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

trunk/dll/filldir.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2010 Steven H. Levine
 
   10 Jan 04 SHL ProcessDirectory: avoid most large drive failures
@@ -84 +84 @@
   15 Nov 09 GKY Avoid szBuf overflow in FillTreeCnr
   15 Nov 09 GKY Optimize some check code
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -1095 +1096 @@
           if (hwndStatus && dcd &&
               dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-            WinSetWindowText(hwndStatus, GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
+            WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
           }
           pci = pciFirst;
@@ -1709 +1710 @@
         char s[64];
         sprintf(s, "PARAMETERS=%s", szSuggest);
-        WinCreateObject(WPProgram, "FM/2", s, FM3Folder, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "FM/2 Lite", s, FM3Folder, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "Archive Viewer/2", s, FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "Dir Sizes", s, FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "Visual Tree", s, FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "Visual Directory", s, FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram,
-                        "Global File Viewer", s, FM3Tools, CO_UPDATEIFEXISTS);
-        WinCreateObject(WPProgram, "Databar", s, FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram, "FM/2", s, (CHAR *) FM3Folder, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "FM/2 Lite", s, (CHAR *) FM3Folder, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "Archive Viewer/2", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "Dir Sizes", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "Visual Tree", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "Visual Directory", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram,
+                        "Global File Viewer", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
+        WinCreateObject((CHAR *) WPProgram, "Databar", s, (CHAR *) FM3Tools, CO_UPDATEIFEXISTS);
       }
       else if (MBID_CANCEL) {