Changeset 1498 for trunk/dll/seeall.c

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:

• trunk/dll/seeall.c (modified) (8 diffs)

trunk/dll/seeall.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2010 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -49 +49 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -785 +786 @@
 
                 WinSetWindowText(WinWindowFromID(hwndFrame, SEEALL_STATUS),
-                                 GetPString(IDS_FITTINGTEXT));
+                                 (CHAR *) GetPString(IDS_FITTINGTEXT));
                 DosError(FERR_DISABLEHARDERR);
                 if (!DosQueryFSInfo(toupper(*newname) - '@',
@@ -811 +812 @@
                     WinSetWindowText(WinWindowFromID(hwndFrame,
                                                      SEEALL_STATUS),
-                                     GetPString(IDS_COULDNTFITTEXT));
+                                     (CHAR *) GetPString(IDS_COULDNTFITTEXT));
                   }
                 }
@@ -1207 +1208 @@
         DosError(FERR_DISABLEHARDERR);
         WinRegisterClass(hab2,
-                         WC_OBJECTWINDOW,
+                         (CHAR *) WC_OBJECTWINDOW,
                          SeeObjWndProc, 0, sizeof(PVOID));
         hwndObj = WinCreateWindow(HWND_OBJECT,
-                                  WC_OBJECTWINDOW,
+                                  (CHAR *) WC_OBJECTWINDOW,
                                   (PSZ) NULL,
                                   0,
@@ -2635 +2636 @@
         if (!DosCreateMutexSem(NULL, &pAD->hmtxScan, 0, FALSE)) {
           pAD->hwndStatus = WinCreateWindow(hwndFrame,
-                                            WC_SEESTATUS,
+                                            (CHAR *) WC_SEESTATUS,
                                             NullStr,
                                             WS_VISIBLE | SS_TEXT |
@@ -3135 +3136 @@
         Runtime_Error(pszSrcFile, __LINE__, NULL);
       else {
-        WinSetWindowText(pAD->hwndStatus, GetPString(IDS_DRAGGINGFILESTEXT));
+        WinSetWindowText(pAD->hwndStatus, (CHAR *) GetPString(IDS_DRAGGINGFILESTEXT));
         DragList(hwnd, (HWND) 0, list, TRUE);
         FreeList(list);
@@ -4397 +4398 @@
                                  WS_VISIBLE,
                                  &FrameFlags,
-                                 WC_SEEALL,
-                                 GetPString(IDS_SEEALLTITLETEXT),
+                                 (CHAR *) WC_SEEALL,
+                                 (CHAR *) GetPString(IDS_SEEALLTITLETEXT),
                                  WS_VISIBLE | fwsAnimate,
                                  FM3ModHandle, SEEALL_FRAME, &hwndClient);