Changeset 232

Timestamp:

Dec 5, 2002, 9:36:28 PM (23 years ago)

Author:

umoeller

Message:

New toolbar control.

Location:

trunk

Files:

• include/helpers/comctl.h (modified) (3 diffs)
• include/helpers/dialog.h (modified) (1 diff)
• include/helpers/gpih.h (modified) (1 diff)
• include/helpers/standards.h (modified) (1 diff)
• include/helpers/winh.h (modified) (8 diffs)
• src/helpers/_call_filedlg.c (modified) (7 diffs)
• src/helpers/_test_dialog.c (modified) (1 diff)
• src/helpers/animate.c (modified) (2 diffs)
• src/helpers/cctl_chart.c (modified) (1 diff)
• src/helpers/cctl_combo.c (modified) (1 diff)
• src/helpers/cctl_toolbar.c (added)
• src/helpers/cctl_tooltip.c (modified) (6 diffs)
• src/helpers/cctl_xframe.c (added)
• src/helpers/cnrh.c (modified) (1 diff)
• src/helpers/comctl.c (modified) (9 diffs)
• src/helpers/dialog.c (modified) (2 diffs)
• src/helpers/except.c (modified) (1 diff)
• src/helpers/gpih.c (modified) (21 diffs)
• src/helpers/helpers_pre.in (modified) (1 diff)
• src/helpers/linklist.c (modified) (1 diff)
• src/helpers/makefile (modified) (2 diffs)
• src/helpers/winh.c (modified) (31 diffs)

trunk/include/helpers/comctl.h

@@ -39 +39 @@
     /* ******************************************************************
      *
+     *   Shared stuff
+     *
+     ********************************************************************/
+
+    MRESULT ctlSendWmControl(HWND hwndControl,
+                             USHORT usCode,
+                             MPARAM mp2);
+
+    BOOL ctlPostWmControl(HWND hwndControl,
+                          USHORT usCode,
+                          MPARAM mp2);
+
+    /*
+     *@@ SYSCOLORSET:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _SYSCOLORSET
+    {
+        BOOL    fInheritPP;
+
+        LONG    lBackIndex,
+                lForeIndex;
+    } SYSCOLORSET, *PSYSCOLORSET;
+
+    /*
+     *@@ DEFWINDOWDATA:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _DEFWINDATA
+    {
+        HWND        hwnd;
+        HAB         hab;
+
+        PFNWP       pDefWindowProc;
+        const SYSCOLORSET *pSysColorSet;
+
+        LONG        lcolBackground,
+                    lcolForeground;
+
+        SIZEL       szlWin;             // current window dimensions
+
+        PSZ         pszText;            // window text or NULL
+
+    } DEFWINDATA, *PDEFWINDATA;
+
+    VOID ctlInitDWD(HWND hwnd,
+                    MPARAM mp2,
+                    PDEFWINDATA pdwd,
+                    PFNWP pDefWindowProc,
+                    const SYSCOLORSET *pSysColorSet);
+
+    VOID ctlRefreshColors(PDEFWINDATA pdwd);
+
+    MRESULT ctlDefWindowProc(PDEFWINDATA pdwd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+    /* ******************************************************************
+     *
      *   "Separator line" control
      *
      ********************************************************************/
 
-    #define WC_SEPARATORLINE        "XwpSeparatorLine"
+    #define WC_CCTL_SEPARATOR       "ComctlSeparator"
+
+    #define SEPS_HORIZONTAL         0x0000
+    #define SEPS_VERTICAL           0x0001
 
     BOOL ctlRegisterSeparatorLine(HAB hab);
-
-    /* ******************************************************************
-     *
-     *   "XButton" control
-     *
-     ********************************************************************/
-
-    /*
-     *@@ XBUTTONDATA:
-     *      paint data for ctlPaintXButton.
-     *
-     *@@added V0.9.13 (2001-06-21) [umoeller]
-     */
-
-    typedef struct _XBUTTONDATA
-    {
-        RECTL       rcl;                // size of button (in presentation space
-                                        // coordinates); exclusive!
-
-        ULONG       cxIconOrBitmap,     // icon size
-                    cyIconOrBitmap;
-
-        LONG        lcol3DDark,         // lo-3D color
-                    lcol3DLight,        // hi-3D color
-                    lMiddle;            // color for center (button background)
-
-        HPOINTER    hptr;               // icon to paint or NULLHANDLE
-
-    } XBUTTONDATA, *PXBUTTONDATA;
-
-    #define XBF_FLAT                0x00000001
-    #define XBF_BITMAP              0x00000002
-
-    #define XBF_PRESSED             0x00010000
-    #define XBF_BACKGROUND          0x00020000
-    #define XBF_INUSE               0x00040000
-
-    VOID ctlPaintXButton(HPS hps,
-                         ULONG fl,
-                         PXBUTTONDATA pxbd);
 
     /* ******************************************************************
@@ -670 +694 @@
      ********************************************************************/
 
+    #define WC_CCTL_TOOLTIP         "ComctlTooltipClass"
+                    // define identifier changed V1.0.1 (2002-11-30) [umoeller]
+
     // addt'l tooltip window styles: use lower 16 bits
     #define TTS_ALWAYSTIP           0x0001
@@ -927 +954 @@
     #define TTN_POP             1002
 
-    #define COMCTL_TOOLTIP_CLASS    "ComctlTooltipClass"
-
     BOOL ctlRegisterTooltip(HAB hab);
 
     MRESULT EXPENTRY ctl_fnwpTooltip(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+    /* ******************************************************************
+     *
+     *   "Tool bar button" control
+     *
+     ********************************************************************/
+
+    #define WC_CCTL_TOOLBAR         "ComctlToolbarClass"
+
+    // toolbar button styles: use lower 16 bits
+    #define TBBS_BIGICON            0x0001
+    #define TBBS_MINIICON           0x0002
+    #define TBBS_BITMAP             0x0004
+    #define TBBS_TEXT               0x0008
+
+    #define TBBS_CHECK              0x0010
+    #define TBBS_RADIO              0x0020
+    #define TBBS_CHECKINITIAL       0x0040
+
+    #define TBBS_AUTORESIZE         0x0100
+    #define TBBS_HILITE             0x0200
+    #define TBBS_FLAT               0x0400
+    #define TBBS_DROPMNEMONIC       0x0800
+
+    #define TBBS_COMMAND            0x1000
+    #define TBBS_SYSCOMMAND         0x2000
+
+    // tool bar button messages
+
+    #define TBBM_CHECK              (WM_USER + 1)
+
+    #define TBBM_QUERYCHECK         (WM_USER + 2)
+
+    /*
+     *@@ XBUTTONDATA:
+     *      paint data for ctlPaintTBButton.
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    typedef struct _XBUTTONDATA
+    {
+        DEFWINDATA  dwd;              // color for center (button background)
+
+        SIZEL       szlIconOrBitmap;
+
+        HPOINTER    hptr;               // icon to paint or NULLHANDLE
+
+        // BOOL        fPaintButtonSunk;
+
+    } XBUTTONDATA, *PXBUTTONDATA;
+
+    /*
+     *@@ XBUTTONSTATE:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _XBUTTONSTATE
+    {
+        BOOL        fMB1Pressed;            // if TRUE, mouse button is currently pressed
+        BOOL        fIgnoreMB1Up;
+        BOOL        fPaintButtonSunk;       // if TRUE, button control is to be painted "down"
+        BOOL        fMouseCaptured;         // if TRUE, mouse is currently captured
+        BOOL        fMouseOver;
+    } XBUTTONSTATE, *PXBUTTONSTATE;
+
+    // the following styles are only for painting and not stored
+    #define TBBS_BACKGROUND          0x00010000
+    #define TBBS_INUSE               0x00020000
+
+    VOID ctlPaintTBButton(HPS hps,
+                          ULONG fl,
+                          PXBUTTONDATA pbd,
+                          PXBUTTONSTATE pbs);
+
+    MRESULT EXPENTRY ctl_fnwpToolbarButton(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+    /* ******************************************************************
+     *
+     *   "Tool bar" control
+     *
+     ********************************************************************/
+
+    #define WC_CCTL_TBBUTTON        "ComCtlToolbarButton"
+                    // define identifier changed V1.0.1 (2002-11-30) [umoeller]
+
+    // tool bar window styles: use lower 16 bits
+    #define TBS_TOOLTIPS            0x0001
+    #define TBS_AUTORESIZE          0x0002
+
+    /*
+     *@@ TOOLBARCONTROL:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _TOOLBARCONTROL
+    {
+        PCSZ        pcszClass;
+        PCSZ        pcszTitle;
+        ULONG       flStyle;
+        ULONG       id;
+        LONG        cx,
+                    cy;
+    } TOOLBARCONTROL, *PTOOLBARCONTROL;
+
+    /*
+     *@@ TOOLBARCDATA:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _TOOLBARCDATA
+    {
+        USHORT      cb;
+
+        HWND        hwndControlsOwner;
+
+        ULONG       cControls;
+        PTOOLBARCONTROL patbc;
+
+    } TOOLBARCDATA, *PTOOLBARCDATA;
+
+    #define TBM_ADDCONTROLS         (WM_USER + 1)
+
+    /*
+     *@@ TBN_RESIZED:
+     *      notification code posted with WM_CONTROL when
+     *      a tool bar has resized itself, e.g. because
+     *      controls were added or removed.
+     *
+     *      Parameters:
+     *
+     *      --  SHORT1FROMMP(mp1): ID of the tool bar control.
+     *
+     *      --  SHORT2FROMMP(mp1): TBN_RESIZED code.
+     *
+     *      --  mp2: unused.
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    #define TBN_RESIZED             1
+
+    MRESULT EXPENTRY ctl_fnwpToolbar(HWND hwndToolbar, ULONG msg, MPARAM mp1, MPARAM mp2);
+
+    BOOL ctlRegisterToolbar(HAB hab);
+
+    HWND ctlCreateToolBar(HWND hwndParent,
+                          HWND hwndOwner,
+                          ULONG flStyle,
+                          HWND hwndControlsOwner,
+                          ULONG cControls,
+                          PTOOLBARCONTROL patbc);
+
+    /* ******************************************************************
+     *
+     *   Extended frame
+     *
+     ********************************************************************/
+
+    #define FID_TOOLBAR             0x8101
+    #define FID_STATUSBAR           0x8100
+
+    /*
+     *@@ EXTFRAMECDATA:
+     *
+     *@@added V0.9.16 (2001-09-29) [umoeller]
+     */
+
+    typedef struct _EXTFRAMECDATA
+    {
+        PSWP        pswpFrame;          // in: frame wnd pos (can be NULL)
+        ULONG       flFrame;            // in: standard FCF_* flags
+        ULONG       flExtFrame;         // in: XFCF_* flags
+                #define XFCF_STATUSBAR          0x0001
+                            // create a status bar for the frame
+                #define XFCF_TOOLBAR            0x0002
+                            // create a tool bar for the frame
+                #define XFCF_FORCETBOWNER       0x0004
+                            // if set, we will enfore that all toolbar controls have
+                            // the main frame as their owner, otherwise they'll have
+                            // the frame's client, if one exists
+        ULONG       flStyleFrame;       // in: frame style (WS_* flags, e.g. WS_VISIBLE | WS_ANIMATE)
+        PCSZ        pcszFrameTitle;     // in: frame title (title bar)
+        ULONG       ulResourcesID;      // in: according to FCF_* flags
+
+        PCSZ        pcszClassClient;    // in: client class name or NULL for no client
+        ULONG       flStyleClient;      // in: client style (WS_* flags, e.g. WS_VISIBLE)
+
+        ULONG       ulID;               // in: frame window ID
+        PVOID       pClientCtlData;     // in: pCtlData structure pointer for client
+
+        HINI        hiniSaveWinPos;     // in: HINI for saving window position or NULLHANDLE
+        PCSZ        pcszIniApp,
+                    pcszIniKey;
+
+        ULONG       cTBControls;        // in: count of tool bar controls in paTBControls or 0
+        PTOOLBARCONTROL paTBControls;
+
+    } EXTFRAMECDATA, *PEXTFRAMECDATA;
+
+    /*
+     *@@ XFRAMECONTROLS:
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    typedef struct _XFRAMECONTROLS
+    {
+        PFNWP           pfnwpOrig;      // original frame wnd proc from subclassing
+
+        HWND            hwndToolBar,
+                        hwndStatusBar;
+
+        LONG            lToolBarHeight,
+                        lStatusBarHeight;
+
+    } XFRAMECONTROLS, *PXFRAMECONTROLS;
+
+    /*
+     *@@ EXTFRAMEDATA:
+     *
+     *@@added V0.9.16 (2001-09-29) [umoeller]
+     */
+
+    typedef struct _EXTFRAMEDATA
+    {
+        EXTFRAMECDATA   CData;
+
+        XFRAMECONTROLS  xfc;
+
+        PVOID           pvUser;         // more data for user (e.g. for additional subclassing)
+
+    } EXTFRAMEDATA, *PEXTFRAMEDATA;
+
+    MRESULT ctlFormatExtFrame(HWND hwndFrame,
+                              PXFRAMECONTROLS pxfc,
+                              MPARAM mp1,
+                              MPARAM mp2);
+
+    VOID ctlCalcExtFrameRect(MPARAM mp1,
+                             MPARAM mp2,
+                             LONG lStatusBarHeight);
+
+    HWND ctlCreateStatusBar(HWND hwndFrame,
+                            HWND hwndOwner,
+                            const char *pcszText,
+                            const char *pcszFont,
+                            LONG lColor);
+
+    HWND ctlCreateStdWindow(PEXTFRAMECDATA pData,
+                            PHWND phwndClient);
 
     /* ******************************************************************

trunk/include/helpers/dialog.h

@@ -485 +485 @@
 
     // the following require #include helpers\comctl.h
-    #define CONTROLDEF_SEPARATORLINE(id, cx, cy) { WC_SEPARATORLINE, NULL, \
+    #define CONTROLDEF_SEPARATORLINE(id, cx, cy) { WC_CCTL_SEPARATOR, NULL, \
             WS_VISIBLE, \
             id, NULL, {cx, cy}, COMMON_SPACING }

trunk/include/helpers/gpih.h

@@ -44 +44 @@
     VOID gpihInflateRect(PRECTL prcl,
                          LONG l);
+
+    VOID gpihCopyRectIncl(PRECTL prclGpi,
+                          PRECTL prclWin);
 
     /* ******************************************************************

trunk/include/helpers/standards.h

@@ -116 +116 @@
     #define STRINGORNULL(s) (s) ? (s) : "NULL"
 
+    /*
+     *@@ STOREIFMAX:
+     *      helpful macro to store a in b if it is
+     *      larger than b.
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    #define STOREIFMAX(a, b) if ((a) > (b)) { b = a; }
+
 #endif
 

trunk/include/helpers/winh.h

@@ -71 +71 @@
     #define BM_INDETERMINATE       2   // for tri-state checkboxes: indeterminate
 
+    // these undocumented msgs are posted whenever the mouse
+    // enters or leaves a window V1.0.1 (2002-11-30) [umoeller]
+    #ifndef WM_MOUSEENTER
+        #define WM_MOUSEENTER   0x041E
+        #define WM_MOUSELEAVE   0x041F
+    #endif
+
     /* ******************************************************************
      *
@@ -172 +179 @@
      ********************************************************************/
 
+    extern LONG G_cxScreen,
+                G_cyScreen,
+                G_cxIcon,
+                G_cyIcon,
+                G_lcol3DDark,
+                G_lcol3DLight;
+
+    VOID XWPENTRY winhInitGlobals(VOID);
+
     ULONG XWPENTRY winhQueryWindowStyle(HWND hwnd);
 
@@ -184 +200 @@
      ********************************************************************/
 
+    // now including all this only with INCL_WINMENUS
+    // V1.0.1 (2002-11-30) [umoeller]
     #ifdef INCL_WINMENUS
+
+        #ifndef MM_QUERYITEMBYPOS16
+            #define MM_QUERYITEMBYPOS16 0x01f3
+            // this undocumented message is sent to retrieve the definition
+            // of a menu item by its position.  This message will only query
+            // an item in the specified menu.
+            //
+            // Parameters:
+            //     SHORT1FROMMP(mp1) = position of item in the menu
+            //     SHORT2FROMMP(mp1) = reserved, set to 0
+            //     mp2 = (16 bit pointer) points to a MENUITEM structure
+            //           to be filled in.
+        #endif
+        #ifndef MAKE_16BIT_POINTER
+            #define MAKE_16BIT_POINTER(p) \
+                    ((PVOID)MAKEULONG(LOUSHORT(p),(HIUSHORT(p) << 3) | 7))
+            // converts a flat 32bit pointer to its 16bit offset/selector form
+        #endif
+
         BOOL XWPENTRY winhQueryMenuItem(HWND hwndMenu,
                                         USHORT usItemID,
                                         BOOL fSearchSubmenus,
                                         PMENUITEM pmi);
+
+        HWND XWPENTRY winhQuerySubmenu(HWND hMenu, SHORT sID);
+
+        /*
+         * winhCreateEmptyMenu:
+         *      this macro creates an empty menu, which can
+         *      be used with winhInsertMenuItem etc. later.
+         *      Useful for creating popup menus on the fly.
+         *      Note that even though HWND_DESKTOP is specified
+         *      here as both the parent and the owner, the
+         *      actual owner and parent are specified later
+         *      with WinPopupMenu.
+         */
+
+        #define winhCreateEmptyMenu()                                   \
+        WinCreateWindow(HWND_DESKTOP, WC_MENU, "", 0, 0, 0, 0, 0,       \
+                        HWND_DESKTOP, HWND_TOP, 0, 0, 0)
+
+        SHORT XWPENTRY winhInsertMenuItem(HWND hwndMenu,
+                                          SHORT iPosition,
+                                          SHORT sItemId,
+                                          const char *pcszItemTitle,
+                                          SHORT afStyle,
+                                          SHORT afAttr);
+        typedef SHORT XWPENTRY WINHINSERTMENUITEM(HWND hwndMenu,
+                                                  SHORT iPosition,
+                                                  SHORT sItemId,
+                                                  const char *pcszItemTitle,
+                                                  SHORT afStyle,
+                                                  SHORT afAttr);
+        typedef WINHINSERTMENUITEM *PWINHINSERTMENUITEM;
+
+        HWND XWPENTRY winhInsertSubmenu(HWND hwndMenu,
+                                        ULONG iPosition,
+                                        SHORT sMenuId,
+                                        const char *pcszSubmenuTitle,
+                                        USHORT afMenuStyle,
+                                        SHORT sItemId,
+                                        const char *pcszItemTitle,
+                                        USHORT afItemStyle,
+                                        USHORT afAttribute);
+        typedef HWND XWPENTRY WINHINSERTSUBMENU(HWND hwndMenu,
+                                                ULONG iPosition,
+                                                SHORT sMenuId,
+                                                const char *pcszSubmenuTitle,
+                                                USHORT afMenuStyle,
+                                                SHORT sItemId,
+                                                const char *pcszItemTitle,
+                                                USHORT afItemStyle,
+                                                USHORT afAttribute);
+        typedef WINHINSERTSUBMENU *PWINHINSERTSUBMENU;
+
+        BOOL XWPENTRY winhSetMenuCondCascade(HWND hwndMenu,
+                                             LONG lDefaultItem);
+
+        /*
+         *@@ winhRemoveMenuItem:
+         *      removes a menu item (SHORT) from the
+         *      given menu (HWND). Returns the no. of
+         *      remaining menu items (SHORT).
+         *
+         *      This works for whole submenus too.
+         */
+
+        #define winhRemoveMenuItem(hwndMenu, sItemID) \
+                SHORT1FROMMR(WinSendMsg(hwndMenu, MM_REMOVEITEM, MPFROM2SHORT(sItemID, FALSE), 0))
+
+        BOOL XWPENTRY winhRemoveMenuItems(HWND hwndMenu,
+                                          const SHORT *asItemIDs,
+                                          ULONG cItemIDs);
+
+        /*
+         *@@ winhDeleteMenuItem:
+         *      deleted a menu item (SHORT) from the
+         *      given menu (HWND). Returns the no. of
+         *      remaining menu items (SHORT).
+         *
+         *      As opposed to MM_REMOVEITEM, MM_DELETEITEM
+         *      frees submenus and bitmaps also.
+         *
+         *      This works for whole submenus too.
+         */
+
+        #define winhDeleteMenuItem(hwndMenu, sItemId) \
+                (SHORT)WinSendMsg(hwndMenu, MM_DELETEITEM, MPFROM2SHORT(sItemId, FALSE), 0)
+
+        SHORT XWPENTRY winhInsertMenuSeparator(HWND hMenu,
+                                               SHORT iPosition,
+                                               SHORT sId);
+
+        #define COPYFL_STRIPTABS            0x0001
+
+        BOOL XWPENTRY winhCopyMenuItem2(HWND hmenuTarget,
+                                        HWND hmenuSource,
+                                        USHORT usID,
+                                        SHORT sTargetPosition,
+                                        ULONG fl);
+
+        BOOL XWPENTRY winhCopyMenuItem(HWND hmenuTarget,
+                                       HWND hmenuSource,
+                                       USHORT usID,
+                                       SHORT sTargetPosition);
+        typedef BOOL XWPENTRY WINHCOPYMENUITEM(HWND hmenuTarget,
+                                       HWND hmenuSource,
+                                       USHORT usID,
+                                       SHORT sTargetPosition);
+        typedef WINHCOPYMENUITEM *PWINHCOPYMENUITEM;
+
+        HWND XWPENTRY winhMergeIntoSubMenu(HWND hmenuTarget,
+                                           SHORT sTargetPosition,
+                                           const char *pcszTitle,
+                                           SHORT sID,
+                                           HWND hmenuSource);
+        typedef HWND XWPENTRY WINHMERGEINTOSUBMENU(HWND hmenuTarget,
+                                           SHORT sTargetPosition,
+                                           const char *pcszTitle,
+                                           SHORT sID,
+                                           HWND hmenuSource);
+        typedef WINHMERGEINTOSUBMENU *PWINHMERGEINTOSUBMENU;
+
+        ULONG XWPENTRY winhMergeMenus(HWND hmenuTarget,
+                                      SHORT sTargetPosition,
+                                      HWND hmenuSource,
+                                      ULONG fl);
+        typedef ULONG XWPENTRY WINHMERGEMENUS(HWND hmenuTarget,
+                                              SHORT sTargetPosition,
+                                              HWND hmenuSource,
+                                              ULONG fl);
+        typedef WINHMERGEMENUS *PWINHMERGEMENUS;
+
+        ULONG XWPENTRY winhClearMenu(HWND hwndMenu);
+
+        PSZ XWPENTRY winhQueryMenuItemText(HWND hwndMenu,
+                                           USHORT usItemID);
+
+        BOOL XWPENTRY winhAppend2MenuItemText(HWND hwndMenu,
+                                              USHORT usItemID,
+                                              const char *pcszAppend,
+                                              BOOL fTab);
+
+        VOID XWPENTRY winhMenuRemoveEllipse(HWND hwndMenu,
+                                            USHORT usItemId);
+
+        SHORT XWPENTRY winhQueryItemUnderMouse(HWND hwndMenu, POINTL *pptlMouse, RECTL *prtlItem);
+
     #endif
-
-    HWND XWPENTRY winhQuerySubmenu(HWND hMenu, SHORT sID);
-
-    /*
-     * winhCreateEmptyMenu:
-     *      this macro creates an empty menu, which can
-     *      be used with winhInsertMenuItem etc. later.
-     *      Useful for creating popup menus on the fly.
-     *      Note that even though HWND_DESKTOP is specified
-     *      here as both the parent and the owner, the
-     *      actual owner and parent are specified later
-     *      with WinPopupMenu.
-     */
-
-    #define winhCreateEmptyMenu()                                   \
-    WinCreateWindow(HWND_DESKTOP, WC_MENU, "", 0, 0, 0, 0, 0,       \
-                    HWND_DESKTOP, HWND_TOP, 0, 0, 0)
-
-    SHORT XWPENTRY winhInsertMenuItem(HWND hwndMenu,
-                                      SHORT iPosition,
-                                      SHORT sItemId,
-                                      const char *pcszItemTitle,
-                                      SHORT afStyle,
-                                      SHORT afAttr);
-    typedef SHORT XWPENTRY WINHINSERTMENUITEM(HWND hwndMenu,
-                                              SHORT iPosition,
-                                              SHORT sItemId,
-                                              const char *pcszItemTitle,
-                                              SHORT afStyle,
-                                              SHORT afAttr);
-    typedef WINHINSERTMENUITEM *PWINHINSERTMENUITEM;
-
-    HWND XWPENTRY winhInsertSubmenu(HWND hwndMenu,
-                                    ULONG iPosition,
-                                    SHORT sMenuId,
-                                    const char *pcszSubmenuTitle,
-                                    USHORT afMenuStyle,
-                                    SHORT sItemId,
-                                    const char *pcszItemTitle,
-                                    USHORT afItemStyle,
-                                    USHORT afAttribute);
-    typedef HWND XWPENTRY WINHINSERTSUBMENU(HWND hwndMenu,
-                                            ULONG iPosition,
-                                            SHORT sMenuId,
-                                            const char *pcszSubmenuTitle,
-                                            USHORT afMenuStyle,
-                                            SHORT sItemId,
-                                            const char *pcszItemTitle,
-                                            USHORT afItemStyle,
-                                            USHORT afAttribute);
-    typedef WINHINSERTSUBMENU *PWINHINSERTSUBMENU;
-
-    BOOL XWPENTRY winhSetMenuCondCascade(HWND hwndMenu,
-                                         LONG lDefaultItem);
-
-    /*
-     *@@ winhRemoveMenuItem:
-     *      removes a menu item (SHORT) from the
-     *      given menu (HWND). Returns the no. of
-     *      remaining menu items (SHORT).
-     *
-     *      This works for whole submenus too.
-     */
-
-    #define winhRemoveMenuItem(hwndMenu, sItemID) \
-            SHORT1FROMMR(WinSendMsg(hwndMenu, MM_REMOVEITEM, MPFROM2SHORT(sItemID, FALSE), 0))
-
-    BOOL XWPENTRY winhRemoveMenuItems(HWND hwndMenu,
-                                      const SHORT *asItemIDs,
-                                      ULONG cItemIDs);
-
-    /*
-     *@@ winhDeleteMenuItem:
-     *      deleted a menu item (SHORT) from the
-     *      given menu (HWND). Returns the no. of
-     *      remaining menu items (SHORT).
-     *
-     *      As opposed to MM_REMOVEITEM, MM_DELETEITEM
-     *      frees submenus and bitmaps also.
-     *
-     *      This works for whole submenus too.
-     */
-
-    #define winhDeleteMenuItem(hwndMenu, sItemId) \
-            (SHORT)WinSendMsg(hwndMenu, MM_DELETEITEM, MPFROM2SHORT(sItemId, FALSE), 0)
-
-    SHORT XWPENTRY winhInsertMenuSeparator(HWND hMenu,
-                                           SHORT iPosition,
-                                           SHORT sId);
-
-    #define COPYFL_STRIPTABS            0x0001
-
-    BOOL XWPENTRY winhCopyMenuItem2(HWND hmenuTarget,
-                                    HWND hmenuSource,
-                                    USHORT usID,
-                                    SHORT sTargetPosition,
-                                    ULONG fl);
-
-    BOOL XWPENTRY winhCopyMenuItem(HWND hmenuTarget,
-                                   HWND hmenuSource,
-                                   USHORT usID,
-                                   SHORT sTargetPosition);
-    typedef BOOL XWPENTRY WINHCOPYMENUITEM(HWND hmenuTarget,
-                                   HWND hmenuSource,
-                                   USHORT usID,
-                                   SHORT sTargetPosition);
-    typedef WINHCOPYMENUITEM *PWINHCOPYMENUITEM;
-
-    HWND XWPENTRY winhMergeIntoSubMenu(HWND hmenuTarget,
-                                       SHORT sTargetPosition,
-                                       const char *pcszTitle,
-                                       SHORT sID,
-                                       HWND hmenuSource);
-    typedef HWND XWPENTRY WINHMERGEINTOSUBMENU(HWND hmenuTarget,
-                                       SHORT sTargetPosition,
-                                       const char *pcszTitle,
-                                       SHORT sID,
-                                       HWND hmenuSource);
-    typedef WINHMERGEINTOSUBMENU *PWINHMERGEINTOSUBMENU;
-
-    ULONG XWPENTRY winhMergeMenus(HWND hmenuTarget,
-                                  SHORT sTargetPosition,
-                                  HWND hmenuSource,
-                                  ULONG fl);
-    typedef ULONG XWPENTRY WINHMERGEMENUS(HWND hmenuTarget,
-                                          SHORT sTargetPosition,
-                                          HWND hmenuSource,
-                                          ULONG fl);
-    typedef WINHMERGEMENUS *PWINHMERGEMENUS;
-
-    ULONG XWPENTRY winhClearMenu(HWND hwndMenu);
-
-    PSZ XWPENTRY winhQueryMenuItemText(HWND hwndMenu,
-                                       USHORT usItemID);
-
-    BOOL XWPENTRY winhAppend2MenuItemText(HWND hwndMenu,
-                                          USHORT usItemID,
-                                          const char *pcszAppend,
-                                          BOOL fTab);
-
-    VOID XWPENTRY winhMenuRemoveEllipse(HWND hwndMenu,
-                                        USHORT usItemId);
-
-    SHORT XWPENTRY winhQueryItemUnderMouse(HWND hwndMenu, POINTL *pptlMouse, RECTL *prtlItem);
 
     /* ******************************************************************
@@ -711 +749 @@
     typedef WINHQUERYWINDOWFONT *PWINHQUERYWINDOWFONT;
 
+    PCSZ XWPENTRY winhQueryDefaultFont(VOID);
+
     BOOL XWPENTRY winhSetWindowFont(HWND hwnd, const char *pcszFont);
     typedef BOOL XWPENTRY WINHSETWINDOWFONT(HWND hwnd, const char *pcszFont);
@@ -735 +775 @@
                                          ULONG cbData,
                                          PVOID pData);
+
+        PPRESPARAMS XWPENTRY winhCreateDefaultPresparams(VOID);
     #endif
 
@@ -788 +830 @@
     typedef WINHFREE *PWINHFREE;
 
+    /*
+     *@@ winhMyAnchorBlock:
+     *      returns the HAB of the current thread.
+     *
+     *      Many Win* functions require an HAB to be
+     *      passed in. While many of them will work
+     *      when passing in NULLHANDLE, some (such as
+     *      WinGetMsg) won't. If you don't know the
+     *      anchor block of the calling thread, use
+     *      this function.
+     *
+     *      The HAB is simply a LONG whose hiword has
+     *      the current PID and the lowword has the
+     *      current TID. The previous function that
+     *      created a temporary window to figure this
+     *      out has been replaced with this macro, since
+     *      WinQueryAnchorBlock(HWND_DESKTOP) yields the
+     *      same result.
+     *
+     *@@added V1.0.1 (2002-11-30) [umoeller]
+     */
+
+    #define winhMyAnchorBlock() WinQueryAnchorBlock(HWND_DESKTOP)
+
+    /*
     HAB XWPENTRY winhMyAnchorBlock(VOID);
     typedef HAB XWPENTRY WINHMYANCHORBLOCK(VOID);
     typedef WINHMYANCHORBLOCK *PWINHMYANCHORBLOCK;
+    */
 
     VOID XWPENTRY winhSleep(ULONG ulSleep);
@@ -804 +872 @@
                               const char *pcszApplication,
                               const char *pcszKey);
+
+    HPOINTER XWPENTRY winhQueryWaitPointer(VOID);
 
     HPOINTER XWPENTRY winhSetWaitPointer(VOID);
@@ -903 +973 @@
                                        ULONG cbSize);
 
-    /*
-     *@@ winhQueryScreenCX:
-     *      helper macro for getting the screen width.
-     */
-
-    #define winhQueryScreenCX() (WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
-
-    /*
-     *@@ winhQueryScreenCY:
-     *      helper macro for getting the screen height.
-     */
-
-    #define winhQueryScreenCY() (WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN))
-
-    /* ******************************************************************
-     *
-     *   Extended frame
-     *
-     ********************************************************************/
-
-    #define XFCF_STATUSBAR          0x0001
-
-    #define FID_STATUSBAR           0x8100
-
-    VOID winhCalcExtFrameRect(MPARAM mp1,
-                              MPARAM mp2,
-                              LONG lStatusBarHeight);
-
-    /*
-     *@@ EXTFRAMECDATA:
-     *
-     *@@added V0.9.16 (2001-09-29) [umoeller]
-     */
-
-    typedef struct _EXTFRAMECDATA
-    {
-        PSWP        pswpFrame;          // in: frame wnd pos
-        ULONG       flFrameCreateFlags; // in: FCF_* flags
-        ULONG       flExtFlags;         // in: XFCF_* flags
-        ULONG       ulFrameStyle;       // in: WS_* flags (e.g. WS_VISIBLE, WS_ANIMATE)
-        const char  *pcszFrameTitle;    // in: frame title (title bar)
-        ULONG       ulResourcesID;      // in: according to FCF_* flags
-        const char  *pcszClassClient;   // in: client class name
-        ULONG       flStyleClient;      // in: client style
-        ULONG       ulID;               // in: frame window ID
-        PVOID       pClientCtlData;     // in: pCtlData structure pointer for client
-    } EXTFRAMECDATA, *PEXTFRAMECDATA;
-
-    /*
-     *@@ EXTFRAMEDATA:
-     *
-     *@@added V0.9.16 (2001-09-29) [umoeller]
-     */
-
-    typedef struct _EXTFRAMEDATA
-    {
-        EXTFRAMECDATA   CData;
-
-        PFNWP           pfnwpOrig;      // original frame wnd proc from subclassing
-
-        PVOID           pvUser;         // more data for user (e.g. for additional subclassing)
-
-    } EXTFRAMEDATA, *PEXTFRAMEDATA;
-
-    HWND winhCreateStatusBar(HWND hwndFrame,
-                             HWND hwndOwner,
-                             const char *pcszText,
-                             const char *pcszFont,
-                             LONG lColor);
-
-    HWND winhCreateExtStdWindow(PEXTFRAMECDATA pData,
-                                PHWND phwndClient);
-
     /* ******************************************************************
      *

trunk/src/helpers/_call_filedlg.c

@@ -11 +11 @@
 #define INCL_WINFRAMEMGR
 #define INCL_WINMENUS
+#define INCL_WINBUTTONS
+#define INCL_WINPOINTERS
 #define INCL_WINSTDFILE
 
@@ -24 +26 @@
 
 #include "helpers\call_file_dlg.c"
+#include "helpers\comctl.h"
+#include "helpers\standards.h"
 #include "helpers\winh.h"
+#include "helpers\gpih.h"
+
+PCSZ    WC_CLIENT = "MyClient";
 
 /*
@@ -83 +90 @@
 
 /*
+ *@@ fnwpClient:
+ *
+ */
+
+MRESULT EXPENTRY fnwpClient(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    MRESULT mrc = 0;
+
+    switch (msg)
+    {
+        case WM_PAINT:
+        {
+            HPS hps;
+            RECTL rcl;
+            if (hps = WinBeginPaint(hwnd, NULLHANDLE, &rcl))
+            {
+                gpihSwitchToRGB(hps);
+                WinFillRect(hps, &rcl, RGBCOL_GRAY);
+                WinEndPaint(hps);
+            }
+        }
+        break;
+
+        default:
+            mrc = WinDefWindowProc(hwnd, msg, mp1, mp2);
+    }
+
+    return mrc;
+}
+
+/*
  *@@ main:
  *
@@ -92 +130 @@
     HMQ             hmq;
 
-    ULONG           flFrame =     FCF_TITLEBAR
-                                | FCF_SYSMENU
-                                | FCF_MINMAX
-                                | FCF_SIZEBORDER
-                                | FCF_NOBYTEALIGN
-                                | FCF_SHELLPOSITION
-                                | FCF_TASKLIST;
+    #define TBBS_COMMON TBBS_AUTORESIZE | TBBS_FLAT | TBBS_HILITE | WS_VISIBLE
+
+    CHAR            szOpen[200],
+                    szExit[200];
+
+    TOOLBARCONTROL  aControls[] =
+        {
+            WC_CCTL_TBBUTTON,
+            szExit,
+            TBBS_COMMON | TBBS_BIGICON | TBBS_TEXT | TBBS_SYSCOMMAND,
+            SC_CLOSE,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            szExit,
+            TBBS_COMMON | TBBS_BIGICON /* TBBS_TEXT | */ ,
+            0,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            szExit,
+            TBBS_COMMON | TBBS_MINIICON /* TBBS_TEXT | */ ,
+            0,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            szOpen,
+            TBBS_COMMON | TBBS_MINIICON | TBBS_TEXT,
+            1000,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            "Toggle\ntest",
+            TBBS_COMMON | TBBS_TEXT | TBBS_CHECK,
+            1001,
+            10,
+            10,
+
+            WC_CCTL_SEPARATOR,
+            NULL,
+            WS_VISIBLE | SEPS_VERTICAL,
+            1002,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            "Group 1",
+            TBBS_COMMON | TBBS_TEXT | TBBS_CHECKGROUP | TBBS_CHECKINITIAL,
+            1101,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            "Group 2",
+            TBBS_COMMON | TBBS_TEXT | TBBS_CHECKGROUP,
+            1102,
+            10,
+            10,
+
+            WC_CCTL_TBBUTTON,
+            "Group 3",
+            TBBS_COMMON | TBBS_TEXT | TBBS_CHECKGROUP,
+            1103,
+            10,
+            10,
+
+        };
+
+    EXTFRAMECDATA   xfd =
+        {
+            NULL,                               // pswpFrame
+            FCF_TITLEBAR
+                  | FCF_SYSMENU
+                  | FCF_MINMAX
+                  | FCF_SIZEBORDER
+                  | FCF_NOBYTEALIGN
+                  | FCF_SHELLPOSITION
+                  | FCF_TASKLIST,
+            XFCF_TOOLBAR | XFCF_FORCETBOWNER | XFCF_STATUSBAR,
+            WS_VISIBLE,                         // ulFrameStyle
+            "Test File Dialog",                 // pcszFrameTitle
+            0,                                  // ulResourcesID
+            WC_CLIENT,                          // pcszClassClient
+            WS_VISIBLE,                         // flStyleClient
+            0,                                  // ulID
+            NULL,
+            HINI_USER,
+            "XWorkplace Test Apps",
+            "CallFileDlgPos",
+
+            ARRAYITEMCOUNT(aControls),
+            aControls
+        };
 
     HWND            hwndFrame,
                     hwndClient,
+                    hwndStatusBar,
+                    hwndToolBar,
                     hwndMenu,
                     hwndSubmenu;
@@ -109 +239 @@
     hmq = WinCreateMsgQueue(hab, 0);
 
-    hwndFrame = WinCreateStdWindow(HWND_DESKTOP,
-                                   WS_VISIBLE,
-                                   &flFrame,
-                                   NULL,
-                                   "Test File Dialog",
-                                   WS_VISIBLE,
-                                   0,
-                                   0,
-                                   &hwndClient);
+    winhInitGlobals();
+
+    ctlRegisterToolbar(hab);
+    ctlRegisterSeparatorLine(hab);
+
+    WinRegisterClass(hab,
+                     (PSZ)WC_CLIENT,
+                     fnwpClient,
+                     0,
+                     4);
+
+    sprintf(szOpen,
+            "#%d#Open",
+            WinQuerySysPointer(HWND_DESKTOP,
+                               SPTR_ICONINFORMATION,
+                               FALSE));
+
+    sprintf(szExit,
+            "#%d#Exit",
+            WinQuerySysPointer(HWND_DESKTOP,
+                               SPTR_ICONWARNING,
+                               FALSE));
+
+    hwndFrame = ctlCreateStdWindow(&xfd, &hwndClient);
+
+    hwndToolBar = WinWindowFromID(hwndFrame, FID_TOOLBAR);
+    hwndStatusBar = WinWindowFromID(hwndFrame, FID_STATUSBAR);
+
+    WinSetWindowText(hwndToolBar, "Tool bar");
+    WinSetWindowText(hwndStatusBar, "Status bar");
 
     hwndMenu = WinCreateMenu(hwndFrame,
@@ -128 +279 @@
                                     MIS_TEXT | MIS_SUBMENU,
                                     1000,
-                                    "~Show dialog",
+                                    "Open...",
                                     MIS_TEXT,
                                     0);
@@ -135 +286 @@
                        MIT_END,
                        SC_CLOSE,
-                       "~Close",
+                       "~Quit",
                        MIS_SYSCOMMAND | MIS_TEXT,
                        0);

trunk/src/helpers/_test_dialog.c

@@ -30 +30 @@
 #include "setup.h"                      // code generation and debugging options
 
-#include "R:\projects\R_cvs\xworkplace\include\dlgids.h"
+#include "K:\projects\cvs\xworkplace\include\dlgids.h"
 
 #include "helpers\comctl.h"

trunk/src/helpers/animate.c

@@ -58 +58 @@
 #include "setup.h"                      // code generation and debugging options
 
-// #include "helpers\animate.h"
-
-// #include "helpers\winh.h"
-// #include "helpers\gpih.h"
+#include "helpers\winh.h"
 
 /*
@@ -108 +105 @@
         BITMAPINFOHEADER bih;
         GpiQueryBitmapParameters(hbm, &bih);
-        /* ptl.y = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN)
-                        - BMPSPACING
-                        - bih.cy; */
-        ptl.x = (WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN)
-                        - bih.cx) / 2;
-        ptl.y = (WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN)
-                        - bih.cy) / 2;
+        ptl.x = (G_cxScreen - bih.cx) / 2;
+        ptl.y = (G_cyScreen - bih.cy) / 2;
 
         // we now use ul for the current animation step,

trunk/src/helpers/cctl_chart.c

@@ -1496 +1496 @@
                           LONG lIndex)
 {
-    HWND hwndOwner;
-
-    if (hwndOwner = WinQueryWindow(hwndChart, QW_OWNER))
-    {
-        EMPHASISNOTIFY en;
-        en.hwndSource = hwndChart;
-        en.lIndex = lIndex;        // can be -1
-        en.ulEmphasis = ulEmphasis;
-        en.ptl.x = SHORT1FROMMP(mp1Mouse);
-        en.ptl.y = SHORT2FROMMP(mp1Mouse);
-
-        WinSendMsg(hwndOwner,
-                   WM_CONTROL,
-                   MPFROM2SHORT(WinQueryWindowUShort(hwndChart,
-                                                     QWS_ID),
-                                usNotify),
-                   &en);
-    }
+    EMPHASISNOTIFY en;
+    en.hwndSource = hwndChart;
+    en.lIndex = lIndex;        // can be -1
+    en.ulEmphasis = ulEmphasis;
+    en.ptl.x = SHORT1FROMMP(mp1Mouse);
+    en.ptl.y = SHORT2FROMMP(mp1Mouse);
+
+    ctlSendWmControl(hwndChart,
+                     usNotify,
+                     &en);
 }
 

trunk/src/helpers/cctl_combo.c

@@ -408 +408 @@
                     // our own owner, but replace the id
                     // with the combo box id
-                    WinPostMsg(WinQueryWindow(hwnd, QW_OWNER),
-                               WM_CONTROL,
-                               MPFROM2SHORT(WinQueryWindowUShort(hwnd, QWS_ID),
-                                            uscode),
-                               mp2);
+                    ctlPostWmControl(hwnd,
+                                     uscode,
+                                     mp2);
 
                     // do not call parent

trunk/src/helpers/cctl_tooltip.c

@@ -112 +112 @@
 {
     return WinRegisterClass(hab,
-                            COMCTL_TOOLTIP_CLASS,
+                            WC_CCTL_TOOLTIP,
                             ctl_fnwpTooltip,
                             CS_HITTEST,     // class styles;
@@ -295 +295 @@
     if (!FindSubclassedTool(hwndTool))
     {
-        PFNWP   pfnwpOrig = WinSubclassWindow(hwndTool,
-                                              ctl_fnwpSubclassedTool);
-        if (pfnwpOrig)
+        PFNWP   pfnwpOrig;
+        if (pfnwpOrig = WinSubclassWindow(hwndTool,
+                                          ctl_fnwpSubclassedTool))
         {
-            PSUBCLASSEDTOOL pst = (PSUBCLASSEDTOOL)malloc(sizeof(SUBCLASSEDTOOL));
-            if (pst)
+            PSUBCLASSEDTOOL pst;
+            if (pst = (PSUBCLASSEDTOOL)malloc(sizeof(SUBCLASSEDTOOL)))
             {
                 pst->pfnwpOrig = pfnwpOrig;
@@ -361 +361 @@
     HAB         hab;                // from WM_CREATE
     USHORT      usTooltipID;        // from WM_CREATE
-
-    LONG        cxScreen,
-                cyScreen;
 
     BOOL        fIsActive;          // TRUE per default; changed by TTM_ACTIVATE
@@ -457 +454 @@
         pttd->usTooltipID = pcs->id;
 
-        pttd->cxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
-        pttd->cyScreen = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
-
         pttd->fIsActive = TRUE;
 
@@ -1133 +1127 @@
     if (ptlTooltip.y < 0)
         ptlTooltip.y = 0;
-    if (ptlTooltip.x + cx > pttd->cxScreen)
-        ptlTooltip.x = pttd->cxScreen-cx;
-    if (ptlTooltip.y + cy > pttd->cyScreen)
-        ptlTooltip.y = pttd->cyScreen-cy;
+    if (ptlTooltip.x + cx > G_cxScreen)
+        ptlTooltip.x = G_cxScreen - cx;
+    if (ptlTooltip.y + cy > G_cyScreen)
+        ptlTooltip.y = G_cyScreen - cy;
 
     // if shadow is enabled,
@@ -1350 +1344 @@
  +          ctlRegisterTooltip(hab);
  +          hwndTooltip = WinCreateWindow(HWND_DESKTOP, // parent
- +                           COMCTL_TOOLTIP_CLASS, // wnd class (comctl.h)
+ +                           WC_CCTL_TOOLTIP, // wnd class (comctl.h)
  +                           NULL,          // window text
  +                           TTS_ALWAYSTIP, // window style, ignored except for TTS_* flags

trunk/src/helpers/cnrh.c

@@ -2142 +2142 @@
                            (   poi->rclItem.xLeft
                              + (poi->rclItem.xRight - poi->rclItem.xLeft
-                                - WinQuerySysValue(HWND_DESKTOP, SV_CXICON) / 2
+                                - G_cxIcon / 2
                                ) / 2
                            ),
                            (   poi->rclItem.yBottom
                              + (poi->rclItem.yTop - poi->rclItem.yBottom
-                                - WinQuerySysValue(HWND_DESKTOP, SV_CYICON) / 2
+                                - G_cyIcon / 2
                                ) / 2
                            ),

trunk/src/helpers/comctl.c

@@ -90 +90 @@
 #define INCL_WINSTDCNR
 #define INCL_WINENTRYFIELDS
+#define INCL_WINSHELLDATA
 
 #define INCL_GPIPRIMITIVES
@@ -112 +113 @@
 #include "helpers\linklist.h"
 #include "helpers\winh.h"
+#include "helpers\standards.h"
 
 #include "helpers\comctl.h"
 
 #pragma hdrstop
+
+/* ******************************************************************
+ *
+ *   Shared stuff
+ *
+ ********************************************************************/
+
+/*
+ *@@ ctlSendWmControl:
+ *      little helper that post a WM_CONTROL message to
+ *      a control's owner.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+MRESULT ctlSendWmControl(HWND hwndControl,     // in: control who's posting
+                         USHORT usCode,        // in: code for SHORT2FROMMP(mp1)
+                         MPARAM mp2)           // in: mp2 from WM_CONTROL
+{
+    HWND hwndOwner;
+
+    if (hwndOwner = WinQueryWindow(hwndControl, QW_OWNER))
+        return WinSendMsg(hwndOwner,
+                          WM_CONTROL,
+                          MPFROM2SHORT(WinQueryWindowUShort(hwndControl, QWS_ID),
+                                       usCode),
+                          mp2);
+
+    return NULL;
+}
+
+/*
+ *@@ ctlPostWmControl:
+ *      little helper that post a WM_CONTROL message to
+ *      a control's owner.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+BOOL ctlPostWmControl(HWND hwndControl,     // in: control who's posting
+                      USHORT usCode,        // in: code for SHORT2FROMMP(mp1)
+                      MPARAM mp2)           // in: mp2 from WM_CONTROL
+{
+    HWND hwndOwner;
+
+    if (hwndOwner = WinQueryWindow(hwndControl, QW_OWNER))
+        return WinPostMsg(hwndOwner,
+                          WM_CONTROL,
+                          MPFROM2SHORT(WinQueryWindowUShort(hwndControl, QWS_ID),
+                                       usCode),
+                          mp2);
+
+    return FALSE;
+}
+
+/*
+ *@@ ctlInitDWD:
+ *      ininitializes the DEFWINDATA struct for the
+ *      given window. This must be called in WM_CREATE
+ *      of a window proc if it intends to use
+ *      ctlDefWindowProc as its default window procedure.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+VOID ctlInitDWD(HWND hwnd,
+                MPARAM mp2,
+                PDEFWINDATA pdwd,
+                PFNWP pDefWindowProc,
+                const SYSCOLORSET *pSysColorSet)
+{
+    pdwd->hwnd = hwnd;
+    pdwd->szlWin.cx = ((PCREATESTRUCT)mp2)->cx;
+    pdwd->szlWin.cy = ((PCREATESTRUCT)mp2)->cy;
+    pdwd->hab = WinQueryAnchorBlock(hwnd);
+    pdwd->pDefWindowProc = pDefWindowProc;
+    pdwd->pSysColorSet = pSysColorSet;
+
+    ctlRefreshColors(pdwd);
+}
+
+/*
+ *@@ ctlRefreshColors:
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+VOID ctlRefreshColors(PDEFWINDATA pdwd)
+{
+    pdwd->lcolBackground = winhQueryPresColor2(pdwd->hwnd,
+                                               PP_BACKGROUNDCOLOR,
+                                               PP_BACKGROUNDCOLORINDEX,
+                                               pdwd->pSysColorSet->fInheritPP,
+                                               pdwd->pSysColorSet->lBackIndex);
+    pdwd->lcolForeground = winhQueryPresColor2(pdwd->hwnd,
+                                               PP_FOREGROUNDCOLOR,
+                                               PP_FOREGROUNDCOLORINDEX,
+                                               pdwd->pSysColorSet->fInheritPP,
+                                               pdwd->pSysColorSet->lForeIndex);
+}
+
+/*
+ *@@ ctlDefWindowProc:
+ *      replacement default window procedure for controls that
+ *      have a custom window class and do not inherit from
+ *      standard OS/2 controls.
+ *
+ *      If a window proc wishes to use this, it must allocate
+ *      its own private window data in WM_CREATE (preferrably in
+ *      QWL_USER + 1) and have room for a DEFWINDATA struct in
+ *      there. It must call ctlInitDWD in WM_CREATE also which
+ *      initializes that structure. It can then safely pass
+ *      messages to this function.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+MRESULT ctlDefWindowProc(PDEFWINDATA pdwd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    MRESULT mrc = 0;
+
+    switch (msg)
+    {
+        case WM_SYSCOLORCHANGE:
+        case WM_PRESPARAMCHANGED:
+            ctlRefreshColors(pdwd);
+        break;
+
+        default:
+            mrc = pdwd->pDefWindowProc(pdwd->hwnd, msg, mp1, mp2);
+    }
+
+    return mrc;
+}
 
 /* ******************************************************************
@@ -131 +267 @@
  *
  *@@added V0.9.20 (2002-08-10) [umoeller]
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: added SEPS_VERTICAL
  */
 
@@ -150 +287 @@
                 gpihSwitchToRGB(hps);
 
-                GpiSetColor(hps, WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONLIGHT, 0));
-
-                ptl.x = rcl.xLeft;
-                ptl.y = (rcl.yTop - rcl.yBottom) / 2 - 1;
-                GpiMove(hps, &ptl);
-                ptl.x = rcl.xRight;
-                GpiLine(hps, &ptl);
-
-                GpiSetColor(hps, WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONDARK, 0));
-
-                ptl.x = rcl.xLeft;
-                ++ptl.y;
-                GpiMove(hps, &ptl);
-                ptl.x = rcl.xRight;
-                GpiLine(hps, &ptl);
+                WinFillRect(hps,
+                            &rcl,
+                            winhQueryPresColor2(hwnd,
+                                                PP_BACKGROUNDCOLOR,
+                                                PP_BACKGROUNDCOLORINDEX,
+                                                TRUE,
+                                                SYSCLR_WINDOW));
+
+                if (WinQueryWindowULong(hwnd, QWL_STYLE) & SEPS_VERTICAL)
+                {
+                    GpiSetColor(hps, G_lcol3DDark);
+
+                    ptl.x = (rcl.xRight - rcl.xLeft) / 2 - 1;
+                    ptl.y = rcl.yBottom;
+                    GpiMove(hps, &ptl);
+                    ptl.y = rcl.yTop;
+                    GpiLine(hps, &ptl);
+
+                    GpiSetColor(hps, G_lcol3DLight);
+
+                    ptl.y = rcl.yBottom;
+                    ++ptl.x;
+                    GpiMove(hps, &ptl);
+                    ptl.y = rcl.yTop;
+                    GpiLine(hps, &ptl);
+                }
+                else
+                {
+                    GpiSetColor(hps, G_lcol3DLight);
+
+                    ptl.x = rcl.xLeft;
+                    ptl.y = (rcl.yTop - rcl.yBottom) / 2 - 1;
+                    GpiMove(hps, &ptl);
+                    ptl.x = rcl.xRight;
+                    GpiLine(hps, &ptl);
+
+                    GpiSetColor(hps, G_lcol3DDark);
+
+                    ptl.x = rcl.xLeft;
+                    ++ptl.y;
+                    GpiMove(hps, &ptl);
+                    ptl.x = rcl.xRight;
+                    GpiLine(hps, &ptl);
+                }
 
                 WinEndPaint(hps);
@@ -179 +345 @@
 
 /*
- *@@ ctlMakeSeparatorLine:
- *      turns the given static control into a 3D separator line.
+ *@@ ctlRegisterSeparatorLine:
+ *      registers the separator line control, which is a dull
+ *      static displaying a 3D line for use as a separator
+ *      in dialogs.
+ *
+ *      In addition to the standard WS_* styles, the control
+ *      supports the SEPS_VERTICAL style bit. If set, the
+ *      separator is vertical; if not, it is horizontal.
  *
  *@@added V1.0.0 (2002-08-12) [umoeller]
@@ -195 +367 @@
 
         return WinRegisterClass(hab,
-                                WC_SEPARATORLINE,
+                                WC_CCTL_SEPARATOR,
                                 fnwpSeparatorLine,
                                 (ciStatic.flClassStyle & ~CS_PUBLIC),
@@ -203 +375 @@
 
     return FALSE;
-}
-
-/* ******************************************************************
- *
- *   "XButton" control
- *
- ********************************************************************/
-
-/*
- *@@ ctlPaintXButton:
- *      paints an X-button control. Can be called externally
- *      for just painting a button even if this is not really
- *      a window.
- *
- *      WARNING: this is work in progress and will change into
- *      the future. Eventually this will turn into a full
- *      button control replacement.
- *
- *@@added V0.9.13 (2001-06-21) [umoeller]
- *@@changed V0.9.16 (2001-10-24) [umoeller]: fixed wrong hatch color and paint offset
- *@@changed V0.9.16 (2001-10-28) [umoeller]: added bitmap support, fixed bad clip rectangle
- *@@changed V0.9.20 (2002-08-04) [umoeller]: fixed button offset, depressed color
- */
-
-VOID ctlPaintXButton(HPS hps,               // in: presentation space (RGB mode)
-                     ULONG fl,              // in: XBF_* flags
-                     PXBUTTONDATA pxbd)     // in: button data
-{
-    ULONG   ulBorder = 0,
-            cx,
-            cy,
-            ulOfs = 0;
-    LONG    lLeft,
-            lRight,
-            lColorMiddle = pxbd->lMiddle;
-    RECTL   rclWin;
-
-    memcpy(&rclWin, &pxbd->rcl, sizeof(RECTL));
-
-    if (0 == (fl & XBF_FLAT))
-        ulBorder = 2;
-
-    gpihSwitchToRGB(hps);
-
-    if (fl & XBF_PRESSED)
-    {
-        // paint button "down":
-        lLeft = pxbd->lcol3DDark;
-        lRight = pxbd->lcol3DLight;
-        // add offset for icon painting at the bottom
-        ulOfs += 1;
-        if (ulBorder == 0)
-            ulBorder = 1;
-
-        // make the depressed color darker
-        // V0.9.20 (2002-07-31) [umoeller]
-        gpihManipulateRGB(&lColorMiddle,
-                          .95);
-    }
-    else
-    {
-        lLeft = pxbd->lcol3DLight;
-        lRight = pxbd->lcol3DDark;
-    }
-
-    if (ulBorder)
-    {
-        // button border:
-        // now paint button frame
-
-        // make rcl inclusive
-        rclWin.xRight--;
-        rclWin.yTop--;
-        gpihDraw3DFrame(hps,
-                        &rclWin,        // inclusive
-                        ulBorder,
-                        lLeft,
-                        lRight);
-
-        // now paint button middle
-        rclWin.xLeft += ulBorder;
-        rclWin.yBottom += ulBorder;
-        rclWin.xRight -= ulBorder - 1;  // make exclusive again
-        rclWin.yTop -= ulBorder - 1;    // make exclusive again
-    }
-
-    if (fl & XBF_BACKGROUND)
-        WinFillRect(hps,
-                    &rclWin,        // exclusive
-                    lColorMiddle);
-
-    // get icon
-    if (pxbd->hptr)
-    {
-        // calculate x and y to be centered in rectangle
-        POINTL  ptl;
-
-        cx = rclWin.xRight - rclWin.xLeft;
-        cy = rclWin.yTop - rclWin.yBottom;
-
-        ptl.x = rclWin.xLeft + ((cx - pxbd->cxIconOrBitmap) / 2);
-        ptl.y = rclWin.yBottom + ((cy - pxbd->cyIconOrBitmap) / 2);
-
-        if (fl & XBF_INUSE)
-        {
-            // caller wants in-use (hatched) emphasis:
-            // draw a box then
-            POINTL ptl2;
-            ptl2.x = ptl.x - 2;
-            ptl2.y = ptl.y - 2;
-            GpiMove(hps,
-                    &ptl2);     // &ptl
-                                // duh, typo V0.9.16 (2001-10-24) [umoeller]
-            GpiSetPattern(hps, PATSYM_DIAG1);
-            GpiSetColor(hps, RGBCOL_BLACK);     // V0.9.16 (2001-10-24) [umoeller]
-            ptl2.x = ptl.x + pxbd->cxIconOrBitmap + 1; // inclusive!
-            ptl2.y = ptl.y + pxbd->cyIconOrBitmap + 1; // inclusive!
-            GpiBox(hps,
-                   DRO_FILL,
-                   &ptl2,
-                   0,
-                   0);
-        }
-
-        // now paint icon
-
-        // make rcl inclusive           // V0.9.16 (2001-10-28) [umoeller]
-        rclWin.xRight--;
-        rclWin.yTop--;
-        GpiIntersectClipRectangle(hps,
-                                  &rclWin);    // inclusive!
-
-        // center this in remaining rectl
-        ptl.x += ulOfs;
-        ptl.y -= ulOfs;
-        if (fl & XBF_BITMAP)
-            // V0.9.16 (2001-10-28) [umoeller]
-            WinDrawBitmap(hps,
-                          pxbd->hptr,           // a bitmap really
-                          NULL,                 // entire bitmap
-                          &ptl,
-                          0,
-                          0,
-                          DBM_NORMAL);
-        else
-            WinDrawPointer(hps,
-                           // center this in remaining rectl
-                           ptl.x, //  + ulOfs,
-                           ptl.y, //  - ulOfs,
-                           pxbd->hptr,
-                           DP_MINI);
-    }
 }
 
@@ -1097 +1117 @@
             WinQueryWindowRect(hwndStatic, &pa->rclIcon);
             pa->OldStaticProc = WinSubclassWindow(hwndStatic, ctl_fnwpBitmapStatic);
-            pa->szlIcon.cx = WinQuerySysValue(HWND_DESKTOP, SV_CXICON);
-            pa->szlIcon.cy = WinQuerySysValue(HWND_DESKTOP, SV_CYICON);
+            pa->szlIcon.cx = G_cxIcon;
+            pa->szlIcon.cy = G_cyIcon;
         }
     }
@@ -1628 +1648 @@
                     // doesn't send any notifications, we
                     // use EN_CHANGED
-                    WinSendMsg(WinQueryWindow(hwndStatic, QW_OWNER),
-                               WM_CONTROL,
-                               MPFROM2SHORT(WinQueryWindowUShort(hwndStatic, QWS_ID),
-                                            EN_CHANGE),
-                               (MPARAM)hwndStatic);
+                    ctlSendWmControl(hwndStatic,
+                                     EN_CHANGE,
+                                     (MPARAM)hwndStatic);
                 break;
             }

trunk/src/helpers/dialog.c

@@ -1001 +1001 @@
             rcl.yTop = pColumn->szlProposed.cy;
         else
-            rcl.yTop = winhQueryScreenCY() * 2 / 3;
+            rcl.yTop = G_cyScreen * 2 / 3;
 
         winhDrawFormattedText(pDlgData->hps,
@@ -1185 +1185 @@
 
                 case SS_ICON:
-                    pColumn->szlAuto.cx = WinQuerySysValue(HWND_DESKTOP, SV_CXICON);
-                    pColumn->szlAuto.cy = WinQuerySysValue(HWND_DESKTOP, SV_CYICON);
+                    pColumn->szlAuto.cx = G_cxIcon;
+                    pColumn->szlAuto.cy = G_cyIcon;
                 break;
             }

trunk/src/helpers/except.c

@@ -788 +788 @@
  *      writes no trap logs).
  *
+ *      Registering hooks affects all threads that use
+ *      the exception handlers.
+ *
  *      The hooks are as follows:
  *

trunk/src/helpers/gpih.c

@@ -134 +134 @@
 {
     if (prcl)
-    {
         return (    (x >= prcl->xLeft)
                  && (x <= prcl->xRight)
@@ -140 +139 @@
                  && (y <= prcl->yTop)
                );
-    }
 
     return FALSE;
@@ -163 +161 @@
         prcl->yTop += l;
     }
+}
+
+/*
+ *@@ gpihCopyRectIncl:
+ *      copies prclWin to prclGpi, making it
+ *      inclusive-inclusive for use with GPI
+ *      functions.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+VOID gpihCopyRectIncl(PRECTL prclGpi,       // out: GPI rectangle
+                      PRECTL prclWin)       // in: WIN rectangle
+{
+    prclGpi->xLeft = prclWin->xLeft;
+    prclGpi->yBottom = prclWin->yBottom;
+    prclGpi->xRight = prclWin->xRight - 1;
+    prclGpi->yTop = prclWin->yTop - 1;
 }
 
@@ -1687 +1703 @@
 }
 
+static const BITMAPINFOHEADER2 G_bih2Template[] =
+    {
+        sizeof(BITMAPINFOHEADER2), // ULONG      cbFix;
+        0,                  // ULONG      cx;               // tbr
+        0,                  // ULONG      cy;               // tbr
+        0,                  // USHORT     cPlanes;          // tbr
+        0,                  // USHORT     cBitCount;        // tbr
+        BCA_UNCOMP,         // ULONG      ulCompression;
+        0,                  // ULONG      cbImage;
+        70,                 // ULONG      cxResolution;
+        70,                 // ULONG      cyResolution;
+        2,                  // ULONG      cclrUsed;
+        0,                  // ULONG      cclrImportant;
+        BRU_METRIC,         // USHORT     usUnits;
+                                    // measure units for cxResolution/cyResolution: pels per meter
+        0,                  // USHORT     usReserved;
+        BRA_BOTTOMUP,       // USHORT     usRecording;
+                                    // scan lines are bottom to top (default)
+
+        BRH_NOTHALFTONED,   // USHORT     usRendering;
+                                    // other algorithms aren't documented anyway
+        0,                  // ULONG      cSize1;
+                                    // parameter for halftoning (undocumented anyway)
+        0,                  // ULONG      cSize2;
+                                    // parameter for halftoning (undocumented anyway)
+        BCE_RGB,            // ULONG      ulColorEncoding;
+                                    // only possible value
+        0                   // ULONG      ulIdentifier;
+                                    // application-specific data
+    };
+
 /*
  *@@ gpihCreateBitmap2:
@@ -1703 +1750 @@
  *
  *@@added V0.9.16 (2001-12-18) [umoeller]
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: optimized
  */
 
@@ -1711 +1759 @@
                           ULONG cBitCount)   // in: either 1, 4, or 24; if 0, current screen value
 {
-    HBITMAP hbm = NULLHANDLE;
     LONG alData[2];
     BITMAPINFOHEADER2 bih2;
-    // PBITMAPINFO2 pbmi = NULL;
 
     // determine the device's plane/bit-count format;
@@ -1721 +1767 @@
     if (GpiQueryDeviceBitmapFormats(hpsMem, 2, alData))
     {
-        // set up the BITMAPINFOHEADER2 and BITMAPINFO2 structures
-        bih2.cbFix = (ULONG)sizeof(BITMAPINFOHEADER2);
+        // copy values from global template V1.0.1 (2002-11-30) [umoeller]
+        memcpy(&bih2, &G_bih2Template, sizeof(bih2));
+
+        // fix variable fields V1.0.1 (2002-11-30) [umoeller]
         bih2.cx = cx;
         bih2.cy = cy;
         bih2.cPlanes = (cPlanes) ? cPlanes : alData[0];
         bih2.cBitCount = (cBitCount) ? cBitCount : alData[1];
-        bih2.ulCompression = BCA_UNCOMP;
         bih2.cbImage = (    (   (bih2.cx
                                     * (1 << bih2.cPlanes)
@@ -1734 +1781 @@
                             ) / 32
                        ) * bih2.cy;
-        bih2.cxResolution = 70;
-        bih2.cyResolution = 70;
-        bih2.cclrUsed = 2;
-        bih2.cclrImportant = 0;
-        bih2.usUnits = BRU_METRIC;  // measure units for cxResolution/cyResolution: pels per meter
-        bih2.usReserved = 0;
-        bih2.usRecording = BRA_BOTTOMUP;        // scan lines are bottom to top (default)
-        bih2.usRendering = BRH_NOTHALFTONED;    // other algorithms aren't documented anyway
-        bih2.cSize1 = 0;            // parameter for halftoning (undocumented anyway)
-        bih2.cSize2 = 0;            // parameter for halftoning (undocumented anyway)
-        bih2.ulColorEncoding = BCE_RGB;     // only possible value
-        bih2.ulIdentifier = 0;              // application-specific data
 
         // create a bit map that is compatible with the display
-        hbm = GpiCreateBitmap(hpsMem,
-                              &bih2,
-                              0,            // do not initialize
-                              NULL,         // init data
-                              NULL);
+        return GpiCreateBitmap(hpsMem,
+                               &bih2,
+                               0,            // do not initialize
+                               NULL,         // init data
+                               NULL);
     }
 
-    return hbm;
+    return NULLHANDLE;
+}
+
+/*
+ *@@ gpihQueryBitmapSize:
+ *      returns the width and height of the given bitmap.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+BOOL gpihQueryBitmapSize(HBITMAP hbm,       // in: bitmap handle for query
+                         PSIZEL pszl)       // out: size (cx, cy) of bitmap
+{
+    BITMAPINFOHEADER2 bmi2;
+    // query bitmap info
+    bmi2.cbFix = sizeof(bmi2);
+    if (    (hbm)
+         && (GpiQueryBitmapInfoHeader(hbm, &bmi2))
+       )
+    {
+        pszl->cx = bmi2.cx;
+        pszl->cy = bmi2.cy;
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
@@ -1776 +1836 @@
  *
  *@added V0.9.0
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: optimized
  */
 
@@ -1786 +1847 @@
     HDC     hdcMem;
     HPS     hpsMem;
-    BITMAPINFOHEADER2 bmi;
-
-    if (hbmSource)
+    SIZEL   szlPage;
+
+    if (gpihQueryBitmapSize(hbmSource, &szlPage))       // V1.0.1 (2002-11-30) [umoeller]
     {
-        SIZEL szlPage;
-        // query bitmap info
-        bmi.cbFix = sizeof(bmi);
-        GpiQueryBitmapInfoHeader(hbmSource, &bmi);
-
-        szlPage.cx = bmi.cx;
-        szlPage.cy = bmi.cy;
         if (gpihCreateMemPS(hab, &szlPage, &hdcMem, &hpsMem))
         {
             if ((hbmReturn = gpihCreateBitmap(hpsMem,
-                                              bmi.cx,
-                                              bmi.cy)))
+                                              szlPage.cx,
+                                              szlPage.cy)))
             {
                 if (GpiSetBitmap(hpsMem, hbmReturn) != HBM_ERROR)
@@ -1811 +1865 @@
                     // aptl[0]: target bottom-left, is all 0
                     // aptl[1]: target top-right (inclusive!)
-                    aptl[1].x = bmi.cx - 1;
-                    aptl[1].y = bmi.cy - 1;
+                    aptl[1].x = szlPage.cx - 1;
+                    aptl[1].y = szlPage.cy - 1;
                     // aptl[2]: source bottom-left, is all 0
 
                     // aptl[3]: source top-right (exclusive!)
-                    aptl[3].x = bmi.cx;
-                    aptl[3].y = bmi.cy;
+                    aptl[3].x = szlPage.cx;
+                    aptl[3].y = szlPage.cy;
                     GpiWCBitBlt(hpsMem,     // target HPS (bmp selected)
                                 hbmSource,
@@ -1832 +1886 @@
 
                     GpiMove(hpsMem, &aptl[0]);  // still 0, 0
-                    aptl[0].x = bmi.cx - 1;
-                    aptl[0].y = bmi.cy - 1;
+                    aptl[0].x = szlPage.cx - 1;
+                    aptl[0].y = szlPage.cy - 1;
                     GpiSetColor(hpsMem, lColorGray);
                     GpiSetPattern(hpsMem, PATSYM_HALFTONE);
@@ -2326 +2380 @@
  *
  *@added V0.9.0
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: optimized
  */
 
@@ -2334 +2389 @@
                        BOOL fProportional)  // in: preserve proportions when stretching?
 {
-    BITMAPINFOHEADER2   bih2;
+    SIZEL               szlBmp;
     POINTL              aptl[4];
     BOOL                fCalculated = FALSE;
 
+    if (!gpihQueryBitmapSize(hbmSource, &szlBmp))       // V1.0.1 (2002-11-30) [umoeller]
+        return GPI_ERROR;
+
     memset(aptl, 0, sizeof(POINTL) * 4);
-
-    bih2.cbFix = sizeof(bih2);
-    GpiQueryBitmapInfoHeader(hbmSource,
-                             &bih2);
 
     // aptl[2]: source bottom-left, is all 0
     // aptl[3]: source top-right (exclusive!)
-    aptl[3].x = bih2.cx;
-    aptl[3].y = bih2.cy;
+    aptl[3].x = szlBmp.cx;
+    aptl[3].y = szlBmp.cy;
 
     if (fProportional)
@@ -2356 +2410 @@
         // large
 
-        ULONG ulPropSource = (bih2.cx * 1000)
-                                    / bih2.cy;
+        ULONG ulPropSource = (szlBmp.cx * 1000)
+                                    / szlBmp.cy;
                 // e.g. if the bmp is 200 x 100, we now have 2000
         ULONG ulPropTarget = ((prclTarget->xRight - prclTarget->xLeft) * 1000)
@@ -2430 +2484 @@
 
 /*
- * gpihIcon2Bitmap:
- *      this paints the given icon/pointer into
- *      a bitmap. Note that if the bitmap is
- *      larget than the system icon size, only
- *      the rectangle of the icon will be filled
- *      with lBkgndColor.
- *
- *      Returns FALSE upon errors.
- *
- *added V0.9.0 [umoeller]
- *changed V0.9.16 (2001-10-15) [umoeller]: added pptlLowerLeft
- *changed V0.9.16 (2001-10-15) [umoeller]: fixed inclusive/exclusive confusion (sigh...)
- *changed V0.9.19 (2002-06-13) [umoeller]: fixed funny colors when scaling
- *removed V0.9.19 (2002-06-18) [umoeller]
- */
-
-#if 0
-
-BOOL gpihIcon2Bitmap(HPS hpsMem,         // in: target memory PS with bitmap selected into it
-                     HPOINTER hptr,      // in: source icon
-                     LONG lBkgndColor,   // in: background color for transparent areas
-                     PPOINTL pptlLowerLeft, // in: lower left corner of where to paint (ptr can be NULL)
-                     ULONG ulIconSize)   // in: icon size (should be the value of WinQuerySysValue(HWND_DESKTOP, SV_CXICON))
-{
-    BOOL        brc = FALSE;
-    POINTERINFO pi;
-
-    // Each icon consists of two (really three)
-    // bitmaps, which are stored in the POINTERINFO
-    // structure:
-    //   pi.hbmColor    is the actual bitmap to be
-    //                  drawn. The parts that are
-    //                  to be transparent or inverted
-    //                  are black in this image.
-    //   pi.hbmPointer  has twice the height of
-    //                  hbmColor. The upper bitmap
-    //                  contains an XOR mask (for
-    //                  inverting parts), the lower
-    //                  bitmap an AND mask (for
-    //                  transparent parts).
-    if (WinQueryPointerInfo(hptr, &pi))
-    {
-        POINTL  ptlLowerLeft = {0, 0};
-        POINTL  aptl[4];
-        memset(aptl, 0, sizeof(POINTL) * 4);
-
-        if (pptlLowerLeft)
-            // lower left specified: V0.9.16 (2001-10-15) [umoeller]
-            memcpy(&ptlLowerLeft, pptlLowerLeft, sizeof(POINTL));
-
-        // aptl[0]: target bottom-left, is all 0
-        aptl[0].x = ptlLowerLeft.x;
-        aptl[0].y = ptlLowerLeft.y;
-
-        // aptl[1]: target top-right (inclusive!)
-        // V0.9.16 (2001-10-15) [umoeller]: fixed rectangle confusion
-        aptl[1].x = ptlLowerLeft.x + ulIconSize - 1;
-        aptl[1].y = ptlLowerLeft.y + ulIconSize - 1;
-
-        // aptl[2]: source bottom-left, is all 0
-
-        // aptl[3]: source top-right (exclusive!)
-        // V0.9.16 (2001-10-15) [umoeller]: fixed rectangle confusion
-        aptl[3].x = ulIconSize; //  + 1;
-        aptl[3].y = ulIconSize; //  + 1;
-
-        GpiSetColor(hpsMem, CLR_WHITE);
-        GpiSetBackColor(hpsMem, CLR_BLACK);
-
-        // GpiErase(hpsMem);
-
-        // V0.9.19 (2002-06-13) [umoeller]:
-        // use BBO_IGNORE instead of BBO_OR or we get funny colors
-        // when scaling down
-
-        // work on the AND image
-        GpiWCBitBlt(hpsMem,     // target
-                    pi.hbmPointer,  // src bmp
-                    4L,         // must always be 4
-                    &aptl[0],   // point array
-                    ROP_SRCAND,   // source AND target
-                    BBO_IGNORE);        // V0.9.19 (2002-06-13) [umoeller]
-
-        // paint the real image
-        if (pi.hbmColor)
-            GpiWCBitBlt(hpsMem,
-                        pi.hbmColor,
-                        4L,         // must always be 4
-                        &aptl[0],   // point array
-                        ROP_SRCPAINT,    // source OR target
-                        BBO_IGNORE);        // V0.9.19 (2002-06-13) [umoeller]
-
-        GpiSetColor(hpsMem, lBkgndColor);
-        // work on the XOR image
-        aptl[2].y = ulIconSize;                 // exclusive
-        aptl[3].y = (ulIconSize * 2); //  /* + 1; */       // exclusive
-        // V0.9.16 (2001-10-15) [umoeller]: fixed rectangle confusion
-        GpiWCBitBlt(hpsMem,
-                    pi.hbmPointer,
-                    4L,         // must always be 4
-                    &aptl[0],   // point array
-                    ROP_SRCINVERT,
-                    BBO_IGNORE);        // V0.9.19 (2002-06-13) [umoeller]
-
-        brc = TRUE;
-    }
-
-    return brc;
-}
-
-#endif
-
-/*
  *@@ gpihDrawPointer:
  *      replacement for WinDrawPointer that can do clipping.
@@ -2585 +2526 @@
  *@@changed V0.9.20 (2002-07-31) [umoeller]: optimized, saved one GpiQueryBitmapInfoHeader
  *@@changed V0.9.20 (2002-08-04) [umoeller]: added DP_HALFTONED
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: optimized
  */
 
@@ -2604 +2546 @@
         POINTL  aptl[4];
         HBITMAP hbmThis;
-        BITMAPINFOHEADER2 bmiAndXor,
-                          bmiColor;
+        SIZEL   szlAndXor,      // V1.0.1 (2002-11-30) [umoeller]
+                szlColor;
 
         // A HPOINTER really consists of two bitmaps,
@@ -2716 +2658 @@
                )
             {
-                bmiAndXor.cbFix = sizeof(bmiAndXor);
-                GpiQueryBitmapInfoHeader(hbmThis, &bmiAndXor);
+                gpihQueryBitmapSize(hbmThis, &szlAndXor);   // V1.0.1 (2002-11-30) [umoeller]
 
                 // use only half the bitmap height
-                cySrc = bmiAndXor.cy / 2;
+                cySrc = szlAndXor.cy / 2;
 
                 // aptl[2]: source bottom-left
                 aptl[2].x =   0
-                            + lClipLeft   * bmiAndXor.cx / cxIcon;
+                            + lClipLeft   * szlAndXor.cx / cxIcon;
                 aptl[2].y =   cySrc
                             + lClipBottom * cySrc / cyIcon;
 
                 // aptl[3]: source top-right (exclusive!)
-                aptl[3].x =   bmiAndXor.cx
-                            - lClipRight  * bmiAndXor.cx / cxIcon;
-                aptl[3].y =   bmiAndXor.cy
+                aptl[3].x =   szlAndXor.cx
+                            - lClipRight  * szlAndXor.cx / cxIcon;
+                aptl[3].y =   szlAndXor.cy
                             - lClipTop    * cySrc / cyIcon;
 
@@ -2753 +2694 @@
                )
             {
-                bmiColor.cbFix = sizeof(bmiColor);
-                GpiQueryBitmapInfoHeader(hbmThis, &bmiColor);
+                gpihQueryBitmapSize(hbmThis, &szlColor);        // V1.0.1 (2002-11-30) [umoeller]
 
                 // aptl[2]: source bottom-left
                 aptl[2].x =   0
-                            + lClipLeft   * bmiColor.cx / cxIcon;
+                            + lClipLeft   * szlColor.cx / cxIcon;
                 aptl[2].y =   0
-                            + lClipBottom * bmiColor.cy / cyIcon;
+                            + lClipBottom * szlColor.cy / cyIcon;
 
                 // aptl[3]: source top-right (exclusive!)
-                aptl[3].x =   bmiColor.cx
-                            - lClipRight  * bmiColor.cx / cxIcon;
-                aptl[3].y =   bmiColor.cy
-                            - lClipTop    * bmiColor.cy / cyIcon;
+                aptl[3].x =   szlColor.cx
+                            - lClipRight  * szlColor.cx / cxIcon;
+                aptl[3].y =   szlColor.cy
+                            - lClipTop    * szlColor.cy / cyIcon;
 
                 GpiWCBitBlt(hps,        // target
@@ -2787 +2727 @@
                )
             {
-                /*  we queried this one above V0.9.20 (2002-07-31) [umoeller]
-                bmiAndXor.cbFix = sizeof(bmiAndXor);
-                GpiQueryBitmapInfoHeader(hbmThis, &bmiAndXor);
-                */
+                // we queried the size of this one above V0.9.20 (2002-07-31) [umoeller]
 
                 // use only half the bitmap height
-                cySrc = bmiAndXor.cy / 2;
+                cySrc = szlAndXor.cy / 2;
 
                 // aptl[2]: source bottom-left
                 aptl[2].x =   0
-                            + lClipLeft   * bmiAndXor.cx / cxIcon;
+                            + lClipLeft   * szlAndXor.cx / cxIcon;
                 aptl[2].y =   0
                             + lClipBottom * cySrc / cyIcon;
 
                 // aptl[3]: source top-right (exclusive!)
-                aptl[3].x =   bmiAndXor.cx
-                            - lClipRight  * bmiAndXor.cx / cxIcon;
+                aptl[3].x =   szlAndXor.cx
+                            - lClipRight  * szlAndXor.cx / cxIcon;
                 aptl[3].y =   cySrc
                             - lClipTop    * cySrc / cyIcon;

trunk/src/helpers/helpers_pre.in

@@ -89 +89 @@
 $(OUTPUTDIR)\cctl_progbar.obj\
 $(OUTPUTDIR)\cctl_splitwin.obj\
+$(OUTPUTDIR)\cctl_toolbar.obj\
 $(OUTPUTDIR)\cctl_tooltip.obj\
+$(OUTPUTDIR)\cctl_xframe.obj\
 $(OUTPUTDIR)\comctl.obj\
 $(OUTPUTDIR)\configsys.obj\

trunk/src/helpers/linklist.c

@@ -732 +732 @@
         {
             // insert at a later position:
-            PLISTNODE pNodeInsertAfter = lstNodeFromIndex(
-                                    pList,
-                                    (ulIndex-1));
-
-            if (pNodeInsertAfter)
+            PLISTNODE pNodeInsertAfter;
+
+            if (pNodeInsertAfter = lstNodeFromIndex(pList,
+                                                    (ulIndex - 1)))
             {
                 // 1) set pointers for new node

trunk/src/helpers/makefile

@@ -263 +263 @@
 # fdlg.exe
 FDLG_TEST_OBJS = \
+    $(TESTCASE_DIR)\comctl.obj \
+    $(TESTCASE_DIR)\cctl_toolbar.obj \
+    $(TESTCASE_DIR)\cctl_tooltip.obj \
+    $(TESTCASE_DIR)\cctl_xframe.obj \
     $(TESTCASE_DIR)\dosh.obj \
     $(TESTCASE_DIR)\gpih.obj \
+    $(TESTCASE_DIR)\linklist.obj \
     $(TESTCASE_DIR)\winh.obj \
     $(TESTCASE_DIR)\stringh.obj \
@@ -271 +276 @@
 
 fdlg.exe: $(FDLG_TEST_OBJS)
-    ilink /debug /pmtype:pm $(FDLG_TEST_OBJS) /o:$@
+    ilink /debug /pmtype:pm $(FDLG_TEST_OBJS) pmprintf.lib /o:$@
 
 # xmap.exe

trunk/src/helpers/winh.c

@@ -271 +271 @@
 /* ******************************************************************
  *
+ *   Global variables
+ *
+ ********************************************************************/
+
+extern LONG G_cxScreen = 0,
+            G_cyScreen = 0,
+            G_cxIcon = 0,
+            G_cyIcon = 0,
+            G_lcol3DDark = 0,         // lo-3D color
+            G_lcol3DLight = 0;        // hi-3D color
+
+/* ******************************************************************
+ *
  *   Generics
  *
  ********************************************************************/
+
+/*
+ *@@ winhInitGlobals:
+ *      initializes a few global variables that are usually
+ *      used all the time in many applications and also
+ *      internally by many helper routines. You must call
+ *      this at the start of your application if you want
+ *      to use these.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+VOID winhInitGlobals(VOID)
+{
+    G_cxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
+    G_cyScreen = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
+    G_cxIcon = WinQuerySysValue(HWND_DESKTOP, SV_CXICON);
+    G_cyIcon = WinQuerySysValue(HWND_DESKTOP, SV_CYICON);
+    G_lcol3DDark = WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONDARK, 0);
+    G_lcol3DLight = WinQuerySysColor(HWND_DESKTOP, SYSCLR_BUTTONLIGHT, 0);
+}
 
 /*
@@ -2805 +2839 @@
         // if (xNew + swpThis.cy > WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
                 // not cy, but cx V1.0.0 (2002-08-26) [umoeller]
-        if (xNew + swpThis.cx > WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN))
+        if (xNew + swpThis.cx > G_cxScreen)
         {
             // place left then
@@ -2902 +2936 @@
 
 /*
+ *@@ winhQueryDefaultFont:
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+PCSZ winhQueryDefaultFont(VOID)
+{
+    if (doshIsWarp4())
+        return "9.WarpSans";
+
+    return "8.Helv";
+}
+
+/*
  *@@ winhSetWindowFont:
  *      this sets a window's font by invoking
@@ -2914 +2962 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: optimized
  */
 
@@ -2919 +2968 @@
                        const char *pcszFont)
 {
-    CHAR    szFont[256];
-
-    if (pcszFont == NULL)
-    {
-        if (doshIsWarp4())
-            strhncpy0(szFont, "9.WarpSans", sizeof(szFont));
-        else
-            strhncpy0(szFont, "8.Helv", sizeof(szFont));
-    }
-    else
-        strhncpy0(szFont, pcszFont, sizeof(szFont));
+    if (!pcszFont)
+        pcszFont = winhQueryDefaultFont();
 
     return WinSetPresParam(hwnd,
                            PP_FONTNAMESIZE,
-                           strlen(szFont)+1,
-                           szFont);
+                           strlen(pcszFont) + 1,
+                           (PSZ)pcszFont);
 }
 
@@ -3082 +3122 @@
         }
     }
+
     return brc;
+}
+
+/*
+ *@@ winhCreateDefaultPresparams:
+ *
+ *      Caller must free() the return value.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+PPRESPARAMS winhCreateDefaultPresparams(VOID)
+{
+    PPRESPARAMS ppp = NULL;
+
+    PCSZ    pcszFont = winhQueryDefaultFont();
+    LONG    lColor;
+
+    winhStorePresParam(&ppp,
+                       PP_FONTNAMESIZE,
+                       strlen(pcszFont) + 1,
+                       (PVOID)pcszFont);
+
+    lColor = WinQuerySysColor(HWND_DESKTOP,
+                              SYSCLR_DIALOGBACKGROUND,
+                              0);
+    winhStorePresParam(&ppp,
+                       PP_BACKGROUNDCOLOR,
+                       sizeof(lColor),
+                       &lColor);
+
+    lColor = RGBCOL_BLACK;
+    winhStorePresParam(&ppp,
+                       PP_FOREGROUNDCOLOR,
+                       sizeof(lColor),
+                       &lColor);
+
+    return ppp;
 }
 
@@ -3497 +3575 @@
 
 /*
- *@@ winhMyAnchorBlock:
- *      returns the proper anchor block (HAB)
- *      for the calling thread.
- *
- *      Many Win* functions require an HAB to be
- *      passed in. While many of them will work
- *      when passing in NULLHANDLE, some (such as
- *      WinGetMsg) won't. If you don't know the
- *      anchor block of the calling thread, use
- *      this function.
- *
- *      This creates a temporary object window to
- *      find out the anchor block. This is quite
- *      expensive so only use this if there's no
- *      other way to find out.
- *
- *@@added V0.9.11 (2001-04-20) [umoeller]
- */
-
-HAB winhMyAnchorBlock(VOID)
-{
-    HAB hab = NULLHANDLE;
-    HWND hwnd;
-    if (hwnd = winhCreateObjectWindow(WC_BUTTON, NULL))
-    {
-        hab = WinQueryAnchorBlock(hwnd);
-        WinDestroyWindow(hwnd);
-    }
-
-    return hab;
-}
-
-/*
  *@@ winhFree:
  *      frees a block of memory allocated by the
@@ -3728 +3773 @@
 
 /*
+ *@@ winhQueryWaitPointer:
+ *      shortcut for getting the system "wait" pointer.
+ *
+ *@@added V1.0.1 (2002-11-30) [umoeller]
+ */
+
+HPOINTER winhQueryWaitPointer(VOID)
+{
+    return WinQuerySysPointer(HWND_DESKTOP,
+                              SPTR_WAIT,
+                              FALSE);   // no copy
+}
+
+/*
  *@@ winhSetWaitPointer:
  *      this sets the mouse pointer to "Wait".
@@ -3742 +3801 @@
     HPOINTER hptr = WinQueryPointer(HWND_DESKTOP);
     WinSetPointer(HWND_DESKTOP,
-                  WinQuerySysPointer(HWND_DESKTOP,
-                                     SPTR_WAIT,
-                                     FALSE));   // no copy
+                  winhQueryWaitPointer());
     return hptr;
 }
@@ -3760 +3817 @@
 {
     PSZ     pszText = NULL;
-    ULONG   cbText = WinQueryWindowTextLength(hwnd);
-                                    // additional null character
-    if (cbText)
-    {
-        if (pszText = (PSZ)malloc(cbText + 1))
+    ULONG   cbText;
+    if (cbText = WinQueryWindowTextLength(hwnd))
+    {
+        if (pszText = (PSZ)malloc(cbText + 1))  // additional null character
             WinQueryWindowText(hwnd,
                                cbText + 1,
                                pszText);
     }
+
     return pszText;
 }
@@ -3821 +3878 @@
 {
     BOOL    brc = FALSE;
-    PSZ     pszText = winhQueryWindowText(hwnd);
-    if (pszText)
+    PSZ     pszText;
+
+    if (pszText = winhQueryWindowText(hwnd))
     {
         ULONG ulOfs = 0;
@@ -3830 +3888 @@
             brc = TRUE;
         }
+
         free(pszText);
     }
+
     return brc;
 }
@@ -3939 +3999 @@
  *@@changed V0.9.5 (2000-08-13) [umoeller]: flStyleClient never worked, fixed
  *@@changed V0.9.7 (2000-12-08) [umoeller]: fixed client calc for invisible window
+ *@@changed V1.0.1 (2002-11-30) [umoeller]: added support for NULL pcszClassClient
  */
 
@@ -3947 +4008 @@
                          const char *pcszFrameTitle, // in: frame title (title bar)
                          ULONG ulResourcesID,       // in: according to FCF_* flags
-                         const char *pcszClassClient, // in: client class name
+                         const char *pcszClassClient, // in: client class name (can be NULL for no client)
                          ULONG flStyleClient,       // in: client style
                          ULONG ulID,                // in: frame window ID
                          PVOID pClientCtlData,      // in: pCtlData structure pointer for client
-                         PHWND phwndClient)         // out: created client wnd
+                         PHWND phwndClient)         // out: created client wnd (required)
 {
     FRAMECDATA  fcdata;
@@ -3962 +4023 @@
     fcdata.idResources   = ulResourcesID;
 
-    /* Create the frame and client windows.  */
-    hwndFrame = WinCreateWindow(hwndFrameParent,
-                                WC_FRAME,
-                                (PSZ)pcszFrameTitle,
-                                ulFrameStyle,
-                                0,0,0,0,         // size and position = 0
-                                NULLHANDLE,      // no owner
-                                HWND_TOP,        // z-order
-                                ulID,            // frame window ID
-                                &fcdata,         // frame class data
-                                NULL);           // no presparams
-
-    if (hwndFrame)
-    {
-        if (*phwndClient = WinCreateWindow(hwndFrame,      // parent
-                                           (PSZ)pcszClassClient, // class
-                                           NULL,           // no title
-                                           flStyleClient,  // style
-                                           0,0,0,0,        // size and position = 0
-                                           hwndFrame,      // owner
-                                           HWND_BOTTOM,    // bottom z-order
-                                           FID_CLIENT,     // frame window ID
-                                           pClientCtlData, // class data
-                                           NULL))          // no presparams
+    // create the frame and client windows
+    if (hwndFrame = WinCreateWindow(hwndFrameParent,
+                                    WC_FRAME,
+                                    (PSZ)pcszFrameTitle,
+                                    ulFrameStyle,
+                                    0,0,0,0,
+                                    NULLHANDLE,
+                                    HWND_TOP,
+                                    ulID,
+                                    &fcdata,
+                                    NULL))
+    {
+        if (    (!pcszClassClient)          // V1.0.1 (2002-11-30) [umoeller]
+             || (*phwndClient = WinCreateWindow(hwndFrame,      // parent
+                                                (PSZ)pcszClassClient, // class
+                                                NULL,           // no title
+                                                flStyleClient,  // style
+                                                0,0,0,0,        // size and position = 0
+                                                hwndFrame,      // owner
+                                                HWND_BOTTOM,    // bottom z-order
+                                                FID_CLIENT,     // frame window ID
+                                                pClientCtlData, // class data
+                                                NULL))          // no presparams
+           )
         {
             if (pswpFrame)
@@ -3998 +4059 @@
                                 pswpFrame->fl);
 
-                // position client
-                // WinQueryWindowRect(hwndFrame, &rclClient);
-                // doesn't work because it might be invisible V0.9.7 (2000-12-08) [umoeller]
-                rclClient.xLeft = 0;
-                rclClient.yBottom = 0;
-                rclClient.xRight = pswpFrame->cx;
-                rclClient.yTop = pswpFrame->cy;
-                WinCalcFrameRect(hwndFrame,
-                                 &rclClient,
-                                 TRUE);     // calc client from frame
-                WinSetWindowPos(*phwndClient,
-                                HWND_TOP,
-                                rclClient.xLeft,
-                                rclClient.yBottom,
-                                rclClient.xRight - rclClient.xLeft,
-                                rclClient.yTop - rclClient.yBottom,
-                                SWP_MOVE | SWP_SIZE | SWP_SHOW);
+                if (!pcszClassClient)
+                    *phwndClient = NULLHANDLE;
+                else
+                {
+                    // position client
+                    // WinQueryWindowRect(hwndFrame, &rclClient);
+                    // doesn't work because it might be invisible V0.9.7 (2000-12-08) [umoeller]
+                    rclClient.xLeft = 0;
+                    rclClient.yBottom = 0;
+                    rclClient.xRight = pswpFrame->cx;
+                    rclClient.yTop = pswpFrame->cy;
+                    WinCalcFrameRect(hwndFrame,
+                                     &rclClient,
+                                     TRUE);     // calc client from frame
+                    WinSetWindowPos(*phwndClient,
+                                    HWND_TOP,
+                                    rclClient.xLeft,
+                                    rclClient.yBottom,
+                                    rclClient.xRight - rclClient.xLeft,
+                                    rclClient.yTop - rclClient.yBottom,
+                                    SWP_MOVE | SWP_SIZE | SWP_SHOW);
+                }
             }
         }
@@ -4119 +4185 @@
         if (WinQueryClassName(hwndThis, sizeof(szClass), szClass))
         {
-            if (strcmp(szClass, "#32767") == 0)
+            if (!strcmp(szClass, "#32767"))
             {
                 // message queue window:
@@ -4132 +4198 @@
                 {
                     // get HMQ from window words
-                    rc = WinQueryWindowULong(hwndThis, QWL_HMQ);
-                    if (rc)
+                    if (rc = WinQueryWindowULong(hwndThis, QWL_HMQ))
                         if (phab)
                             *phab = WinQueryAnchorBlock(hwndThis);
+
                     break;
                 }
@@ -4178 +4244 @@
     // enumerate all child windows of HWND_OBJECT
     henumObject = WinBeginEnumWindows(HWND_OBJECT);
-    while ((hwndObjectChild = WinGetNextWindow(henumObject)) != NULLHANDLE)
+    while ((hwndObjectChild = WinGetNextWindow(henumObject)))
     {
         // see if the current HWND_OBJECT child window runs in the
@@ -4272 +4338 @@
                            WS_VISIBLE,    // window style
                            0, 0,          // position and size
-                           WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN),
-                           WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN),
+                           G_cxScreen,
+                           G_cyScreen,
                            NULLHANDLE,    // owner window
                            hwndSibling,   // sibling window
@@ -4426 +4492 @@
  *         was encountered.
  *
- *      You can specify DT_QUERYEXTENT with flDraw to only have
- *      these text boundaries calculated without actually drawing.
+ *      The following DT_* flags are supported:
+ *
+ *      --  DT_LEFT, DT_CENTER, DT_RIGHT all work.
+ *
+ *      --  Vertically however only DT_TOP is supported.
+ *
+ *      --  You can specify DT_QUERYEXTENT to only have
+ *          these text boundaries calculated without actually
+ *          drawing.
+ *
+ *      Note that DT_TEXTATTRS will always be added, so you
+ *      will want to call GpiSetColor before this.
  *
  *      This returns the number of lines drawn.
- *
- *      Note that this calls WinDrawText with DT_TEXTATTRS set,
- *      that is, the current text primitive attributes will be
- *      used (fonts and colors).
  *
  *@@changed V0.9.0 [umoeller]: prcl.xLeft and xRight are now updated too upon return
@@ -4443 +4515 @@
                                          // (modified)
                             const char *pcszText, // in: text to draw (zero-terminated)
-                            ULONG flCmd) // in: flags like in WinDrawText; I have
-                                         // only tested DT_TOP and DT_LEFT though.
-                                         // DT_WORDBREAK | DT_TEXTATTRS are always
-                                         // set.
-                                         // You can specify DT_QUERYEXTENT to only
-                                         // have prcl calculated without drawing.
+                            ULONG flCmd) // in: DT_* flags like in WinDrawText; see remarks
 {
     PSZ     p = (PSZ)pcszText;
@@ -4472 +4539 @@
         memcpy(&rcl2, prcl, sizeof(rcl2));
         lDrawn = WinDrawText(hps,
-                             ulTextLen-lTotalDrawn,
+                             ulTextLen - lTotalDrawn,
                              p,
                              &rcl2,
-                             0, 0,                       // colors
+                             0,
+                             0,                       // colors
                              flCmd2);
 
@@ -4494 +4562 @@
         lLineCount++;
     }
+
     prcl->xLeft = xLeftmost;
     prcl->xRight = xRightmost;
@@ -4521 +4590 @@
 PSWBLOCK winhQuerySwitchList(HAB hab)
 {
-    ULONG   cItems = WinQuerySwitchList(hab, NULL, 0);
-    ULONG   ulBufSize = (cItems * sizeof(SWENTRY)) + sizeof(HSWITCH);
-    PSWBLOCK pSwBlock = (PSWBLOCK)malloc(ulBufSize);
-    if (pSwBlock)
-    {
-        cItems = WinQuerySwitchList(hab, pSwBlock, ulBufSize);
-        if (!cItems)
+    ULONG       cItems = WinQuerySwitchList(hab, NULL, 0);
+    ULONG       ulBufSize = (cItems * sizeof(SWENTRY)) + sizeof(HSWITCH);
+    PSWBLOCK    pSwBlock;
+    if (pSwBlock = (PSWBLOCK)malloc(ulBufSize))
+    {
+        if (!(cItems = WinQuerySwitchList(hab, pSwBlock, ulBufSize)))
         {
             free(pSwBlock);
@@ -4747 +4815 @@
                     &ShiftState, DataLen, &DataLen,
                     NULL, 0L, NULL);
+
         // now close OS/2 keyboard driver
         DosClose(hKbd);
     }
-    return;
 }
 
@@ -4798 +4866 @@
 
 /*
- *@@category: Helpers\PM helpers\Extended frame windows
- */
-
-/* ******************************************************************
- *
- *   Extended frame
- *
- ********************************************************************/
-
-/*
- *@@ winhCalcExtFrameRect:
- *      implementation for WM_CALCFRAMERECT in fnwpSubclExtFrame.
- *      This is exported so it can be used independently
- *      (XWorkplace status bars).
- *
- *@@added V1.0.0 (2002-08-28) [umoeller]
- */
-
-VOID winhCalcExtFrameRect(MPARAM mp1,
-                          MPARAM mp2,
-                          LONG lStatusBarHeight)
-{
-    PRECTL prclPassed = (PRECTL)mp1;
-
-    // mp2 == TRUE:  Frame rectangle provided, calculate client
-    // mp2 == FALSE: Client area rectangle provided, calculate frame
-    if (mp2)
-    {
-        //  TRUE: calculate the rectl of the client;
-        //  call default window procedure to subtract child frame
-        //  controls from the rectangle's height
-        LONG lClientHeight;
-
-        //  position the static text frame extension below the client
-        lClientHeight = prclPassed->yTop - prclPassed->yBottom;
-        if (lStatusBarHeight > lClientHeight)
-            // extension is taller than client, so set client height to 0
-            prclPassed->yTop = prclPassed->yBottom;
-        else
-        {
-            //  set the origin of the client and shrink it based upon the
-            //  static text control's height
-            prclPassed->yBottom += lStatusBarHeight;
-            prclPassed->yTop -= lStatusBarHeight;
-        }
-    }
-    else
-    {
-        //  FALSE: calculate the rectl of the frame;
-        //  call default window procedure to subtract child frame
-        //  controls from the rectangle's height;
-        //  set the origin of the frame and increase it based upon the
-        //  static text control's height
-        prclPassed->yBottom -= lStatusBarHeight;
-        prclPassed->yTop += lStatusBarHeight;
-    }
-}
-
-#define STATUS_BAR_HEIGHT       20
-
-/*
- *@@ fnwpSubclExtFrame:
- *      subclassed frame window proc.
- *
- *@@added V0.9.16 (2001-09-29) [umoeller]
- */
-
-MRESULT EXPENTRY fnwpSubclExtFrame(HWND hwndFrame, ULONG msg, MPARAM mp1, MPARAM mp2)
-{
-    MRESULT mrc = 0;
-
-    PEXTFRAMEDATA pData = (PEXTFRAMEDATA)WinQueryWindowPtr(hwndFrame, QWL_USER);
-
-    switch (msg)
-    {
-        case WM_QUERYFRAMECTLCOUNT:
-        {
-            // query the standard frame controls count
-            ULONG ulrc = (ULONG)pData->pfnwpOrig(hwndFrame, msg, mp1, mp2);
-
-            // if we have a status bar, increment the count
-            ulrc++;
-
-            mrc = (MPARAM)ulrc;
-        }
-        break;
-
-        case WM_FORMATFRAME:
-        {
-            // query the number of standard frame controls
-            ULONG ulCount = (ULONG)pData->pfnwpOrig(hwndFrame, msg, mp1, mp2);
-
-            // we have a status bar:
-            // format the frame
-            ULONG       ul;
-            PSWP        swpArr = (PSWP)mp1;
-
-            for (ul = 0; ul < ulCount; ul++)
-            {
-                if (WinQueryWindowUShort(swpArr[ul].hwnd, QWS_ID) == 0x8008)
-                                                                 // FID_CLIENT
-                {
-                    POINTL      ptlBorderSizes;
-                    WinSendMsg(hwndFrame,
-                               WM_QUERYBORDERSIZE,
-                               (MPARAM)&ptlBorderSizes,
-                               0);
-
-                    // first initialize the _new_ SWP for the status bar.
-                    // Since the SWP array for the std frame controls is
-                    // zero-based, and the standard frame controls occupy
-                    // indices 0 thru ulCount-1 (where ulCount is the total
-                    // count), we use ulCount for our static text control.
-                    swpArr[ulCount].fl = SWP_MOVE | SWP_SIZE | SWP_NOADJUST | SWP_ZORDER;
-                    swpArr[ulCount].x  = ptlBorderSizes.x;
-                    swpArr[ulCount].y  = ptlBorderSizes.y;
-                    swpArr[ulCount].cx = swpArr[ul].cx;  // same as cnr's width
-                    swpArr[ulCount].cy = STATUS_BAR_HEIGHT;
-                    swpArr[ulCount].hwndInsertBehind = HWND_BOTTOM; // HWND_TOP;
-                    swpArr[ulCount].hwnd = WinWindowFromID(hwndFrame, FID_STATUSBAR);
-
-                    // adjust the origin and height of the container to
-                    // accomodate our static text control
-                    swpArr[ul].y  += swpArr[ulCount].cy;
-                    swpArr[ul].cy -= swpArr[ulCount].cy;
-                }
-            }
-
-            // increment the number of frame controls
-            // to include our status bar
-            mrc = (MRESULT)(ulCount + 1);
-        }
-        break;
-
-        case WM_CALCFRAMERECT:
-            mrc = pData->pfnwpOrig(hwndFrame, msg, mp1, mp2);
-
-            // we have a status bar: calculate its rectangle
-            winhCalcExtFrameRect(mp1,
-                                 mp2,
-                                 STATUS_BAR_HEIGHT);
-        break;
-
-        case WM_DESTROY:
-            WinSubclassWindow(hwndFrame, pData->pfnwpOrig);
-            free(pData);
-            WinSetWindowPtr(hwndFrame, QWL_USER, NULL);
-        break;
-
-        default:
-            mrc = pData->pfnwpOrig(hwndFrame, msg, mp1, mp2);
-    }
-
-    return mrc;
-}
-
-/*
- *@@ winhCreateStatusBar:
- *      creates a status bar for a frame window.
- *
- *      Normally there's no need to call this manually,
- *      this gets called by winhCreateExtStdWindow
- *      automatically.
- *
- *@@added V0.9.16 (2001-09-29) [umoeller]
- */
-
-HWND winhCreateStatusBar(HWND hwndFrame,
-                         HWND hwndOwner,
-                         const char *pcszText,      // in: initial status bar text
-                         const char *pcszFont,      // in: font to use for status bar
-                         LONG lColor)               // in: foreground color for status bar
-{
-    // create status bar
-    HWND        hwndReturn = NULLHANDLE;
-    PPRESPARAMS ppp = NULL;
-
-    winhStorePresParam(&ppp,
-                       PP_FONTNAMESIZE,
-                       strlen(pcszFont) + 1,
-                       (PVOID)pcszFont);
-
-    lColor = WinQuerySysColor(HWND_DESKTOP,
-                              SYSCLR_DIALOGBACKGROUND,
-                              0);
-    winhStorePresParam(&ppp,
-                       PP_BACKGROUNDCOLOR,
-                       sizeof(lColor),
-                       &lColor);
-
-    lColor = CLR_BLACK;
-    winhStorePresParam(&ppp,
-                       PP_FOREGROUNDCOLOR,
-                       sizeof(lColor),
-                       &lColor);
-
-    hwndReturn = WinCreateWindow(hwndFrame,
-                                 WC_STATIC,
-                                 (PSZ)pcszText,
-                                 SS_TEXT | DT_VCENTER | WS_VISIBLE,
-                                 0, 0, 0, 0,
-                                 hwndOwner,
-                                 HWND_TOP,
-                                 FID_STATUSBAR,
-                                 NULL,
-                                 ppp);
-    free(ppp);
-
-    return hwndReturn;
-}
-
-/*
- *@@ winhCreateExtStdWindow:
- *      creates an extended frame window.
- *
- *      pData must point to an EXTFRAMECDATA structure
- *      which contains a copy of the parameters to be
- *      passed to winhCreateStdWindow. In addition,
- *      this contains the flExtFlags field, which allows
- *      you to automatically create a status bar for
- *      the window.
- *
- *      Note that we subclass the frame here and require
- *      QWL_USER for that. The frame's QWL_USER points
- *      to an EXTFRAMEDATA structure whose pUser parameter
- *      you may use for additional data, if you want to
- *      do further subclassing.
- *
- *@@added V0.9.16 (2001-09-29) [umoeller]
- */
-
-HWND winhCreateExtStdWindow(PEXTFRAMECDATA pData,        // in: extended frame data
-                            PHWND phwndClient)          // out: created client wnd
-{
-    HWND hwndFrame;
-
-    if (hwndFrame = winhCreateStdWindow(HWND_DESKTOP,
-                                        pData->pswpFrame,
-                                        pData->flFrameCreateFlags,
-                                        pData->ulFrameStyle,
-                                        pData->pcszFrameTitle,
-                                        pData->ulResourcesID,
-                                        pData->pcszClassClient,
-                                        pData->flStyleClient,
-                                        pData->ulID,
-                                        pData->pClientCtlData,
-                                        phwndClient))
-    {
-        if (pData->flExtFlags & XFCF_STATUSBAR)
-        {
-            // create status bar as child of the frame
-            HWND hwndStatusBar = winhCreateStatusBar(hwndFrame,
-                                                     hwndFrame,
-                                                     "",
-                                                     "9.WarpSans",
-                                                     CLR_BLACK);
-
-            // subclass frame for supporting status bar and msgs
-            PEXTFRAMEDATA pFrameData;
-            if (pFrameData = NEW(EXTFRAMEDATA))
-            {
-                ZERO(pFrameData),
-                memcpy(&pFrameData->CData, pData, sizeof(pFrameData->CData));
-                if (pFrameData->pfnwpOrig = WinSubclassWindow(hwndFrame,
-                                                              fnwpSubclExtFrame))
-                {
-                    WinSetWindowPtr(hwndFrame, QWL_USER, pFrameData);
-                }
-                else
-                    free(pFrameData);
-            }
-        }
-    }
-
-    return hwndFrame;
-}
-
-/*
  *@@category: Helpers\PM helpers\Workplace Shell\WPS class list
  */
@@ -5156 +4946 @@
     while (pocThis)
     {
-        if (strcmp(pocThis->pszClassName, pszClass) == 0)
+        if (!strcmp(pocThis->pszClassName, pszClass))
         {
             pbReturn = (PBYTE)pocThis;
             break;
         }
+
         // next class
         pocThis = pocThis->pNext;
@@ -5237 +5028 @@
         // failed: do more error checking then, try DosLoadModule
         HMODULE hmod = NULLHANDLE;
-        arc = DosLoadModule(pszBuf, cbBuf,
-                            (PSZ)pcszModule,
-                            &hmod);
-        if (arc == NO_ERROR)
+        if (!(arc = DosLoadModule(pszBuf, cbBuf,
+                                  (PSZ)pcszModule,
+                                  &hmod)))
         {
             // DosLoadModule succeeded:
@@ -5266 +5056 @@
 {
     BOOL    brc = FALSE;
-    PBYTE   pClassList = winhQueryWPSClassList();
-    if (pClassList)
+    PBYTE   pClassList;
+
+    if (pClassList = winhQueryWPSClassList())
     {
         if (winhQueryWPSClass(pClassList, pcszClass))
             brc = TRUE;
+
         free(pClassList);
     }
@@ -5331 +5123 @@
     return ulrc;
 }
+