Changeset 1402 for trunk/dll/filldir.c

Timestamp:

Mar 14, 2009, 6:17:59 PM (16 years ago)

Author:

Gregg Young

Message:

Remove variable aurgs from docopy & unlinkf (not used); Move more strings to PCSZs and string table; Move PCSZs to compile time initialization; Fix hang on startup caused by a drive scan and a dircnr scan trying to update a drive in the tree at the same time (related to the "treeswitch options); Code cleanup mainly removal of old printfs, SayMsgs, DbgMsg and unneeded %s.

File:

• trunk/dll/filldir.c (modified) (8 diffs)

trunk/dll/filldir.c

@@ -66 +66 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
-  08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  08 Mar 09 GKY Additional strings move to PCSZs
+  08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
 ***********************************************************************/
@@ -120 +122 @@
 
 #pragma data_seg(GLOBAL2)
-CHAR *FM3Tools;
-CHAR *WPProgram;
+PCSZ FM3Tools   = "<FM3_Tools>";
+PCSZ WPProgram  = "WPProgram";
 volatile INT StubbyScanCount;
 volatile INT ProcessDirCount;
@@ -252 +254 @@
                      MPFROM2SHORT(LIT_SORTASCENDING, 0),
                      MPFROMP(StubbyScan->pci->pszFileName));
-        }
-        StubbyScanCount--;
+        }
+        StubbyScanCount--;
        /* if (StubbyScanCount == 0) {
           if (fInitialDriveScan) {
@@ -416 +418 @@
         fclose(fp);
         hptr3 = WinLoadFileIcon(szFileName, FALSE);
-        unlinkf("%s", szFileName);
+        unlinkf(szFileName);
         if (!hptr2)
           hptr2 = hptr3;
@@ -1242 +1244 @@
     while (pci && (INT)pci != -1) {
       if ((pci->attrFile & FILE_DIRECTORY))
-        if (fInitialDriveScan)
+        //if (fInitialDriveScan)
           Stubby(hwndCnr, pci);
-        else {
+        /*else {
           while (StubbyScanCount != 0)
             DosSleep(50);
           Stubby(hwndCnr, pci);
-        }
+        } */
         //Stubby(hwndCnr, pci);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
@@ -1659 +1661 @@
                                 CM_QUERYRECORD,
                                 MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
     StubbyScanCount ++;
     while (pci && (INT)pci != -1) {
@@ -1679 +1681 @@
           if (~flags & DRIVE_INVALID &&
               ~flags & DRIVE_NOPRESCAN &&
-              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE) && !fDrivetoSkip[drvNum])
+              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) //&& !fDrivetoSkip[drvNum])
           {
             if (DRIVE_RAMDISK)
@@ -1708 +1710 @@
                      MPFROMP(pci->pszFileName));
         }
-        fDrivetoSkip[drvNum] = FALSE;
+        //fDrivetoSkip[drvNum] = FALSE;
       }
       pci = pciNext;