msvc6 warning fixes for shell32

Royce Mitchell III royce3 at ev1.net
Mon Sep 12 16:23:50 CDT 2005


-------------- next part --------------
? dlls/shell32/brsfolder.c.ros
? dlls/shell32/shell32_main.h.ros
Index: dlls/shell32/brsfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/brsfolder.c,v
retrieving revision 1.63
diff -u -r1.63 brsfolder.c
--- dlls/shell32/brsfolder.c	2 Sep 2005 11:32:18 -0000	1.63
+++ dlls/shell32/brsfolder.c	12 Sep 2005 21:13:54 -0000
@@ -269,7 +269,7 @@
 	tvi.cChildren= pEnumIL ? 1 : 0;
 	tvi.mask |= TVIF_CHILDREN;
 
-	lptvid = SHAlloc( sizeof(TV_ITEMDATA) );
+	lptvid = (LPTV_ITEMDATA)SHAlloc( sizeof(TV_ITEMDATA) );
 	if (!lptvid)
 	    return NULL;
 
Index: dlls/shell32/shell32_main.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v
retrieving revision 1.106
diff -u -r1.106 shell32_main.h
--- dlls/shell32/shell32_main.h	2 Sep 2005 11:32:18 -0000	1.106
+++ dlls/shell32/shell32_main.h	12 Sep 2005 21:14:42 -0000
@@ -183,7 +183,7 @@
 	};
 inline static void __SHCloneStrA(char ** target,const char * source)
 {
-	*target = SHAlloc(strlen(source)+1);
+	*target = (char*)SHAlloc(strlen(source)+1);
 	strcpy(*target, source);
 }
 
@@ -196,7 +196,7 @@
 
 inline static void __SHCloneStrW(WCHAR ** target, const WCHAR * source)
 {
-	*target = SHAlloc( (strlenW(source)+1) * sizeof(WCHAR) );
+	*target = (WCHAR*)SHAlloc( (strlenW(source)+1) * sizeof(WCHAR) );
 	strcpyW(*target, source);
 }
 


More information about the wine-patches mailing list