Changeset 552 for trunk/dll/valid.c

Timestamp:

Mar 1, 2007, 7:24:47 AM (18 years ago)

Author:

Gregg Young

Message:

font cleanup; new image and archiver masks; messages moved to string file; new drive flags including David's icons mostly working

File:

• trunk/dll/valid.c (modified) (14 diffs)

trunk/dll/valid.c

@@ -20 +20 @@
   22 Oct 06 GKY Add NDFS32 support
   22 Oct 06 GKY Increased BUFFER_BYTES in CheckDrive to 8192 to fix NDFS32 scan failure
+  07 Jan 07 GKY Move error strings etc. to string file
+  18 Feb 07 GKY Add more drive types and icons
 
 ***********************************************************************/
@@ -210 +212 @@
 
 # define BUFFER_BYTES 8192
-  rc =
-    DosAllocMem(&pvBuffer, BUFFER_BYTES,
+  rc = DosAllocMem(&pvBuffer, BUFFER_BYTES,
                 PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
@@ -242 +243 @@
   }
 
-  if (pulType && !strcmp(pfsn, CDFS))
+  if (pulType && (!strcmp(pfsn, CDFS) || !strcmp(pfsn, ISOFS)))
     *pulType |= DRIVE_NOTWRITEABLE | DRIVE_CDROM | DRIVE_REMOVABLE;
-
-  if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV) {
+  if (pulType && !strcmp(pfsn, NDFS32)){
+        *pulType |= DRIVE_VIRTUAL;
+    }
+  if (pulType && !strcmp(pfsn, RAMFS)){
+        *pulType |= DRIVE_RAMDISK;
+    }
+  if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV &&
+      (strcmp(pfsn, CDFS) && strcmp(pfsn, ISOFS))) {
     if (pulType)
       *pulType |= DRIVE_REMOTE;
+
     if (pulType && !strcmp(pfsn, CBSIFS)) {
       *pulType |= DRIVE_ZIPSTREAM;
@@ -261 +269 @@
             *pulType &= ~DRIVE_NOLONGNAMES;
         }
+
       }
     }
@@ -267 +276 @@
          !strcmp(pfsn, JFS) ||
          !strcmp(pfsn, FAT32) ||
-         !strcmp(pfsn, NDFS32) || !strcmp(pfsn, HPFS386))) {
+         !strcmp(pfsn, RAMFS) ||
+         !strcmp(pfsn, NDFS32) ||
+         !strcmp(pfsn, HPFS386))) {
       *pulType &= ~DRIVE_NOLONGNAMES;
     }
+
     DosFreeMem(pvBuffer);
     return 0;                           // Remotes are non-removable
@@ -278 +290 @@
       strcmp(pfsn, JFS) &&
       strcmp(pfsn, CDFS) &&
-      strcmp(pfsn, FAT32) && strcmp(pfsn, NDFS32) && strcmp(pfsn, HPFS386)) {
+      strcmp(pfsn, ISOFS) &&
+      strcmp(pfsn, RAMFS) &&
+      strcmp(pfsn, FAT32) &&
+      strcmp(pfsn, NDFS32) &&
+      strcmp(pfsn, HPFS386)) {
     if (pulType)
       (*pulType) |= DRIVE_NOLONGNAMES;  // Others can not have long names
   }
+
 
   DosError(FERR_DISABLEHARDERR);
@@ -543 +560 @@
       }
     }
+     else if (*argv[x] == '`' && isalpha(argv[x][1])) {
+
+      CHAR *p = &argv[x][1];
+
+      while (isalpha(*p)) {
+        driveflags[toupper(*p) - 'A'] |= DRIVE_NOSTATS;
+        p++;
+      }
+    }
     else if (*argv[x] == ',' && isalpha(argv[x][1])) {
 
@@ -552 +578 @@
       }
     }
-    else if (*argv[x] == '`' && isalpha(argv[x][1])) {
+    else if (*argv[x] == '-' && isalpha(argv[x][1])) {
 
       CHAR *p = &argv[x][1];
@@ -586 +612 @@
   driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                     DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
-                    DRIVE_INCLUDEFILES | DRIVE_SLOW);
+                    DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS);
   if (removable != -1) {
     struct
@@ -608 +634 @@
   if (drvtype & DRIVE_REMOTE)
     driveflags[x] |= DRIVE_REMOTE;
+  if(!stricmp(FileSystem,NDFS32)){
+    driveflags[x] |= DRIVE_VIRTUAL;
+    driveflags[x] &= (~DRIVE_REMOTE);
+  }
+  if(!stricmp(FileSystem,RAMFS)){
+    driveflags[x] |= DRIVE_RAMDISK;
+    driveflags[x] &= (~DRIVE_REMOTE);
+  }
   if (strcmp(FileSystem, HPFS) &&
       strcmp(FileSystem, JFS) &&
       strcmp(FileSystem, CDFS) &&
-      strcmp(FileSystem, FAT32) && strcmp(FileSystem, HPFS386)) {
+      strcmp(FileSystem, ISOFS) &&
+      strcmp(FileSystem, RAMFS) &&
+      strcmp(FileSystem, FAT32) &&
+      strcmp(FileSystem, HPFS386)) {
     driveflags[x] |= DRIVE_NOLONGNAMES;
   }
-  if (!strcmp(FileSystem, CDFS)) {
+
+  if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS)) {
     removable = 1;
     driveflags[x] |= (DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM);
@@ -636 +674 @@
     driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                       DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
-                      DRIVE_INCLUDEFILES | DRIVE_SLOW);
+                      DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS);
   memset(driveserial, -1, sizeof(driveserial));
   DosError(FERR_DISABLEHARDERR);
@@ -737 +775 @@
   *pp = ' ';
   pp++;
+  *pp = '-';
+  pp[1] = 0;
+  p = pp + 1;
+  if (pp) {
+    for (x = 0; x < 26; x++) {
+      if ((driveflags[x] & DRIVE_NOLOADSUBJS) != 0) {
+        *p = (CHAR) x + 'A';
+        p++;
+        *p = 0;
+      }
+    }
+  }
+  if (!pp[1])
+    *pp = 0;
+  pp = &s[strlen(s)];
+  *pp = ' ';
+  pp++;
   *pp = '`';
   pp[1] = 0;
@@ -742 +797 @@
   if (pp) {
     for (x = 0; x < 26; x++) {
-      if ((driveflags[x] & DRIVE_NOLOADSUBJS) != 0) {
+      if ((driveflags[x] & DRIVE_NOSTATS) != 0) {
         *p = (CHAR) x + 'A';
         p++;
@@ -871 +926 @@
     }
     if (!*objectpath) {
-      // Fall back - fixme to work for NLS
+      // Fall back
       DosError(FERR_DISABLEHARDERR);
       DosQuerySysInfo(QSV_BOOT_DRIVE, QSV_BOOT_DRIVE,
                       (PVOID) & startdrive, (ULONG) sizeof(ULONG));
-      sprintf(objectpath, "%c:\\DESKTOP", ((CHAR) startdrive) + '@');
-    }
-  }
-}
+      sprintf(objectpath, GetPString(IDS_PATHTODESKTOP), ((CHAR) startdrive) + '@');
+    }
+  }
+}