Changeset 762 for trunk/dll/arccnrs.c

Timestamp:

Aug 5, 2007, 1:19:21 AM (18 years ago)

Author:

Steven Levine

Message:

Use two pass logic to free CNRITEMs and ARCITEMs
Rename pszLongname to pszLongName
More compare directories rework
Make directory sizes item draw placement deterministic - how did it ever work?

File:

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

trunk/dll/arccnrs.c

@@ -61 +61 @@
 #include <limits.h>
 #include <process.h>                    // _beginthread
+
+#if 0
 #include <malloc.h>                     // _heapchk
+#endif
 
 #include "fm3dll.h"
@@ -317 +320 @@
 {
   // DbgMsg(pszSrcFile, __LINE__, "FreeArcItemData %p", pai);
-
-  if (pai->pszFileName && pai->pszFileName != NullStr)
-    xfree(pai->pszFileName);
+  PSZ psz;
+
+  if (pai->pszFileName && pai->pszFileName != NullStr) {
+    psz = pai->pszFileName;
+    pai->pszFileName = NullStr;
+    free(psz);
+  }
 }
 
 /**
- * Remove item from archive container and free associated storage if requested
+ * Remove item(s) from archive container and free associated storage if requested
+ * @param paiFirst points to first item to remove or NULL to remove all
+ * @param usCnt is remove count or 0 to remove all
  */
 
-static VOID RemoveArcItems(HWND hwnd, PARCITEM pai, USHORT usCnt, USHORT usFlags)
+static VOID RemoveArcItems(HWND hwnd, PARCITEM paiFirst, USHORT usCnt, USHORT usFlags)
 {
-  if (usCnt == 0) {
-    if (pai != NULL)
-      Runtime_Error(pszSrcFile, __LINE__, "pai not NULL");
-    else {
-      for (;;) {
+  INT remaining = usCnt;
+  PARCITEM pai;
+
+  if ((usCnt && !paiFirst) || (!usCnt && paiFirst))
+    Runtime_Error(pszSrcFile, __LINE__, "paiFirst %p usCnt %u mismatch", paiFirst, usCnt);
+  else {
+    // Free our buffers if free requested
+    if (usFlags & CMA_FREE) {
+      if (paiFirst)
+        pai = paiFirst;
+      else {
         pai = (PARCITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
                                    MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-        if (!pai)
+        if ((INT)pai == -1) {
+          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+          remaining = -1;
+          pai = NULL;
+        }
+      }
+      while (pai) {
+        FreeArcItemData(pai);
+        pai = (PARCITEM)pai->rc.preccNextRecord;
+        if (remaining && --remaining == 0)
           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) {
+
+  // DbgMsg(pszSrcFile, __LINE__, "RemoveArcItems %p %u %s", pai, usCnt, pai->pszFileName);
+
+  if (remaining != - 1) {
+    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&paiFirst), MPFROM2SHORT(usCnt, usFlags));
+    if (remaining == -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);
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pai %p cnt %u", hwnd, paiFirst, usCnt);
     }
   }
@@ -362 +377 @@
 
 /**
- * Empty all records from an archive container and free associated storage and
- * Free up field infos
+ * 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
+#if 0 // fixme to disable or to be configurable
   {
     int state = _heapchk();
     if (state != _HEAPOK)
       Runtime_Error(pszSrcFile, __LINE__, "heap corrupted %d", state);
+    else
+      DbgMsg(pszSrcFile, __LINE__, "_memavl %u", _memavl());
   }
 #endif
@@ -659 +676 @@
                 pai->flags = ARCFLAGS_REALDIR;
               pai->pszFileName = xstrdup(fname,pszSrcFile, __LINE__);
-              pai->pszDisplayName = pai->pszFileName;
-              pai->rc.pszIcon = pai->pszDisplayName;
+              pai->pszDisplayName = pai->pszFileName;
+              pai->rc.pszIcon = pai->pszDisplayName;
               if (fdate)
                 strcpy(pai->szDate, fdate);
@@ -1211 +1228 @@
       cni.pDragInfo = (PDRAGINFO) mp1;
       li = DoFileDrop(dcd->hwndCnr,
-                      dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
+                      dcd->directory, FALSE, MPVOID, MPFROMP(&cni));
       CheckPmDrgLimit(cni.pDragInfo);
       if (li) {
@@ -1843 +1860 @@
               if (li->type == IDM_MCIPLAY) {
 
-                FILE *fp;
+                FILE *fp;
 
                 fp = xfopen("$FM2PLAY.$$$", "w", pszSrcFile, __LINE__);
@@ -1851 +1868 @@
                     fprintf(fp, "%s\n", li->list[x]);
                   fprintf(fp, ";end\n");
-                  fclose(fp);
-                  RunFM2Util("FM2PLAY.EXE", "/@$FM2PLAY.$$$");
-                }
+                  fclose(fp);
+                  RunFM2Util("FM2PLAY.EXE", "/@$FM2PLAY.$$$");
+                }
               }
               else if (li->type == IDM_PRINT) {
@@ -2242 +2259 @@
       }
       if ((dcd->arcfilled && !dcd->totalfiles) ||
-          !IsArcThere(hwnd, dcd->arcname))
+          !IsArcThere(hwnd, dcd->arcname))
         PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
     }
@@ -2611 +2628 @@
           WinSetFocus(HWND_DESKTOP,
                       hwndActive == hwnd ?
-                        WinWindowFromID(dcd->hwndClient, ARC_EXTRACTDIR) :
-                        hwnd);
+                        WinWindowFromID(dcd->hwndClient, ARC_EXTRACTDIR) :
+                        hwnd);
         }
         break;
@@ -3111 +3128 @@
           DosBeep(500, 100);            // fixme to know why beep?
           li = DoFileDrop(hwnd, dcd->arcname, FALSE, mp1, mp2);
-          DosBeep(50, 100);             // fixme to know why beep?
-          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
+          DosBeep(50, 100);             // fixme to know why beep?
+          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
             li->type = li->type == DO_MOVE ? IDM_ARCHIVEM : IDM_ARCHIVE;