Changeset 1777 for trunk/dll/dircnrs.c

Timestamp:

Jun 13, 2014, 3:51:31 AM (11 years ago)

Author:

Steven Levine

Message:

Rework FM/2 Config menu. Add confirm delete toggle. (Steven)
Rework FM/2 Lite Config menu. Add drag&drop dialog toggle and confirm delete toggles. (Steven)
Correct View, Sort and Filter button initialization. (Steven)

File:

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

trunk/dll/dircnrs.c

@@ -747 +747 @@
   case UM_SETUP:
 #   ifdef FORTIFY
-    //DbgMsg(pszSrcFile, __LINE__, "UM_SETUP hwnd %p TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL fixme
+    // DbgMsg(pszSrcFile, __LINE__, "UM_SETUP hwnd %p TID %u", hwnd, GetTidForThread());        // 18 Jul 08 SHL fixme
     Fortify_EnterScope();
 #   endif
@@ -878 +878 @@
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
       }
-      while (fInitialDriveScan)
-        DosSleep(100);
+      while (fInitialDriveScan) {
+        DosSleep(100);                  // Allow to complete
+      }
       if (fSwitchTree && hwndTree) {
         // Keep drive tree in sync with directory container
@@ -1414 +1415 @@
           strcpy(dcd->previous, dcd->directory);
           strcpy(dcd->directory, fullname);
-          //DosEnterCritSec(); //GKY 11-27-08
+          // DosEnterCritSec(); // GKY 11-27-08
           dcd->stopflag++;
-          //DosExitCritSec();
-          //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
+          // DosExitCritSec();
+          // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
           if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
             strcpy(dcd->directory, dcd->previous);
-            //DosEnterCritSec(); //GKY 11-27-08
+            // DosEnterCritSec(); // GKY 11-27-08
             dcd->stopflag--;
-            //DosExitCritSec();
+            // DosExitCritSec();
           }
           else if (*dcd->directory) {
@@ -1620 +1621 @@
         }
         else
-          DosSleep(32); //05 Aug 07 GKY 64
+          DosSleep(32); // 05 Aug 07 GKY 64
         WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0));
       }
+      // 2014-06-11 SHL fm/2 lite can get here before drive scan completes
       if (!fInitialDriveScan)
         PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
@@ -1634 +1636 @@
   case UM_SETUP2:
     if (dcd) {
+      // DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc UM_SETUP2 %x", hwnd);
       AdjustCnrColsForPref(hwnd, NULL, &dcd->ds, FALSE);
       SayFilter(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
@@ -1847 +1850 @@
               strcpy(newfile, dcd->directory);
               AddBackslashToPath(newfile);
-              //if (newfile[strlen(newfile) - 1] != '\\')
-              //  strcat(newfile, "\\");
+#             if 0      
+              if (newfile[strlen(newfile) - 1] != '\\')
+                strcat(newfile, "\\");
+#             endif     
               strcat(newfile, sip.ret);
               test = IsFile(newfile);
@@ -2124 +2129 @@
               TileChildren(dcd->hwndParent, TRUE);
             WinSetWindowPos(hwndC, HWND_TOP, 0, 0, 0, 0, SWP_ACTIVATE);
-            DosSleep(100); //05 Aug 07 GKY 250
+            DosSleep(100); // 05 Aug 07 GKY 250
           }
         }
@@ -2147 +2152 @@
 
       case IDM_COLLECTOR:
-        DosSleep(32); //05 Aug 07 GKY 64
+        DosSleep(32); // 05 Aug 07 GKY 64
         {
           CHAR **list;
@@ -2212 +2217 @@
 
       case IDM_RESORT:
-//          WinSendMsg(hwnd,
-//                     CM_SORTRECORD,
-//                     MPFROMP(SortDirCnr),
-//                     MPFROMLONG((fSyncUpdates) ? sortFlags : dcd->sortFlags));
+#           if 0
+            WinSendMsg(hwnd,
+                       CM_SORTRECORD,
+                       MPFROMP(SortDirCnr),
+                       MPFROMLONG((fSyncUpdates) ? sortFlags : dcd->sortFlags));
+#endif
         WinSendMsg(hwnd,
                    CM_SORTRECORD,
@@ -2315 +2322 @@
         //DosEnterCritSec(); //GKY 11-27-08
         dcd->stopflag++;
-        //DosExitCritSec();
-        //DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
+        // DosExitCritSec();
+        // DbgMsg(pszSrcFile, __LINE__, "WM_RESCAN");
         if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPVOID)) {
           //DosEnterCritSec(); //GKY 11-27-08
@@ -2769 +2776 @@
         if (pci->attrFile & FILE_DIRECTORY) {
           menuHwnd = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
-//          WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
+          // WinEnableMenuItem(DirMenu,IDM_TREE,TRUE);
         }
         else