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

    r1488 r1498  
    77
    88  Copyright (c) 1993-98 M. Kimes
    9   Copyright (c) 2004, 2008 Steven H.Levine
     9  Copyright (c) 2004, 2010 Steven H.Levine
    1010
    1111  01 Aug 04 SHL Rework lstrip/rstrip usage
    … …  
    2727                one or more miniapp but not to FM/2
    2828  21 Dec 09 GKY Added CheckExecutibleFlags to streamline code in command.c assoc.c & cmdline.c
     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***********************************************************************/
    … …  
    435436            WinSetDlgItemText(hwnd,
    436437                              EXEC_WARNING2,
    437                               GetPString(IDS_CANTFINDFILETEXT));
     438                              (CHAR *) GetPString(IDS_CANTFINDFILETEXT));
    438439            break;
    439440          }
    … …  
    455456            WinSetDlgItemText(hwnd,
    456457                              EXEC_WARNING2,
    457                               GetPString(IDS_RUNTHRUCMDEXETEXT));
     458                              (CHAR *) GetPString(IDS_RUNTHRUCMDEXETEXT));
    458459            break;
    459460          }
    460461        }
    461         WinSetDlgItemText(hwnd,
    462                           EXEC_WARNING2, GetPString(IDS_NOTDIRECTEXETEXT));
     462        WinSetDlgItemText(hwnd, EXEC_WARNING2, (CHAR *) GetPString(IDS_NOTDIRECTEXETEXT));
    463463      }
    464464      else if (apptype) {               /* acceptable */
    … …  
    467467
    468468        *s = 0;
    469         WinSetDlgItemText(hwnd,
    470                           EXEC_WARNING, GetPString(IDS_ACCEPTABLEAPPTEXT));
     469        WinSetDlgItemText(hwnd, EXEC_WARNING, (CHAR *) GetPString(IDS_ACCEPTABLEAPPTEXT));
    471470        if (apptype & FAPPTYP_DOS)
    472471          strcat(s, GetPString(IDS_DOSTEXT));
    … …  
    526525      }
    527526      else
    528         WinSetDlgItemText(hwnd,
    529                           EXEC_WARNING2, GetPString(IDS_UNKNOWNDEFAULTTEXT));
     527        WinSetDlgItemText(hwnd, EXEC_WARNING2, (CHAR *) GetPString(IDS_UNKNOWNDEFAULTTEXT));
    530528    }
    531529    return 0;
    … …  
    666664                              EXEC_WARNING2,
    667665                              sizeof(ex->tempprompt), ex->tempprompt);
    668           WinSetDlgItemText(hwnd,
    669                             EXEC_WARNING2, GetPString(IDS_CMDSELCMDHELPTEXT));
     666          WinSetDlgItemText(hwnd, EXEC_WARNING2, (CHAR *) GetPString(IDS_CMDSELCMDHELPTEXT));
    670667          ex->dropped = TRUE;
    671668          if ((SHORT) WinSendDlgItemMsg(hwnd,
Note: See TracChangeset for help on using the changeset viewer.