Changeset 1395 for trunk/dll/filldir.c


Ignore:
Timestamp:
Feb 8, 2009, 2:48:16 AM (17 years ago)
Author:
Gregg Young
Message:

Allow user to turn off alert and/or error beeps in settings notebook. Ticket 341 Move repeated strings to PCSZs. Ticket 6 Add *DateFormat functions to format dates based on locale Ticket 28 Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error Ticket 6

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/filldir.c

    r1358 r1395  
    6464  25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
    6565  25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
     66  07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
    6667
    6768***********************************************************************/
    … …  
    10561057                                  MPFROMLONG(ulSelCnt));
    10571058            if (!pciFirst) {
    1058               Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1059                          IDS_CMALLOCRECERRTEXT);
     1059              Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1060                        GetPString(IDS_CMALLOCRECERRTEXT));
    10601061              ok = FALSE;
    10611062              ullTotalBytes = 0;
    … …  
    10891090                                CM_INSERTRECORD,
    10901091                                MPFROMP(pciFirst), MPFROMP(&ri))) {
    1091                   Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1092                              IDS_CMINSERTERRTEXT);
     1092                  Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1093                            GetPString(IDS_CMINSERTERRTEXT));
    10931094                  ok = FALSE;
    10941095                  ullTotalBytes = 0;
    … …  
    11481149                              MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulTotal));
    11491150        if (!pciFirst) {
    1150           Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1151                      IDS_CMALLOCRECERRTEXT);
     1151          Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1152                    GetPString(IDS_CMALLOCRECERRTEXT));
    11521153          ok = FALSE;
    11531154          ullTotalBytes = 0;
    … …  
    11811182              if (!WinSendMsg(hwndCnr, CM_INSERTRECORD,
    11821183                              MPFROMP(pciFirst), MPFROMP(&ri))) {
    1183                 Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1184                            IDS_CMINSERTERRTEXT);
     1184                Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1185                          GetPString(IDS_CMINSERTERRTEXT));
    11851186                ok = FALSE;
    11861187                ullTotalBytes = 0;
    … …  
    13261327              rc,
    13271328              HWND_DESKTOP,
    1328               pszSrcFile, __LINE__, GetPString(IDS_FILLDIRQCURERRTEXT));
     1329              pszSrcFile, __LINE__, PCSZ_FILLDIRQCURERRTEXT);
    13291330    exit(0);
    13301331  }
    … …  
    13441345
    13451346  if (!pciFirst) {
    1346     Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
     1347    Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, GetPString(IDS_CMALLOCRECERRTEXT));
    13471348    // 04 Jan 08 SHL fixme not just up and die
    13481349    exit(0);
    … …  
    15371538                    CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri)))
    15381539    {
    1539       Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1540                  IDS_CMINSERTERRTEXT);
     1540      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1541                GetPString(IDS_CMINSERTERRTEXT));
    15411542    }
    15421543  }
    … …  
    16281629                              CM_INSERTRECORD,
    16291630                              MPFROMP(pci), MPFROMP(&ri))) {
    1630                 Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
    1631                            IDS_CMINSERTERRTEXT);
     1631                Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
     1632                          GetPString(IDS_CMINSERTERRTEXT));
    16321633                FreeCnrItem(hwndCnr, pci);
    16331634              }
    … …  
    19081909
    19091910  if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
    1910     // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
    19111911    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
    19121912              "CM_FREERECORD hwnd %x pci %p file %s",
    … …  
    19341934  if (usCount) {
    19351935    if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(usCount))) {
    1936       // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
    19371936      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD hwnd %x pci %p cnt %u", hwnd, pci, usCount);
    19381937    }
    … …  
    19931992    remaining = (INT)WinSendMsg(hwnd, CM_REMOVERECORD, MPFROMP(&pciFirst), MPFROM2SHORT(usCnt, usFlags));
    19941993    if (remaining == -1) {
    1995       // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMREMOVEERRTEXT);
    19961994      Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_REMOVERECORD hwnd %x pci %p cnt %u", hwnd, pciFirst, usCnt);
    19971995    }
Note: See TracChangeset for help on using the changeset viewer.