mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 17:41:33 +00:00
crypt32: Cast-qual warnings fix.
This commit is contained in:
parent
c0d2923cc1
commit
950b838e28
|
@ -1019,7 +1019,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNameValue(DWORD dwCertEncodingType,
|
|||
|
||||
__TRY
|
||||
{
|
||||
const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo;
|
||||
const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo;
|
||||
|
||||
switch (value->dwValueType)
|
||||
{
|
||||
|
@ -1159,7 +1159,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType,
|
|||
|
||||
static int BLOBComp(const void *l, const void *r)
|
||||
{
|
||||
CRYPT_DER_BLOB *a = (CRYPT_DER_BLOB *)l, *b = (CRYPT_DER_BLOB *)r;
|
||||
const CRYPT_DER_BLOB *a = (const CRYPT_DER_BLOB *)l, *b = (const CRYPT_DER_BLOB *)r;
|
||||
int ret;
|
||||
|
||||
if (!(ret = memcmp(a->pbData, b->pbData, min(a->cbData, b->cbData))))
|
||||
|
@ -1564,7 +1564,7 @@ static BOOL WINAPI CRYPT_AsnEncodeUnicodeNameValue(DWORD dwCertEncodingType,
|
|||
|
||||
__TRY
|
||||
{
|
||||
const CERT_NAME_VALUE *value = (CERT_NAME_VALUE *)pvStructInfo;
|
||||
const CERT_NAME_VALUE *value = (const CERT_NAME_VALUE *)pvStructInfo;
|
||||
|
||||
switch (value->dwValueType)
|
||||
{
|
||||
|
|
|
@ -555,7 +555,7 @@ void free_protect_data(struct protect_data_t * pInfo)
|
|||
|
||||
/* copies a string into a data blob */
|
||||
static
|
||||
BYTE * convert_str_to_blob(char* str, DATA_BLOB* blob)
|
||||
BYTE *convert_str_to_blob(LPCSTR str, DATA_BLOB *blob)
|
||||
{
|
||||
if (!str || !blob) return NULL;
|
||||
|
||||
|
@ -590,11 +590,11 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr,
|
|||
|
||||
pInfo->count0=0x0001;
|
||||
|
||||
convert_str_to_blob((char*)crypt_magic_str,&pInfo->info0);
|
||||
convert_str_to_blob(crypt_magic_str, &pInfo->info0);
|
||||
|
||||
pInfo->count1=0x0001;
|
||||
|
||||
convert_str_to_blob((char*)crypt_magic_str,&pInfo->info1);
|
||||
convert_str_to_blob(crypt_magic_str, &pInfo->info1);
|
||||
|
||||
pInfo->null0=0x0000;
|
||||
|
||||
|
@ -606,7 +606,7 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr,
|
|||
pInfo->unknown0=0x0000;
|
||||
pInfo->unknown1=0x0000;
|
||||
|
||||
convert_str_to_blob((char*)crypt_magic_str,&pInfo->data0);
|
||||
convert_str_to_blob(crypt_magic_str, &pInfo->data0);
|
||||
|
||||
pInfo->null1=0x0000;
|
||||
pInfo->unknown2=0x0000;
|
||||
|
|
|
@ -572,7 +572,7 @@ static DWORD CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators,
|
|||
|
||||
while (*separators)
|
||||
map[*separators++] = 1;
|
||||
while (*str && (*str >= 0xff || !map[*(unsigned short *)str]))
|
||||
while (*str && (*str >= 0xff || !map[*(const unsigned short *)str]))
|
||||
str++;
|
||||
token->end = str;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue