Changeset 907 for trunk/dll/treecnr.c

Timestamp:

Jan 6, 2008, 8:26:17 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid out of memory traps in Compare Directories
Rework Compare Directories progress display for 2 second update rate
Start refactoring to reduce dependence on fm3dll.h
Add timer services (IsITimerExpired etc.)

File:

• trunk/dll/treecnr.c (modified) (10 diffs)

trunk/dll/treecnr.c

@@ +1 @@
+
 /***********************************************************************
 
@@ -6 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H. Levine
+  Copyright (c) 2001, 2008 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -45 +46 @@
 ***********************************************************************/
 
-#define INCL_DOS
-#define INCL_WIN
-#define INCL_GPI
-#define INCL_DOSERRORS
-#define INCL_LONGLONG
-#include <os2.h>
-
-#include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -59 +51 @@
 #include <process.h>                    // _beginthread
 
-#include "fm3dll.h"
+#define INCL_DOS
+#define INCL_WIN
+#define INCL_LONGLONG
+
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "mle.h"
+#include "comp.h"                       // COMPARE
+#include "filldir.h"                    // RemoveCnrItems...
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "fm3dll.h"
 
 #pragma data_seg(DATA1)
@@ -202 +202 @@
     if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
-        // DbgMsg(pszSrcFile, __LINE__, "collapsing");  // 14 Aug 07 SHL fixme
+        // DbgMsg(pszSrcFile, __LINE__, "collapsing");  // 14 Aug 07 SHL fixme
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
                           MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         while (pciP && (INT) pciP != -1) {
-#if 1
+#if 1 // // 05 Jan 08 SHL fixme to be sure this is correct code
           if (pciP->rc.flRecordAttr & CRA_EXPANDED) {
             // collapse top level of all branches
@@ -256 +256 @@
       }
       if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) {
-        // DbgMsg(pszSrcFile, __LINE__, "expanding current");   // 14 Aug 07 SHL fixme
+        // DbgMsg(pszSrcFile, __LINE__, "expanding current");   // 14 Aug 07 SHL fixme
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-        // DbgMsg(pszSrcFile, __LINE__, "expanded");    // 14 Aug 07 SHL fixme
+        // DbgMsg(pszSrcFile, __LINE__, "expanded");    // 14 Aug 07 SHL fixme
       }
       if (!quickbail) {
-        WinSendMsg(hwndCnr,
+        WinSendMsg(hwndCnr,
                    CM_SETRECORDEMPHASIS,
                    MPFROMP(pciToSelect),
@@ -2054 +2054 @@
 
             CopyPresParams((HWND) mp2, hwndMainMenu);
-            WinEnableMenuItem((HWND) mp2, IDM_INFO, rdy);
+            WinEnableMenuItem((HWND) mp2, IDM_INFO, rdy);
 
             WinEnableMenuItem((HWND) mp2, IDM_ATTRS, writeable);
@@ -2092 +2092 @@
             WinEnableMenuItem((HWND) mp2, IDM_MOVEMENU, !underenv
                               && writeable);
-            WinEnableMenuItem((HWND) mp2, IDM_RENAME, !underenv && writeable);
+            WinEnableMenuItem((HWND) mp2, IDM_RENAME, !underenv && writeable);
 
           }
@@ -2101 +2101 @@
         WinCheckMenuItem((HWND) mp2,
                          IDM_MINIICONS, ((dcd->flWindowAttr & CV_MINI) != 0));
-        CopyPresParams((HWND) mp2, hwndMainMenu);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         WinEnableMenuItem((HWND) mp2, IDM_RESELECT, FALSE);
-        break;
+        break;
 
       case IDM_COMMANDSMENU:
-        SetupCommandMenu((HWND) mp2, hwnd);
-        CopyPresParams((HWND) mp2, hwndMainMenu);
+        SetupCommandMenu((HWND) mp2, hwnd);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
 
       case IDM_SORTSUBMENU:
         SetSortChecks((HWND) mp2, TreesortFlags);
-        CopyPresParams((HWND) mp2, hwndMainMenu);
-        break;
+        CopyPresParams((HWND) mp2, hwndMainMenu);
+        break;
 
       case IDM_WINDOWSMENU:
         SetupWinList((HWND) mp2,
-                     (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
-        CopyPresParams((HWND) mp2, hwndMainMenu);
+                     (hwndMain) ? hwndMain : (HWND) 0, dcd->hwndFrame);
+        CopyPresParams((HWND) mp2, hwndMainMenu);
         break;
       }
@@ -2411 +2411 @@
 
       case IDM_PARTITION:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
-                NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "MINILVM.EXE");
         break;
 
       case IDM_PARTITIONDF:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
-                NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "DFSOS2.EXE");
         break;
 
       case IDM_PARTITIONLVMG:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
-                NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "LVMGUI.CMD");
         break;
 
       case IDM_PARTITIONFD:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
-                NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "FDISKPM.EXE");
         break;