From ec5b7e38c0c167f1f4c3598c09ae5114cf54dbdd Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Fri, 23 Jun 2006 18:27:08 +0000
Subject: [PATCH] include wingdi before winuser.h replace nice construct with
 static const WCHAR :)

svn path=/trunk/; revision=22537
---
 reactos/dll/win32/crypt32/oid.c         | 1 +
 reactos/dll/win32/crypt32/protectdata.c | 7 ++++++-
 reactos/dll/win32/crypt32/store.c       | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/reactos/dll/win32/crypt32/oid.c b/reactos/dll/win32/crypt32/oid.c
index 1555bb240db..5af42096ad9 100644
--- a/reactos/dll/win32/crypt32/oid.c
+++ b/reactos/dll/win32/crypt32/oid.c
@@ -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"
diff --git a/reactos/dll/win32/crypt32/protectdata.c b/reactos/dll/win32/crypt32/protectdata.c
index 9f9e0d18026..320a62cef7c 100644
--- a/reactos/dll/win32/crypt32/protectdata.c
+++ b/reactos/dll/win32/crypt32/protectdata.c
@@ -57,6 +57,9 @@ static const BYTE crypt32_protectdata_secret[] = {
     'w','a','b','b','i','t','s',0
 };
 
+static const WCHAR szNullString[] =
+{ '\0' };
+
 /*
  * The data format returned by the real Windows CryptProtectData seems
  * to be something like this:
@@ -843,6 +846,8 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
     HCRYPTKEY hKey;
     DWORD dwLength;
 
+
+
     TRACE("called\n");
 
     SetLastError(ERROR_SUCCESS);
@@ -861,7 +866,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
     /* 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))
diff --git a/reactos/dll/win32/crypt32/store.c b/reactos/dll/win32/crypt32/store.c
index 495ca03b917..a90cc3f3dfd 100644
--- a/reactos/dll/win32/crypt32/store.c
+++ b/reactos/dll/win32/crypt32/store.c
@@ -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"