Changeset 1455 for trunk/dll/worker.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/worker.c (modified) (12 diffs)

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)