Changeset 1444 for trunk/dll/dircnrs.c

Timestamp:

Jul 23, 2009, 1:24:23 AM (16 years ago)

Author:

Gregg Young

Message:

Rework of drivebar to rescan all drives and refresh media buttons and menu items grey out inappropriate menu items. Streamline Tree scan code and use semaphores to serialize access. Add NOEASUPPORT and LOCALHD driveflag; .LONGNAME usage fixes; (Tickets 377-386)

File:

• trunk/dll/dircnrs.c (modified) (11 diffs)

trunk/dll/dircnrs.c

@@ -65 +65 @@
   29 Mar 09 SHL Increase extended search timeout to 3 seconds
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 SHL Cleanup of SETFOCUS code
 
 ***********************************************************************/
@@ -805 +807 @@
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
           if (!pciC) {
-            if (fInitialDriveScan)
-              Stubby(dcd->hwndCnr, pci);
-            else {
-              while (StubbyScanCount != 0)
-                DosSleep(50);
-              Stubby(dcd->hwndCnr, pci);
-            }
+            Stubby(dcd->hwndCnr, pci);
           }
         }
@@ -859 +855 @@
       }
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
-      AdjustCnrColsForFSType(dcd->hwndCnr, dcd->directory, &dcd->ds);
+      AdjustCnrColsForFSType(dcd->hwndCnr, dcd->directory, &dcd->ds, FALSE);
       dcd->ullTotalBytes = dcd->totalfiles =
         dcd->selectedfiles = dcd->selectedbytes = 0;
@@ -1348 +1344 @@
 
   case WM_SETFOCUS:
-    /*
-     * put name of our window (directory name) on status line
-     */
-    if (dcd && hwndStatus && mp2) {
-
+    /* put name of our window (directory name) on status line */
+    if (mp2) {
+      // Getting focus
+      if (dcd && hwndStatus) {
+        /* put name of our window (directory name) on status line */
       PCNRITEM pci = NULL;
-
       if (fAutoView && hwndMain) {
         pci = WinSendMsg(hwnd, CM_QUERYRECORDEMPHASIS, MPFROMLONG(CMA_FIRST),
@@ -1374 +1369 @@
         PostMsg(hwndMain, UM_ADVISEFOCUS, MPFROMLONG(dcd->hwndFrame), MPVOID);
     }
-    if (mp2) {
+
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+
       if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
-
         if (pszTempDir) {
           if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
-            free(pszTempDir);
+            free(pszTempDir);           // Failed
         }
       }
@@ -1451 +1446 @@
                            CM_QUERYRECORDEMPHASIS,
                            MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1) {
+          if (pci && (INT) pci != -1) {
             if (fSplitStatus && hwndStatus2) {
               CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
@@ -1601 +1596 @@
         WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0));
       }
-      PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+      if (!fInitialDriveScan)
+        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     }
     else {
@@ -1618 +1614 @@
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                               DIR_VIEW), dcd->flWindowAttr);
-      //DbgMsg(pszSrcFile, __LINE__, "UM_SETUP2 %p pci %p", hwnd, dcd);
     } else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2424 +2419 @@
 
       case IDM_SWITCH:
-        if (mp2) {
+        if (mp2) {
           strcpy(dcd->previous, dcd->directory);
-          strcpy(dcd->directory, (CHAR *)mp2);
+          strcpy(dcd->directory, (CHAR *)mp2);
           //DosEnterCritSec(); // GKY 11-27-08
           dcd->stopflag++;
-          //DosExitCritSec();
+          //DosExitCritSec();
           if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
             strcpy(dcd->directory, dcd->previous);
@@ -3484 +3479 @@
     break;
 
+  case WM_TIMER:
+    return ActionWMTimer(hwnd, mp1, mp2);
+
   case WM_CLOSE:
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
@@ -3629 +3627 @@
       /* Got match make found item current item */
       USHORT attrib = CRA_CURSORED;
+      // 29 Mar 09 SHL fixme to clear other object select if not extended select
       if (!stricmp(pci->pszDisplayName, dcd->szCommonName))
         attrib |= CRA_SELECTED;