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

    r1480 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  31 Jul 04 SHL ArcReviewDlgProc: correct nameis... decodes
    … …  
    2929  23 Nov 08 JBS Support use of CMD files in archiver definitions
    3030  11 Jan 08 GKY Replace "ARCHIVER.BB2" in string file with global set at compile in init.c
     31  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
    3132
    3233***********************************************************************/
    … …  
    653654
    654655      case LN_SETFOCUS:
    655         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_TEXTARCPRODUCEDTEXT));
     656        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_TEXTARCPRODUCEDTEXT));
    656657        break;
    657658      }
    … …  
    662663        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    663664      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    664         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADIDTEXT));
     665        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADIDTEXT));
    665666      break;
    666667
    … …  
    669670        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    670671      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    671         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADADDTEXT));
     672        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADADDTEXT));
    672673      break;
    673674
    … …  
    676677        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    677678      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    678         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADMOVETEXT));
     679        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADMOVETEXT));
    679680      break;
    680681
    … …  
    683684        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    684685      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    685         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADEXTTEXT));
     686        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADEXTTEXT));
    686687      break;
    687688
    … …  
    690691        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    691692      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    692         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADEXTRACTTEXT));
     693        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADEXTRACTTEXT));
    693694      break;
    694695
    … …  
    697698        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    698699      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    699         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADWDIRSTEXT));
     700        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADWDIRSTEXT));
    700701      break;
    701702
    … …  
    704705        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    705706      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    706         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADSIGTEXT));
     707        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADSIGTEXT));
    707708      break;
    708709
    … …  
    711712        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    712713      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    713         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADLISTTEXT));
     714        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADLISTTEXT));
    714715      break;
    715716
    … …  
    718719        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    719720      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    720         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADTESTTEXT));
     721        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADTESTTEXT));
    721722      break;
    722723
    … …  
    725726        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    726727      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    727         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADADDWPATHSTEXT));
     728        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADADDWPATHSTEXT));
    728729      break;
    729730
    … …  
    732733        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    733734      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    734         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADMOVEWPATHSTEXT));
     735        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADMOVEWPATHSTEXT));
    735736      break;
    736737
    … …  
    739740        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    740741      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    741         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADADDRECURSETEXT));
     742        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADADDRECURSETEXT));
    742743      break;
    743744
    … …  
    746747        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    747748      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    748         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADDELETETEXT));
     749        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADDELETETEXT));
    749750      break;
    750751
    … …  
    753754        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    754755      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    755         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADSIGPOSTEXT));
     756        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADSIGPOSTEXT));
    756757      break;
    757758
    … …  
    760761        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    761762      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    762         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADFNAMEPOSTEXT));
     763        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADFNAMEPOSTEXT));
    763764      break;
    764765
    … …  
    767768        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    768769      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    769         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADOLDSZTEXT));
     770        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADOLDSZTEXT));
    770771      break;
    771772
    … …  
    774775        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    775776      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    776         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADNUMDATEFLDSTEXT));
     777        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADNUMDATEFLDSTEXT));
    777778      break;
    778779
    … …  
    781782        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    782783      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    783         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADDATEPOSTEXT));
     784        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADDATEPOSTEXT));
    784785      break;
    785786
    … …  
    788789        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    789790      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    790         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADNEWSZTEXT));
     791        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADNEWSZTEXT));
    791792      break;
    792793
    … …  
    795796        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    796797      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    797         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADSTARTLISTTEXT));
     798        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADSTARTLISTTEXT));
    798799      break;
    799800
    … …  
    802803        WinSetDlgItemText(hwnd, AD_HELP, NullStr);
    803804      if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
    804         WinSetDlgItemText(hwnd, AD_HELP, GetPString(IDS_ADENDLISTTEXT));
     805        WinSetDlgItemText(hwnd, AD_HELP, (CHAR *) GetPString(IDS_ADENDLISTTEXT));
    805806      break;
    806807
Note: See TracChangeset for help on using the changeset viewer.