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

trunk/src/crypt32/sip.c

@@ -21 +21 @@
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #define WINE_LARGE_INTEGER /* for QuadPart in LARGE_INTEGER */
@@ -177 +178 @@
 
     /* write the values */
-    r = RegSetValueExW( hKey, szFuncName, 0, REG_SZ, (const BYTE*) szFunction,
+    r = RegSetValueExW( hKey, szFuncName, 0, REG_SZ, (BYTE*) szFunction,
                         ( lstrlenW( szFunction ) + 1 ) * sizeof (WCHAR) );
     if( r != ERROR_SUCCESS ) goto error_close_key;
-    r = RegSetValueExW( hKey, szDllName, 0, REG_SZ, (const BYTE*) szDll,
+    r = RegSetValueExW( hKey, szDllName, 0, REG_SZ, (BYTE*) szDll,
                         ( lstrlenW( szDll ) + 1) * sizeof (WCHAR) );
 
@@ -282 +283 @@
     if (!lib)
         goto end;
-    func = GetProcAddress(lib, functionName);
+    func = (void*)GetProcAddress(lib, functionName);
     if (func)
         *pLib = lib;
@@ -456 +457 @@
                 {
                     HMODULE lib;
-                    pfnIsFileSupported isMy = CRYPT_LoadSIPFuncFromKey(subKey,
-                     &lib);
+                    pfnIsFileSupported isMy =
+                       (pfnIsFileSupported)CRYPT_LoadSIPFuncFromKey(subKey, &lib);
 
                     if (isMy)
@@ -494 +495 @@
                     {
                         HMODULE lib;
-                        pfnIsFileSupportedName isMy2 =
+                        pfnIsFileSupportedName isMy2 = (pfnIsFileSupportedName)
                          CRYPT_LoadSIPFuncFromKey(subKey, &lib);
 
@@ -572 +573 @@
     { &providers_cs_debug.ProcessLocksList,
     &providers_cs_debug.ProcessLocksList },
-    0, 0, { (DWORD_PTR)(__FILE__ ": providers_cs") }
+    0, 0, { (DWORD)(DWORD_PTR)(__FILE__ ": providers_cs") }
 };
 static RTL_CRITICAL_SECTION providers_cs = { &providers_cs_debug, -1, 0, 0, 0, 0 };
@@ -584 +585 @@
         prov->subject = *pgSubject;
         prov->info = *info;
-        EnterCriticalSection(&providers_cs);
+        EnterCriticalSection((CRITICAL_SECTION*)&providers_cs);
         list_add_tail(&providers, &prov->entry);
-        LeaveCriticalSection(&providers_cs);
+        LeaveCriticalSection((CRITICAL_SECTION*)&providers_cs);
     }
 }
@@ -594 +595 @@
     WINE_SIP_PROVIDER *provider = NULL, *ret = NULL;
 
-    EnterCriticalSection(&providers_cs);
+    EnterCriticalSection((CRITICAL_SECTION*)&providers_cs);
     LIST_FOR_EACH_ENTRY(provider, &providers, WINE_SIP_PROVIDER, entry)
     {
@@ -602 +603 @@
     if (provider && IsEqualGUID(pgSubject, &provider->subject))
         ret = provider;
-    LeaveCriticalSection(&providers_cs);
+    LeaveCriticalSection((CRITICAL_SECTION*)&providers_cs);
     return ret;
 }
@@ -631 +632 @@
     HMODULE lib = NULL, temp = NULL;
 
-    sip.pfGet = CRYPT_LoadSIPFunc(pgSubject, szGetSigned, &lib);
+    sip.pfGet = (pCryptSIPGetSignedDataMsg)CRYPT_LoadSIPFunc(pgSubject, szGetSigned, &lib);
     if (!sip.pfGet)
         goto error;
-    sip.pfPut = CRYPT_LoadSIPFunc(pgSubject, szPutSigned, &temp);
+    sip.pfPut = (pCryptSIPPutSignedDataMsg)CRYPT_LoadSIPFunc(pgSubject, szPutSigned, &temp);
     if (!sip.pfPut || temp != lib)
         goto error;
     FreeLibrary(temp);
-    sip.pfCreate = CRYPT_LoadSIPFunc(pgSubject, szCreate, &temp);
+    sip.pfCreate = (pCryptSIPCreateIndirectData)CRYPT_LoadSIPFunc(pgSubject, szCreate, &temp);
     if (!sip.pfCreate || temp != lib)
         goto error;
     FreeLibrary(temp);
-    sip.pfVerify = CRYPT_LoadSIPFunc(pgSubject, szVerify, &temp);
+    sip.pfVerify = (pCryptSIPVerifyIndirectData)CRYPT_LoadSIPFunc(pgSubject, szVerify, &temp);
     if (!sip.pfVerify || temp != lib)
         goto error;
     FreeLibrary(temp);
-    sip.pfRemove = CRYPT_LoadSIPFunc(pgSubject, szRemoveSigned, &temp);
+    sip.pfRemove = (pCryptSIPRemoveSignedDataMsg)CRYPT_LoadSIPFunc(pgSubject, szRemoveSigned, &temp);
     if (!sip.pfRemove || temp != lib)
         goto error;
@@ -720 +721 @@
     TRACE("(%p %p %p)\n", pSubjectInfo, pcbIndirectData, pIndirectData);
 
-    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
+    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)) != NULL)
         ret = sip->info.pfCreate(pSubjectInfo, pcbIndirectData, pIndirectData);
     TRACE("returning %d\n", ret);
@@ -738 +739 @@
           pcbSignedDataMsg, pbSignedDataMsg);
 
-    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
+    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)) != NULL)
         ret = sip->info.pfGet(pSubjectInfo, pdwEncodingType, dwIndex,
          pcbSignedDataMsg, pbSignedDataMsg);
@@ -757 +758 @@
           cbSignedDataMsg, pbSignedDataMsg);
 
-    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
+    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)) != NULL)
         ret = sip->info.pfPut(pSubjectInfo, pdwEncodingType, pdwIndex,
          cbSignedDataMsg, pbSignedDataMsg);
@@ -775 +776 @@
     TRACE("(%p %d)\n", pSubjectInfo, dwIndex);
 
-    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
+    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)) != NULL)
         ret = sip->info.pfRemove(pSubjectInfo, dwIndex);
     TRACE("returning %d\n", ret);
@@ -792 +793 @@
     TRACE("(%p %p)\n", pSubjectInfo, pIndirectData);
 
-    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)))
+    if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType)) != NULL)
         ret = sip->info.pfVerify(pSubjectInfo, pIndirectData);
     TRACE("returning %d\n", ret);