Changeset 1318 for trunk/dll/mainwnd.c

Timestamp:

Dec 5, 2008, 2:57:40 AM (17 years ago)

Author:

Gregg Young

Message:

Fix dbl free error for deletes by disabling fSyncUpdates for deletes; ironically the container now update faster then with it on. Also improved failure of container to update following an archive extract. It now should work for all but may be the largest archives (based on root filenames). It work with the largest I could find.

File:

• trunk/dll/mainwnd.c (modified) (5 diffs)

trunk/dll/mainwnd.c

@@ -70 +70 @@
   01 Sep 08 GKY Save toolbars immediately on change. Add bmps for default toolbars
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
-  03 Dec 08 GKY Use StubbyScanCount to prevent scan of "last" directory container prior to
+  04 Dec 08 GKY Use event semaphore to prevent scan of "last" directory container prior to
                 tree scan completion; prevents duplicate directory names in tree.
 
@@ -415 +415 @@
       henum = WinBeginEnumWindows(hwndMain);
       while ((hwndC = WinGetNextWindow(henum)) != NULLHANDLE) {
-        // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
+         //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu",hwndTree,exclude,hwndC);
         if (hwndC != exclude && hwndC != hwndTree) {
           id = WinQueryWindowUShort(hwndC, QWS_ID);
@@ -434 +434 @@
                                UM_CONTAINERDIR, MPFROMP(ret), MPVOID)) {
                   MakeValidDir(ret);
-                  // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
+                  //saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"Tree = %lu\rExclude = %lu\rFound = %lu\r\"%s\"",hwndTree,exclude,hwndC,ret);
                   WinEndEnumWindows(henum);
                   return hwndC;
@@ -3187 +3187 @@
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
   }
+  DosWaitEventSem(DriveScanStart, 20000);
   size = (ULONG)0;
   sprintf(szKey, "%sTargetDir", szPrefix);
@@ -5931 +5932 @@
           continue;
         if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE)) {
-          DosSleep(10); // Give time for StubbyScanThreads to start
-          while (StubbyScanCount !=0)
-            DosSleep(50);
           OpenDirCnr((HWND) 0, hwndMain, hwndTree, TRUE, argv[x]);
         }