Changeset 1455 for trunk/dll/dircnrs.c

Timestamp:

Sep 15, 2009, 4:43:55 AM (16 years ago)

Author:

Steven Levine

Message:

Blink thread LEDs while worker threads are working
Drop expermental code

File:

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

trunk/dll/dircnrs.c

@@ -67 +67 @@
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
   22 Jul 09 SHL Cleanup of SETFOCUS code
+  14 Sep 09 SHL Drop experimental code
 
 ***********************************************************************/
@@ -144 +145 @@
 #include "fortify.h"
 #include "excputil.h"                   // 06 May 08 SHL added
-#include "pathutil.h"                   // AddBackslashToPath
+#include "pathutil.h"                   // AddBackslashToPath
 
 // Data definitions
@@ -368 +369 @@
 
       if (WinQueryWindowUShort(hwnd, QWS_ID) != DIR_FOLDERICON) {
-        memset(&nr, 0, sizeof(NOTIFYRECORDENTER));
-        nr.hwndCnr = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), DIR_CNR);
-        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
-                   WM_CONTROL, MPFROM2SHORT(DIR_CNR, CN_ENTER), MPFROMP(&nr));
+        memset(&nr, 0, sizeof(NOTIFYRECORDENTER));
+        nr.hwndCnr = WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT), DIR_CNR);
+        WinSendMsg(WinQueryWindow(hwnd, QW_PARENT),
+                   WM_CONTROL, MPFROM2SHORT(DIR_CNR, CN_ENTER), MPFROMP(&nr));
       }
     }
@@ -808 +809 @@
                             MPFROMP(pci),
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-          if (!pciC) {
-            Stubby(dcd->hwndCnr, pci);
+          if (!pciC) {
+            Stubby(dcd->hwndCnr, pci);
           }
         }
@@ -1151 +1152 @@
           wk->li = (LISTINFO *) mp1;
           strcpy(wk->directory, dcd->directory);
+
           if (xbeginthread(Action,
                            122880,
@@ -1351 +1353 @@
       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),
-                         MPFROMSHORT(CRA_CURSORED));
-        if (pci && (INT) pci != -1 &&
-            (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
-          WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
-        else
-          WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
-      }
-      if (*dcd->directory) {
-        if (hwndMain)
-          WinSendMsg(hwndMain,
-                     UM_SETUSERLISTNAME, MPFROMP(dcd->directory), MPVOID);
-        else
-          add_udir(FALSE, dcd->directory);
-      }
+        PCNRITEM pci = NULL;
+        if (fAutoView && hwndMain) {
+          pci = WinSendMsg(hwnd, CM_QUERYRECORDEMPHASIS, MPFROMLONG(CMA_FIRST),
+                           MPFROMSHORT(CRA_CURSORED));
+          if (pci && (INT) pci != -1 &&
+              (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_SLOW)))
+            WinSendMsg(hwndMain, UM_LOADFILE, MPFROMP(pci->pszFileName), MPVOID);
+          else
+            WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
+        }
+        if (*dcd->directory) {
+          if (hwndMain)
+            WinSendMsg(hwndMain,
+                       UM_SETUSERLISTNAME, MPFROMP(dcd->directory), MPVOID);
+          else
+            add_udir(FALSE, dcd->directory);
+        }
+
       if (hwndMain)
         PostMsg(hwndMain, UM_ADVISEFOCUS, MPFROMLONG(dcd->hwndFrame), MPVOID);
@@ -1448 +1451 @@
                            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, ' ');
@@ -1599 +1602 @@
       }
       if (!fInitialDriveScan)
-        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     }
     else {
@@ -1615 +1618 @@
               DIR_SORT), dcd->sortFlags, FALSE);
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-                              DIR_VIEW), dcd->flWindowAttr);
+                              DIR_VIEW), dcd->flWindowAttr);
     } else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -1821 +1824 @@
               PCNRITEM pci;
 
-              strcpy(newfile, dcd->directory);
-              AddBackslashToPath(newfile);
+              strcpy(newfile, dcd->directory);
+              AddBackslashToPath(newfile);
               //if (newfile[strlen(newfile) - 1] != '\\')
               //  strcat(newfile, "\\");
@@ -2421 +2424 @@
 
       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);
@@ -2447 +2450 @@
           CHAR tempname1[CCHMAXPATH], tempname2[CCHMAXPATH];
 
-          strcpy(tempname1, dcd->directory);
-          AddBackslashToPath(tempname1);
+          strcpy(tempname1, dcd->directory);
+          AddBackslashToPath(tempname1);
           //if (tempname1[strlen(tempname1) - 1] != '\\')
           //  strcat(tempname1, "\\");
@@ -2801 +2804 @@
                   if (Flesh(hwnd, pci) &&
                       SHORT2FROMMP(mp1) == CN_EXPANDTREE &&
-                      !dcd->suspendview && fTopDir) {
-                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                    //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
-                  }
+                      !dcd->suspendview && fTopDir) {
+                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                    //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+                  }
                 }
                 driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
@@ -2810 +2813 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir) {
+              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir) {
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
-              }
-            }
-            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview) {
+                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+              }
+            }
+            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview) {
               WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
-              //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
-            }
+              //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+            }
           }
         }
@@ -3481 +3484 @@
     break;
 
-  case WM_TIMER:
-    return ActionWMTimer(hwnd, mp1, mp2);
-
   case WM_CLOSE:
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);