[ros-dev] RE: [ros-diffs] [cwittich] 19320: got a lot of crypt32stuff working

[Robert Shearman]

Thomas Weidenmueller wrote:

>Please commit and/or email the patch to wine-patches if appropriate, I'm
>not sure if the patch is any good or just yet another bad hack. Comments
>appreciated.
>  
>

I'll happily send the patch to wine-patches on your behalf. However, I 
want to know why the addition of the headers below are needed so that I 
can make our headers more compatible so that changes aren't needed in 
the future. AFAICS, ntstatus.h is only needed for 
STATUS_ACCESS_VIOLATION, but this should be defined by winnt.h that is 
included somewhere. Why is winternl.h needed?

>- Thomas
>  
>
>------------------------------------------------------------------------
>
>Index: dlls/crypt32/cert.c
>===================================================================
>RCS file: /home/wine/wine/dlls/crypt32/cert.c,v
>retrieving revision 1.21
>diff -u -r1.21 cert.c
>--- dlls/crypt32/cert.c	31 Oct 2005 10:04:06 -0000	1.21
>+++ dlls/crypt32/cert.c	18 Nov 2005 16:31:05 -0000
>@@ -27,6 +27,7 @@
>  *   registering and enumerating physical stores and locations.)
>  * - Many flags, options and whatnot are unimplemented.
>  */
>+#include "config.h"
> #include <assert.h>
> #include <stdarg.h>
> #include "windef.h"
>@@ -38,6 +39,8 @@
> #include "wine/debug.h"
> #include "wine/list.h"
> #include "excpt.h"
>+#include "ntstatus.h"
>+#include "winternl.h"
> #include "wine/exception.h"
> #include "crypt32_private.h"
> 
>Index: dlls/crypt32/encode.c
>===================================================================
>RCS file: /home/wine/wine/dlls/crypt32/encode.c,v
>retrieving revision 1.32
>diff -u -r1.32 encode.c
>--- dlls/crypt32/encode.c	28 Oct 2005 10:09:26 -0000	1.32
>+++ dlls/crypt32/encode.c	18 Nov 2005 16:43:27 -0000
>@@ -31,6 +31,7 @@
>  * MSDN, especially:
>  * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cryptencodeobject_and_cryptdecodeobject.asp
>  */
>+#include "config.h"
> #include <assert.h>
> #include <stdarg.h>
> #include <stdio.h>
>@@ -44,6 +45,8 @@
> #include "wincrypt.h"
> #include "winreg.h"
> #include "snmp.h"
>+#include "winternl.h"
>+#include "ntstatus.h"
> #include "wine/debug.h"
> #include "wine/exception.h"
> 
>@@ -53,7 +56,9 @@
> /* a few asn.1 tags we need */
> #define ASN_BOOL            (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01)
> #define ASN_BITSTRING       (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03)
>+#ifndef ASN_OCTETSTRING
> #define ASN_OCTETSTRING     (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x04)
>+#endif
> #define ASN_ENUMERATED      (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0a)
> #define ASN_SETOF           (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x11)
> #define ASN_NUMERICSTRING   (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x12)
>  
>


-- 
Rob Shearman