Changeset 744

Timestamp:

Jul 30, 2007, 4:42:59 AM (18 years ago)

Author:

Steven Levine

Message:

Add CNRITEM free and remove support (ticket#24)

File:

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

trunk/dll/filldir.c

@@ -32 +32 @@
   23 Jun 07 GKY Fixed ram disk without a directory not appearing on states drive list
   23 Jul 07 SHL Sync with CNRITEM updates (ticket#24)
+  29 Jul 07 SHL Add CNRITEM free and remove support (ticket#24)
 
 ***********************************************************************/
@@ -1036 +1037 @@
 
   if (!pciFirst) {
-    Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
+    Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
     exit(0);
   }
@@ -1216 +1217 @@
                     CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri)))
     {
-      Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__,
+      Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
                  IDS_CMINSERTERRTEXT);
     }
@@ -1309 +1310 @@
                               CM_INSERTRECORD,
                               MPFROMP(pci), MPFROMP(&ri))) {
-                Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__,
+                Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
                            IDS_CMINSERTERRTEXT);
                 WinSendMsg(hwndCnr, CM_FREERECORD, MPFROMP(&pci),
@@ -1517 +1518 @@
 
   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");
+    // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
+    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD");
   }
 }
@@ -1534 +1535 @@
       for (;;) {
         pci = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
-                                  MPFROMSHORT(CMA_FIRST));
+                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         if (!pci)
           break;
-        else if ((INT)pci == -1)
-          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+        else if ((INT)pci == -1) {
+          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
+          break;
+        }
         else
           RemoveCnrItems(hwnd, pci, 1, usFlags);
@@ -1549 +1552 @@
     FreeCnrItemData(pci);
 
+    DbgMsg(pszSrcFile, __LINE__, "removing %p %u", pci, usCnt);
     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");
+      // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
+      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD");
     }
   }