include wingdi before winuser.h

replace nice construct with static const WCHAR :)

svn path=/trunk/; revision=22537
This commit is contained in:
Johannes Anderwald 2006-06-23 18:27:08 +00:00
parent 98b5733eb2
commit ec5b7e38c0
3 changed files with 8 additions and 1 deletions

View file

@ -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"

View file

@ -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))

View file

@ -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"