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

trunk/dll/printer.c

@@ -6 +6 @@
 
   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
@@ -15 +15 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -477 +478 @@
       else {
         prnformat = WinQueryButtonCheckstate(hwnd, PRN_FORMAT);
-        PrfWriteProfileData(fmprof, FM3Str, "Prnformat",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnformat",
                             (PVOID) & prnformat, sizeof(prnformat));
         prnalt = WinQueryButtonCheckstate(hwnd, PRN_ALT);
-        PrfWriteProfileData(fmprof, FM3Str, "Prnalt",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnalt",
                             (PVOID) & prnalt, sizeof(prnalt));
         prnpagenums = WinQueryButtonCheckstate(hwnd, PRN_PAGENUMS);
-        PrfWriteProfileData(fmprof, FM3Str, "Prnpagenums",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnpagenums",
                             (PVOID) & prnpagenums, sizeof(prnpagenums));
         prnformfeedbefore = WinQueryButtonCheckstate(hwnd, PRN_FORMBEFORE);
-        PrfWriteProfileData(fmprof, FM3Str, "Prnformfeedbefore",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnformfeedbefore",
                             (PVOID) & prnformfeedbefore,
                             sizeof(prnformfeedbefore));
         prnformfeedafter = WinQueryButtonCheckstate(hwnd, PRN_FORMAFTER);
-        PrfWriteProfileData(fmprof, FM3Str, "Prnformfeedafter",
+        PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnformfeedafter",
                             (PVOID) & prnformfeedafter,
                             sizeof(prnformfeedafter));
@@ -505 +506 @@
           }
           prnwidth = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnwidth",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnwidth",
                               (PVOID) & prnwidth, sizeof(prnwidth));
           *s = 0;
@@ -516 +517 @@
           }
           prnlength = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnlength",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnlength",
                               (PVOID) & prnlength, sizeof(prnlength));
           *s = 0;
@@ -527 +528 @@
           }
           prnlmargin = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnlmargin",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnlmargin",
                               (PVOID) & prnlmargin, sizeof(prnlmargin));
           *s = 0;
@@ -538 +539 @@
           }
           prnrmargin = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnrmargin",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnrmargin",
                               (PVOID) & prnrmargin, sizeof(prnrmargin));
           *s = 0;
@@ -550 +551 @@
           }
           prntabspaces = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prntabspaces",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prntabspaces",
                               (PVOID) & prntabspaces, sizeof(prntabspaces));
           *s = 0;
@@ -561 +562 @@
           }
           prntmargin = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prntmargin",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prntmargin",
                               (PVOID) & prntmargin, sizeof(prntmargin));
           *s = 0;
@@ -572 +573 @@
           }
           prnbmargin = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnbmargin",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnbmargin",
                               (PVOID) & prnbmargin, sizeof(prnbmargin));
           *s = 0;
@@ -584 +585 @@
           }
           prnspacing = atol(s);
-          PrfWriteProfileData(fmprof, FM3Str, "Prnspacing",
+          PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Prnspacing",
                               (PVOID) & prnspacing, sizeof(prnspacing));
           WinQueryDlgItemText(hwnd, PRN_PRINTER, sizeof(printer), printer);