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

trunk/dll/collect.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2009 Steven H. Levine
+  Copyright (c) 2003, 2010 Steven H. Levine
 
   15 Oct 02 MK Baseline
@@ -70 +70 @@
   13 Jul 09 GKY Fixed double free of memory buffer in UM_COLLECTFROMFILE
   15 Sep 09 SHL Use UM_GREP when passing pathname
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -653 +654 @@
       if (!hwndStatus) {
         WinSetWindowText(WinWindowFromID(dcd->hwndClient, DIR_SELECTED),
-                         GetPString(IDS_COLLECTINGTEXT));
+                         (CHAR *) GetPString(IDS_COLLECTINGTEXT));
       }
       else {
         if (WinQueryFocus(HWND_DESKTOP) == dcd->hwndCnr)
-          WinSetWindowText(hwndStatus, GetPString(IDS_COLLECTINGTEXT));
+          WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_COLLECTINGTEXT));
       }
 
@@ -1266 +1267 @@
       }
       if (dcd->amextracted)
-        WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));  // Say working
+        WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_INSEEKSCANTEXT)); // Say working
       WinSendMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
     }
@@ -1369 +1370 @@
           }
           if (dcd->amextracted && hwndStatus2 && !fStatus2Used)
-            WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));      // Say working
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_INSEEKSCANTEXT));     // Say working
         }
         else {
           if (hwndStatus2) {
             if (dcd->amextracted)
-              WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));    // Say working
+              WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_INSEEKSCANTEXT));   // Say working
             else
               WinSetWindowText(hwndStatus2, NullStr);
@@ -2475 +2476 @@
                                        0);      /* Index to DRAGITEM */
           if (DrgVerifyRMF(pDItem,      /* Check valid rendering */
-                           DRM_OS2FILE, /* mechanisms and data */
+                           (CHAR *) DRM_OS2FILE,        /* mechanisms and data */
                            NULL)) {
             DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO */
@@ -2510 +2511 @@
               if (hwndStatus2)
                 WinSetWindowText(hwndStatus2,
-                                 GetPString(IDS_DRAGFILEOBJTEXT));
+                                 (CHAR *) GetPString(IDS_DRAGFILEOBJTEXT));
               if (DoFileDrag(hwnd, dcd->hwndObject, mp2, NULL, NULL, TRUE)) {
                 if ((fUnHilite && wasemphasized) || dcd->ulItemsToUnHilite)
@@ -2993 +2994 @@
                                  WS_VISIBLE,
                                  &FrameFlags,
-                                 WC_COLLECTOR,
+                                 (CHAR *) WC_COLLECTOR,
                                  NULL,
                                  WS_VISIBLE | fwsAnimate,
@@ -3047 +3048 @@
         Collector = dcd->hwndCnr;
         WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);
-        WinSetWindowText(hwndFrame, GetPString(IDS_COLLECTORTITLETEXT));
+        WinSetWindowText(hwndFrame, (CHAR *) GetPString(IDS_COLLECTORTITLETEXT));
         if (FrameFlags & FCF_MENU) {
           PFNWP oldmenuproc;