Changeset 743

Timestamp:

Jul 30, 2007, 2:42:56 AM (18 years ago)

Author:

Steven Levine

Message:

Baseline code for ticket 24 CNRITEM remove/free

Location:

trunk/dll

Files:

• filldir.c (modified) (2 diffs)
• fm3dll.h (modified) (2 diffs)
• misc.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -54 +54 @@
 #pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile)
 #pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr)
+#pragma alloc_text(EMPTYCNR,EmptyCnr)
 
 static HPOINTER IDFile(PSZ p)
@@ -1467 +1468 @@
 
 } // FillTreeCnr
+
+
+/**
+ * Empty all records from a container and free associated storage and
+ * Free up field infos
+ */
+
+VOID EmptyCnr(HWND hwnd)
+{
+  PFIELDINFO pfi;
+
+  // Remove all records
+  RemoveCnrItems(hwnd, NULL, 0, CMA_FREE);
+
+  // Remove field info descriptors
+  pfi = (PFIELDINFO) WinSendMsg(hwnd, CM_QUERYDETAILFIELDINFO, MPVOID,
+                                MPFROMSHORT(CMA_FIRST));
+  if (pfi)
+    WinSendMsg(hwnd, CM_REMOVEDETAILFIELDINFO, MPVOID,
+               MPFROM2SHORT(0, CMA_FREE));
+}
+
+
+/**
+ * Free storage associated with container item
+ */
+
+static VOID FreeCnrItemData(PCNRITEM pci)
+{
+  if (pci->pszSubject && pci->pszSubject != NullStr)
+    xfree(pci->pszSubject);
+
+  if (pci->pszLongname && pci->pszLongname != NullStr &&
+      pci->pszLongname != pci->pszFileName && pci->pszLongname != pci->pszDisplayName)
+    xfree(pci->pszLongname);
+
+  if (pci->pszFileName && pci->pszFileName != NullStr)
+    xfree(pci->pszFileName);
+}
+
+/**
+ * Free container item and associated storage
+ */
+
+VOID FreeCnrItem(HWND hwnd, PCNRITEM pci)
+{
+  FreeCnrItemData(pci);
+
+  if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
+    // Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
+    Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_FREERECORD");
+  }
+}
+
+/**
+ * Remove item from container and free associated storage
+ */
+
+VOID RemoveCnrItems(HWND hwnd, PCNRITEM pci, USHORT usCnt, USHORT usFlags)
+{
+  if (usCnt == 0) {
+    if (pci != NULL)
+      Runtime_Error(pszSrcFile, __LINE__, "pci not NULL");
+    else {
+      for (;;) {
+        pci = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
+                                  MPFROMSHORT(CMA_FIRST));
+        if (!pci)
+          break;
+        else if ((INT)pci == -1)
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+        else
+          RemoveCnrItems(hwnd, pci, 1, usFlags);
+      }
+    }
+  }
+  else if (usCnt != 1)
+    Runtime_Error(pszSrcFile, __LINE__, "count not 1");
+  else {
+    FreeCnrItemData(pci);
+
+    if (!WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pci), MPFROM2SHORT(usCnt, CMA_FREE))) {
+      // Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
+      Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_REMOVERECORD");
+    }
+  }
+}
+

trunk/dll/fm3dll.h

@@ -625 +625 @@
 
 /* filldir.c */
-VOID FillDirCnr(HWND hwndCnr, CHAR * pszDirectory, DIRCNRDATA * pdcd,
+VOID EmptyCnr(HWND hwnd);
+VOID FillDirCnr(HWND hwndCnr, CHAR *pszDirectory, DIRCNRDATA *pdcd,
                 PULONGLONG pullBytes);
 VOID FillTreeCnr(HWND hwndCnr, HWND hwndParent);
 VOID ProcessDirectory(const HWND hwndCnr, const PCNRITEM pciParent,
-                      const CHAR * szDirBase, const BOOL filestoo,
+                      const CHAR *szDirBase, const BOOL filestoo,
                       const BOOL recurse, const BOOL partial,
-                      CHAR * stopflag, DIRCNRDATA * pdcd,
+                      CHAR *stopflag, DIRCNRDATA *pdcd,
                       PULONG pullTotalFiles, PULONGLONG pullTotalBytes);
 ULONGLONG FillInRecordFromFFB(HWND hwndCnr, PCNRITEM pci,
                               const PSZ pszDirectory,
                               const PFILEFINDBUF4 pffb, const BOOL partial,
-                              DIRCNRDATA * pdcd);
+                              DIRCNRDATA *pdcd);
 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci,
                               const PSZ pszFileName, const PFILESTATUS4 pfsa4,
-                              const BOOL partial, DIRCNRDATA * pdcd);
+                              const BOOL partial, DIRCNRDATA *pdcd);
+VOID FreeCnrItem(HWND hwnd, PCNRITEM pci);
+VOID RemoveCnrItems(HWND hwnd, PCNRITEM pci, USHORT usCnt, USHORT usFlags);
 
 /* flesh.c */
@@ -710 +713 @@
 VOID CloseHelp(VOID);
 INT ExecFile(HWND hwnd, CHAR * filename);
-VOID EmptyCnr(HWND hwnd);
 VOID SetDetailsSwitches(HWND hwnd, DIRCNRDATA * dcd);
 VOID AdjustDetailsSwitches(HWND hwnd, HWND hwndMenu, USHORT cmd,

trunk/dll/misc.c

@@ -55 +55 @@
 #pragma alloc_text(CNR_MISC1,AdjustCnrColVis,AdjustCnrColsForFSType)
 #pragma alloc_text(CNR_MISC1,AdjustCnrColsForPref,SetCnrCols)
-#pragma alloc_text(CNR_MISC2,CnrDirectEdit,EmptyCnr,OpenEdit)
+#pragma alloc_text(CNR_MISC2,CnrDirectEdit,OpenEdit)
 #pragma alloc_text(MISC2,SetMenuCheck,disable_menuitem,SetSortChecks)
 #pragma alloc_text(MISC2,SetDetailsSwitches,SetViewMenu)
@@ -926 +926 @@
     return -1;
   return 0;
-}
-
-VOID EmptyCnr(HWND hwnd)
-{
-  /* Empty out a container in preparation to it dying */
-  PCNRITEM pci;
-  PFIELDINFO pfi;
-
-  pci = (PCNRITEM) WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
-                              MPFROMSHORT(CMA_FIRST));
-  if (pci && (INT) pci != -1)
-    WinSendMsg(hwnd, CM_REMOVERECORD, MPVOID, MPFROM2SHORT(0, CMA_FREE));
-  pfi = (PFIELDINFO) WinSendMsg(hwnd, CM_QUERYDETAILFIELDINFO, MPVOID,
-                                MPFROMSHORT(CMA_FIRST));
-  if (pfi)
-    WinSendMsg(hwnd, CM_REMOVEDETAILFIELDINFO, MPVOID,
-               MPFROM2SHORT(0, CMA_FREE));
 }