1. Make buffer for message large enough to hold very long file names.

2. Pass FORMAT_MESSAGE_ARGUMENT_ARRAY for FormatMessageA to not assume implementation specific behaviour. 3. Show actual message to user, not non-formatted one.

1. Make buffer for message large enough to hold very long file names.
407916e1 · Dmitry Timoshkov · Alexandre Julliard · 42d20f9d · 407916e1
Commit 407916e1 authored Aug 11, 2000 by Dmitry Timoshkov Committed by Alexandre Julliard Aug 11, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

shlfileop.c dlls/shell32/shlfileop.c +4 -3

No files found.
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -19,13 +19,14 @@ DEFAULT_DEBUG_CHANNEL(shell);

 static BOOL SHELL_WarnFolderDelete (int nKindOfDialog, LPCSTR szDir)
 {
-	char szCaption[255], szText[255], szBuffer[256];
+	char szCaption[255], szText[255], szBuffer[MAX_PATH + 256];

 	LoadStringA(shell32_hInstance, IDS_DELETEFOLDER_TEXT, szText, sizeof(szText));
 	LoadStringA(shell32_hInstance, IDS_DELETEFOLDER_CAPTION, szCaption, sizeof(szCaption));
-	FormatMessageA(FORMAT_MESSAGE_FROM_STRING, szText, 0,0, szBuffer, sizeof(szBuffer), (DWORD*)&szDir);
+	FormatMessageA(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+	    szText, 0, 0, szBuffer, sizeof(szBuffer), (DWORD*)&szDir);

-	return (IDOK == MessageBoxA(GetActiveWindow(),szText, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION));
+	return (IDOK == MessageBoxA(GetActiveWindow(), szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION));
 }

 /**************************************************************************