Changeset 21354 for trunk/src/crypt32/protectdata.c

Timestamp:

Feb 21, 2010, 5:32:09 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/crypt32/protectdata.c (modified) (10 diffs)

trunk/src/crypt32/protectdata.c

@@ -264 +264 @@
     /*if (pSerial->cbData<256) pSerial->cbData=256;*/
 
-    pSerial->pbData=LocalAlloc(LPTR,pSerial->cbData);
+    pSerial->pbData=(BYTE*)LocalAlloc(LPTR,pSerial->cbData);
     if (!pSerial->pbData) return FALSE;
 
@@ -338 +338 @@
         ERR("struct size changed!? %u != expected %u\n",
             ptr - pSerial->pbData, dwStruct);
-        LocalFree(pSerial->pbData);
+        LocalFree((HANDLE)pSerial->pbData);
         pSerial->pbData=NULL;
         pSerial->cbData=0;
@@ -410 +410 @@
 
     /* cipher_alg */
-    if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg))
+    if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg))
     {
         ERR("reading cipher_alg failed!\n");
@@ -439 +439 @@
     
     /* hash_alg */
-    if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg))
+    if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg))
     {
         ERR("reading hash_alg failed!\n");
@@ -598 +598 @@
     pInfo->null0=0x0000;
 
-    if ((pInfo->szDataDescr=CryptMemAlloc((dwStrLen+1)*sizeof(WCHAR))))
+    if ((pInfo->szDataDescr=CryptMemAlloc((dwStrLen+1)*sizeof(WCHAR))) != NULL)
     {
         memcpy(pInfo->szDataDescr,szDataDescr,(dwStrLen+1)*sizeof(WCHAR));
@@ -613 +613 @@
 
     /* allocate memory to hold a salt */
-    if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN)))
+    if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN)) != NULL)
     {
         /* generate random salt */
@@ -794 +794 @@
     {
         TRACE_DATA_BLOB(pOptionalEntropy);
-        TRACE("  %s\n",debugstr_an((LPCSTR)pOptionalEntropy->pbData,pOptionalEntropy->cbData));
+        TRACE("  %s\n", debugstr_an((LPCSTR)pOptionalEntropy->pbData,pOptionalEntropy->cbData));
     }
 
@@ -1071 +1071 @@
     /* prepare for plaintext */
     pDataOut->cbData=protect_data.cipher.cbData;
-    if (!(pDataOut->pbData=LocalAlloc( LPTR, pDataOut->cbData)))
+    if (!(pDataOut->pbData=(BYTE*)LocalAlloc( LPTR, pDataOut->cbData)))
     {
         ERR("CryptMemAlloc\n");
@@ -1087 +1087 @@
         SetLastError(ERROR_INVALID_DATA);
 
-        LocalFree( pDataOut->pbData );
+        LocalFree((HANDLE)pDataOut->pbData );
         pDataOut->pbData = NULL;
         pDataOut->cbData = 0;
@@ -1098 +1098 @@
     if (ppszDataDescr)
     {
-        if (!(*ppszDataDescr = LocalAlloc(LPTR,dwLength)))
+        if (!(*ppszDataDescr = (LPWSTR)LocalAlloc(LPTR,dwLength)))
         {
             ERR("LocalAlloc (ppszDataDescr)\n");