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

trunk/dll/mainwnd.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2010 Steven H. Levine
 
   11 Jun 02 SHL Drop obsolete xor code
@@ -104 +104 @@
                 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 *.
 
 ***********************************************************************/
@@ -390 +391 @@
                        MainObjectWndProc, 0, sizeof(PVOID));
       MainObjectHwnd = WinCreateWindow(HWND_OBJECT,
-                                       WC_OBJECTWINDOW,
+                                       (CHAR *) WC_OBJECTWINDOW,
                                        (PSZ) NULL,
                                        0,
@@ -852 +853 @@
           switch (id) {
           case MAIN_CMDLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_CMDLISTHELP));
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_CMDLISTHELP));
             break;
           case MAIN_SETUPLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_SETUPLISTHELP));
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_SETUPLISTHELP));
             break;
           case MAIN_USERLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_USERLISTHELP));
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_USERLISTHELP));
             break;
           case MAIN_DRIVELIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_DRIVELISTHELP));
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_DRIVELISTHELP));
             break;
           case MAIN_BUTTONLIST:
-            WinSetWindowText(hwndStatus2, GetPString(IDS_BUTTONLISTHELP));
+            WinSetWindowText(hwndStatus2, (CHAR *) GetPString(IDS_BUTTONLISTHELP));
             break;
           default:
@@ -1002 +1003 @@
 
   hwndBubble = WinCreateWindow(HWND_DESKTOP,
-                               WC_BUBBLE,
-                               help,
+                               (CHAR *) WC_BUBBLE,
+                               (CHAR *) help,
                                WS_CLIPSIBLINGS | SS_TEXT |
                                DT_CENTER | DT_VCENTER,
@@ -1471 +1472 @@
                                      0);        /* Index to DRAGITEM */
         if (DrgVerifyRMF(pDItem,        /* Check valid rendering */
-                         DRM_OS2FILE,   /* mechanisms and data */
+                         (CHAR *) DRM_OS2FILE,   /* mechanisms and data */
                          NULL)) {       /* formats */
           if (!(tool->flags & T_EMPHASIZED)) {
@@ -1572 +1573 @@
       if (!(tool->flags & T_MYICON)) {
         hwndTool = WinCreateWindow(hwndT,
-                                   WC_TOOLBUTTONS,
+                                   (CHAR *) WC_TOOLBUTTONS,
                                    s,
                                    BS_NOPOINTERFOCUS |
@@ -1591 +1592 @@
           btc.hImage = hbm;
           hwndTool = WinCreateWindow(hwndT,
-                                     WC_TOOLBUTTONS,
+                                     (CHAR *) WC_TOOLBUTTONS,
                                      NullStr,
                                      BS_NOPOINTERFOCUS |
@@ -1609 +1610 @@
     if (!hwndTool) {
       hwndTool = WinCreateWindow(hwndT,
-                                 WC_TOOLBUTTONS,
+                                 (CHAR *) WC_TOOLBUTTONS,
                                  (!tool->text && tool->id >= IDM_COMMANDSTART
                                   && tool->id <
@@ -1625 +1626 @@
     if (fToolTitles && !fTextTools) {
       hwndTool = WinCreateWindow(hwndT,
-                                 WC_STATIC,
+                                 (CHAR *) WC_STATIC,
                                  tool->text,
                                  SS_TEXT | DT_LEFT | DT_VCENTER,
@@ -1651 +1652 @@
 
   hwndTool = WinCreateWindow(hwndT,
-                             WC_BUTTON,
+                             (CHAR *) WC_BUTTON,
                              "#6010",
                              BS_NOPOINTERFOCUS |
@@ -1663 +1664 @@
               PCSZ_WINCREATEWINDOW);
   hwndTool =
-    WinCreateWindow(hwndT, WC_BUTTON, "#6011",
+    WinCreateWindow(hwndT, (CHAR *) WC_BUTTON, "#6011",
                     BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON, 1, 4, 14,
                     13, hwndT, HWND_TOP, IDM_TOOLRIGHT, NULL, NULL);
@@ -2355 +2356 @@
       if ((ulDriveMap & (1L << x)) && !(driveflags[x] & DRIVE_IGNORE)) {
         hwndB = WinCreateWindow(hwndT,
-                                WC_DRIVEBUTTONS,
+                                (CHAR *) WC_DRIVEBUTTONS,
                                 0,
                                 BS_NOPOINTERFOCUS | BS_USERBUTTON,
@@ -2372 +2373 @@
     }                                   // for
     hwndB = WinCreateWindow(hwndT,
-                            WC_DRIVEBUTTONS,
+                            (CHAR *) WC_DRIVEBUTTONS,
                             "#7001",
                             BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
@@ -2384 +2385 @@
               PCSZ_WINCREATEWINDOW);
   hwndB = WinCreateWindow(hwndT,
-                          WC_DRIVEBUTTONS,
+                          (CHAR *) WC_DRIVEBUTTONS,
                           "#7000",
                           BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
@@ -2622 +2623 @@
         WinQueryWindowPos(hwnd, &swp);
         hwndB = WinCreateWindow(hwnd,
-                                WC_BUTTON,
+                                (CHAR *) WC_BUTTON,
                                 "+",
                                 WS_VISIBLE | BS_PUSHBUTTON |
@@ -2635 +2636 @@
                     PCSZ_WINCREATEWINDOW);
         hwndE = WinCreateWindow(hwnd,
-                                WC_ENTRYFIELD,
+                                (CHAR *) WC_ENTRYFIELD,
                                 NULL,
                                 WS_VISIBLE | ES_AUTOSCROLL,
@@ -2655 +2656 @@
           WinSetWindowText(hwndE, lastcmd);
         else
-          WinSetWindowText(hwndE, GetPString(IDS_HELPCMDTEXT));
+          WinSetWindowText(hwndE, (CHAR *) GetPString(IDS_HELPCMDTEXT));
         oldproce = WinSubclassWindow(hwndE, (PFNWP) CommandLineProc);
         if (oldproce)
@@ -3056 +3057 @@
   if (*lasttoolbar) {
     sprintf(szKey, "%sToolbar", szPrefix);
-    PrfWriteProfileString(fmprof, FM3Str, szKey, lasttoolbar);
+    PrfWriteProfileString(fmprof, (CHAR *) (CHAR *) FM3Str, szKey, lasttoolbar);
   }
 
   if (!fIsShutDownState) {
     sprintf(szKey, "%sTargetDir", szPrefix);
-    PrfWriteProfileString(fmprof, FM3Str, szKey, targetdir);
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, targetdir);
     sprintf(szKey, "%sVersion", szPrefix);
-    PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, "3.16");
   }
 
@@ -3087 +3088 @@
             eos = &szKey[strlen(szKey)];
             strcpy(eos, "Pos");
-            PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
+            PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & swp,
                                 sizeof(SWP));
             dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
             if (dcd) {
               strcpy(eos, "Sort");
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
+              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & dcd->sortFlags,
                                   sizeof(INT));
               strcpy(eos, "Filter");
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
+              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) & dcd->mask,
                                   sizeof(MASK));
               strcpy(eos, "View");
@@ -3114 +3115 @@
                   flWindowAttr |= CV_NAME;
               }
-              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &flWindowAttr,
+              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &flWindowAttr,
                                   sizeof(ULONG));
               WriteDetailsSwitches(szKeyBase, &dcd->ds, TRUE);
@@ -3120 +3121 @@
             }
             strcpy(eos, "Dir");
-            PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
+            PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, szDir);
             numsaves++;
           }
@@ -3130 +3131 @@
 
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
-  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp)) {
+  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp)) {
     ULONG size = 0;
 
     sprintf(szKey, "%sVersion", szPrefix);
-    PrfQueryProfileSize(fmprof, FM3Str, szKey, &size);
+    PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, szKey, &size);
     if (!size && fSaveState) {
       for (ulTemp = 0; ulTemp < previous_numsaves; ulTemp++)
         RemoveOldCnrSwitches(szPrefix, ulTemp);
        sprintf(szKey, "%sVersion", szPrefix);
-       PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
+       PrfWriteProfileString(fmprof, (CHAR *) FM3Str, szKey, "3.16");
       }
     for (ulTemp = numsaves; ulTemp < previous_numsaves; ulTemp++) {
@@ -3148 +3149 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   if (numsaves) {
-    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
     WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swp);
     sprintf(szKey, "%sMySizeLastTime", szPrefix);
-    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
     if (WinQueryWindowPos(hwndTree, &swp)) {
       sprintf(szKey, "%sLastTreePos", szPrefix);
-      PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
+      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, sizeof(SWP));
     }
   }
   else if (fIsShutDownState) {
-    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, sizeof(ULONG));
   }
   return numsaves;
@@ -3239 +3240 @@
     if (fToolsChanged)
       save_tools(NULL);
-    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, lasttoolbar, sizeof(lasttoolbar));
-    PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+    PrfQueryProfileString(fmprof, (CHAR *) FM3Str, szKey, NULL, lasttoolbar, sizeof(lasttoolbar));
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
     load_tools(NULL);
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
@@ -3246 +3247 @@
   sprintf(szKey, "%sTargetDir", szPrefix);
   {
-    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
-    PrfWriteProfileString(fmprof, FM3Str, "TargetDir", targetdir);
+    PrfQueryProfileString(fmprof, (CHAR *) FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
+    PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "TargetDir", targetdir);
     SetTargetDir(NULLHANDLE, TRUE);
   }
   size = sizeof(SWP);
   sprintf(szKey, "%sMySizeLastTime", szPrefix);
-  if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swpO, &size) ||
+  if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swpO, &size) ||
       size != sizeof(SWP) || !swp.cx || !swp.cy)
   {
@@ -3259 +3260 @@
   // If restoring internally saved state, forget info
   if (fDeleteState)
-    PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
   WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swpN);
   if (swpN.fl & (SWP_MINIMIZE | SWP_HIDE))
@@ -3267 +3268 @@
   size = sizeof(SWP);
   sprintf(szKey, "%sLastTreePos", szPrefix);
-  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, &size)) {
+  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, &size)) {
     if (fDeleteState)
-      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
     swp.hwnd = hwndTree;
     TransformSwp(&swp, xtrans, ytrans);
@@ -3298 +3299 @@
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   size = sizeof(ULONG);
-  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
+  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, &size)) {
     if (fDeleteState)
-      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
     for (x = numsaves - 1; x >= 0; x--) {
       CHAR *eos = szKey;
@@ -3310 +3311 @@
       strcpy(eos, "Pos");
       size = sizeof(SWP);
-      if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &swp, &size)) {
+      if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &swp, &size)) {
         strcpy(eos, "Dir"); ;
         size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
+        if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) szDir, &size)) {
           // If restoring shutdown state and drive marked no prescan
           // bypass window restore
@@ -3332 +3333 @@
               if (!hwndPPSave) {
                 hwndPPSave = WinCreateWindow(hwndCnr,         // Create a window (used to save default presparams)
-                                             WC_CONTAINER,
+                                             (CHAR *) WC_CONTAINER,
                                              NULL,
                                              CCS_AUTOPOSITION | CCS_MINIICONS |
@@ -3362 +3363 @@
                 strcpy(eos, "Sort");
                 size = sizeof(INT);
-                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->sortFlags,
+                if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str,        szKey, (PVOID) &dcd->sortFlags,
                                         &size)) {
                   if (!dcd->sortFlags)
@@ -3369 +3370 @@
                 size = sizeof(MASK);
                 strcpy(eos, "Filter");
-                if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->mask, &size)) {
+                if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str,        szKey, (PVOID) &dcd->mask, &size)) {
                   if (*dcd->mask.szMask)
                     WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
@@ -3378 +3379 @@
                 if (!noview) {
                   size = sizeof(ULONG);
-                  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &dcd->flWindowAttr,
+                  if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &dcd->flWindowAttr,
                                           &size)) {
 
@@ -4696 +4697 @@
                        GetPString(IDS_WARNINGTEXT),
                        GetPString(IDS_STATEADDFAILEDTEXT), szStateName);      // 15 Apr 07 SHL failed
-                WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+                WinSetWindowText(hwndStatelist, (CHAR *) GetPString(IDS_STATETEXT));
               }
             }
@@ -4704 +4705 @@
                      GetPString(IDS_WARNINGTEXT),
                      GetPString(IDS_STATEDATASAVEFAILED));
-              WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+              WinSetWindowText(hwndStatelist, (CHAR *) GetPString(IDS_STATETEXT));
             }
           }
@@ -4717 +4718 @@
             sprintf(szKey, "%s.NumDirsLastTime", szStateName);
             size = sizeof(ULONG);
-            if (!PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
+            if (!PrfQueryProfileData(fmprof, (CHAR *) FM3Str, szKey, (PVOID) &numsaves, &size)) {
               saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                      GetPString(IDS_WARNINGTEXT),
@@ -4725 +4726 @@
               Runtime_Error(pszSrcFile, __LINE__, NULL);
             else {
-              PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+              PrfWriteProfileData(fmprof, (CHAR *) FM3Str, szKey, NULL, 0L);
               for (x = 0; x < numsaves; x++) {
                 sprintf(szKeyBase, "%s.DirCnr.%lu", szStateName, x);
@@ -4731 +4732 @@
                 size = 0;
                 sprintf(szKey, "%sVersion", szStateName);
-                if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+                if (PrfQueryProfileSize(fmprof, (CHAR *) FM3Str, szKey, &size) && size)
                   RemoveOldCnrSwitches(szStateName, x);
               }
@@ -5052 +5053 @@
     else
       fComments = TRUE;
-    PrfWriteProfileData(fmprof, FM3Str, "Comments", &fComments, sizeof(BOOL));
+    PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "Comments", &fComments, sizeof(BOOL));
     WinSetWindowText((fComments) ? hwndAutoview : hwndAutoMLE, NullStr);
     goto AutoChange;
@@ -5124 +5125 @@
       PostMsg(WinQueryWindow(hwnd, QW_PARENT), WM_UPDATEFRAME,
               MPFROMLONG(FCF_MENU), MPVOID);
-      PrfWriteProfileData(fmprof, FM3Str, "MenuInvisible",
+      PrfWriteProfileData(fmprof, (CHAR *) FM3Str, "MenuInvisible",
                           &MenuInvisible, sizeof(BOOL));
     }
@@ -5398 +5399 @@
             strcpy(lasttoolbar,
                    quicktool[SHORT1FROMMP(mp1) - IDM_QUICKTOOLSTART - 1]);
-            PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
+            PrfWriteProfileString(fmprof, (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
           }
           PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
@@ -5464 +5465 @@
 
     if (!WinCreateWindow(hwndFrame,
-                         WC_BUTTON,
+                         (CHAR *) WC_BUTTON,
                          "I",
                          WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS,
@@ -5496 +5497 @@
 
     hwndTmp = WinCreateWindow(hwndFrame,
-                              WC_BUTTON,
+                              (CHAR *) WC_BUTTON,
                               "#1019",
                               WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
@@ -5509 +5510 @@
 
     hwndTmp = WinCreateWindow(hwndFrame,
-                              WC_BUTTON,
+                              (CHAR *) WC_BUTTON,
                               "#3062",
                               WS_VISIBLE | BS_PUSHBUTTON | BS_NOPOINTERFOCUS |
@@ -5522 +5523 @@
 
     hwndUserlist = WinCreateWindow(hwndFrame,
-                                   WC_COMBOBOX,
+                                   (CHAR *) WC_COMBOBOX,
                                    (PSZ) NULL,
                                    WS_VISIBLE | CBS_DROPDOWN |
@@ -5541 +5542 @@
                 PCSZ_WINCREATEWINDOW);
     hwndCmdlist = WinCreateWindow(hwndFrame,
-                                  WC_COMBOBOX,
+                                  (CHAR *) WC_COMBOBOX,
                                   (PSZ) NULL,
                                   WS_VISIBLE | CBS_DROPDOWN |
@@ -5559 +5560 @@
       Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
                 PCSZ_WINCREATEWINDOW);
-    WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
+    WinSetWindowText(hwndCmdlist, (CHAR *) GetPString(IDS_COMMANDSTEXT));
     hwndStatelist = WinCreateWindow(hwndFrame,
-                                    WC_COMBOBOX,
+                                    (CHAR *) WC_COMBOBOX,
                                     (PSZ) NULL,
                                     WS_VISIBLE | CBS_DROPDOWN |
@@ -5581 +5582 @@
 
     hwndDrivelist = WinCreateWindow(hwndFrame,
-                                    WC_COMBOBOX,
+                                    (CHAR *) WC_COMBOBOX,
                                     (PSZ) NULL,
                                     //WS_VISIBLE |
@@ -5602 +5603 @@
                   NULL, NULL, NULL, FNT_10SYSTEMMONOTEXT);
     hwndButtonlist = WinCreateWindow(hwndFrame,
-                                     WC_COMBOBOX,
+                                     (CHAR *) WC_COMBOBOX,
                                      (PSZ) NULL,
                                      WS_VISIBLE | CBS_DROPDOWN |
@@ -5706 +5707 @@
 
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, FM3Str, "MenuInvisible", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "MenuInvisible", &temp, &size) &&
         size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, FM3Str, "FreeTree", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "FreeTree", &temp, &size) &&
         size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
     size = sizeof(BOOL);
-    if (PrfQueryProfileData(fmprof, FM3Str, "AutoTile", &temp, &size) &&
+    if (PrfQueryProfileData(fmprof, (CHAR *) FM3Str, "AutoTile", &temp, &size) &&
         size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
@@ -5745 +5746 @@
         if (!fSaveState ||
             !PrfQueryProfileData(fmprof,
-                                 FM3Str,
+                                 (CHAR *) FM3Str,
                                  "LastTreePos",
                                  &swp, &size) || size != sizeof(SWP)) {
@@ -5755 +5756 @@
           size = sizeof(ratio);
           if (!PrfQueryProfileData(fmprof,
-                                   FM3Str,
+                                   (CHAR *) FM3Str,
                                    "TreeWindowRatio",
                                    (PVOID) & ratio,
@@ -5946 +5947 @@
       WinQueryWindowPos(WinQueryWindow(hwnd, QW_PARENT), &swp);
       if (!(swp.fl & (SWP_HIDE | SWP_MINIMIZE))) {
-        WinStoreWindowPos(FM2Str,
+        WinStoreWindowPos((CHAR *) FM2Str,
                           "MainWindowPos", WinQueryWindow(hwnd, QW_PARENT));
         if (!fNoSaveState && fSaveState)
@@ -6084 +6085 @@
         priority_bumped();
       }
-      WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
+      WinSetWindowText(hwndButtonlist, (CHAR *) GetPString(IDS_TOOLBARTEXT));
     }
     return 0;
@@ -6191 +6192 @@
                  MPFROM2SHORT(0, 0),
                  MPFROMP(GetPString(IDS_NEWDIRECTORYTEXT)));
-      WinSetWindowText(hwndUserlist, GetPString(IDS_COMMONDIRTEXT));
+      WinSetWindowText(hwndUserlist, (CHAR *) GetPString(IDS_COMMONDIRTEXT));
     }
     return 0;
@@ -6265 +6266 @@
                   strcpy(path, pFM2SaveDirectory);
                 if (!PMMkDir(hwnd, path, TRUE)) {
-                  WinSetWindowText(hwndUL, GetPString(IDS_COMMONDIRTEXT));
+                  WinSetWindowText(hwndUL, (CHAR *) GetPString(IDS_COMMONDIRTEXT));
                   break;
                 }
@@ -6295 +6296 @@
               load_tools(path);
               PrfWriteProfileString(fmprof,
-                                    FM3Str, "LastToolbar", lasttoolbar);
+                                    (CHAR *) FM3Str, "LastToolbar", lasttoolbar);
               PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
-              WinSetWindowText(hwndButtonlist, GetPString(IDS_TOOLBARTEXT));
+              WinSetWindowText(hwndButtonlist, (CHAR *) GetPString(IDS_TOOLBARTEXT));
             }
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
@@ -6308 +6309 @@
               sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
               if (!PrfQueryProfileData(fmprof,
-                                       FM3Str,
+                                       (CHAR *) FM3Str,
                                        szKey,
                                        (PVOID)&numsaves,
@@ -6366 +6367 @@
                            MPVOID);
               }
-                WinSetWindowText(hwndCmdlist, GetPString(IDS_COMMANDSTEXT));
+                WinSetWindowText(hwndCmdlist, (CHAR *) GetPString(IDS_COMMANDSTEXT));
             }
           }