Andrew Talbot : shell32: Another cast-qual warning fix.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Oct 2 05:40:48 CDT 2006


Module: wine
Branch: master
Commit: 19e85ca5a9eba72fb1c8d6ee525ec7600296b900
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=19e85ca5a9eba72fb1c8d6ee525ec7600296b900

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Sun Oct  1 00:04:02 2006 +0100

shell32: Another cast-qual warning fix.

---

 dlls/shell32/shlfileop.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index bff1b63..6405b5b 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -133,6 +133,7 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int
 	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 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int
 	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-cvs mailing list