shell32: Cast-qual warnings fix (2 of 4)

Andrew Talbot Andrew.Talbot at talbotville.com
Thu Sep 28 17:14:30 CDT 2006


Changelog:
    shell32: Cast-qual warnings fix.

diff -urN a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
--- a/dlls/shell32/pidl.c	2006-08-22 11:56:31.000000000 +0100
+++ b/dlls/shell32/pidl.c	2006-09-28 21:45:23.000000000 +0100
@@ -1971,7 +1971,7 @@
     if (!(_ILIsValue(pidl) || _ILIsFolder(pidl)))
         return NULL;
 
-    cbOffset = *(WORD*)((LPBYTE)pidl + pidl->mkid.cb - sizeof(WORD));
+    cbOffset = *(const WORD *)((const BYTE *)pidl + pidl->mkid.cb - sizeof(WORD));
     pFileStructW = (FileStructW*)((LPBYTE)pidl + cbOffset);
 
     /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP
diff -urN a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c
--- a/dlls/shell32/regsvr.c	2006-08-09 22:19:32.000000000 +0100
+++ b/dlls/shell32/regsvr.c	2006-09-28 22:10:20.000000000 +0100
@@ -344,13 +344,13 @@
 				  &shellfolder_key, NULL);
 	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
 	    if (list->flags & SHELLFOLDER_WANTSFORPARSING)
-		res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (LPBYTE)"", 1);
+		res = RegSetValueExA(shellfolder_key, wfparsing_valuename, 0, REG_SZ, (const BYTE *)"", 1);
 	    if (list->flags & SHELLFOLDER_ATTRIBUTES) 
 		res = RegSetValueExA(shellfolder_key, attributes_valuename, 0, REG_DWORD, 
-				     (LPBYTE)&list->dwAttributes, sizeof(DWORD));
+				     (const BYTE *)&list->dwAttributes, sizeof(DWORD));
 	    if (list->flags & SHELLFOLDER_CALLFORATTRIBUTES) 
 		res = RegSetValueExA(shellfolder_key, cfattributes_valuename, 0, REG_DWORD,
-				     (LPBYTE)&list->dwCallForAttributes, sizeof(DWORD));
+				     (const BYTE *)&list->dwCallForAttributes, sizeof(DWORD));
 	    RegCloseKey(shellfolder_key);
 	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
 	}
@@ -460,7 +460,7 @@
         if (pwszKey && ERROR_SUCCESS == 
             RegCreateKeyExW(HKEY_LOCAL_MACHINE, pwszKey, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)) 
         {
-            RegSetValueExW(hKey, NULL, 0, REG_SZ, (LPBYTE)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1));
+            RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE *)list->value, sizeof(WCHAR)*(lstrlenW(list->value)+1));
             RegCloseKey(hKey);
         }
 



More information about the wine-patches mailing list