Changeset 1498 for trunk/dll/viewinf.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/viewinf.c (modified) (5 diffs)

trunk/dll/viewinf.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H.Levine
+  Copyright (c) 2004, 2010 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -21 +21 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   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 *.
 
 ***********************************************************************/
@@ -192 +193 @@
               key = "HLPPaths";
             repeating = TRUE;
-            if (PrfQueryProfileSize(fmprof, FM3Str, key, &size) && size) {
+            if (PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, key, &size) && size) {
               holdenv = xmalloc(size + 2, pszSrcFile, __LINE__);
               if (holdenv) {
-                if (!PrfQueryProfileData(fmprof, FM3Str, key, holdenv, &size)) {
+                if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, key, holdenv, &size)) {
                   Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                             PCSZ_PRFQUERYPROFILEDATA);
@@ -265 +266 @@
                         (PVOID) FNT_10SYSTEMMONOTEXT);
       }
-      WinSetWindowText(hwnd, GetPString(IDS_VIEWHELPFILESTEXT));
+      WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_VIEWHELPFILESTEXT));
       WinShowWindow(WinWindowFromID(hwnd, VINF_SRCH), FALSE);
       WinShowWindow(WinWindowFromID(hwnd, VINF_FILTER), FALSE);
@@ -520 +521 @@
         bstrip(szBuffer);
         PrfWriteProfileData(fmprof,
-                            FM3Str,
+                            (CHAR *) FM3Str,
                             key,
                             (*szBuffer) ? szBuffer : NULL, strlen(szBuffer));