[ros-diffs] [janderwald] 22537: include wingdi before winuser.h replace nice construct with static const WCHAR :)

[janderwald at svn.reactos.org]

Author: janderwald
Date: Fri Jun 23 22:27:08 2006
New Revision: 22537

URL: http://svn.reactos.org/svn/reactos?rev=22537&view=rev
Log:
include wingdi before winuser.h
replace nice construct with static const WCHAR :)

Modified:
    trunk/reactos/dll/win32/crypt32/oid.c
    trunk/reactos/dll/win32/crypt32/protectdata.c
    trunk/reactos/dll/win32/crypt32/store.c

Modified: trunk/reactos/dll/win32/crypt32/oid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?rev=22537&r1=22536&r2=22537&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/oid.c (original)
+++ trunk/reactos/dll/win32/crypt32/oid.c Fri Jun 23 22:27:08 2006
@@ -23,6 +23,7 @@
 #include "winbase.h"
 #include "wincrypt.h"
 #include "winreg.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/debug.h"
 #include "wine/list.h"

Modified: trunk/reactos/dll/win32/crypt32/protectdata.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectdata.c?rev=22537&r1=22536&r2=22537&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/protectdata.c (original)
+++ trunk/reactos/dll/win32/crypt32/protectdata.c Fri Jun 23 22:27:08 2006
@@ -56,6 +56,9 @@
     'I','\'','m',' ','h','u','n','t','i','n','g',' ',
     'w','a','b','b','i','t','s',0
 };
+
+static const WCHAR szNullString[] =
+{ '\0' };
 
 /*
  * The data format returned by the real Windows CryptProtectData seems
@@ -843,6 +846,8 @@
     HCRYPTKEY hKey;
     DWORD dwLength;
 
+
+
     TRACE("called\n");
 
     SetLastError(ERROR_SUCCESS);
@@ -861,7 +866,7 @@
     /* Windows appears to create an empty szDataDescr instead of maintaining
      * a NULL */
     if (!szDataDescr)
-        szDataDescr=(WCHAR[]){'\0'};
+        szDataDescr = szNullString;
 
     /* get crypt context */
     if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

Modified: trunk/reactos/dll/win32/crypt32/store.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?rev=22537&r1=22536&r2=22537&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crypt32/store.c (original)
+++ trunk/reactos/dll/win32/crypt32/store.c Fri Jun 23 22:27:08 2006
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winreg.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wincrypt.h"
 #include "wine/debug.h"