Changeset 1354 for trunk/dll/rename.c

Timestamp:

Dec 25, 2008, 11:43:34 PM (17 years ago)

Author:

Gregg Young

Message:

Added driveflags to over ride write verify for USB removable drives that fail when it is on (Ticket 323); A flag to prevent directory name from being broadcast to drives in the tree cnr prior to a recursive scan of the drive (causes dbl directory names Ticket 321) Add option for multithreaded recursive scan of user selected drives at startup (Ticket 322).

File:

• trunk/dll/rename.c (modified) (4 diffs)

trunk/dll/rename.c

@@ -17 +17 @@
 
 #include <string.h>
+#include <ctype.h>
 
 #define INCL_WIN
@@ -36 +37 @@
 #include "commafmt.h"                   // CommaFmtULL
 #include "strips.h"                     // bstrip
+#include "info.h"                       // driveflags
 
 MRESULT EXPENTRY RenameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -238 +240 @@
         CHAR newexist[CCHMAXPATH], fullname[CCHMAXPATH];
         INT was;
-        APIRET rc;
+        APIRET rc;
+        BOOL fResetVerify = FALSE;
 
         *newexist = 0;
@@ -247 +250 @@
             strcpy(fullname, newexist);
           was = IsFile(fullname);
-          if (was == -1) {
-            rc = docopyf(MOVE, mv->target, "%s", fullname);
+          if (was == -1) {
+            if (fVerify && (driveflags[toupper(*mv->target) - 'A'] & DRIVE_WRITEVERIFYOFF ||
+                              driveflags[toupper(*fullname) - 'A'] & DRIVE_WRITEVERIFYOFF)) {
+              DosSetVerify(FALSE);
+              fResetVerify = TRUE;
+            }
+            rc = docopyf(MOVE, mv->target, "%s", fullname);
+            if (fResetVerify) {
+              DosSetVerify(fVerify);
+              fResetVerify = FALSE;
+            }
             if (rc) {
               if ((LONG) rc > 0)