Changeset 751 for trunk/dll/arccnrs.c

Timestamp:

Aug 3, 2007, 1:05:48 AM (18 years ago)

Author:

Steven Levine

Message:

Sync rest of code with CNRITEM mods
Sync code with ARCITEM mods
Get compare dialog working
Still some issues with status display
Still some issues with directory sizes tree display
Heap check diagnostic code mostly enabled

File:

• trunk/dll/arccnrs.c (modified) (5 diffs)

trunk/dll/arccnrs.c

@@ -40 +40 @@
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
   16 Jun 07 SHL Use DosQueryAppType not DosQAppType
+  02 Aug 07 SHL Sync with ARCITEM mods
 
 ***********************************************************************/
@@ -60 +61 @@
 #include <limits.h>
 #include <process.h>                    // _beginthread
+#include <malloc.h>                     // _heapchk
 
 #include "fm3dll.h"
@@ -307 +309 @@
 }
 
+/**
+ * Free storage associated with archive container item
+ * Caller is responsible for correcting pointers
+ */
+
+static VOID FreeArcItemData(PARCITEM pai)
+{
+  // DbgMsg(pszSrcFile, __LINE__, "FreeArcItemData %p", pai);
+
+  if (pai->pszFileName && pai->pszFileName != NullStr)
+    xfree(pai->pszFileName);
+}
+
+/**
+ * Remove item from archive container and free associated storage if requested
+ */
+
+static VOID RemoveArcItems(HWND hwnd, PARCITEM pai, USHORT usCnt, USHORT usFlags)
+{
+  if (usCnt == 0) {
+    if (pai != NULL)
+      Runtime_Error(pszSrcFile, __LINE__, "pai not NULL");
+    else {
+      for (;;) {
+        pai = (PARCITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
+                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+        if (!pai)
+          break;
+        else if ((INT)pai == -1) {
+          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+          break;
+        }
+        else
+          RemoveArcItems(hwnd, pai, 1, usFlags);
+      }
+    }
+  }
+  else if (usCnt != 1)
+    Runtime_Error(pszSrcFile, __LINE__, "count not 1");
+  else {
+    // DbgMsg(pszSrcFile, __LINE__, "RemoveArcItems %p %u %s", pai, usCnt, pai->pszFileName);
+
+    if (usFlags & CMA_FREE)
+      FreeArcItemData(pai);
+
+    if ((INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pai), MPFROM2SHORT(usCnt, usFlags)) == -1) {
+      // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pai %p", hwnd, pai);
+    }
+  }
+}
+
+/**
+ * Empty all records from an archive container and free associated storage and
+ * Free up field infos
+ */
+
+static VOID EmptyArcCnr(HWND hwnd)
+{
+#if 1 // fixme to disable or to be configurable
+  {
+    int state = _heapchk();
+    if (state != _HEAPOK)
+      Runtime_Error(pszSrcFile, __LINE__, "heap corrupted %d", state);
+  }
+#endif
+
+  // Remove all ARCITEM records
+  RemoveArcItems(hwnd, NULL, 0, CMA_FREE);
+
+  // Use common code to remove rest
+  EmptyCnr(hwnd);
+}
+
 //== FillArcCnr() generate archive content list and fill container window ==
 
@@ -359 +435 @@
     Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
   else {
-    WinSendMsg(hwndCnr,
-               CM_REMOVERECORD,
-               MPVOID,
-               MPFROM2SHORT(0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE));
+    RemoveArcItems(hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
     *arcinfo = info;
     highest = info->osizepos;
@@ -3215 +3288 @@
       WinDestroyWindow(ArcCnrMenu);
     ArcMenu = ArcCnrMenu = (HWND) 0;
-    EmptyCnr(hwnd);
+    EmptyArcCnr(hwnd);
     break;
   }