Changeset 907 for trunk/dll/dircnrs.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/dircnrs.c (modified) (17 diffs)

trunk/dll/dircnrs.c

@@ -7 +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
@@ -35 +35 @@
 ***********************************************************************/
 
-#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>
 #include <ctype.h>
 #include <limits.h>
-#include "fm3dll.h"
+#include <process.h>                    // _beginthread
+
+#define INCL_DOS
+#define INCL_WIN
+#define INCL_DOSERRORS
+#define INCL_LONGLONG
+
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "mle.h"
-#include <process.h>                    // _beginthread
+#include "arccnrs.h"                    // StartArcCnr
+#include "comp.h"                       // COMPARE
+#include "filldir.h"                    // EmptyCnr...
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "fm3dll.h"
 
 #pragma data_seg(DATA1)
@@ -132 +134 @@
             }
           }
-          hwndButtonPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
-          CopyPresParams(hwndButtonPopup, hwnd);
+          hwndButtonPopup = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, id);
+          CopyPresParams(hwndButtonPopup, hwnd);
           if (hwndButtonPopup) {
             WinSetWindowUShort(hwndButtonPopup, QWS_ID, id);
@@ -596 +598 @@
       li =
         DoFileDrop(dcd->hwndCnr, dcd->directory, FALSE, MPVOID,
-                   MPFROMP(&cni));
+                   MPFROMP(&cni));
       CheckPmDrgLimit(cni.pDragInfo);
       if (li) {
@@ -800 +802 @@
             !strnicmp(dcd->directory, dcd->previous,
                       strlen(dcd->directory)))
-        {
+        {
           PCNRITEM pci = FindCnrRecord(dcd->hwndCnr,
-                                       dcd->previous,
+                                       dcd->previous,
                                        NULL, TRUE, FALSE, TRUE);
           if (pci && (INT) pci != -1) {
@@ -1554 +1556 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_FILESMENU:
-        CopyPresParams((HWND) mp2, hwndMainMenu);
-        if (isalpha(*dcd->directory)) {
+        CopyPresParams((HWND) mp2, hwndMainMenu);
+        if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE) {
             WinEnableMenuItem((HWND) mp2, IDM_MOVEMENU, FALSE);
@@ -1578 +1580 @@
             WinEnableMenuItem((HWND) mp2, IDM_EDITTEXT, TRUE);
             WinEnableMenuItem((HWND) mp2, IDM_EDITBINARY, TRUE);
-            WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
+            WinEnableMenuItem((HWND) mp2, IDM_ATTRS, TRUE);
           }
         }
@@ -1584 +1586 @@
 
       case IDM_VIEWSMENU:
-        SetViewMenu((HWND) mp2, dcd->flWindowAttr);
+        SetViewMenu((HWND) mp2, dcd->flWindowAttr);
         CopyPresParams((HWND) mp2, hwndMainMenu);
-        WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
-                          (dcd->lastselection != NULL));
-        if (isalpha(*dcd->directory)) {
+        WinEnableMenuItem((HWND) mp2, IDM_RESELECT,
+                          (dcd->lastselection != NULL));
+        if (isalpha(*dcd->directory)) {
           if (driveflags[toupper(*dcd->directory) - 'A'] & DRIVE_NOTWRITEABLE)
             WinEnableMenuItem((HWND) mp2, IDM_MKDIR, FALSE);
@@ -1727 +1729 @@
                   dummy[1] = NULL;
                   ExecOnList(hwnd,
-                             editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
-                             pszSrcFile, __LINE__);
+                             editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+                             pszSrcFile, __LINE__);
                 }
                 else
@@ -2234 +2236 @@
       case IDM_MKDIR:
         {
-         // PCNRITEM pci;
-
-         // pci = (PCNRITEM) CurrentRecord(hwnd);
+          PCNRITEM pci;
+          BOOL saved;
+
+          saved = fSelectedAlways;
+          fSelectedAlways = FALSE;
+          pci = (PCNRITEM)CurrentRecord(hwnd);
+          // 01 Oct 07 SHL Make below selected directory or in current directory
           PMMkDir(dcd->hwndParent,
-                  (dcd->directory), FALSE);
+                  pci && (INT)pci != -1 ? pci->pszFileName : dcd->directory,
+                  FALSE);
+          fSelectedAlways = saved;
         }
         break;
@@ -2594 +2602 @@
               memset(&volser, 0, sizeof(volser));
               DosError(FERR_DISABLEHARDERR);
-              // fixme
+              // fixme?
               rc = DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                   FSIL_VOLSER, &volser, sizeof(volser));
@@ -2609 +2617 @@
                 if (SHORT2FROMMP(mp1) == CN_COLLAPSETREE &&
                     !volser.serial ||
-                    driveserial[toupper(*pci->pszFileName) - 'A'] !=
+                    driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
                   UnFlesh(hwnd, pci);
@@ -2647 +2655 @@
                        CM_SETRECORDEMPHASIS,
                        MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED));
-            MarkAll(hwnd, FALSE, FALSE, TRUE);
-            if (pci->attrFile & FILE_DIRECTORY)
+            MarkAll(hwnd, FALSE, FALSE, TRUE);
+            if (pci->attrFile & FILE_DIRECTORY)
               dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
             else
@@ -2732 +2740 @@
           pci = (PCNRITEM) ((PCNRDRAGINFO) mp2)->pRecord;
           pDInfo = ((PCNRDRAGINFO) mp2)->pDragInfo;
-          if (!DrgAccessDraginfo(pDInfo)) {
-            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                      "DrgAccessDraginfo");
+          if (!DrgAccessDraginfo(pDInfo)) {
+            Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                      "DrgAccessDraginfo");
               return (MRFROM2SHORT(DOR_NEVERDROP, 0));
-          }
-          if (*dcd->directory &&
+          }
+          if (*dcd->directory &&
              (driveflags[toupper(*dcd->directory) - 'A'] &
               DRIVE_NOTWRITEABLE)) {
@@ -2852 +2860 @@
           ULONG action = UM_ACTION;
 
-          // DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
-          li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
-          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
+          // DbgMsg(pszSrcFile, __LINE__, "calling DoFileDrop");
+          li = DoFileDrop(hwnd, dcd->directory, TRUE, mp1, mp2);
+          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
             if (li->list && li->list[0] && IsRoot(li->list[0]))
@@ -2888 +2896 @@
               strcat(li->targetpath, " %a");
               ExecOnList(dcd->hwndParent, li->targetpath,
-                         PROMPT | WINDOWED, NULL, li->list, NULL,
-                         pszSrcFile, __LINE__);
+                         PROMPT | WINDOWED, NULL, li->list, NULL,
+                         pszSrcFile, __LINE__);
               FreeList(li->list);
               li->list = NULL;
@@ -3263 +3271 @@
 
       HWND ret = StartMLEEditor(dcd->hwndParent,
-                                (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
+                                (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       if (mp2)
         free((CHAR *)mp2);