crypt32: Cast-qual warnings fix

[Andrew Talbot]

Changelog:
    crypt32: Cast-qual warnings fix.

diff -urN a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
--- a/dlls/crypt32/oid.c	2006-10-04 10:26:38.000000000 +0100
+++ b/dlls/crypt32/oid.c	2006-10-25 20:19:14.000000000 +0100
@@ -253,8 +253,11 @@
                 func->encoding = dwEncodingType;
                 if (HIWORD(rgFuncEntry[i].pszOID))
                 {
-                    func->entry.pszOID = (LPSTR)((LPBYTE)func + sizeof(*func));
-                    strcpy((LPSTR)func->entry.pszOID, rgFuncEntry[i].pszOID);
+                    LPSTR oid;
+
+                    oid = (LPSTR)((LPBYTE)func + sizeof(*func));
+                    strcpy(oid, rgFuncEntry[i].pszOID);
+                    func->entry.pszOID = oid;
                 }
                 else
                     func->entry.pszOID = rgFuncEntry[i].pszOID;
@@ -276,7 +279,6 @@
 {
     BOOL ret = FALSE;
     char *keyName;
-    const char *funcName;
     HKEY key;
     long rc;
 
@@ -284,6 +286,7 @@
     rc = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key);
     if (!rc)
     {
+        char *funcName;
         DWORD type, size = 0;
 
         rc = RegQueryValueExA(key, "FuncName", NULL, &type, NULL, &size);
@@ -294,7 +297,10 @@
              (LPBYTE)funcName, &size);
         }
         else
-            funcName = szFuncName;
+        {
+            funcName = CryptMemAlloc(strlen(szFuncName) + 1);
+            strcpy(funcName, szFuncName);
+        }
         rc = RegQueryValueExW(key, DllW, NULL, &type, NULL, &size);
         if (rc == ERROR_MORE_DATA && type == REG_SZ)
         {
@@ -337,8 +343,7 @@
         }
         else
             SetLastError(rc);
-        if (funcName != szFuncName)
-            CryptMemFree((char *)funcName);
+        CryptMemFree(funcName);
         RegCloseKey(key);
     }
     else