Changeset 745

Timestamp:

Jul 30, 2007, 5:38:41 AM (18 years ago)

Author:

Steven Levine

Message:

Add CNRITEM free and remove support (ticket#24)

File:

• trunk/dll/filldir.c (modified) (4 diffs)

trunk/dll/filldir.c

@@ -1486 +1486 @@
   pfi = (PFIELDINFO) WinSendMsg(hwnd, CM_QUERYDETAILFIELDINFO, MPVOID,
                                 MPFROMSHORT(CMA_FIRST));
-  if (pfi)
-    WinSendMsg(hwnd, CM_REMOVEDETAILFIELDINFO, MPVOID,
-               MPFROM2SHORT(0, CMA_FREE));
+  if (pfi &&
+      (INT)WinSendMsg(hwnd, CM_REMOVEDETAILFIELDINFO, MPVOID,
+               MPFROM2SHORT(0, CMA_FREE)) == -1) {
+    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVEDETAILFIELDINFO hwnd %x", hwnd);
+  }
+
+  // DbgMsg(pszSrcFile, __LINE__, "EmptyCnr hwnd %p emptied", hwnd);
 }
-
 
 /**
@@ -1498 +1501 @@
 static VOID FreeCnrItemData(PCNRITEM pci)
 {
+  // DbgMsg(pszSrcFile, __LINE__, "FreeCnrItemData %p", pci);
+
   if (pci->pszSubject && pci->pszSubject != NullStr)
     xfree(pci->pszSubject);
@@ -1515 +1520 @@
 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci)
 {
+  // DbgMsg(pszSrcFile, __LINE__, "FreeCnrItem hwnd %x pci %p", hwnd, pci);
+
   FreeCnrItemData(pci);
 
-  if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
+  if ((INT)WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1)) == -1) {
     // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
-    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD");
+    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD hwnd %x pci %p", hwnd, pci);
   }
 }
@@ -1550 +1557 @@
     Runtime_Error(pszSrcFile, __LINE__, "count not 1");
   else {
+    // DbgMsg(pszSrcFile, __LINE__, "RemoveCnrItems %p %u %s", pci, usCnt, pci->pszFileName);
+
     FreeCnrItemData(pci);
 
-    DbgMsg(pszSrcFile, __LINE__, "removing %p %u", pci, usCnt);
-    if (!WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pci), MPFROM2SHORT(usCnt, CMA_FREE))) {
+    if ((INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pci), MPFROM2SHORT(usCnt, CMA_FREE)) == -1) {
       // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
-      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD");
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pci %p", hwnd, pci);
     }
   }