Changeset 1354 for trunk/dll/valid.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/valid.c (modified) (7 diffs)

trunk/dll/valid.c

@@ -68 +68 @@
 CHAR *NTFS;
 CHAR *RAMFS;
+BOOL fVerifyOffChecked[26];
 
 APIRET MakeFullName(char *pszFileName)
@@ -598 +599 @@
       strcat(fname, ".");
       ret = DosQueryAppType(fname, &apptype);
-    }
+    } //fixme protectonly BMT GKY 23 Dec 08
     if ((!ret && (!apptype ||
                   (apptype &
@@ -691 +692 @@
   driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                     DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
-                    DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS);
+                    DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS |
+                    DRIVE_WRITEVERIFYOFF);
   if (removable != -1) {
     struct
@@ -751 +753 @@
 VOID FillInDriveFlags(VOID * dummy)
 {
-  ULONG ulDriveNum, ulDriveMap;
+  ULONG ulDriveNum, ulDriveMap, size;
   register INT x;
 
@@ -757 +759 @@
     driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                       DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
-                      DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS);
+                      DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS |
+                      DRIVE_WRITEVERIFYOFF);
   memset(driveserial, -1, sizeof(driveserial));
   DosError(FERR_DISABLEHARDERR);
@@ -764 +767 @@
     if (ulDriveMap & (1 << x) && !(driveflags[x] & DRIVE_IGNORE)) {
       {
-        CHAR s[80];
-        ULONG flags = 0, size = sizeof(ULONG);
-
-        sprintf(s, "%c.DriveFlags", (CHAR) (x + 'A'));
-        if (PrfQueryProfileData(fmprof, appname, s, &flags, &size) &&
-            size == sizeof(ULONG))
-          driveflags[x] |= flags;
+        ULONG flags = 0, size = sizeof(ULONG);
+        CHAR FlagKey[80];
+
+          sprintf(FlagKey, "%c.DriveFlags", (CHAR) (x + 'A'));
+          if (PrfQueryProfileData(fmprof, appname, FlagKey, &flags, &size) &&
+              size == sizeof(ULONG))
+            driveflags[x] |= flags;
       }
 
@@ -795 +798 @@
     if (startdrive)
       driveflags[startdrive - 1] |= DRIVE_BOOT;
+  }
+  {
+    INT x;
+    CHAR Key[80];
+
+    for (x = 2; x < 26; x++) {
+      sprintf(Key, "%c.VerifyOffChecked", (CHAR) (x + 'A'));
+      size = sizeof(BOOL);
+      PrfQueryProfileData(fmprof, appname, Key, &fVerifyOffChecked[x], &size);
+      if (!fVerifyOffChecked[x]) {
+        if (driveflags[x] & DRIVE_REMOVABLE)
+          driveflags[x] |= DRIVE_WRITEVERIFYOFF;
+        if (!(driveflags[x] & DRIVE_IGNORE | DRIVE_INVALID)) {
+          fVerifyOffChecked[x] = TRUE;
+          PrfWriteProfileData(fmprof, appname, Key, &fVerifyOffChecked[x], sizeof(BOOL));
+        }
+      }
+    }
   }
 }