mirror of
https://github.com/reactos/reactos.git
synced 2024-10-27 16:46:55 +00:00
include wingdi before winuser.h
replace nice construct with static const WCHAR :) svn path=/trunk/; revision=22537
This commit is contained in:
parent
98b5733eb2
commit
ec5b7e38c0
|
@ -23,6 +23,7 @@
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "wincrypt.h"
|
#include "wincrypt.h"
|
||||||
#include "winreg.h"
|
#include "winreg.h"
|
||||||
|
#include "wingdi.h"
|
||||||
#include "winuser.h"
|
#include "winuser.h"
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/list.h"
|
#include "wine/list.h"
|
||||||
|
|
|
@ -57,6 +57,9 @@ static const BYTE crypt32_protectdata_secret[] = {
|
||||||
'w','a','b','b','i','t','s',0
|
'w','a','b','b','i','t','s',0
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const WCHAR szNullString[] =
|
||||||
|
{ '\0' };
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The data format returned by the real Windows CryptProtectData seems
|
* The data format returned by the real Windows CryptProtectData seems
|
||||||
* to be something like this:
|
* to be something like this:
|
||||||
|
@ -843,6 +846,8 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
|
||||||
HCRYPTKEY hKey;
|
HCRYPTKEY hKey;
|
||||||
DWORD dwLength;
|
DWORD dwLength;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TRACE("called\n");
|
TRACE("called\n");
|
||||||
|
|
||||||
SetLastError(ERROR_SUCCESS);
|
SetLastError(ERROR_SUCCESS);
|
||||||
|
@ -861,7 +866,7 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
|
||||||
/* Windows appears to create an empty szDataDescr instead of maintaining
|
/* Windows appears to create an empty szDataDescr instead of maintaining
|
||||||
* a NULL */
|
* a NULL */
|
||||||
if (!szDataDescr)
|
if (!szDataDescr)
|
||||||
szDataDescr=(WCHAR[]){'\0'};
|
szDataDescr = szNullString;
|
||||||
|
|
||||||
/* get crypt context */
|
/* get crypt context */
|
||||||
if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))
|
if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "winnls.h"
|
#include "winnls.h"
|
||||||
#include "winreg.h"
|
#include "winreg.h"
|
||||||
|
#include "wingdi.h"
|
||||||
#include "winuser.h"
|
#include "winuser.h"
|
||||||
#include "wincrypt.h"
|
#include "wincrypt.h"
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
|
Loading…
Reference in a new issue