Changeset 21354 for trunk/src/crypt32/msg.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/msg.c (modified) (18 diffs)

trunk/src/crypt32/msg.c

@@ -21 +21 @@
 
 #include <stdarg.h>
+#include <string.h>
 #define NONAMELESSUNION
 #include "windef.h"
@@ -113 +114 @@
 
     if (msg->bare_content != empty_data_content)
-        LocalFree(msg->bare_content);
+        LocalFree((HANDLE)msg->bare_content);
 }
 
@@ -134 +135 @@
     {
         if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded,
-         pcbEncoded, 1 + lenBytes)))
+         pcbEncoded, 1 + lenBytes)) != FALSE)
         {
             if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)
@@ -156 +157 @@
          0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x80,0x24,0x80 };
 
-        header->pbData = LocalAlloc(0, sizeof(headerValue));
+        header->pbData = (BYTE*)LocalAlloc(0, sizeof(headerValue));
         if (header->pbData)
         {
@@ -211 +212 @@
                      msg->base.stream_info.pvArg, header.pbData, header.cbData,
                      FALSE);
-                    LocalFree(header.pbData);
+                    LocalFree((HANDLE)header.pbData);
                 }
             }
@@ -230 +231 @@
                      msg->base.stream_info.pvArg, header, headerLen,
                      FALSE);
-                    LocalFree(header);
+                    LocalFree((HANDLE)header);
                 }
             }
@@ -437 +438 @@
              pcbData);
         CryptMemFree(digestedData.hash.pbData);
-        LocalFree(digestedData.ContentInfo.Content.pbData);
+        LocalFree((HANDLE)digestedData.ContentInfo.Content.pbData);
     }
     return ret;
@@ -1039 +1040 @@
                  &msg_data->info->rgSignerInfo[signerIndex].AuthAttrs,
                  &messageDigestAttr);
-                LocalFree(encodedHash.pbData);
+                LocalFree((HANDLE)encodedHash.pbData);
             }
         }
@@ -1093 +1094 @@
                      msg_data->signerHandles[i].authAttrHash, encodedAttrs,
                      size, 0);
-                    LocalFree(encodedAttrs);
+                    LocalFree((HANDLE)encodedAttrs);
                 }
             }
@@ -1253 +1254 @@
         {
             ret = CRYPT_AsnEncodeCMSSignedInfo(&info, pvData, pcbData);
-            LocalFree(info.content.Content.pbData);
+            LocalFree((HANDLE)info.content.Content.pbData);
         }
         break;
@@ -1495 +1496 @@
         if (msg->u.signed_data.info)
         {
-            LocalFree(msg->u.signed_data.info);
+            LocalFree((HANDLE)msg->u.signed_data.info);
             CSignedMsgData_CloseHandles(&msg->u.signed_data);
         }
@@ -1541 +1542 @@
         ret = ContextPropertyList_SetProperty(msg->properties,
          CMSG_CONTENT_PARAM, data->pbData, data->cbData);
-        LocalFree(data);
+        LocalFree((HANDLE)data);
     }
     return ret;
@@ -1620 +1621 @@
         ContextPropertyList_SetProperty(msg->properties, CMSG_HASH_DATA_PARAM,
          digestedData->hash.pbData, digestedData->hash.cbData);
-        LocalFree(digestedData);
+        LocalFree((HANDLE)digestedData);
     }
     return ret;
@@ -1653 +1654 @@
     {
     case CMSG_DATA:
-        if ((ret = CDecodeMsg_DecodeDataContent(msg, blob)))
+        if ((ret = CDecodeMsg_DecodeDataContent(msg, blob)) != FALSE)
             msg->type = CMSG_DATA;
         break;
     case CMSG_HASHED:
-        if ((ret = CDecodeMsg_DecodeHashedContent(msg, blob)))
+        if ((ret = CDecodeMsg_DecodeHashedContent(msg, blob)) != FALSE)
             msg->type = CMSG_HASHED;
         break;
@@ -1665 +1666 @@
         break;
     case CMSG_SIGNED:
-        if ((ret = CDecodeMsg_DecodeSignedContent(msg, blob)))
+        if ((ret = CDecodeMsg_DecodeSignedContent(msg, blob)) != FALSE)
             msg->type = CMSG_SIGNED;
         break;
@@ -1694 +1695 @@
                 ret = FALSE;
             }
-            LocalFree(info);
+            LocalFree((HANDLE)info);
         }
     }
@@ -1779 +1780 @@
                     ret = CSignedMsgData_Update(&msg->u.signed_data,
                      blob->pbData, blob->cbData, TRUE, Verify);
-                    LocalFree(blob);
+                    LocalFree((HANDLE)blob);
                 }
             }
@@ -2283 +2284 @@
                     ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData,
                      blob->cbData);
-                    LocalFree(blob);
+                    LocalFree((HANDLE)blob);
                 }
             }