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

trunk/src/crypt32/oid.c

@@ -23 +23 @@
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 #define NONAMELESSUNION
 #include "windef.h"
@@ -61 +62 @@
     0, 0, &funcSetCS,
     { &funcSetCSDebug.ProcessLocksList, &funcSetCSDebug.ProcessLocksList },
-    0, 0, { (DWORD_PTR)(__FILE__ ": funcSetCS") }
+    0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": funcSetCS") }
 };
 static RTL_CRITICAL_SECTION funcSetCS = { &funcSetCSDebug, -1, 0, 0, 0, 0 };
@@ -106 +107 @@
         }
         setCursor->cs.DebugInfo->Spare[0] = 0;
-        DeleteCriticalSection(&setCursor->cs);
+        DeleteCriticalSection((CRITICAL_SECTION*)&setCursor->cs);
         CryptMemFree(setCursor);
     }
@@ -121 +122 @@
     TRACE("(%s, %x)\n", debugstr_a(pszFuncName), dwFlags);
 
-    EnterCriticalSection(&funcSetCS);
+    EnterCriticalSection((CRITICAL_SECTION*)&funcSetCS);
     LIST_FOR_EACH_ENTRY(cursor, &funcSets, struct OIDFunctionSet, next)
     {
@@ -139 +140 @@
             if (ret->name)
             {
-                InitializeCriticalSection(&ret->cs);
-                ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": OIDFunctionSet.cs");
+                InitializeCriticalSection((CRITICAL_SECTION*)&ret->cs);
+                ret->cs.DebugInfo->Spare[0] = (DWORD)(DWORD_PTR)(__FILE__ ": OIDFunctionSet.cs");
                 list_init(&ret->functions);
                 strcpy(ret->name, pszFuncName);
@@ -152 +153 @@
         }
     }
-    LeaveCriticalSection(&funcSetCS);
+    LeaveCriticalSection((CRITICAL_SECTION*)&funcSetCS);
 
     return (HCRYPTOIDFUNCSET)ret;
@@ -252 +253 @@
         DWORD i;
 
-        EnterCriticalSection(&set->cs);
+        EnterCriticalSection((CRITICAL_SECTION*)&set->cs);
         for (i = 0; ret && i < cFuncEntry; i++)
         {
@@ -281 +282 @@
                 ret = FALSE;
         }
-        LeaveCriticalSection(&set->cs);
+        LeaveCriticalSection((CRITICAL_SECTION*)&set->cs);
     }
     else
@@ -339 +340 @@
                     if (lib)
                     {
-                        *ppvFuncAddr = GetProcAddress(lib, funcName);
+                        *ppvFuncAddr = (LPVOID)GetProcAddress(lib, funcName);
                         if (*ppvFuncAddr)
                         {
@@ -399 +400 @@
         struct OIDFunction *function;
 
-        EnterCriticalSection(&set->cs);
+        EnterCriticalSection((CRITICAL_SECTION*)&set->cs);
         LIST_FOR_EACH_ENTRY(function, &set->functions, struct OIDFunction, next)
         {
@@ -424 +425 @@
             }
         }
-        LeaveCriticalSection(&set->cs);
+        LeaveCriticalSection((CRITICAL_SECTION*)&set->cs);
     }
     if (!*ppvFuncAddr)
@@ -461 +462 @@
     if (*lib)
     {
-        *ppvFuncAddr = GetProcAddress(*lib, func);
+        *ppvFuncAddr = (LPVOID)GetProcAddress(*lib, func);
         if (*ppvFuncAddr)
             ret = TRUE;
@@ -648 +649 @@
     {
         r = RegSetValueExA(hKey, "FuncName", 0, REG_SZ,
-             (const BYTE*)pszOverrideFuncName, lstrlenA(pszOverrideFuncName) + 1);
+             (LPBYTE)pszOverrideFuncName, lstrlenA(pszOverrideFuncName) + 1);
         if (r != ERROR_SUCCESS) goto error_close_key;
     }
-    r = RegSetValueExW(hKey, DllW, 0, REG_SZ, (const BYTE*) pwszDll,
+    r = RegSetValueExW(hKey, DllW, 0, REG_SZ, (LPBYTE) pwszDll,
          (lstrlenW(pwszDll) + 1) * sizeof (WCHAR));
 
@@ -758 +759 @@
     else
     {
-        rc = RegSetValueExW(hKey, pwszValueName, 0, dwValueType, pbValueData,
+        rc = RegSetValueExW(hKey, pwszValueName, 0, dwValueType, (LPBYTE)pbValueData,
          cbValueData);
         if (rc)
@@ -928 +929 @@
     LONG r;
 
-    if ((r = RegSetValueExW(key, DllW, 0, REG_MULTI_SZ, (const BYTE *)dlls,
-     len * sizeof (WCHAR))))
+    if ((r = RegSetValueExW(key, DllW, 0, REG_MULTI_SZ, (LPBYTE)dlls,
+     len * sizeof (WCHAR))) != 0)
         SetLastError(r);
     return r == ERROR_SUCCESS;
@@ -990 +991 @@
 
     dlls = CRYPT_GetDefaultOIDDlls(key);
-    if ((ret = CRYPT_RemoveStringFromMultiString(dlls, pwszDll)))
+    if ((ret = CRYPT_RemoveStringFromMultiString(dlls, pwszDll)) != FALSE)
         ret = CRYPT_SetDefaultOIDDlls(key, dlls);
     CryptMemFree(dlls);
@@ -1031 +1032 @@
     0, 0, &oidInfoCS,
     { &oidInfoCSDebug.ProcessLocksList, &oidInfoCSDebug.ProcessLocksList },
-    0, 0, { (DWORD_PTR)(__FILE__ ": oidInfoCS") }
+    0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": oidInfoCS") }
 };
 static RTL_CRITICAL_SECTION oidInfoCS = { &oidInfoCSDebug, -1, 0, 0, 0, 0 };
@@ -1409 +1410 @@
             LPCWSTR stringresource = NULL;
             int len = LoadStringW(hInstance,
-             (UINT_PTR)oidInfoConstructors[i].pwszName,
+             (UINT)(UINT_PTR)oidInfoConstructors[i].pwszName,
              (LPWSTR)&stringresource, 0);
 
@@ -1426 +1427 @@
                     info->info.dwGroupId = oidInfoConstructors[i].dwGroupId;
                     info->info.u.Algid = oidInfoConstructors[i].Algid;
-                    if (stringresource && (char*)stringresource != 0xAAAAAAAA)
+                    if (stringresource && (char*)stringresource != (char*)0xAAAAAAAA)
                         memcpy(info + 1, stringresource, len*sizeof(WCHAR));
                     ((LPWSTR)(info + 1))[len] = 0;
@@ -1450 +1451 @@
     LIST_FOR_EACH_ENTRY_SAFE(info, next, &oidInfo, struct OIDInfo, entry)
     {
-        if (info > 0x10000)
-        {
-            if (&info->entry  > 0x10000)
+        if (info > (struct OIDInfo*)0x10000)
+        {
+            if (&info->entry > (struct list*)0x10000)
                 list_remove(&info->entry);
             CryptMemFree(info);
@@ -1471 +1472 @@
      pfnEnumOIDInfo);
 
-    EnterCriticalSection(&oidInfoCS);
+    EnterCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
     LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
     {
@@ -1481 +1482 @@
         }
     }
-    LeaveCriticalSection(&oidInfoCS);
+    LeaveCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
     return ret;
 }
@@ -1499 +1500 @@
 
         TRACE("CRYPT_OID_INFO_ALGID_KEY: %d\n", *(DWORD *)pvKey);
-        EnterCriticalSection(&oidInfoCS);
+        EnterCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
@@ -1509 +1510 @@
             }
         }
-        LeaveCriticalSection(&oidInfoCS);
+        LeaveCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         break;
     }
@@ -1517 +1518 @@
 
         TRACE("CRYPT_OID_INFO_NAME_KEY: %s\n", debugstr_w((LPWSTR)pvKey));
-        EnterCriticalSection(&oidInfoCS);
+        EnterCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
@@ -1527 +1528 @@
             }
         }
-        LeaveCriticalSection(&oidInfoCS);
+        LeaveCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         break;
     }
@@ -1536 +1537 @@
 
         TRACE("CRYPT_OID_INFO_OID_KEY: %s\n", debugstr_a(oid));
-        EnterCriticalSection(&oidInfoCS);
+        EnterCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
@@ -1546 +1547 @@
             }
         }
-        LeaveCriticalSection(&oidInfoCS);
+        LeaveCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         break;
     }
@@ -1554 +1555 @@
 
         TRACE("CRYPT_OID_INFO_SIGN_KEY: %d\n", *(DWORD *)pvKey);
-        EnterCriticalSection(&oidInfoCS);
+        EnterCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
         {
@@ -1567 +1568 @@
             }
         }
-        LeaveCriticalSection(&oidInfoCS);
+        LeaveCriticalSection((CRITICAL_SECTION*)&oidInfoCS);
         break;
     }