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

trunk/dll/mainwnd2.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005, 2008 Steven H. Levine
+  Copyright (c) 2005, 2010 Steven H. Levine
 
   23 May 05 SHL Use datamin.h
@@ -38 +38 @@
                 aren't user settable; realappname should be used for setting applicable to
                 one or more miniapp but not to FM/2
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -604 +605 @@
     fTileBackwards = (fTileBackwards) ? FALSE : TRUE;
     PrfWriteProfileData(fmprof,
-                        FM3Str,
+                        (CHAR *) FM3Str,
                         "TileBackwards",
                         (PVOID) & fTileBackwards, sizeof(BOOL));
@@ -993 +994 @@
 
   case WM_SAVEAPPLICATION:
-    WinStoreWindowPos(FM2Str,
+    WinStoreWindowPos((CHAR *) FM2Str,
                       "MainWindowPos2", WinQueryWindow(hwnd, QW_PARENT));
     pd = WinQueryWindowPtr(hwnd, QWL_USER + 4);
@@ -1416 +1417 @@
 
     if (PrfQueryProfileString(HINI_USERPROFILE,
-                              FM2Str,
+                              (CHAR *) FM2Str,
                               "Home", NULL, inipath, sizeof(inipath))) {
       if (!DosQueryPathInfo(inipath, FIL_STANDARD, &fsa, sizeof(fsa))) {
@@ -1432 +1433 @@
                                  WS_VISIBLE,
                                  &FrameFlags,
-                                 WC_MAINWND2,
+                                 (CHAR *) WC_MAINWND2,
                                  NULL,
                                  WS_VISIBLE | WS_ANIMATE,
@@ -1438 +1439 @@
   if (hwndFrame) {
     hwndMainMenu = WinWindowFromID(hwndFrame, FID_MENU);
-    if (!WinRestoreWindowPos(FM2Str, "MainWindowPos2", hwndFrame)) {
+    if (!WinRestoreWindowPos((CHAR *) FM2Str, "MainWindowPos2", hwndFrame)) {
 
       ULONG fl = SWP_MOVE | SWP_SIZE;