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

trunk/dll/notebook.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2009 Steven H. Levine
+  Copyright (c) 2004, 2010 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -58 +58 @@
   13 Dec 09 GKY Updated Quick page "Default" to match current defaults; added Gregg's way
                 option to Quick page.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -1436 +1437 @@
                           &fShowDriveLabelInTree, sizeof(BOOL));
       fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
-      PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
+      PrfWriteProfileData(fmprof, (CHAR *) (CHAR *) FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
                           sizeof(BOOL));
       fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
@@ -1944 +1945 @@
       if (fOldSyncUpdates != fSyncUpdates) {
         fSyncUpdates = fOldSyncUpdates;
-        if (hwndMain && !strcmp(realappname, FM3Str)) {
+        if (hwndMain && !strcmp(realappname, (CHAR *) FM3Str)) {
           // Save state and restore to refresh windows with new settings
           if (SaveDirCnrState(hwndMain, PCSZ_FM2TEMPTEXT) > 0) {
@@ -2099 +2100 @@
 
   case WM_CLOSE:
-    if (hwndMain && !strcmp(realappname, FM3Str)) {
+    if (hwndMain && !strcmp(realappname, (CHAR *) FM3Str)) {
       if (fFreeTree != WinQueryButtonCheckstate(hwnd, CFGM_FREETREE))
         PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
@@ -2107 +2108 @@
         fSplitStatus = (fSplitStatus) ? FALSE : TRUE;
         PostMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_BLINK, 0), MPVOID);
-        PrfWriteProfileData(fmprof, FM3Str, "SplitStatus", &fSplitStatus,
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "SplitStatus", &fSplitStatus,
                             sizeof(BOOL));
       }
     }
     fUserListSwitches = WinQueryButtonCheckstate(hwnd, CFGM_USERLISTSWITCHES);
-    PrfWriteProfileData(fmprof, FM3Str, "UserListSwitches",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "UserListSwitches",
                         (PVOID) & fUserListSwitches, sizeof(BOOL));
     fExternalINIs = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALINIS);
-    PrfWriteProfileData(fmprof, FM3Str, "ExternalINIs",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "ExternalINIs",
                         (PVOID) & fExternalINIs, sizeof(BOOL));
     fExternalArcboxes = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALARCBOXES);
-    PrfWriteProfileData(fmprof, FM3Str, "ExternalArcboxes",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "ExternalArcboxes",
                         (PVOID) & fExternalArcboxes, sizeof(BOOL));
     fExternalCollector =
       WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALCOLLECTOR);
-    PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "ExternalCollector",
                         (PVOID) & fExternalCollector, sizeof(BOOL));
     fExternalViewer = WinQueryButtonCheckstate(hwnd, CFGM_EXTERNALVIEWER);
-    PrfWriteProfileData(fmprof, FM3Str, "ExternalViewer",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "ExternalViewer",
                         (PVOID) & fExternalViewer, sizeof(BOOL));
     {
@@ -2149 +2150 @@
     fSaveState = WinQueryButtonCheckstate(hwnd, CFGM_SAVESTATE);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
+                        (CHAR *) FM3Str,
                         "SaveState", (PVOID) & fSaveState, sizeof(BOOL));
     fStartMinimized = WinQueryButtonCheckstate(hwnd, CFGM_STARTMIN);
@@ -2166 +2167 @@
     fTileBackwards = WinQueryButtonCheckstate(hwnd, CFGM_TILEBACKWARDS);
     PrfWriteProfileData(fmprof,
-                        FM3Str,
+                        (CHAR *) FM3Str,
                         "TileBackwards",
                         (PVOID) & fTileBackwards, sizeof(BOOL));
@@ -2694 +2695 @@
     fExternalCollector = WinQueryButtonCheckstate(hwnd,
                                                   CFG5_EXTERNALCOLLECTOR);
-    PrfWriteProfileData(fmprof, FM3Str, "ExternalCollector",
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "ExternalCollector",
                         &fExternalCollector, sizeof(BOOL));
     {
@@ -4099 +4100 @@
         Runtime_Error(pszSrcFile, __LINE__, "bad menu id %lu", ulPageId);
       else {
-        PrfWriteProfileData(fmprof, FM3Str, pszIK_LastSettingsPage,
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, pszIK_LastSettingsPage,
                             (PVOID)&x, sizeof(x));
         hwndMenu = WinWindowFromID(hwndOwner, FID_MENU);