Changeset 1498 for trunk/dll/walkem.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/walkem.c

    r1471 r1498  
    3636  28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
    3737  06 Oct 09 SHL Ctrl-select selects Walk Dialog listbox entry, but suppresses action
     38  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    3839
    3940***********************************************************************/
    … …  
    128129                 MPFROMP(pld->path));
    129130    }
    130     WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
     131    WinSetWindowText(hwndStatelist, (CHAR *) GetPString(IDS_STATETEXT));
    131132  }
    132133}
    … …  
    204205    return;
    205206
    206   if (!PrfQueryProfileSize(fmprof, FM3Str, pszLastSetups, &ulDataBytes)) {
     207  if (!PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, pszLastSetups, &ulDataBytes)) {
    207208    // fixme to use generic hab
    208209    ERRORID eid = WinGetLastError((HAB)0);
    209210    if ((eid & 0xffff) != PMERR_NOT_IN_IDX) {
    210211      // Get error info back
    211       PrfQueryProfileSize(fmprof, FM3Str, pszLastSetups, &ulDataBytes);
     212      PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, pszLastSetups, &ulDataBytes);
    212213      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_PRFQUERYPROFILESIZE);
    213214    }
    … …  
    226227    return;
    227228  l = ulDataBytes;
    228   if (!PrfQueryProfileData(fmprof, FM3Str, pszLastSetups, pszBuf, &l)) {
     229  if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, pszLastSetups, pszBuf, &l)) {
    229230    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, PCSZ_PRFQUERYPROFILEDATA);
    230231    free(pszBuf);
    … …  
    321322
    322323  if (!PrfWriteProfileData(fmprof,
    323                            FM3Str,
     324                           (CHAR *) FM3Str,
    324325                            pszLastSetups, pszBuf, ulBufBytes)) {
    325326    ERRORID eid = WinGetLastError((HAB)0);
    … …  
    329330
    330331  // Delete obsolete INI entry
    331   PrfWriteProfileData(fmprof, FM3Str, "LastSetup", NULL, 0);
     332  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "LastSetup", NULL, 0);
    332333}
    333334
    … …  
    777778      ULONG size = sizeof(SWP);
    778779
    779       PrfQueryProfileData(fmprof, FM3Str, "WalkDir.Position", (PVOID) &swp, &size);
     780      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "WalkDir.Position", (PVOID) &swp, &size);
    780781      swp.fl &= ~SWP_SIZE;              // 04 Feb 09 SHL ignore saved size
    781782      WinSetWindowPos(hwnd,
    … …  
    900901            }
    901902            WinSetDlgItemText(hwnd, WALK_RECENT,
    902                               GetPString(IDS_WALKRECENTDIRSTEXT));
     903                              (CHAR *) GetPString(IDS_WALKRECENTDIRSTEXT));
    903904          }
    904905          else if (!(ulDriveMap & (1 << (toupper(*info->path) - 'A')))) {
    … …  
    10061007    case WALK_PATH:
    10071008      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    1008         WinSetDlgItemText(hwnd, WALK_HELP, GetPString(IDS_WALKCURRDIRTEXT));
     1009        WinSetDlgItemText(hwnd, WALK_HELP, (CHAR *) GetPString(IDS_WALKCURRDIRTEXT));
    10091010      else if (SHORT2FROMMP(mp1) == EN_KILLFOCUS)
    10101011        WinSetDlgItemText(hwnd, WALK_HELP,
    1011                           GetPString(IDS_WALKDEFAULTHELPTEXT));
     1012                          (CHAR *) GetPString(IDS_WALKDEFAULTHELPTEXT));
    10121013      break;
    10131014
    … …  
    10591060      else if (SHORT2FROMMP(mp1) == CBN_SHOWLIST)
    10601061        WinSetDlgItemText(hwnd, WALK_HELP,
    1061                           GetPString(IDS_WALKRECENTDIRSHELPTEXT));
     1062                          (CHAR *) GetPString(IDS_WALKRECENTDIRSHELPTEXT));
    10621063      break;
    10631064
    … …  
    11111112      else if (SHORT2FROMMP(mp1) == LN_SETFOCUS)
    11121113        WinSetDlgItemText(hwnd,
    1113                           WALK_HELP, GetPString(IDS_WALKUSERDIRSHELPTEXT));
     1114                          WALK_HELP, (CHAR *) GetPString(IDS_WALKUSERDIRSHELPTEXT));
    11141115      else if (SHORT2FROMMP(mp1) == LN_KILLFOCUS)
    11151116        WinSetDlgItemText(hwnd,
    1116                           WALK_HELP, GetPString(IDS_WALKDEFAULTHELPTEXT));
     1117                          WALK_HELP, (CHAR *) GetPString(IDS_WALKDEFAULTHELPTEXT));
    11171118      break;
    11181119
    … …  
    11361137      else if (SHORT2FROMMP(mp1) == LN_SETFOCUS)
    11371138        WinSetDlgItemText(hwnd, WALK_HELP,
    1138                           GetPString(IDS_WALKDRIVELISTHELPTEXT));
     1139                          (CHAR *) GetPString(IDS_WALKDRIVELISTHELPTEXT));
    11391140      else if (SHORT2FROMMP(mp1) == LN_KILLFOCUS)
    11401141        WinSetDlgItemText(hwnd, WALK_HELP,
    1141                           GetPString(IDS_WALKDEFAULTHELPTEXT));
     1142                          (CHAR *) GetPString(IDS_WALKDEFAULTHELPTEXT));
    11421143      break;
    11431144
    … …  
    11891190      else if (SHORT2FROMMP(mp1) == LN_SETFOCUS)
    11901191        WinSetDlgItemText(hwnd, WALK_HELP,
    1191                           GetPString(IDS_WALKDIRLISTHELPTEXT));
     1192                          (CHAR *) GetPString(IDS_WALKDIRLISTHELPTEXT));
    11921193      else if (SHORT2FROMMP(mp1) == LN_KILLFOCUS)
    11931194        WinSetDlgItemText(hwnd, WALK_HELP,
    1194                           GetPString(IDS_WALKDEFAULTHELPTEXT));
     1195                          (CHAR *) GetPString(IDS_WALKDEFAULTHELPTEXT));
    11951196      break;
    11961197    }
    … …  
    12681269        ULONG size = sizeof(SWP);
    12691270        WinQueryWindowPos(hwnd, &swp);
    1270         PrfWriteProfileData(fmprof, FM3Str, "WalkDir.Position", (PVOID) &swp,
     1271        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "WalkDir.Position", (PVOID) &swp,
    12711272                            size);
    12721273      }
    … …  
    12891290
    12901291        WinQueryWindowPos(hwnd, &swp);
    1291         PrfWriteProfileData(fmprof, FM3Str, "WalkDir.Position", (PVOID) &swp,
     1292        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "WalkDir.Position", (PVOID) &swp,
    12921293                            size);
    12931294      }
    … …  
    13191320  switch (msg) {
    13201321  case WM_INITDLG:
    1321     WinSetWindowText(hwnd, GetPString(IDS_WALKCOPYDLGTEXT));
     1322    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_WALKCOPYDLGTEXT));
    13221323    return WalkDlgProc(hwnd, UM_SETUP2, mp1, mp2);
    13231324  }
    … …  
    13291330  switch (msg) {
    13301331  case WM_INITDLG:
    1331     WinSetWindowText(hwnd, GetPString(IDS_WALKMOVEDLGTEXT));
     1332    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_WALKMOVEDLGTEXT));
    13321333    return WalkDlgProc(hwnd, UM_SETUP2, mp1, mp2);
    13331334  }
    … …  
    13401341  switch (msg) {
    13411342  case WM_INITDLG:
    1342     WinSetWindowText(hwnd, GetPString(IDS_WALKEXTRACTDLGTEXT));
     1343    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_WALKEXTRACTDLGTEXT));
    13431344    return WalkDlgProc(hwnd, UM_SETUP2, mp1, mp2);
    13441345  }
    … …  
    14031404      ULONG size = sizeof(SWP);
    14041405
    1405       PrfQueryProfileData(fmprof, FM3Str, "WalkDir2.Position", (PVOID) &swp, &size);
     1406      PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "WalkDir2.Position", (PVOID) &swp, &size);
    14061407      swp.fl &= ~SWP_SIZE;              // 04 Feb 09 SHL ignore saved size
    14071408      WinSetWindowPos(hwnd,
    … …  
    16851686
    16861687      WinQueryWindowPos(hwnd, &swp);
    1687       PrfWriteProfileData(fmprof, FM3Str, "WalkDir2.Position", (PVOID) &swp,
     1688      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "WalkDir2.Position", (PVOID) &swp,
    16881689                          size);
    16891690      }
    … …  
    17041705
    17051706      WinQueryWindowPos(hwnd, &swp);
    1706       PrfWriteProfileData(fmprof, FM3Str, "WalkDir2.Position", (PVOID) &swp,
     1707      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "WalkDir2.Position", (PVOID) &swp,
    17071708                          size);
    17081709      }
    … …  
    17231724  switch (msg) {
    17241725  case WM_INITDLG:
    1725     WinSetWindowText(hwnd, GetPString(IDS_WALKCOMPAREDLGTEXT));
     1726    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_WALKCOMPAREDLGTEXT));
    17261727    return WalkTwoDlgProc(hwnd, UM_SETUP2, mp1, mp2);
    17271728  }
    … …  
    17341735  switch (msg) {
    17351736  case WM_INITDLG:
    1736     WinSetWindowText(hwnd, GetPString(IDS_WALKSETDIRSDLGTEXT));
     1737    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_WALKSETDIRSDLGTEXT));
    17371738    return WalkTwoDlgProc(hwnd, UM_SETUP2, mp1, mp2);
    17381739  }
Note: See TracChangeset for help on using the changeset viewer.