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

trunk/dll/inis.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H. Levine
+  Copyright (c) 2004, 2010 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -36 +36 @@
   14 Mar 09 GKY Additional strings move to PCSZs
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -670 +671 @@
       if (SHORT2FROMMP(mp1) == EN_SETFOCUS)
         WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTNAMEHELPTEXT));
+                          IAF_HELP, (CHAR *) GetPString(IDS_MASKLISTNAMEHELPTEXT));
       break;
 
@@ -678 +679 @@
       if (SHORT2FROMMP(mp1) == LN_SETFOCUS)
         WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTFILESHELPTEXT));
+                          IAF_HELP, (CHAR *) GetPString(IDS_MASKLISTFILESHELPTEXT));
       else if (SHORT2FROMMP(mp1) == LN_ENTER)
         PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IAF_LOAD, 0), MPVOID);
@@ -688 +689 @@
       if (SHORT2FROMMP(mp1) == MLN_SETFOCUS)
         WinSetDlgItemText(hwnd,
-                          IAF_HELP, GetPString(IDS_MASKLISTMASKSHELPTEXT));
+                          IAF_HELP, (CHAR *) GetPString(IDS_MASKLISTMASKSHELPTEXT));
       break;
     }
@@ -736 +737 @@
         else {
           WinSetPointer(HWND_DESKTOP, hptrBusy);
-          WinSetDlgItemText(hwnd, IAF_HELP, GetPString(IDS_FILTERINGTEXT));
+          WinSetDlgItemText(hwnd, IAF_HELP, (CHAR *) GetPString(IDS_FILTERINGTEXT));
           sSelect = 0;
           while (numitems) {
@@ -902 +903 @@
       switch (inirec->action) {
       case IDM_MOVE:
-        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEAPPTITLETEXT));
+        WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INIRENAMEAPPTITLETEXT));
         break;
       case IDM_COPY:
-        WinSetWindowText(hwnd, GetPString(IDS_INICOPYAPPTITLETEXT));
+        WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INICOPYAPPTITLETEXT));
         break;
       }
@@ -922 +923 @@
       switch (inirec->action) {
       case IDM_MOVE:
-        WinSetWindowText(hwnd, GetPString(IDS_INIRENAMEKEYTITLETEXT));
+        WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INIRENAMEKEYTITLETEXT));
         break;
       case IDM_COPY:
-        WinSetWindowText(hwnd, GetPString(IDS_INICOPYKEYTITLETEXT));
+        WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INICOPYKEYTITLETEXT));
         break;
       }
@@ -1090 +1091 @@
                       INIR_SYSTEMPROFILE,
                       EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
-    WinSetWindowText(hwnd, GetPString(IDS_INISWAPOS2INISTITLETEXT));
+    WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INISWAPOS2INISTITLETEXT));
     break;
 
@@ -1333 +1334 @@
     inidata = (INIDATA *) mp2;
     if (inidata->edit)
-      WinSetWindowText(hwnd, GetPString(IDS_INIEDITINITITLETEXT));
+      WinSetWindowText(hwnd, (CHAR *) GetPString(IDS_INIEDITINITITLETEXT));
     WinSetWindowPtr(hwnd, QWL_USER, (PVOID) mp2);
     WinSendDlgItemMsg(hwnd,
@@ -1549 +1550 @@
                                  0,
                                  &flFrameFlags,
-                                 WC_INIEDITOR,
+                                 (CHAR *) WC_INIEDITOR,
                                  NullStr,
                                  fwsAnimate,
@@ -1564 +1565 @@
     }
     else if (ParentIsDesktop(hwndFrame, hwnd)) {
-      if (!WinRestoreWindowPos(FM2Str, "INIWindowPos", hwndFrame)) {
+      if (!WinRestoreWindowPos((CHAR *) FM2Str, "INIWindowPos", hwndFrame)) {
 
         ULONG fl = SWP_MOVE | SWP_SIZE;
@@ -1700 +1701 @@
         pDItem = DrgQueryDragitemPtr(pDInfo,0);
         /* Check valid rendering mechanisms and data */
-        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
+        if (DrgVerifyRMF(pDItem, (CHAR *) DRM_OS2FILE, NULL)) {
           DrgFreeDraginfo(pDInfo);
           return (MRFROM2SHORT(DOR_DROP, DO_LINK));     /* OK to drop */
         }
-        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+        else if (DrgVerifyRMF(pDItem, (CHAR *) DRM_FM2INIRECORD, (CHAR *) DRF_FM2INI)) {
           if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) !=
               WinQueryWindow(hwnd, QW_PARENT))
@@ -1740 +1741 @@
       for (curitem = 0; curitem < numitems; curitem++) {
         pDItem = DrgQueryDragitemPtr(pDInfo, curitem);
-        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
+        if (DrgVerifyRMF(pDItem, (CHAR *) DRM_OS2FILE, NULL)) {
           if (pDItem->fsControl & DC_PREPARE)
             DrgSendTransferMsg(pDItem->hwndItem,
@@ -1757 +1758 @@
           }
         }
-        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+        else if (DrgVerifyRMF(pDItem, (CHAR *) DRM_FM2INIRECORD, (CHAR *) DRF_FM2INI)) {
           *szDir = *szFrom = *szTemp = 0;
           len = DrgQueryStrName(pDItem->hstrContainerName, CCHMAXPATH, szDir);
@@ -1884 +1885 @@
     if (!WinCreateWindow(hwnd,
                          WC_STATIC,
-                         GetPString(IDS_APPLICATIONSTITLETEXT),
+                         (CHAR *) GetPString(IDS_APPLICATIONSTITLETEXT),
                          WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER,
@@ -1894 +1895 @@
     if (!WinCreateWindow(hwnd,
                          WC_STATIC,
-                         GetPString(IDS_KEYWORDSTITLETEXT),
+                         (CHAR *) GetPString(IDS_KEYWORDSTITLETEXT),
                          WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER,
@@ -1904 +1905 @@
     if (!WinCreateWindow(hwnd,
                          WC_STATIC,
-                         GetPString(IDS_DATABYTESTITLETEXT),
+                         (CHAR *) GetPString(IDS_DATABYTESTITLETEXT),
                          WS_VISIBLE | SS_TEXT |
                          DT_CENTER | DT_VCENTER,
@@ -1941 +1942 @@
       else if (hwndStatus) {
         if (*inidata->ininame) {
-          WinSetWindowText(hwndStatus, GetPString(IDS_INTERNALINIVIEWERTEXT));
+          WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_INTERNALINIVIEWERTEXT));
           if (hwndStatus2)
             WinSetWindowText(hwndStatus2, inidata->ininame);
@@ -2294 +2295 @@
                                   QW_PARENT))) {
           if (hwndStatus)
-            WinSetWindowText(hwndStatus,
-                             GetPString(IDS_INTERNALINIVIEWERTEXT));
+            WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_INTERNALINIVIEWERTEXT));
           if (hwndStatus2)
             WinSetWindowText(hwndStatus2, inidata->ininame);
@@ -2834 +2834 @@
       WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE)))
-        WinStoreWindowPos(FM2Str,
+        WinStoreWindowPos((CHAR *) FM2Str,
                           "INIWindowPos", WinQueryWindow(hwnd, QW_PARENT));
       // inidata = WinQueryWindowPtr(hwnd, QWL_USER);   // 09 Jan 08 SHL