shell32: Another cast-qual warning fix

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Sep 30 18:04:02 CDT 2006


Changelog:
    shell32: Cast-qual warning fix.

diff -urN a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
--- a/dlls/shell32/shlfileop.c	2006-09-12 23:59:42.000000000 +0100
+++ b/dlls/shell32/shlfileop.c	2006-09-30 23:46:52.000000000 +0100
@@ -133,6 +133,7 @@
 	WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256];
 	SHELL_ConfirmIDstruc ids;
 	MSGBOXPARAMSW params;
+	DWORD_PTR args[1];
 
 	if (!SHELL_ConfirmIDs(nKindOfDialog, &ids))
 	  return FALSE;
@@ -140,8 +141,9 @@
 	LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR));
 	LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR));
 
+	args[0] = (DWORD_PTR)szDir;
 	FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
-	               szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir);
+	               szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args);
 
         ZeroMemory(&params, sizeof(params));
         params.cbSize = sizeof(MSGBOXPARAMSW);



More information about the wine-patches mailing list