Avoid non-portable WCHAR[] constructs.

This commit is contained in:
Dmitry Timoshkov 2006-07-03 19:54:10 +09:00 committed by Alexandre Julliard
parent 7e9fd0b4c1
commit 081563e7ec
2 changed files with 3 additions and 4 deletions

View File

@ -107,7 +107,7 @@ struct protect_data_t
};
/* this is used to check if an incoming structure was built by Wine */
static const char * crypt_magic_str = "Wine Crypt32 ok";
static const char crypt_magic_str[] = "Wine Crypt32 ok";
/* debugging tool to print strings of hex chars */
static const char *
@ -835,8 +835,8 @@ BOOL WINAPI CryptProtectData(DATA_BLOB* pDataIn,
DWORD dwFlags,
DATA_BLOB* pDataOut)
{
static const WCHAR empty_str[1];
BOOL rc = FALSE;
HCRYPTPROV hProv;
struct protect_data_t protect_data;
HCRYPTHASH hHash;
@ -861,7 +861,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 = empty_str;
/* get crypt context */
if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

View File

@ -1680,7 +1680,6 @@ static void dump_table( string_table *st, USHORT *rawdata, UINT rawsize )
for( i=0; i<(rawsize/2); i++ )
{
sval = msi_string_lookup_id( st, rawdata[i] );
if( !sval ) sval = (WCHAR[]) {0};
MESSAGE(" %04x %s\n", rawdata[i], debugstr_w(sval) );
}
}