Changeset 21353 for trunk/src/advapi32/crypt.c

Timestamp:

Feb 21, 2010, 5:30:47 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/advapi32/crypt.c (modified) (22 diffs)

trunk/src/advapi32/crypt.c

@@ -200 +200 @@
 
 #define CRYPT_GetProvFunc(name) \
-        if ( !(provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)) ) goto error
+        if ( !(provider->pFuncs->p##name = (fn##name *)GetProcAddress(provider->hModule, #name)) ) goto error
 #define CRYPT_GetProvFuncOpt(name) \
-        provider->pFuncs->p##name = (void*)GetProcAddress(provider->hModule, #name)
+        provider->pFuncs->p##name = (fn##name *)GetProcAddress(provider->hModule, #name)
 static PCRYPTPROV CRYPT_LoadProvider(PCWSTR pImage)
 {
@@ -208 +208 @@
         DWORD errorcode = ERROR_NOT_ENOUGH_MEMORY;
 
-        if ( !(provider = CRYPT_Alloc(sizeof(CRYPTPROV))) ) goto error;
-        if ( !(provider->pFuncs = CRYPT_Alloc(sizeof(PROVFUNCS))) ) goto error;
-        if ( !(provider->pVTable = CRYPT_Alloc(sizeof(VTableProvStruc))) ) goto error;
+        if ( !(provider = (PCRYPTPROV)CRYPT_Alloc(sizeof(CRYPTPROV))) ) goto error;
+        if ( !(provider->pFuncs = (PPROVFUNCS)CRYPT_Alloc(sizeof(PROVFUNCS))) ) goto error;
+        if ( !(provider->pVTable = (PVTableProvStruc)CRYPT_Alloc(sizeof(VTableProvStruc))) ) goto error;
         if ( !(provider->hModule = LoadLibraryW(pImage)) )
         {
@@ -325 +325 @@
                                              uuid.Data4[6], uuid.Data4[7] );
                                     RegSetValueExW(key, machineGuidW, 0, REG_SZ,
-                                                   (const BYTE *)buf,
+                                                   (BYTE *)buf,
                                                    (lstrlenW(buf)+1)*sizeof(WCHAR));
                                 }
@@ -417 +417 @@
                         goto error;
                 }
-                if(!(provname = CRYPT_Alloc(len)))
+                if(!(provname = (PWSTR)CRYPT_Alloc(len)))
                 {
                         RegCloseKey(key);
@@ -433 +433 @@
                 RegCloseKey(key);
         } else {
-                if ( !(provname = CRYPT_Alloc((strlenW(pszProvider) +1)*sizeof(WCHAR))) )
+                if ( !(provname = (PWSTR)CRYPT_Alloc((strlenW(pszProvider) +1)*sizeof(WCHAR))) )
                 {
                         SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -471 +471 @@
                 goto error;
         }
-        if (!(temp = CRYPT_Alloc(len)))
+        if (!(temp = (PWSTR)CRYPT_Alloc(len)))
         {
                 RegCloseKey(key);
@@ -487 +487 @@
         RegCloseKey(key);
         len = ExpandEnvironmentStringsW(temp, NULL, 0);
-        if ( !(imagepath = CRYPT_Alloc(len*sizeof(WCHAR))) )
+        if ( !(imagepath = (PWSTR)CRYPT_Alloc(len*sizeof(WCHAR))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -660 +660 @@
 
         pProv->refcount--;
-        if (pProv->refcount <= 0) 
+        if (pProv->refcount == 0) 
         {
                 ret = pProv->pFuncs->pCPReleaseContext(pProv->hPrivate, dwFlags);
@@ -757 +757 @@
                 return FALSE;
         }
-        if ( !(hash = CRYPT_Alloc(sizeof(CRYPTHASH))) )
+        if ( !(hash = (PCRYPTHASH)CRYPT_Alloc(sizeof(CRYPTHASH))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -851 +851 @@
                 return FALSE;
         }
-        if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+        if ( !(key = (PCRYPTKEY)CRYPT_Alloc(sizeof(CRYPTKEY))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -984 +984 @@
         }
 
-        if ( !(newhash = CRYPT_Alloc(sizeof(CRYPTHASH))) )
+        if ( !(newhash = (PCRYPTHASH)CRYPT_Alloc(sizeof(CRYPTHASH))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1037 +1037 @@
         }
 
-        if ( !(newkey = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+        if ( !(newkey = (PCRYPTKEY)CRYPT_Alloc(sizeof(CRYPTKEY))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1159 +1159 @@
                                  NULL, NULL, NULL, NULL, NULL, NULL);
                 
-                if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR))))
+                if (!(provNameW = (WCHAR *)CRYPT_Alloc(*pcbProvName * sizeof(WCHAR))))
                 {
                         SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1213 +1213 @@
         if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize))
                 return FALSE;
-        if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) )
+        if ( pszProvName && !(str = (PWSTR)CRYPT_Alloc(bufsize)) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1296 +1296 @@
         }
         keylen++;
-        if ( !(keyname = CRYPT_Alloc(keylen*sizeof(WCHAR))) )
+        if ( !(keyname = (PWSTR)CRYPT_Alloc(keylen*sizeof(WCHAR))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1342 +1342 @@
         if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &bufsize))
                 return FALSE;
-        if ( pszTypeName && !(str = CRYPT_Alloc(bufsize)) )
+        if ( pszTypeName && !(str = (PWSTR)CRYPT_Alloc(bufsize)) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1435 +1435 @@
                 return FALSE;
         }
-        if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+        if ( !(key = (PCRYPTKEY)CRYPT_Alloc(sizeof(CRYPTKEY))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1540 +1540 @@
 
         CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &bufsize);
-        if ( pszProvName && !(str = CRYPT_Alloc(bufsize)) )
+        if ( pszProvName && !(str = (PWSTR)CRYPT_Alloc(bufsize)) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1703 +1703 @@
                 return FALSE;
         }
-        if ( !(key = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+        if ( !(key = (PCRYPTKEY)CRYPT_Alloc(sizeof(CRYPTKEY))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1829 +1829 @@
         }
 
-        if ( !(importkey = CRYPT_Alloc(sizeof(CRYPTKEY))) )
+        if ( !(importkey = (PCRYPTKEY)CRYPT_Alloc(sizeof(CRYPTKEY))) )
         {
                 SetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -2067 +2067 @@
         if (dwFlags & CRYPT_DELETE_DEFAULT)
         {
-                RegDeleteValueW(hTypeKey, nameW);
+        RegDeleteValueW(hTypeKey, (WCHAR*)nameW);
         }
         else
@@ -2087 +2087 @@
                 CRYPT_Free(keyname);
                 
-                if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName,
+                if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (BYTE *)pszProvName,
                         (strlenW(pszProvName) + 1)*sizeof(WCHAR)))
                 {