Changeset 1394 for trunk/dll/mainwnd.c

Timestamp:

Feb 5, 2009, 5:17:25 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 340: Convert GetPString to use STRINGTABLE.

Drop fm3dll.str and mkstr.exe from makefiles and wpi builders

Convert many functions to expect PCSZ arguments.
Correct walk, compare and dirsizes dialog setups to ignore saved dialog size
Drop copyright.c logic from makefile

File:

• trunk/dll/mainwnd.c (modified) (20 diffs)

trunk/dll/mainwnd.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   11 Jun 02 SHL Drop obsolete xor code
@@ -77 +77 @@
   30 Dec 08 GKY Initialize tool bar background color to palegray not black
   03 Jan 09 GKY Check for system that is protectonly to gray out Dos/Win command lines and prevent
-                Dos/Win programs from being inserted into the execute dialog with message why.
+                Dos/Win programs from being inserted into the execute dialog with message why.
   11 Jan 09 GKY Replace font names in the string file with global set at compile in init.c
 
@@ -942 +942 @@
 }
 
-void BubbleHelp(HWND hwnd, BOOL other, BOOL drive, BOOL above, char *help)
+void BubbleHelp(HWND hwnd, BOOL other, BOOL drive, BOOL above, PCSZ help)
 {
   if (help && *help &&
@@ -954 +954 @@
 }
 
-VOID MakeBubble(HWND hwnd, BOOL above, CHAR * help)
+VOID MakeBubble(HWND hwnd, BOOL above, PCSZ help)
 {
   if (!hwnd || !help || !*help)
@@ -997 +997 @@
     POINTL aptl[TXTBOX_COUNT], ptl, tptl;
     LONG lxScreen, sx, sy, extra = 0, lyScreen;
-    char *p, *pp, *wp;
+    CHAR *p, *pp, *wp;
     SWP swp;
 
@@ -1007 +1007 @@
     SetPresParams(hwndBubble, NULL, NULL, NULL, FNT_8HELVETICA);
     hps = WinGetPS(hwndBubble);
-    p = help;
+    // 03 Feb 09 SHL fixme to not overwrite?
+    p = (PSZ)help;
     tptl.x = tptl.y = 0;
     while (p && *p) {
@@ -1228 +1229 @@
         break;
       default:
-        //fixme to allow user to change presparams 1-10-09 GKY
+        //fixme to allow user to change presparams 1-10-09 GKY
         SetPresParams(hwnd,
                       &RGBGREY,
@@ -1322 +1323 @@
         id = (USHORT) WinDlgBox(HWND_DESKTOP, hwnd,
                                 PickToolProc, FM3ModHandle,
-                                PICKBTN_FRAME, GetPString(IDS_HIDETEXT));
+                                PICKBTN_FRAME, (PSZ)GetPString(IDS_HIDETEXT));
       if (id) {
         tool = find_tool(id);
@@ -1348 +1349 @@
         id =
           (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
-                             PICKBTN_FRAME, GetPString(IDS_DELETETEXT));
+                             PICKBTN_FRAME, (PSZ)GetPString(IDS_DELETETEXT));
       if (id)
         PostMsg(WinQueryWindow(hwnd, QW_PARENT), UM_SETUP,
@@ -1361 +1362 @@
         id =
           (USHORT) WinDlgBox(HWND_DESKTOP, hwnd, PickToolProc, FM3ModHandle,
-                             PICKBTN_FRAME, GetPString(IDS_EDITTEXT));
+                             PICKBTN_FRAME, (PSZ)GetPString(IDS_EDITTEXT));
       if (id) {
         tool = find_tool(id);
@@ -2275 +2276 @@
             Win_Error2(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
                        IDS_WINCREATEWINDOW);
-          else {
-            //fixme to allow user to change presparams 1-10-09 GKY
+          else {
+            //fixme to allow user to change presparams 1-10-09 GKY
             SetPresParams(hwndB,
                           &RGBGREY,
@@ -2404 +2405 @@
     {
       USHORT id = WinQueryWindowUShort(hwnd, QWS_ID);
-      char *s = NULL;
+      PCSZ s = NULL;
 
       if (fOtherHelp) {
@@ -2642 +2643 @@
       hps = WinBeginPaint(hwnd, (HPS)0, NULL);
       if (hps) {
-        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
-        if (!WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
-                               sizeof(lColor), &lColor, 0))
-          lColor = 0x00CCCCCCL; //Palegray
+        GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
+        if (!WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
+                               sizeof(lColor), &lColor, 0))
+          lColor = 0x00CCCCCCL; //Palegray
         WinQueryWindowRect(hwnd, &rcl);
         WinFillRect(hps, &rcl, lColor);
@@ -2923 +2924 @@
  */
 
-INT SaveDirCnrState(HWND hwndClient, PSZ pszStateName)
+INT SaveDirCnrState(HWND hwndClient, PCSZ pszStateName)
 {
   HENUM henum;
@@ -3426 +3427 @@
           if (hwndDir) {
             hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
-            if (hwndC) {
+            if (hwndC) {
               HWND hwndCnr = WinWindowFromID(hwndC, DIR_CNR);
               if (!hwndPPSave) {
@@ -3502 +3503 @@
                                    MPFROMLONG(sizeof(CNRINFO)))) {
                       cnri.flWindowAttr = dcd->flWindowAttr;
-                      WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
-                                 CM_SETCNRINFO,
-                                 MPFROMP(&cnri),
-                                 MPFROMLONG(CMA_FLWINDOWATTR));
+                      WinSendMsg(WinWindowFromID(hwndC, DIR_CNR),
+                                 CM_SETCNRINFO,
+                                 MPFROMP(&cnri),
+                                 MPFROMLONG(CMA_FLWINDOWATTR));
                     }
                   }
@@ -3513 +3514 @@
                 if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
                   WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
-              }
+              }
             }
             fRestored = TRUE;
@@ -5625 +5626 @@
     else {
       WinSubclassWindow(WinWindowFromID(hwndFrame, IDM_IDEALSIZE),
-                        IdealButtonProc);
+                        IdealButtonProc);
       //fixme to allow user to change presparams 1-10-09 GKY
       SetPresParams(WinWindowFromID(hwndFrame,
@@ -5715 +5716 @@
                                     WC_COMBOBOX,
                                     (PSZ) NULL,
-                                    //WS_VISIBLE |
-                                    CBS_DROPDOWN,
+                                    //WS_VISIBLE |
+                                    CBS_DROPDOWN,
                                     (swp.x +
                                      WinQuerySysValue(HWND_DESKTOP,
@@ -5921 +5922 @@
     /* start remaining child windows */
     if (!fNoSaveState && fSaveState) {
-      PSZ pszStatename = GetPString(IDS_SHUTDOWNSTATE);
+      PCSZ pszStatename = GetPString(IDS_SHUTDOWNSTATE);
       PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMP(pszStatename), MPVOID);
       if (!add_setup(pszStatename))