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

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2010 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -74 +74 @@
                 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 *.
 
 ***********************************************************************/
@@ -867 +868 @@
       if (hwndStatus &&
           dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-        WinSetWindowText(hwndStatus, GetPString(IDS_PLEASEWAITSCANNINGTEXT));
+        WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_PLEASEWAITSCANNINGTEXT));
         if (hwndMain)
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
@@ -2988 +2989 @@
            */
           pDItem = DrgQueryDragitemPtr(pDInfo, 0);
-          if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL) ||
+          if (DrgVerifyRMF(pDItem, (CHAR *) DRM_OS2FILE, NULL) ||
               ((!pci || (pci->attrFile & FILE_DIRECTORY)) &&
-               DrgVerifyRMF(pDItem, DRM_FM2ARCMEMBER, DRF_FM2ARCHIVE))) {
+               DrgVerifyRMF(pDItem, (CHAR *) DRM_FM2ARCMEMBER, (CHAR *) DRF_FM2ARCHIVE))) {
             DrgFreeDraginfo(pDInfo);
             if (driveflags[toupper(*dcd->directory) - 'A'] &
@@ -3029 +3030 @@
             if (hwndStatus2) {
               if (pci)
-                WinSetWindowText(hwndStatus2,
-                                 GetPString(IDS_DRAGFILEOBJTEXT));
+                WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_DRAGFILEOBJTEXT));
               else
-                WinSetWindowText(hwndStatus2, GetPString(IDS_DRAGDIRTEXT));
+                WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_DRAGDIRTEXT));
             }
             if (DoFileDrag(hwnd,
@@ -3435 +3435 @@
                 if (hwndStatus)
                   WinSetWindowText(hwndStatus,
-                                   GetPString(IDS_RESCANSUGGESTEDTEXT));
+                                   (CHAR *) GetPString(IDS_RESCANSUGGESTEDTEXT));
               }
               else {
@@ -3719 +3719 @@
                                    WS_VISIBLE,
                                    &FrameFlags,
-                                   WC_DIRCONTAINER,
+                                   (CHAR *) WC_DIRCONTAINER,
                                    NULL,
                                    WS_VISIBLE | fwsAnimate,