Changeset 9959 for trunk/src

Timestamp:

Mar 31, 2003, 12:27:55 PM (22 years ago)

Author:

sandervl

Message:

DT: Shell file operations update

File:

• trunk/src/shell32/shlfileop.c (modified) (15 diffs)

trunk/src/shell32/shlfileop.c

@@ -492 +492 @@
 }
 
+/**************************************************************************
+ *      SHELL_FileNamesMatch()
+ *
+ * Accepts two \0 delimited lists of the file names. Checks whether number of
+ * files in the both lists is the same,
+ * and checks also if source-name exists.
+ */
+BOOL SHELL_FileNamesMatch(LPCWSTR pszFiles1, LPCWSTR pszFiles2, BOOL B_OnlyFrom)
+{
+        while (              (pszFiles1[0] != '\0') &&
+             (B_OnlyFrom || (pszFiles2[0] != '\0')))
+        {
+          if (NULL == StrPBrkW(pszFiles1, wWildcardChars))
+          {
+            if (-1 == GetFileAttributesW(pszFiles1))
+              return FALSE;
+          }
+          pszFiles1 += lstrlenW(pszFiles1) + 1;
+          if (!B_OnlyFrom)
+            pszFiles2 += lstrlenW(pszFiles2) + 1;
+        }
+        return
+          (              (pszFiles1[0] == '\0') &&
+          (B_OnlyFrom || (pszFiles2[0] == '\0')));
+}
+
 /*************************************************************************
  *
@@ -546 +572 @@
             {
               retCode = ERROR_OUTOFMEMORY;
+              SetLastError(retCode);
               goto shfileop_error;
             }
@@ -564 +591 @@
         {
           nFileOp.fAnyOperationsAborted = TRUE;
-          SetLastError(retCode);
         }
         lpFileOp->hNameMappings = nFileOp.hNameMappings;
@@ -577 +603 @@
  *     exported by name
  */
+
+/* in w98 brings shell32_test.exe this 4 failures
+shlfileop.c:177: Test failed: Can't rename many files
+ * W98 return 0 without action
+shlfileop.c:185: Test failed: Can't rename many files
+ * W98 return 0 without action
+shlfileop.c:286: Test failed: Files are copied to other directory
+shlfileop.c:287: Test failed: The file is copied
+ * This two messages are in W98 / W2K also 
+shlfileop: 121 tests executed, 0 marked as todo, 4 failures.
+ * this implementation has only the last 2 messages (W2K lyke)
+*/
+
 DWORD WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp)
 {
@@ -585 +624 @@
         LPCWSTR pFrom = pNextFrom;
         LPCWSTR pTo = NULL;
+        LPCSTR Debug_pFrom;
+        LPCSTR Debug_pTo;
         HANDLE hFind = INVALID_HANDLE_VALUE;
         WIN32_FIND_DATAW wfd;
@@ -595 +636 @@
         DWORD ToAttr;
         DWORD ToPathAttr;
+        DWORD FromPathAttr;
         FILEOP_FLAGS OFl = ((FILEOP_FLAGS)lpFileOp->fFlags & 0x7ff);
 
@@ -600 +642 @@
 
         BOOL b_MultiTo = (FO_DELETE != (lpFileOp->wFunc & 0xf));
+        BOOL b_MultiPaired = (!b_MultiTo);
         BOOL b_MultiFrom = FALSE;
         BOOL not_overwrite;
@@ -665 +708 @@
 /*    OFl ^= (FOF_SILENT | FOF_NOCONFIRMATION | FOF_SIMPLEPROGRESS | FOF_NOCONFIRMMKDIR); */
           OFl &= (~(FOF_MULTIDESTFILES | FOF_NOCONFIRMATION | FOF_FILESONLY));  /* implemented */
-          OFl ^= (FOF_SILENT | FOF_NOCONFIRMMKDIR);          /* ignored, if one */
+          OFl ^= (FOF_SILENT | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI); /* ignored, if one */
           OFl &= (~FOF_SIMPLEPROGRESS);                      /* ignored, only with FOF_SILENT */
           if (OFl)
           {
-            if (OFl & ( ~ (FOF_CONFIRMMOUSE | FOF_SILENT | FOF_RENAMEONCOLLISION | FOF_NOCONFIRMMKDIR)))
+            if (OFl & ( ~ (FOF_CONFIRMMOUSE | FOF_SILENT | FOF_RENAMEONCOLLISION | FOF_NOCONFIRMMKDIR | FOF_NOERRORUI)))
             {
               TRACE("%s level=%d lpFileOp->fFlags=0x%x not implemented, Aborted=TRUE, stub\n", cFO_Name[0], level, OFl);
@@ -684 +727 @@
           {
             nFileOp.pFrom = pTempFrom = HeapAlloc(GetProcessHeap(), 0, ((1 + 2 * (b_MultiTo)) * MAX_PATH + 6) * sizeof(WCHAR));
+            if (!pTempFrom)
+            {
+              retCode = ERROR_OUTOFMEMORY;
+              SetLastError(retCode);
+              goto shfileop_error;
+            }
             if (b_MultiTo)
               pTempTo = &pTempFrom[MAX_PATH + 4];
@@ -715 +764 @@
             pFromFile = SHFileStrCpyCatW(pTempFrom, pFrom, NULL);
 
+/* for seeing in debugger outside from TRACE */
+            Debug_pFrom = debugstr_w(pFrom);
+            Debug_pTo = debugstr_w(pTo);
+            TRACE("%s level=%d with %s %s%s\n",
+              cFO_Name[0], level, Debug_pFrom, pTo ? "-> ":"", Debug_pTo);
+
             if (pTo)
             {
               pToFile = SHFileStrCpyCatW(pTempTo, pTo, NULL);
             }
-            if (!(pFromFile) || !(pFromFile[1]) || ((pTo) && !(pToFile)))
+            if (!b_MultiPaired)
+            {
+              b_MultiPaired =
+                SHELL_FileNamesMatch(lpFileOp->pFrom, lpFileOp->pTo, (!b_Multi || b_MultiFrom));
+            } /* endif */
+            if (!(b_MultiPaired) || !(pFromFile) || !(pFromFile[1]) || ((pTo) && !(pToFile)))
             {
               retCode = 0x402;      /* 1026 */
@@ -748 +808 @@
                 /* no work, only RC=0 */
 /* ???    nFileOp.fAnyOperationsAborted = TRUE; */
+//#define W98_FO_RENEME
+#ifdef W98_FO_RENEME
                 goto shfileop_normal;
+#endif
+                retCode = 0x1;      /* 1 value unknown, W98 returns no error */
+                goto shfileop_error;
               }
             }
@@ -755 +820 @@
             if (INVALID_HANDLE_VALUE == hFind)
             {
+               if ((FO_DELETE == FuncSwitch) && (b_Mask))
+              {
+                pFromFile[0] = '\0';
+                FromPathAttr = GetFileAttributesW(pTempFrom);
+                pFromFile[0] = '\\';
+                if (IsAttribDir(FromPathAttr))
+                {
+                /* FO_DELETE with mask and without found is valid */
+                  goto shfileop_normal;
+                 } /* endif */
+               } /* endif */
               /* root (without mask) is also not allowed as source, tested in W98 */
               retCode = 0x402;   /* 1026 */
@@ -772 +848 @@
                  if (!lpFileName[0])
                    lpFileName = wfd.cFileName;
-                if (IsDotDir(lpFileName))
-                  continue;
+                if (IsDotDir(lpFileName) ||
+                    ((b_Mask) && IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY)))
+                  continue; /* next name in pTempFrom(dir) */
                 SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL);
                 /* TODO: Check the SHELL_DeleteFileOrDirectoryW() function in shell32.dll */
@@ -1026 +1103 @@
         {
           nFileOp.fAnyOperationsAborted = TRUE;
-          SetLastError(retCode);
-        }
-        TRACE("%s level=%d AnyOpsAborted=%s ret=0x%x, with %s%s%s\n",
+        }
+        TRACE("%s level=%d AnyOpsAborted=%s ret=0x%x, with %s %s%s\n",
               cFO_Name[0], level, nFileOp.fAnyOperationsAborted ? "TRUE":"FALSE",
-              retCode, debugstr_w(pFrom), pTo ? " -> ":"", debugstr_w(pTo));
+              retCode, debugstr_w(pFrom), pTo ? "-> ":"", debugstr_w(pTo));
 
         lpFileOp->fAnyOperationsAborted = nFileOp.fAnyOperationsAborted;
@@ -1079 +1155 @@
 
 
+