Changeset 1455

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

Location:

trunk/dll

Files:

• common.c (modified) (20 diffs)
• dircnrs.c (modified) (15 diffs)
• fm3dll2.h (modified) (7 diffs)
• mainwnd.c (modified) (41 diffs)
• notify.c (modified) (10 diffs)
• treecnr.c (modified) (26 diffs)
• worker.c (modified) (12 diffs)
• worker.h (modified) (2 diffs)

trunk/dll/common.c ¶

@@ -27 +27 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
-                loads drive root directory in directory container or expands drive tree
-                and rescans drive in tree container depending on container focus, greyed out
-                inappropriate menu context choices
-
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
+  14 Sep 09 SHL Blink thread LEDs while threads working
 
 ***********************************************************************/
@@ -238 +239 @@
     if (!hwndTmp)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
   } // for
 }
@@ -265 +266 @@
                   hwnd,
                   SetDrvProc,
-                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
+                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
       if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(dv), MPVOID))
-        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
     break;
   case IDM_SIZES:
@@ -283 +284 @@
       hObject = WinQueryObject("<XWP_TRASHCAN>");
       if (hObject != NULLHANDLE && fTrashCan) {
-        hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
-        WinSetFocus(HWND_DESKTOP, hwndDesktop);
-        WinOpenObject(hObject, 0, TRUE);
+        hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+        WinSetFocus(HWND_DESKTOP, hwndDesktop);
+        WinOpenObject(hObject, 0, TRUE);
       }
     else
       WinDlgBox(HWND_DESKTOP,
-                hwnd,
-                UndeleteDlgProc,
-                FM3ModHandle, UNDEL_FRAME, MPFROMP(dv));
+                hwnd,
+                UndeleteDlgProc,
+                FM3ModHandle, UNDEL_FRAME, MPFROMP(dv));
     }
     break;
@@ -381 +382 @@
       rc = DosDevIOCtl(-1L, 8L, 0x40L, &parm, sizeof(parm), &plen, NULL, 0L, &dlen);
       if (cmd == IDM_EJECT &&
-          (fEjectFlpyScan ? TRUE : parm[1] > 1) &&
-          (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
-          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM))) {
-        BOOL toggleTree = FALSE;
-  
-        if (!hwndTree) {
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-          toggleTree = TRUE;
-        }
-        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        if (toggleTree)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          (fEjectFlpyScan ? TRUE : parm[1] > 1) &&
+          (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
+          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM))) {
+        BOOL toggleTree = FALSE;
+
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
       }
     }
@@ -402 +403 @@
 
       if (!hwndTree) {
-        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-        toggleTree = TRUE;
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
       }
       WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
       if (toggleTree)
-        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
     }
     break;
@@ -416 +417 @@
 
       if (!hwndTree) {
-        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-        toggleTree = TRUE;
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
       }
       WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
       if (toggleTree)
-        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
     }
     break;
@@ -453 +454 @@
   if (!hwndStatus)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   // Right status window
@@ -475 +476 @@
   if (!hwndStatus2)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndAttr = WinCreateWindow(hwndFrame,
@@ -494 +495 @@
   if (!hwndAttr)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndDate = WinCreateWindow(hwndFrame,
@@ -513 +514 @@
   if (!hwndDate)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndName = WinCreateWindow(hwndFrame,
@@ -532 +533 @@
   if (!hwndName)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndTmp = WinCreateWindow(hwndFrame,
@@ -550 +551 @@
   if (!hwndTmp)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndBack = WinCreateWindow(hwndFrame,
@@ -561 +562 @@
                              (swp->cy -
                               WinQuerySysValue(HWND_DESKTOP,
-                                               SV_CYSIZEBORDER)) -
-                             (DRIVE_BUTTON_HEIGHT),
+                                               SV_CYSIZEBORDER)) -
+                             (DRIVE_BUTTON_HEIGHT),
                              swp->cx -
                              (WinQuerySysValue(HWND_DESKTOP,
@@ -571 +572 @@
   if (!hwndBack)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndLED = WinCreateWindow(hwndFrame,
                             WC_LED,
-                            "#920",
+                            "#920",     // LEDOFF_BMP
                             WS_VISIBLE | SS_BITMAP,
                             swp->cx - 58,
@@ -583 +584 @@
   if (!hwndLED)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndLEDHdr = WinCreateWindow(hwndFrame,
@@ -597 +598 @@
   if (!hwndLEDHdr)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndAutoview = WinCreateWindow(hwndFrame,
@@ -618 +619 @@
   if (!hwndAutoview)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   hwndAutoMLE = WinCreateWindow(hwndFrame,
@@ -640 +641 @@
   if (!hwndAutoMLE)
     Win_Error(hwndFrame, hwnd, pszSrcFile, __LINE__,
-              PCSZ_WINCREATEWINDOW);
+              PCSZ_WINCREATEWINDOW);
 
   oldproc = WinSubclassWindow(hwndAutoMLE, AutoViewProc);
@@ -647 +648 @@
 }
 
+/**
+ * Called by MainWndProc and MainWndProc2 to process messages
+ * common to both fm/2 and fm/2 lite main window
+ */
+
 MRESULT EXPENTRY CommonMainWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
                                    MPARAM mp2)
 {
+  static BOOL fLedOn;
+  static LONG cWorkerThreads;
+
   switch (msg) {
   case UM_THREADUSE:
     if (hbmLEDon && hbmLEDoff) {
-      static LONG threaduse;
-      CHAR ts[33];
-
+      CHAR sz[33];
       if (mp1) {
-        threaduse++;
-        if (threaduse == 1)
+        cWorkerThreads++;
+        // 13 Sep 09 SHL fixme to be SMP safe
+        if (cWorkerThreads == 1) {
+          if (!WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_LED_TIMER, 500))
+            Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "WinStartTimer");
+          fLedOn = TRUE;
           WinSendMsg(hwndLED, SM_SETHANDLE, MPFROMLONG(hbmLEDon), MPVOID);
-      }
-      else {
-        threaduse--;
-        if (threaduse <= 0) {
-          threaduse = 0;
-          WinSendMsg(hwndLED, SM_SETHANDLE, MPFROMLONG(hbmLEDoff), MPVOID);
         }
       }
-      ltoa(threaduse, ts, 10);
-      WinSetWindowText(hwndLEDHdr, ts);
+      else if (cWorkerThreads > 0)
+        cWorkerThreads--;
+
+      ltoa(cWorkerThreads, sz, 10);
+      WinSetWindowText(hwndLEDHdr, sz);
       DosSleep(0);
     }
     return 0;
+
+  case WM_TIMER:
+    fLedOn = !fLedOn;
+    WinSendMsg(hwndLED,
+               SM_SETHANDLE,
+               fLedOn ? MPFROMLONG(hbmLEDon) : MPFROMLONG(hbmLEDoff),
+               MPVOID);
+    if (!fLedOn && cWorkerThreads == 0) {
+      if (!WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_LED_TIMER))
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "WinStartTimer");
+    }
+    break;
 
   case UM_LOADFILE:

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);

trunk/dll/fm3dll2.h ¶

@@ -28 +28 @@
   13 Jul 09 SHL Rename timer ids
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
+  14 Sep 09 SHL Drop experimental code
 
   Align with spaces only - no tabs please
@@ -76 +77 @@
 #define ID_NEWVIEW_TIMER    20
 // #define ID_TIMER6           21       // 13 Jul 09 SHL Dropped
-
+#define ID_LED_TIMER        22
+
+// Window ids, etc.
 #define MAIN_STATUS2        19
 
@@ -632 +635 @@
 #define IDM_UNHIDEALL         10039
 
-// #define PP_MAX    PP_MENUDISABLEBGNDCOLORINDEX       // Unused, 13 Sep 08 JBS
-// #define PP_MAXBUF 384                                // Unused, 13 Sep 08 JBS
+// #define PP_MAX    PP_MENUDISABLEBGNDCOLORINDEX       // Unused, 13 Sep 08 JBS
+// #define PP_MAXBUF 384                                // Unused, 13 Sep 08 JBS
 
 #ifndef MM_PORTHOLEINIT
 #define MM_PORTHOLEINIT   0x01fb
 #endif
-// #ifndef CCS_MINIICONS        defined in Open Watcom headers
+// #ifndef CCS_MINIICONS     defined in Open Watcom headers
 // #define CCS_MINIICONS     0x0800
 // #endif
-// #ifndef CRA_SOURCE                   // defined in Open Watcom headers
+// #ifndef CRA_SOURCE                   // defined in Open Watcom headers
 // #define CRA_SOURCE        0x00004000
 // #endif
-// #ifndef CV_EXACTMATCH                // defined as CV_EXACTLENGTH in Open Watcom headers
+// #ifndef CV_EXACTMATCH                // defined as CV_EXACTLENGTH in Open Watcom headers
 // #define CV_EXACTMATCH     0x10000000
 // #endif
-// #ifndef CBN_SETFOCUS                 // Unused, 13 Sep 08 JBS
+// #ifndef CBN_SETFOCUS                 // Unused, 13 Sep 08 JBS
 // #define CBN_SETFOCUS      20
 // #endif
-// #ifndef CBN_KILLFOCUS                // Unused, 13 Sep 08 JBS
+// #ifndef CBN_KILLFOCUS                // Unused, 13 Sep 08 JBS
 // #define CBN_KILLFOCUS     21
 // #endif
-// #ifndef CN_VERIFYEDIT                // defined in Open Watcom headers
+// #ifndef CN_VERIFYEDIT                // defined in Open Watcom headers
 // #define CN_VERIFYEDIT     134
 // #endif
-// #ifndef CN_PICKUP                    // defined in Open Watcom headers
+// #ifndef CN_PICKUP                    // defined in Open Watcom headers
 // #define CN_PICKUP         135
 // #endif
-// #ifndef CN_DROPNOTIFY                // defined in Open Watcom headers
+// #ifndef CN_DROPNOTIFY                // defined in Open Watcom headers
 // #define CN_DROPNOTIFY     136
 // #endif
-// #ifndef CN_GRIDRESIZED               // defined in Open Watcom headers
+// #ifndef CN_GRIDRESIZED               // defined in Open Watcom headers
 // #define CN_GRIDRESIZED    137
 // #endif
@@ -702 +705 @@
 #define UM_UNDO             (WM_USER + 30)
 #define UM_RENDER           (WM_USER + 31)
-// #define UM_BUTTON2DOWN      (WM_USER + 32)           // Unused, 13 Sep 08 JBS
-// #define UM_BUTTON2UP        (WM_USER + 33)           // Unused, 13 Sep 08 JBS
+// #define UM_BUTTON2DOWN      (WM_USER + 32)           // Unused, 13 Sep 08 JBS
+// #define UM_BUTTON2UP        (WM_USER + 33)           // Unused, 13 Sep 08 JBS
 #define UM_COLLECTFROMFILE  (WM_USER + 34)
 #define UM_TIMER            (WM_USER + 35)              // 13 Jul 09 SHL fixme to have better name
-// #define UM_HELPON           (WM_USER + 36)           // Unused, 13 Sep 08 JBS
+// #define UM_HELPON           (WM_USER + 36)           // Unused, 13 Sep 08 JBS
 #define UM_SETUP2           (WM_USER + 37)
 #define UM_SETUP3           (WM_USER + 38)
@@ -715 +718 @@
 #define UM_SETUP5           (WM_USER + 45)
 #define UM_NOTIFY           (WM_USER + 46)
-// #define UM_INSERTRECORD     (WM_USER + 47)           // Unused, 13 Sep 08 JBS
+// #define UM_INSERTRECORD     (WM_USER + 47)           // Unused, 13 Sep 08 JBS
 #define UM_ADDTOMENU        (WM_USER + 48)
 #define UM_COLLECT          (WM_USER + 49)
@@ -722 +725 @@
 #define UM_FILTER           (WM_USER + 57)
 #define UM_SORTRECORD       (WM_USER + 58)
-// #define UM_SIZE2            (WM_USER + 59)           // Unused, 13 Sep 08 JBS
+// #define UM_SIZE2            (WM_USER + 59)           // Unused, 13 Sep 08 JBS
 #define UM_RESTORE          (WM_USER + 60)
 #define UM_TOPDIR           (WM_USER + 61)
@@ -737 +740 @@
 #define UM_CLICKED3         (WM_USER + 72)
 #define UM_HIDENOTSELECTED  (WM_USER + 73)
-#define UM_FIRSTTIME        (WM_USER + 74)
+#define UM_FIRSTTIME        (WM_USER + 74)
+// #define UM_ACTIONSTATE      (WM_USER + 75)   // 13 Sep 09 SHL unused SHL
 #define UM_FILLUSERLIST     (WM_USER + 75)
 #define UM_CONTAINERDIR     (WM_USER + 76)

trunk/dll/mainwnd.c ¶

@@ -85 +85 @@
   19 Mar 09 GKY Moved DeletePresParams to presparam.c
   28 Mar 09 GKY Add RemoveOldCnrSwitches to remove pre 3.16 style ini keys;
-                add State.version key for check
+                add State.version key for check
   07 Jun 09 GKY Fix IDM_BLINK to not leave a DataBar? on the screen when fDataMin is TRUE.
   21 Jun 09 GKY Added drive letter to bitmap buttons in drive bar; Eliminate static drive
-                letter windows; Use button ID to identify drive letter for processing.
+                letter windows; Use button ID to identify drive letter for processing.
   12 Jul 09 GKY Removed duplicate UM_SETUP2 message from RestoreDirCnrState caused dbl dir
-                listings in tree
+                listings in tree
   13 Jul 09 GKY Fixed under allocation of memory in the paint code for the drivebar bitmap buttons
   22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
-                loads drive root directory in directory container or expands drive tree
-                and rescans drive in tree container depending on container focus, greyed out
-                inappropriate menu context choices
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
+  14 Sep 09 SHL Blink thread LEDs when workers busy
 
 ***********************************************************************/
@@ -108 +109 @@
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
+#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
 #define INCL_WINHELP
 #define INCL_GPI
@@ -126 +127 @@
 #include "comp.h"
 #include "datamin.h"
-#include "pathutil.h"                   // BldQuotedFileName
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
-#include "notebook.h"                   // CfgDlgProc CfgMenuInit
-#include "command.h"                    // LINKCMDS
-#include "avl.h"                        // free_archivers
-#include "walkem.h"                     // free_setups...
-#include "key.h"                        // AboutDlgProc
-#include "menu.h"                       // AddToMenu
+#include "pathutil.h"                   // BldQuotedFileName
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "notebook.h"                   // CfgDlgProc CfgMenuInit
+#include "command.h"                    // LINKCMDS
+#include "avl.h"                        // free_archivers
+#include "walkem.h"                     // free_setups...
+#include "key.h"                        // AboutDlgProc
+#include "menu.h"                       // AddToMenu
 #include "mainwnd.h"
-#include "cmdline.h"                    // CmdLine2DlgProc, save_cmdlines
-#include "common.h"                     // CommonCreateMainChildren, CommonDriveCmd, CommonMainWndProc
+#include "cmdline.h"                    // CmdLine2DlgProc, save_cmdlines
+#include "common.h"                     // CommonCreateMainChildren, CommonDriveCmd, CommonMainWndProc
                                         // CommonTextButton
-#include "notify.h"                     // DoNotify, HideNote, ShowNote
-#include "draglist.h"                   // DragOne
+#include "notify.h"                     // DoNotify, HideNote, ShowNote
+#include "draglist.h"                   // DragOne
 #include "chklist.h"                    // DropListProc
 #include "avv.h"                        // EditArchiverDefinition
@@ -266 +267 @@
       switch (id) {
       case IDM_RESCAN:
-        strcpy(s, GetPString(IDS_RESCANALLDRIVESTEXT));
-        break;
+        strcpy(s, GetPString(IDS_RESCANALLDRIVESTEXT));
+        break;
 
       case IDM_REFRESHREMOVABLES:
-        strcpy(s, GetPString(IDS_REFRESHREMOVABLESTEXT));
-        break;
+        strcpy(s, GetPString(IDS_REFRESHREMOVABLESTEXT));
+        break;
 
       default:
-        *dv = 0;
-        *dv = id - IDM_DRIVEA + 'A';
-        strcpy(dv + 1, ":");
-        d = toupper(*dv);
-        if (isalpha(d) && d > 'B' &&
-            !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
-                                     DRIVE_SLOW)) &&
-            (!hwndBubble ||
-             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-            !WinQueryCapture(HWND_DESKTOP)) {
-  
-          FSALLOCATE fsa;
-          CHAR szQty[38];
-          ULONG ulPctFree;
-          ULONGLONG ullFreeQty;
-  
-          if (!DosQueryFSInfo((d - 'A') + 1,
-                              FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
-            ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
-              (fsa.cSectorUnit * fsa.cbSector);
-            ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
-              (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
-            CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
-            sprintf(s, "%s %s (%lu%%) %s", dv, szQty, ulPctFree, GetPString(IDS_FREETEXT));
-          }
-        }
+        *dv = 0;
+        *dv = id - IDM_DRIVEA + 'A';
+        strcpy(dv + 1, ":");
+        d = toupper(*dv);
+        if (isalpha(d) && d > 'B' &&
+            !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
+                                     DRIVE_SLOW)) &&
+            (!hwndBubble ||
+             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+            !WinQueryCapture(HWND_DESKTOP)) {
+
+          FSALLOCATE fsa;
+          CHAR szQty[38];
+          ULONG ulPctFree;
+          ULONGLONG ullFreeQty;
+
+          if (!DosQueryFSInfo((d - 'A') + 1,
+                              FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
+            ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
+              (fsa.cSectorUnit * fsa.cbSector);
+            ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
+              (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
+            CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
+            sprintf(s, "%s %s (%lu%%) %s", dv, szQty, ulPctFree, GetPString(IDS_FREETEXT));
+          }
+        }
       }
       if ((!hwndBubble ||
-           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-          !WinQueryCapture(HWND_DESKTOP))
-        WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
+           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+          !WinQueryCapture(HWND_DESKTOP))
+        WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
     }
     return 0;
@@ -879 +880 @@
     id = WinQueryWindowUShort(hwnd, QWS_ID);
     if (id == CBID_EDIT &&
-        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
+        WinQueryWindowUShort(WinQueryWindow(hwnd, QW_PARENT), QWS_ID) ==
         MAIN_USERLIST) {
 
@@ -1213 +1214 @@
     {
       MRESULT mr = PFNWPStatic(hwnd, msg, mp1, mp2);
-      HBITMAP hbmold = (HBITMAP) 0;
-      HPS hps = (HPS) 0;
 
       switch (WinQueryWindowUShort(hwnd, QWS_ID)) {
       case MAIN_LED:
-        hps = WinGetPS(hwnd);
-        hbmold = (HBITMAP) WinSendMsg(hwnd, SM_QUERYHANDLE, MPVOID, MPVOID);
-        if (!fBlueLED) {
-          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON_BMP, 12, 12);
-          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF_BMP, 12, 12);
-        }
-        else {
-          hbmLEDon = GpiLoadBitmap(hps, 0, LEDON2_BMP, 12, 12);
-          hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF2_BMP, 12, 12);
-        }
-        if (hbmLEDoff && hbmLEDon)
-          WinSendMsg(hwnd, SM_SETHANDLE, MPFROMLONG(hbmLEDoff), MPVOID);
-        else {
-          if (hbmLEDoff)
-            GpiDeleteBitmap(hbmLEDoff);
-          if (hbmLEDon)
-            GpiDeleteBitmap(hbmLEDon);
-        }
-        if (hbmold &&
-            hbmLEDon &&
-            hbmLEDoff && hbmold != hbmLEDon && hbmold != hbmLEDoff)
-          GpiDeleteBitmap(hbmold);
-        if (hps)
-          WinReleasePS(hps);
+        {
+          HPS hps = WinGetPS(hwnd);
+          HBITMAP hbmold = (HBITMAP)WinSendMsg(hwnd, SM_QUERYHANDLE, MPVOID, MPVOID);
+          if (!fBlueLED) {
+            hbmLEDon = GpiLoadBitmap(hps, 0, LEDON_BMP, 12, 12);
+            hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF_BMP, 12, 12);
+          }
+          else {
+            hbmLEDon = GpiLoadBitmap(hps, 0, LEDON2_BMP, 12, 12);
+            hbmLEDoff = GpiLoadBitmap(hps, 0, LEDOFF2_BMP, 12, 12);
+          }
+          if (hbmLEDoff && hbmLEDon)
+            WinSendMsg(hwnd, SM_SETHANDLE, MPFROMLONG(hbmLEDoff), MPVOID);
+          else {
+            if (hbmLEDoff)
+              GpiDeleteBitmap(hbmLEDoff);
+            if (hbmLEDon)
+              GpiDeleteBitmap(hbmLEDon);
+          }
+          if (hbmold &&
+              hbmLEDon &&
+              hbmLEDoff && hbmold != hbmLEDon && hbmold != hbmLEDoff)
+            GpiDeleteBitmap(hbmold);
+          if (hps)
+            WinReleasePS(hps);
+        }
         break;
       default:
@@ -1859 +1860 @@
     case IDM_RESCAN:
       {
-        BOOL toggleTree = FALSE;
-  
-        if (!hwndTree) {
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-          toggleTree = TRUE;
-        }
-        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        if (toggleTree)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        BOOL toggleTree = FALSE;
+
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
       }
       break;
     case IDM_REFRESHREMOVABLES:
       {
-        BOOL toggleTree = FALSE;
-  
-        if (!hwndTree) {
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
-          toggleTree = TRUE;
-        }
-        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
-        if (toggleTree)
-          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        BOOL toggleTree = FALSE;
+
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
       }
       break;
     default:
       {
-        CHAR dv[4];
-  
-        *dv = SHORT1FROMMP(mp1) - IDM_DRIVEA + 'A';
-        strcpy(dv + 1, ":\\");
-        if (isalpha(*dv)) {
-  
-          HWND hwndActive;
-  
-          dv[1] = ':';
-          dv[2] = '\\';
-          dv[3] = 0;
-          hwndActive = TopWindow(hwnd, (HWND) 0);
-          if (hwndActive)
-            WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
-                       UM_DRIVECMD, MPFROMP(dv), MPVOID);
-        }
+        CHAR dv[4];
+
+        *dv = SHORT1FROMMP(mp1) - IDM_DRIVEA + 'A';
+        strcpy(dv + 1, ":\\");
+        if (isalpha(*dv)) {
+
+          HWND hwndActive;
+
+          dv[1] = ':';
+          dv[2] = '\\';
+          dv[3] = 0;
+          hwndActive = TopWindow(hwnd, (HWND) 0);
+          if (hwndActive)
+            WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
+                       UM_DRIVECMD, MPFROMP(dv), MPVOID);
+        }
       }
     }
@@ -1932 +1933 @@
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (helpid != id) {
-        helpid = id;
+        helpid = id;
         PostMsg(MainObjectHwnd, UM_SETUP6, MPFROMLONG((ULONG) hwnd), MPVOID);
       }
@@ -1942 +1943 @@
   case WM_PAINT:
     {
-      HPS hps; 
+      HPS hps;
       POINTL aptl[4] = {0, 0, DRIVE_BUTTON_WIDTH - 1, DRIVE_BUTTON_HEIGHT - 1,
       0, 0, DRIVE_BUTTON_WIDTH - 1, DRIVE_BUTTON_HEIGHT - 1};
@@ -1955 +1956 @@
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (id == IDM_REFRESHREMOVABLES || id == IDM_RESCAN)
-        break;
+        break;
       *szDrv = 0;
       x = id - IDM_DRIVEA;
@@ -1965 +1966 @@
           else
             iconid = (driveflags[x] & DRIVE_REMOVABLE) ?
-                      REMOVABLE_ICON :
+                      REMOVABLE_ICON :
                      (driveflags[x] & DRIVE_VIRTUAL) ?
                       VIRTUAL_ICON :
-                     (driveflags[x] & DRIVE_REMOTE) ?
-                      REMOTE_ICON :
+                     (driveflags[x] & DRIVE_REMOTE) ?
+                      REMOTE_ICON :
                      (driveflags[x] & DRIVE_RAMDISK) ?
                       RAMDISK_ICON :
                      (driveflags[x] & DRIVE_ZIPSTREAM) ?
-                      ZIPSTREAM_ICON :
-                     (driveflags[x] & DRIVE_LOCALHD) ?
-                      DRIVE_ICON : DONNO_ICON;
+                      ZIPSTREAM_ICON :
+                     (driveflags[x] & DRIVE_LOCALHD) ?
+                      DRIVE_ICON : DONNO_ICON;
         }
         else
-          iconid = FLOPPY_ICON;
+          iconid = FLOPPY_ICON;
       hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
       if (hps) {
-        hbm = GpiLoadBitmap(hps, 0, iconid, 0, 0);
-        if (hbm) {
-          pbmpData = xmallocz(sizeof(PBITMAPINFOHEADER) * 3, pszSrcFile, __LINE__);
-          if (pbmpData) {
-            GpiQueryBitmapParameters(hbm, pbmpData);
-            aptl[1].x = pbmpData->cx;
-            aptl[1].y = pbmpData->cy;
-            aptl[3].x = pbmpData->cx;
-            aptl[3].y = pbmpData->cy;
-            GpiWCBitBlt(hps, hbm, 4L, aptl, ROP_SRCCOPY, BBO_PAL_COLORS);
-            free(pbmpData);
-          }
-        }
-        memset(&fat, 0, sizeof(fat));
-        fat.usRecordLength = sizeof(FATTRS);
-        fat.fsSelection = FATTR_SEL_BOLD ;
-        fat.usCodePage = 850;
-        fat.fsFontUse = FATTR_FONTUSE_NOMIX;
-        strcpy(fat.szFacename , FNT_HELVETICA);
-        x = GpiCreateLogFont(hps, NULL, DRIVEBAR_FONT_LCID, &fat);
-        if (x != GPI_ERROR) {
-          GpiSetCharSet(hps, DRIVEBAR_FONT_LCID);
-          sizfCharBox.cx = MAKEFIXED(10,0); //Font size
-          sizfCharBox.cy = MAKEFIXED(14,0);
-          GpiSetCharBox( hps, &sizfCharBox );
-          GpiSetColor(hps, iconid == RAMDISK_ICON ? CLR_YELLOW : CLR_DARKBLUE);
-          ptlStart.x = 1L;  //Char box position
-          ptlStart.y = 8L;
-          GpiCharStringAt(hps, &ptlStart, strlen(szDrv), szDrv);
-          GpiDeleteSetId(hps, DRIVEBAR_FONT_LCID);
-        }
-        WinEndPaint(hps);
+        hbm = GpiLoadBitmap(hps, 0, iconid, 0, 0);
+        if (hbm) {
+          pbmpData = xmallocz(sizeof(PBITMAPINFOHEADER) * 3, pszSrcFile, __LINE__);
+          if (pbmpData) {
+            GpiQueryBitmapParameters(hbm, pbmpData);
+            aptl[1].x = pbmpData->cx;
+            aptl[1].y = pbmpData->cy;
+            aptl[3].x = pbmpData->cx;
+            aptl[3].y = pbmpData->cy;
+            GpiWCBitBlt(hps, hbm, 4L, aptl, ROP_SRCCOPY, BBO_PAL_COLORS);
+            free(pbmpData);
+          }
+        }
+        memset(&fat, 0, sizeof(fat));
+        fat.usRecordLength = sizeof(FATTRS);
+        fat.fsSelection = FATTR_SEL_BOLD ;
+        fat.usCodePage = 850;
+        fat.fsFontUse = FATTR_FONTUSE_NOMIX;
+        strcpy(fat.szFacename , FNT_HELVETICA);
+        x = GpiCreateLogFont(hps, NULL, DRIVEBAR_FONT_LCID, &fat);
+        if (x != GPI_ERROR) {
+          GpiSetCharSet(hps, DRIVEBAR_FONT_LCID);
+          sizfCharBox.cx = MAKEFIXED(10,0); //Font size
+          sizfCharBox.cy = MAKEFIXED(14,0);
+          GpiSetCharBox( hps, &sizfCharBox );
+          GpiSetColor(hps, iconid == RAMDISK_ICON ? CLR_YELLOW : CLR_DARKBLUE);
+          ptlStart.x = 1L;  //Char box position
+          ptlStart.y = 8L;
+          GpiCharStringAt(hps, &ptlStart, strlen(szDrv), szDrv);
+          GpiDeleteSetId(hps, DRIVEBAR_FONT_LCID);
+        }
+        WinEndPaint(hps);
       }
     }
@@ -2057 +2058 @@
         UINT iDrv;
 
-        strcat(szDrv, PCSZ_BACKSLASH);
+        strcat(szDrv, PCSZ_BACKSLASH);
         MakeValidDir(szDrv);
-        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
-        local = ~driveflags[iDrv] & DRIVE_REMOTE && ~driveflags[iDrv] & DRIVE_VIRTUAL &&
-                ~driveflags[iDrv] & DRIVE_RAMDISK;
+        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
+        local = ~driveflags[iDrv] & DRIVE_REMOTE && ~driveflags[iDrv] & DRIVE_VIRTUAL &&
+                ~driveflags[iDrv] & DRIVE_RAMDISK;
         rdy = toupper(*szDrv) == toupper(chDrv);
-        iDrv = toupper(*szDrv) - 'A';
+        iDrv = toupper(*szDrv) - 'A';
         if (!rdy || ~driveflags[iDrv] & DRIVE_REMOTE)
-          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
-
-        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE)
-          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
+
+        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE)
+          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
 
         if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE || !local) {
@@ -2084 +2085 @@
           WinEnableMenuItem(hwndMenu, IDM_ARCHIVE, FALSE);
           WinEnableMenuItem(hwndMenu, IDM_SIZES, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
-
-        if (!rdy || !local)
+          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
+
+        if (!rdy || !local)
           WinEnableMenuItem(hwndMenu, IDM_CHKDSK, FALSE);
         }
@@ -2333 +2334 @@
 VOID BuildDriveBarButtons(HWND hwndT)
 {
-  register ULONG x; 
-  ULONG ulDriveNum, ulDriveMap; 
+  register ULONG x;
+  ULONG ulDriveNum, ulDriveMap;
   HENUM henum;
   HWND hwndB;
@@ -2352 +2353 @@
                                 WC_DRIVEBUTTONS,
                                 0,
-                                BS_NOPOINTERFOCUS | BS_USERBUTTON,
+                                BS_NOPOINTERFOCUS | BS_USERBUTTON,
                                 0,
                                 0,
@@ -2360 +2361 @@
         if (!hwndB)
           Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
-        else {
+                    PCSZ_WINCREATEWINDOW);
+        else {
           WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
         }
@@ -2367 +2368 @@
     }                                   // for
     hwndB = WinCreateWindow(hwndT,
-                            WC_DRIVEBUTTONS,
-                            "#7001",
-                            BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
-                            0,
-                            0,
-                            DRIVE_BUTTON_WIDTH,
-                            DRIVE_BUTTON_HEIGHT,
-                            hwndT, HWND_TOP, IDM_REFRESHREMOVABLES, NULL, NULL);
+                            WC_DRIVEBUTTONS,
+                            "#7001",
+                            BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
+                            0,
+                            0,
+                            DRIVE_BUTTON_WIDTH,
+                            DRIVE_BUTTON_HEIGHT,
+                            hwndT, HWND_TOP, IDM_REFRESHREMOVABLES, NULL, NULL);
   if (!hwndB)
     Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_WINCREATEWINDOW);
   hwndB = WinCreateWindow(hwndT,
-                          WC_DRIVEBUTTONS,
-                          "#7000",
-                          BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
-                          0,
-                          0,
-                          DRIVE_BUTTON_WIDTH,
-                          DRIVE_BUTTON_HEIGHT,
-                          hwndT, HWND_TOP, IDM_RESCAN, NULL, NULL);
+                          WC_DRIVEBUTTONS,
+                          "#7000",
+                          BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
+                          0,
+                          0,
+                          DRIVE_BUTTON_WIDTH,
+                          DRIVE_BUTTON_HEIGHT,
+                          hwndT, HWND_TOP, IDM_RESCAN, NULL, NULL);
   if (!hwndB)
     Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -2415 +2416 @@
     WinSetWindowPos(hwndB,
                     HWND_TOP,
-                    ctrlxpos, ctrlypos, ctrlxsize, DRIVE_BUTTON_HEIGHT, SWP_MOVE | SWP_SHOW);
+                    ctrlxpos, ctrlypos, ctrlxsize, DRIVE_BUTTON_HEIGHT, SWP_MOVE | SWP_SHOW);
     ctrlxpos += (ctrlxsize + 2);
     if (ctrlxpos + (DRIVE_BUTTON_WIDTH + 2 + ((fShowTarget && DriveLines == 0) ?
-                          256 : 0)) > xwidth) {
+                          256 : 0)) > xwidth) {
       ctrlxpos = 1;
       ctrlypos += DRIVE_BUTTON_HEIGHT;
@@ -2627 +2628 @@
                                 hwnd, HWND_TOP, COMMAND_BUTTON, NULL, NULL);
         if (!hwndB)
-          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         hwndE = WinCreateWindow(hwnd,
                                 WC_ENTRYFIELD,
@@ -2639 +2640 @@
                                 hwnd, HWND_TOP, COMMAND_LINE, NULL, NULL);
         if (!hwndE)
-          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         if (!hwndE || !hwndB) {
           PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -3077 +3078 @@
               continue;
             }
-            sprintf(szKeyBase, "%sDirCnr.%lu", szPrefix, numsaves);
-            strcpy(szKey, szKeyBase);
-            strcat(szKey, ".");
-            eos = &szKey[strlen(szKey)];
-            strcpy(eos, "Pos");
+            sprintf(szKeyBase, "%sDirCnr.%lu", szPrefix, numsaves);
+            strcpy(szKey, szKeyBase);
+            strcat(szKey, ".");
+            eos = &szKey[strlen(szKey)];
+            strcpy(eos, "Pos");
             PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
                                 sizeof(SWP));
             dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
-            if (dcd) {
-              strcpy(eos, "Sort");
+            if (dcd) {
+              strcpy(eos, "Sort");
               PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
-                                  sizeof(INT));
-              strcpy(eos, "Filter");
+                                  sizeof(INT));
+              strcpy(eos, "Filter");
               PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
-                                  sizeof(MASK));
-              strcpy(eos, "View");
+                                  sizeof(MASK));
+              strcpy(eos, "View");
               flWindowAttr = dcd->flWindowAttr;
               if (!fLeaveTree && (flWindowAttr & CV_TREE)) {
@@ -3111 +3112 @@
               PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &flWindowAttr,
                                   sizeof(ULONG));
-              WriteDetailsSwitches(szKeyBase, &dcd->ds, TRUE);
+              WriteDetailsSwitches(szKeyBase, &dcd->ds, TRUE);
               SavePresParams(hwndDir, szKeyBase);
-            }
-            strcpy(eos, "Dir");
+            }
+            strcpy(eos, "Dir");
             PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
-            numsaves++;
+            numsaves++;
           }
         }
@@ -3132 +3133 @@
     if (!size && fSaveState) {
       for (ulTemp = 0; ulTemp < previous_numsaves; ulTemp++)
-        RemoveOldCnrSwitches(szPrefix, ulTemp);
+        RemoveOldCnrSwitches(szPrefix, ulTemp);
        sprintf(szKey, "%sVersion", szPrefix);
        PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
@@ -3323 +3324 @@
           if (fIsShutDownState &&
               driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-            RemoveCnrSwitches(szKeyBase, NULL);
-            RemoveOldCnrSwitches(szPrefix, x);
+            RemoveCnrSwitches(szKeyBase, NULL);
+            RemoveOldCnrSwitches(szPrefix, x);
             continue;
           }
-          LoadDetailsSwitches(szKeyBase, &localdcd.ds, TRUE);
+          LoadDetailsSwitches(szKeyBase, &localdcd.ds, TRUE);
           hwndDir = (HWND) WinSendMsg(hwndClient,
                                       UM_SETDIR,
@@ -3364 +3365 @@
                 dcd->ds.detailslatime   = localdcd.ds.detailslatime  ;
                 dcd->ds.detailslwdate   = localdcd.ds.detailslwdate  ;
-                dcd->ds.detailslwtime   = localdcd.ds.detailslwtime  ;
-                strcpy(eos, "Sort");
+                dcd->ds.detailslwtime   = localdcd.ds.detailslwtime  ;
+                strcpy(eos, "Sort");
                 size = sizeof(INT);
                 if (PrfQueryProfileData(fmprof,
@@ -3375 +3376 @@
                     dcd->sortFlags = SORT_PATHNAME;
                 }
-                size = sizeof(MASK);
-                strcpy(eos, "Filter");
+                size = sizeof(MASK);
+                strcpy(eos, "Filter");
                 if (PrfQueryProfileData(fmprof,
                                         FM3Str,
@@ -3386 +3387 @@
                 }
                 *(dcd->mask.prompt) = 0;
-                strcpy(eos, "View");
+                strcpy(eos, "View");
                 if (!noview) {
                   size = sizeof(ULONG);
@@ -3412 +3413 @@
                 }
                 if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
-                  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL); 
+                  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
               }
             }
@@ -3435 +3436 @@
                               SWP_SIZE | SWP_SHOW |  SWP_ZORDER |
                               SWP_ACTIVATE);
-          }
-          if (fDeleteState)
-            RemoveCnrSwitches(szKeyBase, pszStateName);
+          }
+          if (fDeleteState)
+            RemoveCnrSwitches(szKeyBase, pszStateName);
         }
       }
@@ -4748 +4749 @@
             else {
               PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-              for (x = 0; x < numsaves; x++) {
-                sprintf(szKeyBase, "%s.DirCnr.%lu", szStateName, x);
-                RemoveCnrSwitches(szKeyBase, szStateName);
-                size = 0;
-                sprintf(szKey, "%sVersion", szStateName);
-                if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
-                  RemoveOldCnrSwitches(szStateName, x);
+              for (x = 0; x < numsaves; x++) {
+                sprintf(szKeyBase, "%s.DirCnr.%lu", szStateName, x);
+                RemoveCnrSwitches(szKeyBase, szStateName);
+                size = 0;
+                sprintf(szKey, "%sVersion", szStateName);
+                if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+                  RemoveOldCnrSwitches(szStateName, x);
               }
             }
@@ -4807 +4808 @@
 
       if (fDataMin) {
-        fDataMin = FALSE;
-        changed = TRUE;
+        fDataMin = FALSE;
+        changed = TRUE;
       }
       WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                      SWP_MINIMIZE);
+                      SWP_MINIMIZE);
       WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                      SWP_RESTORE | SWP_ZORDER);
+                      SWP_RESTORE | SWP_ZORDER);
       if (changed)
-        fDataMin = TRUE;
+        fDataMin = TRUE;
       break;
     }
@@ -5506 +5507 @@
                          hwnd, HWND_TOP, IDM_IDEALSIZE, NULL, NULL)) {
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
     }
     else {
@@ -5528 +5529 @@
     if (!hwndTmp)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
 
     hwndTmp = WinCreateWindow(hwndFrame,
@@ -5541 +5542 @@
     if (!hwndTmp)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
 
     hwndUserlist = WinCreateWindow(hwndFrame,
@@ -5561 +5562 @@
     if (!hwndUserlist)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
     hwndCmdlist = WinCreateWindow(hwndFrame,
                                   WC_COMBOBOX,
@@ -5580 +5581 @@
     if (!hwndCmdlist)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
     WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
     hwndStatelist = WinCreateWindow(hwndFrame,
@@ -5600 +5601 @@
     if (!hwndStatelist)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
 
     hwndDrivelist = WinCreateWindow(hwndFrame,
@@ -5619 +5620 @@
     if (!hwndDrivelist)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
     //fixme to allow user to change presparams 1-10-09 GKY
     SetPresParams(hwndDrivelist,
@@ -5639 +5640 @@
     if (!hwndButtonlist)
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
     WinSendMsg(WinWindowFromID(hwndUserlist, CBID_EDIT),
                EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
@@ -5822 +5823 @@
       PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
       if (fInitialDriveScan) {
-        DosPostEventSem(hevInitialCnrScanComplete);
-        DosCloseEventSem(hevInitialCnrScanComplete);
+        DosPostEventSem(hevInitialCnrScanComplete);
+        DosCloseEventSem(hevInitialCnrScanComplete);
       }
     }
@@ -5898 +5899 @@
   case UM_THREADUSE:
   case UM_BUILDDRIVEBAR:
+  case WM_TIMER:
     return CommonMainWndProc(hwnd, msg, mp1, mp2);
 

trunk/dll/notify.c ¶

@@ -26 +26 @@
 #include <string.h>
 #include <ctype.h>
-#include <stddef.h>                     // _threadid
+#include <stddef.h>                     // _threadid
 
 #define INCL_DOS
 #define INCL_WIN
 #define INCL_GPI
-#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_LONGLONG                   // dircnrs.h
 
 #include "fm3dll.h"
@@ -41 +41 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 #include "notify.h"
 #include "presparm.h"                   // SetPresParams
@@ -55 +55 @@
 // Data definitions
 static PSZ pszSrcFile = __FILE__;
-static volatile HWND hwndNotify;        // 16 Apr 08 SHL
+static volatile HWND hwndNotify;        // 16 Apr 08 SHL
 static volatile PCSZ pszCachedNote;     // 16 Jul 09 SHL
 
@@ -170 +170 @@
 {
   char *p;
-  HWND hwnd = (HWND) 0, hwndP;
+  HWND hwnd = (HWND)0, hwndP;
   LONG x, y, cx, cy;
   SWP swp, swpS, swpS2;
@@ -217 +217 @@
     if (!hwnd)
       Win_Error(hwndP, hwndP, pszSrcFile, __LINE__,
-                PCSZ_WINCREATEWINDOW);
+                PCSZ_WINCREATEWINDOW);
 
     if (p != str)
@@ -306 +306 @@
     // Remember showing for restart
     fThreadNotes = TRUE;
-      PrfWriteProfileData(fmprof,
-                          FM3Str, "ThreadNotes", &fThreadNotes, sizeof(BOOL));
-    fThreadNotes = FALSE;               // Optimize
+    PrfWriteProfileData(fmprof,
+                        FM3Str,
+                        "ThreadNotes",
+                        &fThreadNotes,
+                        sizeof(BOOL));
+    fThreadNotes = FALSE;               // Optimize shutdown
 
     // 16 Jul 09 SHL Added
@@ -445 +448 @@
         ndx--;
         len = (SHORT)WinSendDlgItemMsg(hwnd, NOTE_LISTBOX,
-                                       LM_QUERYITEMTEXTLENGTH, 
+                                       LM_QUERYITEMTEXTLENGTH,
                                        MPFROMSHORT(ndx), MPVOID);
         if (len != LIT_ERROR) {
@@ -471 +474 @@
   case WM_DESTROY:
     if (hwndNotify == hwnd) {
-      // Remember not open
-      fThreadNotes = FALSE;
+      fThreadNotes = FALSE;             // Remember not open
       PrfWriteProfileData(fmprof,
                           FM3Str, "ThreadNotes", &fThreadNotes, sizeof(BOOL));
-      hwndNotify = (HWND) 0;
+      hwndNotify = (HWND)0;
     }
     if (hptrIcon) {
@@ -481 +483 @@
       hptrIcon = (HPOINTER)0;           // 16 Jul 09 SHL
     }
-    if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
-      WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
+    if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
+      WinSendMsg((HWND)0, WM_QUIT, MPVOID, MPVOID);
     break;
   }
@@ -492 +494 @@
  */
 
-static VOID NoteThread(VOID * args)
+static VOID NoteThread(VOID *args)
 {
   HAB hab = WinInitialize(0);

trunk/dll/treecnr.c ¶

@@ -69 +69 @@
   06 Jun 09 GKY Status line to show file sys/label not shown in tree; shortened to fit split status
   07 Jun 09 GKY Fixed double names in tree container when collapsed tree is accessed
-                before recursive scan
+                before recursive scan
   12 Jul 09 GKY Add option to show file system type or drive label in tree
-                (get NOPRESCAN drives working)
+                (get NOPRESCAN drives working)
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
   22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
   22 Jul 09 GKY Streamline scanning code for faster Tree rescans
+  14 Sep 09 SHL Drop experimental code
 
 ***********************************************************************/
@@ -280 +281 @@
         if (!stricmp(dirname, pciP->pszFileName))
           break;                        // Found it
-        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
-          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
+          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
         strcpy(szDir, dirname);
         if (p - szDir >= strlen(szDir))
@@ -336 +337 @@
                           MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER));
         if (pciP && (INT) pciP != -1) {
-          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED)) 
-            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
+            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
           pciToSelect = pciP;
         }
@@ -352 +353 @@
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
       }
-      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) 
-        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (!quickbail) {
         WinSendMsg(hwndCnr,
@@ -643 +644 @@
           temptop = fTopDir;
           fTopDir = TRUE;
-        }
-        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
-        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+        }
+        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
         dcd->suspendview = tempsusp;
         fFollowTree = tempfollow;
@@ -780 +781 @@
               else
                 *szFree = 0;
-              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
-              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
-                  fShowFSTypeInTree)
-                strcpy(FileSystem, NullStr);
-              if (fShowDriveLabelInTree)
-                strcpy(szTmpLabel, NullStr);
-              else
-                strcpy(szTmpLabel, volser.volumelabel);
-              if (fSplitStatus) {
-                CHAR temp[CCHMAXPATH] = " [";
-
-                strcat(temp, s);
-                strcat(temp, "]");
-                sprintf(s,
-                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree
-                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
-                        toupper(*pci->pszFileName), FileSystem,
-                        szTmpLabel, volser.serial, szFree);
-                strcat(s, temp);
-              }
-              else {
-                strcat(s, " [");
-                sprintf(&s[strlen(s)],
-                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree
-                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
-                        toupper(*pci->pszFileName), FileSystem,
-                        szTmpLabel, volser.serial, szFree);
-                strcat(s, "]");
-              }
+              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
+              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
+                  fShowFSTypeInTree)
+                strcpy(FileSystem, NullStr);
+              if (fShowDriveLabelInTree)
+                strcpy(szTmpLabel, NullStr);
+              else
+                strcpy(szTmpLabel, volser.volumelabel);
+              if (fSplitStatus) {
+                CHAR temp[CCHMAXPATH] = " [";
+
+                strcat(temp, s);
+                strcat(temp, "]");
+                sprintf(s,
+                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
+                                   fShowDriveLabelInTree
+                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
+                        toupper(*pci->pszFileName), FileSystem,
+                        szTmpLabel, volser.serial, szFree);
+                strcat(s, temp);
+              }
+              else {
+                strcat(s, " [");
+                sprintf(&s[strlen(s)],
+                        GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
+                                   fShowDriveLabelInTree
+                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
+                        toupper(*pci->pszFileName), FileSystem,
+                        szTmpLabel, volser.serial, szFree);
+                strcat(s, "]");
+              }
               if (!fMoreButtons) {
                 if (*dcd->mask.szMask ||
@@ -854 +855 @@
       WinSendMsg(dcd->hwndCnr,
                  CM_SCROLLWINDOW,
-                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
+                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
       DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
@@ -1813 +1814 @@
                   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;
@@ -1829 +1830 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              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){
-              WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
-              //DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p", hwnd, pci);
-            }
+              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){
+              WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
+              //DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p", hwnd, pci);
+            }
           }
         }
@@ -1897 +1898 @@
           (INT) pci != -1 &&
           !(pci->rc.flRecordAttr & CRA_INUSE) &&
-          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
-        x = (INT) (toupper(*pci->pszFileName) - 'A');
+          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
+        x = (INT) (toupper(*pci->pszFileName) - 'A');
         if (driveflags[x] & DRIVE_INVALID) {
           if (!fAlertBeepOff)
             DosBeep(50, 100);
           if (hwndStatus)
-            WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
-          DosReleaseMutexSem(hmtFillingTreeCnr);
+            WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
+          DosReleaseMutexSem(hmtFillingTreeCnr);
           return 0;
         }
@@ -1923 +1924 @@
               }
             } // for
-            RemoveCnrItems(hwnd, pciP, 1, CMA_FREE | CMA_INVALIDATE);
-            DosReleaseMutexSem(hmtFillingTreeCnr);
+            RemoveCnrItems(hwnd, pciP, 1, CMA_FREE | CMA_INVALIDATE);
+            DosReleaseMutexSem(hmtFillingTreeCnr);
             return 0;
           }
@@ -1936 +1937 @@
             CHAR volumelabel[CCHMAXPATH];
           }
-          volser;
-          CHAR FileSystem[CCHMAXPATH];
-          CHAR szBuf[CCHMAXPATH];
+          volser;
+          CHAR FileSystem[CCHMAXPATH];
+          CHAR szBuf[CCHMAXPATH];
 
           pciL = pciP = pci;
@@ -1955 +1956 @@
           if ((driveflags[x] & DRIVE_NOPRESCAN) || (toupper(*pci->pszFileName) > 'B' &&
                !(driveflags[x] & DRIVE_CDROM))) {
-            DriveFlagsOne(x, FileSystem, &volser);
-            SelectDriveIcon(pciP);
+            DriveFlagsOne(x, FileSystem, &volser);
+            SelectDriveIcon(pciP);
             if (hwndMain)
               PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
@@ -1965 +1966 @@
                                   FSIL_VOLSER, &volser,
                                   (ULONG) sizeof(volser));
-          if (!status) {
+          if (!status) {
             if (!volser.serial || driveserial[x] != volser.serial) {
               UnFlesh(hwnd, pciP);
@@ -1977 +1978 @@
             if (!pciL)
               Flesh(hwnd, pciP);
-            if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
-                strlen(pciP->pszFileName) < 4) {
-              strcpy(szBuf, pciP->pszFileName);
-              strcat(szBuf, " [");
-              strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
-              strcat(szBuf, "]");
-              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
-              pciP->rc.pszIcon = pciP->pszDisplayName;
-            }
-            WinSendMsg(hwnd,
-                       CM_INVALIDATERECORD,
-                       MPFROMP(&pciP),
-                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-          }
+            if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
+                strlen(pciP->pszFileName) < 4) {
+              strcpy(szBuf, pciP->pszFileName);
+              strcat(szBuf, " [");
+              strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
+              strcat(szBuf, "]");
+              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+              pciP->rc.pszIcon = pciP->pszDisplayName;
+            }
+            WinSendMsg(hwnd,
+                       CM_INVALIDATERECORD,
+                       MPFROMP(&pciP),
+                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+          }
           else {
             driveserial[x] = -1;
             UnFlesh(hwnd, pci);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(status));
-            DosReleaseMutexSem(hmtFillingTreeCnr);
+            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(status));
+            DosReleaseMutexSem(hmtFillingTreeCnr);
             return 0;
           }
@@ -2018 +2019 @@
             if ((shiftstate & (KC_CTRL | KC_ALT)) == (KC_CTRL | KC_ALT)) {
               PostMsg(hwnd,
-                      WM_COMMAND, MPFROM2SHORT(IDM_SHOWALLFILES, 0), MPVOID);
-              DosReleaseMutexSem(hmtFillingTreeCnr);
+                      WM_COMMAND, MPFROM2SHORT(IDM_SHOWALLFILES, 0), MPVOID);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }
             if ((shiftstate & (KC_CTRL | KC_SHIFT)) == (KC_CTRL | KC_SHIFT)) {
-              OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
-              DosReleaseMutexSem(hmtFillingTreeCnr);
+              OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }
             if (!(shiftstate & (KC_CTRL | KC_SHIFT))) {
               if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
-                if (FindDirCnrByName(pci->pszFileName, TRUE)) {
-                  DosReleaseMutexSem(hmtFillingTreeCnr);
-                  return 0;
-                }
+                if (FindDirCnrByName(pci->pszFileName, TRUE)) {
+                  DosReleaseMutexSem(hmtFillingTreeCnr);
+                  return 0;
+                }
               }
             }
@@ -2054 +2055 @@
               }
               OpenObject(pci->pszFileName, s, dcd->hwndFrame);
-              DosReleaseMutexSem(hmtFillingTreeCnr);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
               return 0;
             }
@@ -2097 +2098 @@
         PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_MKDIR, 0), MPVOID);
       if (fFollowTree)
-        WinSetFocus(HWND_DESKTOP, hwnd);
+        WinSetFocus(HWND_DESKTOP, hwnd);
       DosReleaseMutexSem(hmtFillingTreeCnr);
     }
@@ -2342 +2343 @@
           *s = info->device;
           pci = FindCnrRecord(hwnd, s, NULL, FALSE, FALSE, TRUE);
-          if (pci && (INT) pci != -1) {
-            INT x = info->device - 'A';
-            CHAR  FileSystem[CCHMAXPATH];
+          if (pci && (INT) pci != -1) {
+            INT x = info->device - 'A';
+            CHAR  FileSystem[CCHMAXPATH];
 
             driveserial[x] = -1;
@@ -2588 +2589 @@
         runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED | WAIT,
                 HWND_DESKTOP, pszSrcFile, __LINE__, NULL, NULL,
-                "%s %s", PCSZ_LVMEXE, "/RediscoverPRM");
+                "%s %s", PCSZ_LVMEXE, "/RediscoverPRM");
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
         break;
@@ -2748 +2749 @@
 
       case IDM_UPDATE:
-        {
+        {
           PCNRITEM pci = (PCNRITEM)CurrentRecord(hwnd);
-          if (pci && (INT)pci != -1) {
-            struct
-            {
-              ULONG serial;
-              CHAR volumelength;
-              CHAR volumelabel[CCHMAXPATH];
-            }
-            volser;
-            INT x = toupper(*pci->pszFileName) - 'A';
-            CHAR FileSystem[CCHMAXPATH], szBuf[CCHMAXPATH];
+          if (pci && (INT)pci != -1) {
+            struct
+            {
+              ULONG serial;
+              CHAR volumelength;
+              CHAR volumelabel[CCHMAXPATH];
+            }
+            volser;
+            INT x = toupper(*pci->pszFileName) - 'A';
+            CHAR FileSystem[CCHMAXPATH], szBuf[CCHMAXPATH];
 
             UINT driveflag = driveflags[x];
             if (pci->attrFile & FILE_DIRECTORY) {
               if (pci->flags & RECFLAGS_UNDERENV)
-                break;
-              DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
+                break;
+              DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
               UnFlesh(hwnd, pci);
               // Check if drive type might need update
               if ((driveflag & (DRIVE_INVALID | DRIVE_NOPRESCAN)) ||
-                  (~driveflag & DRIVE_NOPRESCAN && pci->rc.hptrIcon == hptrDunno)) {
+                  (~driveflag & DRIVE_NOPRESCAN && pci->rc.hptrIcon == hptrDunno)) {
                 DriveFlagsOne(x, FileSystem, &volser);
                 driveflag = driveflags[x];
@@ -2776 +2777 @@
                 else  if (strlen(pci->pszFileName) < 4) {
                   SelectDriveIcon(pci);
-                }
-                if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
-                    strlen(pci->pszFileName) < 4) {
-                  strcpy(szBuf, pci->pszFileName);
-                  strcat(szBuf, " [");
-                  strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
-                  strcat(szBuf, "]");
-                  pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
-                  pci->rc.pszIcon = pci->pszDisplayName;
-                }
+                }
+                if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
+                    strlen(pci->pszFileName) < 4) {
+                  strcpy(szBuf, pci->pszFileName);
+                  strcat(szBuf, " [");
+                  strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
+                  strcat(szBuf, "]");
+                  pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+                  pci->rc.pszIcon = pci->pszDisplayName;
+                }
                 WinSendMsg(hwnd,
                            CM_INVALIDATERECORD,
@@ -2794 +2795 @@
               }
               if (~driveflag & DRIVE_INVALID)
-                Flesh(hwnd, pci);
-              DosReleaseMutexSem(hmtFillingTreeCnr);
+                Flesh(hwnd, pci);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
             }
           }
@@ -3004 +3005 @@
     return 0;
 
-  case WM_TIMER:
-    return ActionWMTimer(hwnd, mp1, mp2);
-
   case WM_SAVEAPPLICATION:
     if (dcd && !ParentIsDesktop(hwnd, dcd->hwndParent)) {
@@ -3238 +3236 @@
                                      NULL,
                                      CCS_AUTOPOSITION | CCS_MINIICONS |
-                                     CCS_MINIRECORDCORE, 
+                                     CCS_MINIRECORDCORE,
                                      0,
                                      0,
@@ -3257 +3255 @@
         if (ParentIsDesktop(hwndFrame, hwndParent)) {
           WinSetWindowText(WinWindowFromID(hwndFrame, FID_TITLEBAR), "VTree");
-          FixSwitchList(hwndFrame, "VTree");
-          DosPostEventSem(hevInitialCnrScanComplete);
-          DosCloseEventSem(hevInitialCnrScanComplete);
-          fInitialDriveScan = FALSE;
+          FixSwitchList(hwndFrame, "VTree");
+          DosPostEventSem(hevInitialCnrScanComplete);
+          DosCloseEventSem(hevInitialCnrScanComplete);
+          fInitialDriveScan = FALSE;
         }
         else {

trunk/dll/worker.c ¶

@@ -61 +61 @@
 // #define INCL_WINWORKPLACE            // 13 Jul 09 SHL dropped
 #define INCL_WINSHELLDATA               // PrfQueryProfileData
-#define INCL_WINTIMER                   // WinStarTimer
-#define INCL_WININPUT                   // WinQueryFocus
 
 #include "fm3dll.h"
@@ -106 +104 @@
 #include "avl.h"                        // SBoxDlgProc
 #include "subj.h"                       // Subject
-#include "grep.h"                       // hwndStatus
 #include "stristr.h"                    // stristr
 #include "wrappers.h"                   // xfopen
@@ -199 +196 @@
   INT plen = 0;
   CHAR *p, *pp;
-  ULONG idTimerStarted = 0;
-  BOOL fActionPosted = FALSE;
-  HAB habForActions;
-  HWND hwndForActions;
   CHAR szQuotedDirName[CCHMAXPATH];
   CHAR szQuotedFileName[CCHMAXPATH];
@@ -333 +326 @@
           // Process each list item
           if (wk->li && wk->li->list && wk->li->list[0]) {
-            // char ucClassname[8];
-            if (hwndStatus) {
-              // Send update request to source window or container
-              // 13 Jul 09 SHL fixme to be sure we pick window that understand UM_ACTIONSTATE wk->dcd->hwndCnr?
-              // 13 Jul 09 SHL fixme to ensure focus window is one that understands UM_ACTIONSTATE
-              HWND hwndFocus = WinQueryFocus(HWND_DESKTOP);
-              DbgMsg(pszSrcFile, __LINE__, "hwndFocus %lx", hwndFocus); // 13 Jul 09 SHL fixme debug
-              DbgMsg(pszSrcFile, __LINE__, "hwndCnr %lx", wk->hwndCnr); // 13 Jul 09 SHL fixme debug
-              // DbgMsg(pszSrcFile, __LINE__, "hwndS %lx", wk->li->hwndS);      // 13 Jul 09 SHL fixme debug
-              DbgMsg(pszSrcFile, __LINE__, "hwnd %lx", wk->li->hwnd);   // 13 Jul 09 SHL fixme debug
-              // DbgMsg(pszSrcFile, __LINE__, "hwndParent %lx", wk->hwndParent);        // 13 Jul 09 SHL fixme debug
-              // DbgMsg(pszSrcFile, __LINE__, "hwndClient %lx", wk->hwndClient);        // 13 Jul 09 SHL fixme debug
-              // DbgMsg(pszSrcFile, __LINE__, "hwndFrame %lx", wk->hwndFrame);  // 13 Jul 09 SHL fixme debug
-              // hwndForActions = wk->li->hwnd == hwndFocus ? hwndFocus : wk->hwndCnr;
-              hwndForActions = WinQueryFocus(HWND_DESKTOP);
-#if 0 // 14 Jul 09 SHL fixme
-              hwndForActions = WinQueryFocus(HWND_DESKTOP);
-              if (WinQueryClassName(hwndForActions, sizeof(ucClassname), ucClassname)) {
-                // If not a container fall back to worker
-                if (strcmp(ucClassname, "#25"));
-              }
-#endif
-              habForActions = WinQueryAnchorBlock(hwndForActions);
-              DbgMsg(pszSrcFile, __LINE__, "habForActions %lx hwndForActions %lx", habForActions, hwndForActions);      // 13 Jul 09 SHL fixme debug
-              // Ask container window to update status line every 5 seconds in case action is time intensive
-              idTimerStarted = WinStartTimer(habForActions, hwndForActions, ID_ACTION_TIMER, 2000);     // 13 Jul 09 SHL fixme 5 sec
-            }
             for (x = 0; wk->li->list[x]; x++) {
               switch (wk->li->type) {
@@ -746 +712 @@
                       GetPString(IDS_MOVEDTEXT) : GetPString(IDS_COPIEDTEXT);
                     if (*wk->li->targetpath) {
-                      strcpy(newname, wk->li->targetpath);
-                      AddBackslashToPath(newname);
+                      strcpy(newname, wk->li->targetpath);
+                      AddBackslashToPath(newname);
                       //if (newname[strlen(newname) - 1] != '\\')
                       //  strcat(newname, "\\");
@@ -1026 +992 @@
             } // for list
 
-            // Do actio specific post-processing
+            // Do action specific post-processing
             switch (wk->li->type) {
             case IDM_MOVE:
@@ -1069 +1035 @@
               break;
             }
-            if (idTimerStarted)
-              WinStopTimer(habForActions, hwndForActions, ID_ACTION_TIMER);     // 13 Jul 09 SHL
           } // if have non-empty list
 
@@ -1093 +1057 @@
     }
 
-    if (fActionPosted)
-      DosSleep(2000);                   // Alloc container time to process queued UM_ACTIONSTATE messages 13 Jul 09 SHL
     if (wk->li)
       FreeListInfo(wk->li);
@@ -1258 +1220 @@
               if (wk->li->type == IDM_MCIPLAY)
                 break;
-              strcpy(szBuffer, wk->li->targetpath);
-              AddBackslashToPath(wk->li->targetpath);
+              strcpy(szBuffer, wk->li->targetpath);
+              AddBackslashToPath(wk->li->targetpath);
               //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] != '\\')
               //  strcat(szBuffer, "\\");
@@ -1320 +1282 @@
               }
               else {
-                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
-                  AddBackslashToPath(wk->li->targetpath);
+                if (*wk->li->targetpath && !IsFile(wk->li->targetpath))
+                  AddBackslashToPath(wk->li->targetpath);
                   //if (wk->li->targetpath[strlen(wk->li->targetpath) - 1] !=
                   //    '\\')
@@ -1349 +1311 @@
                 break;
               if (!*wk->li->targetpath && *wk->directory) {
-                strcpy(ad.arcname, wk->directory);
-                AddBackslashToPath(ad.arcname);
+                strcpy(ad.arcname, wk->directory);
+                AddBackslashToPath(ad.arcname);
                 //if (ad.arcname[strlen(ad.arcname) - 1] != '\\')
                 //  strcat(ad.arcname, "\\");
@@ -1811 +1773 @@
 }
 
-// We can use static buffer for all in progress actions because we have only 1 status line
-static WORKER *pCachedActionWorker;     // Sent from Action thread via UM_ACTIONSTATE
-static PSZ pszCachedActionListItem;     // Sent from Action thread via UM_ACTIONSTATE
-
-MRESULT EXPENTRY ActionWMTimer(HWND hwnd, MPARAM mp1, MPARAM mp2)
-{
-  if (pCachedActionWorker != NULL && pszCachedActionListItem != NULL) {
-    DbgMsg(pszSrcFile, __LINE__, "Using hWndStatus %lx pCachedActionWorker %p pszCachedActionListItem %s", hwndStatus, pCachedActionWorker, pszCachedActionListItem);   // 13 Jul 09 SHL fixme debug
-    if (hwndStatus && WinQueryFocus(HWND_DESKTOP) == hwnd) {
-      CHAR s[CCHMAXPATH + 64];
-      sprintf(s, "%s %s",
-              pCachedActionWorker->li->type == IDM_MOVE ?
-                GetPString(IDS_MOVINGTEXT) :
-                GetPString(IDS_COPYINGTEXT),
-              pszCachedActionListItem);
-      // sprintf(s, "Moving/copying %s", pszCachedActionListItem);      // 14 Jul 09 SHL fixme
-      WinSetWindowText(hwndStatus, s);
-    }
-  }
-  return 0;
-}
-
-MRESULT EXPENTRY ActionUMWorkerState(HWND hwnd, MPARAM mp1, MPARAM mp2) {
-  pCachedActionWorker = PVOIDFROMMP(mp1);
-  pszCachedActionListItem = PVOIDFROMMP(mp2);
-  DbgMsg(pszSrcFile, __LINE__, "Setting pCachedActionWorker %p pszCachedActionListItem %s", pCachedActionWorker, pszCachedActionListItem);      // 13 Jul 09 SHL fixme debug
-  if (hwndStatus && WinQueryFocus(HWND_DESKTOP) == hwnd)
-    WinPostMsg(hwnd, WM_SETFOCUS, MPFROMLONG(hwnd), MPFROMLONG(TRUE));  // 14 Jul 09 SHL Force status line update
-  return 0;
-}
-
 #pragma alloc_text(MASSACTION,MassAction)
 #pragma alloc_text(ACTION,Action)

trunk/dll/worker.h ¶

@@ -4 +4 @@
   $Id$
 
-  <<description here>>
+  Worker thread interface
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
+  14 Sep 09 SHL Drop experimental code
 
 ***********************************************************************/
@@ -51 +52 @@
 VOID MassAction(VOID * args);
 
-MRESULT EXPENTRY ActionWMTimer(HWND hwnd, MPARAM mp1, MPARAM mp2);
-MRESULT EXPENTRY ActionUMWorkerState(HWND hwnd, MPARAM mp1, MPARAM mp2);
-
 #endif  // WORKER_H