Changeset 744


Ignore:
Timestamp:
Jul 30, 2007, 2:42:59 AM (13 years ago)
Author:
Steven Levine
Message:

Add CNRITEM free and remove support (ticket#24)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/filldir.c

    r743 r744  
    3232  23 Jun 07 GKY Fixed ram disk without a directory not appearing on states drive list
    3333  23 Jul 07 SHL Sync with CNRITEM updates (ticket#24)
     34  29 Jul 07 SHL Add CNRITEM free and remove support (ticket#24)
    3435
    3536***********************************************************************/
     
    10361037
    10371038  if (!pciFirst) {
    1038     Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
     1039    Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
    10391040    exit(0);
    10401041  }
     
    12161217                    CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri)))
    12171218    {
    1218       Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__,
     1219      Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    12191220                 IDS_CMINSERTERRTEXT);
    12201221    }
     
    13091310                              CM_INSERTRECORD,
    13101311                              MPFROMP(pci), MPFROMP(&ri))) {
    1311                 Win_Error2(hwndCnr, hwndCnr, pszSrcFile, __LINE__,
     1312                Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    13121313                           IDS_CMINSERTERRTEXT);
    13131314                WinSendMsg(hwndCnr, CM_FREERECORD, MPFROMP(&pci),
     
    15171518
    15181519  if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
    1519     // Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
    1520     Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_FREERECORD");
     1520    // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
     1521    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD");
    15211522  }
    15221523}
     
    15341535      for (;;) {
    15351536        pci = (PCNRITEM)WinSendMsg(hwnd, CM_QUERYRECORD, MPVOID,
    1536                                   MPFROMSHORT(CMA_FIRST));
     1537                                   MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
    15371538        if (!pci)
    15381539          break;
    1539         else if ((INT)pci == -1)
    1540           Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_QUERYRECORD");
     1540        else if ((INT)pci == -1) {
     1541          Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_QUERYRECORD");
     1542          break;
     1543        }
    15411544        else
    15421545          RemoveCnrItems(hwnd, pci, 1, usFlags);
     
    15491552    FreeCnrItemData(pci);
    15501553
     1554    DbgMsg(pszSrcFile, __LINE__, "removing %p %u", pci, usCnt);
    15511555    if (!WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pci), MPFROM2SHORT(usCnt, CMA_FREE))) {
    1552       // Win_Error2(hwnd, hwnd, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
    1553       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,"CM_REMOVERECORD");
     1556      // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
     1557      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD");
    15541558    }
    15551559  }
Note: See TracChangeset for help on using the changeset viewer.