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

trunk/dll/treecnr.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
@@ -80 +80 @@
                 before scan completes
   22 Nov 09 GKY Add LVM.EXE to partition submenu
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -1496 +1497 @@
                                        0);      /* Index to DRAGITEM */
           if (DrgVerifyRMF(pDItem,      /* Check valid rendering */
-                           DRM_OS2FILE, /* mechanisms and data */
-                           NULL) || DrgVerifyRMF(pDItem, DRM_FM2ARCMEMBER, DRF_FM2ARCHIVE)) {   /* formats */
+                           (CHAR *) DRM_OS2FILE,        /* mechanisms and data */
+                           NULL) || DrgVerifyRMF(pDItem, (CHAR *) DRM_FM2ARCMEMBER,
+                                                 (CHAR *) DRF_FM2ARCHIVE)) {    /* formats */
             DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO */
             if (!pci || (INT) pci == -1)
@@ -1534 +1536 @@
             if (hwndStatus2) {
               WinSetWindowText(hwndStatus2, (IsRoot(pci->pszFileName)) ?
-                               GetPString(IDS_DRAGROOTTEXT) :
+                               (CHAR *) GetPString(IDS_DRAGROOTTEXT) :
                                (pci->attrFile & FILE_DIRECTORY) ?
-                               GetPString(IDS_DRAGDIRTEXT) :
-                               GetPString(IDS_DRAGFILETEXT));
+                               (CHAR *) GetPString(IDS_DRAGDIRTEXT) :
+                               (CHAR *) GetPString(IDS_DRAGFILETEXT));
             }
             DoFileDrag(hwnd, dcd->hwndObject, mp2, NULL, NULL, TRUE);
@@ -1910 +1912 @@
             DosBeep(50, 100);
           if (hwndStatus)
-            WinSetWindowText(hwndStatus, GetPString(IDS_RESCANSUGTEXT));
+            WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_RESCANSUGTEXT));
           DosReleaseMutexSem(hmtFillingTreeCnr);
           return 0;
@@ -3042 +3044 @@
       WinQueryWindowPos(dcd->hwndFrame, &swp);
       if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE | SWP_MAXIMIZE)))
-        WinStoreWindowPos(FM2Str, "VTreeWindowPos", dcd->hwndFrame);
+        WinStoreWindowPos((CHAR *) FM2Str, "VTreeWindowPos", dcd->hwndFrame);
     }
     break;
@@ -3160 +3162 @@
                                  WS_VISIBLE,
                                  &FrameFlags,
-                                 WC_TREECONTAINER,
+                                 (CHAR *) WC_TREECONTAINER,
                                  NULL,
                                  WS_VISIBLE | fwsAnimate,
@@ -3190 +3192 @@
       if (*(ULONG *) realappname == FM3UL) {
         if (!WinCreateWindow(hwndFrame,
-                             WC_TREEOPENBUTTON,
+                             (CHAR *) WC_TREEOPENBUTTON,
                              "#303",
                              WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS | BS_BITMAP,
@@ -3214 +3216 @@
       else {
         if (!WinCreateWindow(hwndFrame,
-                             WC_TREESTATUS,
-                             GetPString(IDS_YOUAREHERETEXT),
+                             (CHAR *) WC_TREESTATUS,
+                             (CHAR *) GetPString(IDS_YOUAREHERETEXT),
                              WS_VISIBLE | SS_TEXT | DT_LEFT | DT_VCENTER,
                              swp.x + 4 + WinQuerySysValue(HWND_DESKTOP,
@@ -3275 +3277 @@
         }
         else {
-          WinSetWindowText(hwndFrame, GetPString(IDS_TREETEXT));
+          WinSetWindowText(hwndFrame, (CHAR *) GetPString(IDS_TREETEXT));
           WinSetWindowText(WinWindowFromID(hwndFrame, FID_TITLEBAR),
-                           GetPString(IDS_TREETEXT));
+                           (CHAR *) GetPString(IDS_TREETEXT));
         }
         dcd->oldproc = WinSubclassWindow(dcd->hwndCnr, TreeCnrWndProc);