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

trunk/dll/notify.c

@@ -6 +6 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2006, 2009 Steven H.Levine
+  Copyright (c) 2006, 2010 Steven H.Levine
 
   17 Jul 06 SHL Use Win_Error
@@ -20 +20 @@
   13 Jul 09 SHL Sync with renames
   16 Jul 09 SHL Stop leaking hptrIcon
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -211 +212 @@
 
     hwnd = WinCreateWindow(hwndP,
-                           WC_ERRORWND,
+                           (CHAR *) WC_ERRORWND,
                            p,
                            SS_TEXT | DT_LEFT | DT_VCENTER | WS_VISIBLE,
@@ -307 +308 @@
     fThreadNotes = TRUE;
     PrfWriteProfileData(fmprof,
-                        FM3Str,
+                        (CHAR *) FM3Str,
                         "ThreadNotes",
                         &fThreadNotes,
@@ -344 +345 @@
 
       if (PrfQueryProfileData(fmprof,
-                              FM3Str, "NoteWndSwp", (PVOID) & swp, &size)) {
+                              (CHAR *) FM3Str, "NoteWndSwp", (PVOID) & swp, &size)) {
         if (swp.fl & (SWP_HIDE | SWP_MINIMIZE)) {
           fl |= SWP_MINIMIZE;
@@ -389 +390 @@
         }
         PrfWriteProfileData(fmprof,
-                            FM3Str, "NoteWndSwp", (PVOID) & swp, sizeof(SWP));
+                            (CHAR *) FM3Str, "NoteWndSwp", (PVOID) & swp, sizeof(SWP));
       }
     }
@@ -476 +477 @@
       fThreadNotes = FALSE;             // Remember not open
       PrfWriteProfileData(fmprof,
-                          FM3Str, "ThreadNotes", &fThreadNotes, sizeof(BOOL));
+                          (CHAR *) FM3Str, "ThreadNotes", &fThreadNotes, sizeof(BOOL));
       hwndNotify = (HWND)0;
     }