Changeset 1543 for trunk/dll

Timestamp:

Sep 26, 2010, 5:22:47 PM (15 years ago)

Author:

Gregg Young

Message:

Fix percent used/avalable display in drive info dialog (Ticket 367); Fix recursive scan in stubbyscanthread.

Location:

trunk/dll

Files:

• filldir.c (modified) (1 diff)
• info.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -236 +236 @@
             ULONG flags = driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'];
 
-            if (((fRScanLocal && ~flags & DRIVE_REMOTE && ~flags & DRIVE_VIRTUAL) ||
+            if ((fRScanLocal && ~flags & DRIVE_REMOTE && ~flags & DRIVE_VIRTUAL) ||
                  (fRScanRemote && flags & DRIVE_REMOTE) ||
-                 (fRScanVirtual && flags & DRIVE_VIRTUAL)) && fInitialDriveScan) {
-              if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) |
+                 (fRScanVirtual && flags & DRIVE_VIRTUAL)) {
+              if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) ||
                              (fRScanSlow ? 0 : DRIVE_SLOW)))) {
                 UnFlesh(StubbyScan->hwndCnr, StubbyScan->pci);

trunk/dll/info.c

@@ -208 +208 @@
             }
             volser;
-            USHORT percentfree, percentused;
+            ULONG percentfree, percentused;
 
             memset(&volser, 0, sizeof(volser));
@@ -252 +252 @@
 
               percentfree = (fsa.cUnitAvail && fsa.cUnit) ?
-                ((USHORT) fsa.cUnitAvail * 100) / (USHORT) fsa.cUnit : 0;
+                ((ULONG) fsa.cUnitAvail * 100) / (ULONG) fsa.cUnit : 0;
               if (!percentfree && fsa.cUnitAvail)
                 percentfree = 1;