shell32: fix bug in SHELL_DeleteDirecotory

[Rolf Kalbermatter]

Changelog
  - dlls/shell32/shlfileop.c
    Fix bug found by Piotr Caban, where our function tried to delete a
    directory eventhough the user canceled the operation.

Rolf Kalbermatter

Index: dlls/shell32/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.42
diff -u -r1.42 shlfileop.c
--- dlls/shell32/shlfileop.c	16 Aug 2004 19:57:05 -0000	1.42
+++ dlls/shell32/shlfileop.c	5 Oct 2004 20:42:26 -0000
@@ -52,7 +52,7 @@
 
 #define FO_MASK         0xF
 
-CHAR aWildcardFile[] = {'*','.','*',0};
+static const CHAR aWildcardFile[] = {'*','.','*',0};
 static const WCHAR wWildcardFile[] = {'*','.','*',0};
 static const WCHAR wWildcardChars[] = {'*','?',0};
 static const WCHAR wBackslash[] = {'\\',0};
@@ -148,7 +148,7 @@
 	if (hFind == INVALID_HANDLE_VALUE)
 	  return FALSE;
 
-	if (!bShowUI || SHELL_ConfirmDialog(ASK_DELETE_FOLDER, pszDir))
+	if (!bShowUI || (ret = SHELL_ConfirmDialog(ASK_DELETE_FOLDER, pszDir)))
 	{
 	  do
 	  {
@@ -183,7 +183,7 @@
 	if (hFind == INVALID_HANDLE_VALUE)
 	  return FALSE;
 
-	if (!bShowUI || SHELL_ConfirmDialogW(ASK_DELETE_FOLDER, pszDir))
+	if (!bShowUI || (ret = SHELL_ConfirmDialogW(ASK_DELETE_FOLDER, pszDir)))
 	{
 	  do
 	  {

Rolf Kalbermatter
CIT Engineering Nederland BV    tel: +31 (070) 415 9190
Treubstraat 7H                  fax: +31 (070) 415 9191
2288 EG Rijswijk	http://www.citengineering.com
Netherlands		mailto:rolf.kalbermatter at citeng.com