Changeset 1498 for trunk/dll/grep2.c


Ignore:
Timestamp:
Jan 18, 2010, 1:57:01 AM (16 years ago)
Author:
Gregg Young
Message:

Changes to get FM2 to compile with the latest watcom 1.9 beta (mostly type casts of CHAR CONSTANT * to CHAR *). Changes to get the environment settings working everywhere again (broken by the change that moved commands to the INI); Added an environment size variable (set to 2048 which was the largest I found hard coded). Still need to find everywhere the environment size is set and use this variable.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/dll/grep2.c

    r1471 r1498  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2004, 2009 Steven H. Levine
     9  Copyright (c) 2004, 2010 Steven H. Levine
    1010
    1111  01 Aug 04 SHL Rework lstrip/rstrip usage
    … …  
    2727  08 Mar 09 GKY Additional strings move to PCSZs in init.c
    2828  07 Oct 09 SHL Remember last search mask across runs
     29  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    2930
    3031  fixme for more excess locals to be gone
    … …  
    229230      fInitDone = TRUE;
    230231    }
    231     else if (sLastMaskSelect == LIT_NONE) {
     232    else {//if (sLastMaskSelect == LIT_NONE) {
    232233      size = sizeof(sLastMaskSelect);
    233       PrfQueryProfileData(fmprof, appname, PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, &size);
     234      PrfQueryProfileData(fmprof, appname, (CHAR *) PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, &size);
    234235      if (sLastMaskSelect >= 0)
    235236      fInitDone = TRUE;
    … …  
    262263                      GREP_MASK, EM_SETSEL, MPFROM2SHORT(0, 8192), MPVOID);
    263264    size = sizeof(BOOL);
    264     PrfQueryProfileData(fmprof, FM3Str, "RememberFlagsGrep",
     265    PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "RememberFlagsGrep",
    265266                        (PVOID) & gRemember, &size);
    266267    WinCheckButton(hwnd, GREP_REMEMBERFLAGS, gRemember);
    267268    if (gRemember) {
    268269      size = sizeof(BOOL);
    269       PrfQueryProfileData(fmprof, FM3Str, "Grep_Recurse",
     270      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_Recurse",
    270271                          (PVOID) & recurse, &size);
    271272      size = sizeof(BOOL);
    272       PrfQueryProfileData(fmprof, FM3Str, "Grep_Absolute",
     273      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_Absolute",
    273274                          (PVOID) & absolute, &size);
    274275      size = sizeof(BOOL);
    275       PrfQueryProfileData(fmprof, FM3Str, "Grep_Case",
     276      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_Case",
    276277                          (PVOID) & sensitive, &size);
    277278      size = sizeof(BOOL);
    278       PrfQueryProfileData(fmprof, FM3Str, "Grep_Sayfiles",
     279      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_Sayfiles",
    279280                          (PVOID) & sayfiles, &size);
    280281      size = sizeof(BOOL);
    281       PrfQueryProfileData(fmprof, FM3Str, "Grep_Searchfiles",
     282      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_Searchfiles",
    282283                          (PVOID) & searchFiles, &size);
    283284      size = sizeof(BOOL);
    284       PrfQueryProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
     285      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "Grep_SearchfEAs",
    285286                          (PVOID) & searchEAs, &size);
    286287    }
    … …  
    338339    }
    339340    // 25 Sep 09 SHL Reselect last last used item
    340     if (sLastMaskSelect >= 0)
    341       WinSendDlgItemMsg(hwnd, GREP_LISTBOX, LM_SELECTITEM,
    342                         MPFROMSHORT(sLastMaskSelect), MPFROMSHORT(TRUE));
     341    //if (sLastMaskSelect >= 0)
     342    //  WinSendDlgItemMsg(hwnd, GREP_LISTBOX, LM_SELECTITEM,
     343    //                  MPFROMSHORT(sLastMaskSelect), MPFROMSHORT(TRUE));
    343344
    344345    FillPathListBox(hwnd,
    … …  
    369370        BOOL gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
    370371
    371         PrfWriteProfileData(fmprof, FM3Str, "RememberFlagsGrep",
     372        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "RememberFlagsGrep",
    372373                            (PVOID) & gRemember, sizeof(BOOL));
    373374      }
    … …  
    378379      case LN_KILLFOCUS:
    379380        WinSetDlgItemText(hwnd,
    380                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     381                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    381382        break;
    382383      case LN_SETFOCUS:
    383384        WinSetDlgItemText(hwnd,
    384                           GREP_HELP, GetPString(IDS_2CLICKADDDRVMASKTEXT));
     385                          GREP_HELP, (CHAR *) GetPString(IDS_2CLICKADDDRVMASKTEXT));
    385386        break;
    386387      case LN_ENTER:
    … …  
    441442      case LN_KILLFOCUS:
    442443        WinSetDlgItemText(hwnd,
    443                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     444                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    444445        break;
    445446      case LN_SETFOCUS:
    446         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_ADDSELDELMASKTEXT));
     447        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_ADDSELDELMASKTEXT));
    447448        break;
    448449      case LN_ENTER:
    … …  
    484485      if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    485486        WinSetDlgItemText(hwnd,
    486                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     487                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    487488      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    488         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MASKSFINDTEXT));
     489        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_MASKSFINDTEXT));
    489490      break;
    490491    case GREP_SEARCH:
    491492      if (SHORT2FROMMP(mp1) == MLN_KILLFOCUS)
    492493        WinSetDlgItemText(hwnd,
    493                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     494                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    494495      if (SHORT2FROMMP(mp1) == MLN_SETFOCUS)
    495         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_TEXTFINDTEXT));
     496        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_TEXTFINDTEXT));
    496497      break;
    497498    case GREP_GREATER:
    498499      if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    499500        WinSetDlgItemText(hwnd,
    500                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     501                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    501502      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    502         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINSIZEFINDTEXT));
     503        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_MINSIZEFINDTEXT));
    503504      break;
    504505    case GREP_LESSER:
    505506      if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    506507        WinSetDlgItemText(hwnd,
    507                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     508                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    508509      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    509         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXSIZEFINDTEXT));
     510        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_MAXSIZEFINDTEXT));
    510511      break;
    511512    case GREP_NEWER:
    512513      if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    513514        WinSetDlgItemText(hwnd,
    514                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     515                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    515516      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    516         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MAXAGEFINDTEXT));
     517        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_MAXAGEFINDTEXT));
    517518      break;
    518519    case GREP_OLDER:
    519520      if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    520521        WinSetDlgItemText(hwnd,
    521                           GREP_HELP, GetPString(IDS_ARCDEFAULTHELPTEXT));
     522                          GREP_HELP, (CHAR *) GetPString(IDS_ARCDEFAULTHELPTEXT));
    522523      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    523         WinSetDlgItemText(hwnd, GREP_HELP, GetPString(IDS_MINAGEFINDTEXT));
     524        WinSetDlgItemText(hwnd, GREP_HELP, (CHAR *) GetPString(IDS_MINAGEFINDTEXT));
    524525      break;
    525526    case GREP_FINDDUPES:
    … …  
    855856        gRemember = WinQueryButtonCheckstate(hwnd, GREP_REMEMBERFLAGS);
    856857        if (gRemember) {
    857           PrfWriteProfileData(fmprof, FM3Str, "Grep_Recurse",
     858          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_Recurse",
    858859                              (PVOID) & recurse, sizeof(BOOL));
    859           PrfWriteProfileData(fmprof, FM3Str, "Grep_Absolute",
     860          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_Absolute",
    860861                              (PVOID) & absolute, sizeof(BOOL));
    861           PrfWriteProfileData(fmprof, FM3Str, "Grep_Case",
     862          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_Case",
    862863                              (PVOID) & sensitive, sizeof(BOOL));
    863           PrfWriteProfileData(fmprof, FM3Str, "Grep_Sayfiles",
     864          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_Sayfiles",
    864865                              (PVOID) & sayfiles, sizeof(BOOL));
    865           PrfWriteProfileData(fmprof, FM3Str, "Grep_Searchfiles",
     866          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_Searchfiles",
    866867                              (PVOID) & searchFiles, sizeof(BOOL));
    867           PrfWriteProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
     868          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Grep_SearchfEAs",
    868869                              (PVOID) & searchEAs, sizeof(BOOL));
    869870        }
    870871        PrfWriteProfileData(fmprof, appname,
    871                             PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
     872                            (CHAR *) PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
    872873        g.finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES) != 0;
    873874        if (g.finddupes) {
Note: See TracChangeset for help on using the changeset viewer.