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

trunk/dll/assoc.c

@@ -5 +5 @@
 
   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
@@ -22 +22 @@
   15 Nov 09 GKY Add check for attempt to open zero byte file (avoids MMPM trying to play them)
   21 Dec 09 GKY Added CheckExecutibleFlags to streamline code in command.c assoc.c & cmdline.c
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 **************************************************************************************/
@@ -234 +235 @@
   bstripcr(szEnviroment);
   if (*szEnviroment)
-    PrfWriteProfileString(fmprof, FM3Str, temp->pszCmdLine, szEnviroment);
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, temp->pszCmdLine, szEnviroment);
   pszDisplayStr = xmallocz((CCHMAXPATH * 2) + MaxComLineStrg + 6,
                            pszSrcFile, __LINE__);
@@ -638 +639 @@
             size = sizeof(env) - 1;
             if (PrfQueryProfileData(fmprof,
-                                    FM3Str, info->pszCmdLine, env, &size) && *env)
+                                    (CHAR *) FM3Str, info->pszCmdLine, env, &size) && *env)
               WinSetDlgItemText(hwnd, ASS_ENVIRON, env);
             else
@@ -883 +884 @@
         }
         bstrip(temp.mask);
-        PrfWriteProfileData(fmprof, FM3Str, temp.mask, NULL, 0L);
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, temp.mask, NULL, 0L);
         if (kill_association(&temp)) {
           x = (SHORT) WinSendDlgItemMsg(hwnd,
@@ -989 +990 @@
         }
         bstrip(temp.mask);
-        PrfWriteProfileData(fmprof, FM3Str, temp.mask, NULL, 0L);
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, temp.mask, NULL, 0L);
         if (!kill_association(&temp))
           Runtime_Error(pszSrcFile, __LINE__, "kill_association");