RESEND cleanup shlfileop.c

[Joris Huizer]

Changelog:
- use retCode smarter (undoing a few bits of myself)
- add file_operation_invalid_handle() instead of inline code

Now only the relevant part of the patch file (forgot to save before 
attaching)
-------------- next part --------------
Index: dlls/shell32/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.51
diff -u -r1.51 shlfileop.c
--- dlls/shell32/shlfileop.c	14 Jan 2005 16:51:14 -0000	1.51
+++ dlls/shell32/shlfileop.c	18 Jan 2005 16:13:37 -0000
@@ -945,6 +945,25 @@
     return 0;
 }
 
+static int file_operation_invalid_handle(long FuncSwitch, LPWSTR pFromFile, DWORD ToPathAttr, LPWSTR pTempFrom)
+{
+    BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars));
+    if ((FO_DELETE == FuncSwitch) && (b_Mask))
+    {
+        DWORD FromPathAttr;
+        pFromFile[0] = '\0';
+        FromPathAttr = GetFileAttributesW(pTempFrom);
+        pFromFile[0] = '\\';
+        if (IsAttribDir(FromPathAttr))
+        {
+            /* FO_DELETE with mask and without found is valid */
+            return 0;
+        }
+    }
+    /* root (without mask) is also not allowed as source, tested in W98 */
+    return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND;
+}
+
 /*************************************************************************
  * SHFileOperationW          [SHELL32.@]
  *
@@ -964,7 +983,6 @@
 	LPWSTR pTempTo = NULL;
 	LPWSTR pFromFile;
 	LPWSTR pToFile = NULL;
-	LPWSTR lpFileName;
 	int retCode = 0;
 	DWORD ToAttr;
 	DWORD ToPathAttr;
@@ -986,8 +1004,6 @@
 	long FuncSwitch = (nFileOp.wFunc & FO_MASK);
 	long level= nFileOp.wFunc>>4;
 
-        int ret;
-
 	/*  default no error */
 	nFileOp.fAnyOperationsAborted = FALSE;
 
@@ -1016,10 +1032,9 @@
          * create dir              0 0 0 0 0 0 1 0
          */
 
-        ret = file_operation_checkFlags(nFileOp);
-        if (ret != 0)
+        retCode = file_operation_checkFlags(nFileOp);
+        if (retCode)
         {
-            retCode = ret;
             goto shfileop_end;
         }
 
@@ -1108,20 +1123,7 @@
 	    hFind = FindFirstFileW(pFrom, &wfd);
 	    if (INVALID_HANDLE_VALUE == hFind)
 	    {
-                if ((FO_DELETE == FuncSwitch) && (b_Mask))
-                {
-                    DWORD FromPathAttr;
-                    pFromFile[0] = '\0';
-                    FromPathAttr = GetFileAttributesW(pTempFrom);
-                    pFromFile[0] = '\\';
-                    if (IsAttribDir(FromPathAttr))
-                    {
-                        /* FO_DELETE with mask and without found is valid */
-                        goto shfileop_end;
-                    }
-                }
-                /* root (without mask) is also not allowed as source, tested in W98 */
-                retCode = ERROR_SHELL_INTERNAL_FILE_NOT_FOUND;
+                retCode = file_operation_invalid_handle(FuncSwitch,pFromFile,ToPathAttr,pTempFrom);
                 goto shfileop_end;
 	    }
 
@@ -1130,11 +1132,10 @@
             /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */
 	    if (!pTo) /* FO_DELETE */
 	    {
-                ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind);
-                /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */
-                if (ret != 0)
+                retCode = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind);
+                /* if retCode is not 0, nFileOp.fAnyOperationsAborted is TRUE */
+                if (retCode)
                 {
-                  retCode = ret;
                   goto shfileop_end;
                 }
                 continue;
@@ -1202,7 +1203,7 @@
                 nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES);
                 do
                 {
-                    lpFileName = wfd.cAlternateFileName;
+                    LPWSTR lpFileName = wfd.cAlternateFileName;
                     if (!lpFileName[0])
                         lpFileName = wfd.cFileName;
                     if (IsDotDir(lpFileName) ||
@@ -1369,7 +1370,6 @@
 	      nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE",
 	      retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo));
 
-	lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted;
 	return retCode;
 }