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

trunk/dll/misc.c

@@ -6 +6 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2009 Steven H. Levine
+  Copyright (c) 2003, 2010 Steven H. Levine
 
   11 Jun 03 SHL Add JFS and FAT32 support
@@ -65 +65 @@
   21 Dec 09 GKY Allow command menu reorder without changing the "ID" or hot key for a command.
                 Added load_inicommand to load the IDs from the ini file.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -1057 +1058 @@
     *bool = *bool ? FALSE : TRUE;
     if (savename && *savename)
-      PrfWriteProfileData(fmprof, appname, savename, bool, sizeof(BOOL));
+      PrfWriteProfileData(fmprof, appname, (CHAR *) savename, bool, sizeof(BOOL));
   }
   WinSendMsg(hwndMenu, MM_SETITEMATTR,
@@ -1549 +1550 @@
 
   strcpy(eos, "Pos");;
-  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
   strcpy(eos, "Sort");
-  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
   strcpy(eos, "Filter");
-  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
   strcpy(eos, "View");
-  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
   strcpy(eos, "Dir");
-  PrfWriteProfileString(fmprof, FM3Str, s, NULL);
+  PrfWriteProfileString(fmprof, (CHAR *) FM3Str, s, NULL);
   if (statename && strstr(s, ".0.")) {
     strcpy(s, statename);
@@ -1563 +1564 @@
     eos = &s[strlen(s)];
     strcpy(eos, "LastTreePos");
-    PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
     strcpy(eos, "MySizeLastTime");
-    PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, s, NULL, 0);
     strcpy(eos, "Toolbar");
-    PrfWriteProfileString(fmprof, FM3Str, s, NULL);
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, s, NULL);
     strcpy(eos, "TargetDir");
-    PrfWriteProfileString(fmprof, FM3Str, s, NULL);
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, s, NULL);
   }
 
@@ -1582 +1583 @@
 
   sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, ulTemp);
-  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0);
   sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, ulTemp);
-  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0);
   sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, ulTemp);
-  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0);
   sprintf(szKey, "%sDirCnrView.%lu", szPrefix, ulTemp);
-  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0);
   sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, ulTemp);
-  PrfWriteProfileString(fmprof, FM3Str, szKey, NULL);
+  PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, NULL);
   sprintf(szKey, "%sDirCnr.%lu.", szPrefix, ulTemp);
 }
@@ -2156 +2157 @@
         if (!DosQueryProcAddr(hmod,
                               ORD_DOS32QUERYEXTLIBPATH,
-                              NULL, (PFN *) & DQELIBPATH)) {
+                              NULL, (PFN *) &DQELIBPATH)) {
           DQELIBPATH(beg, BEGIN_LIBPATH);
           DQELIBPATH(end, END_LIBPATH);