Rolf Kalbermatter <rolf.kalbermatter@citeng.com>
- Fix bug found by Piotr Caban, where our function tried to delete a
directory eventhough the user canceled the operation.

reactos/lib/shell32

diff -u -r1.7 -r1.8
--- shlfileop.c	20 Sep 2004 14:52:47 -0000	1.7
+++ shlfileop.c	6 Oct 2004 07:29:58 -0000	1.8
@@ -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
 	  {