Changeset 81

Timestamp:

Jun 23, 2001, 11:12:49 AM (24 years ago)

Author:

umoeller

Message:

Tons of changes from the last weeks.

Location:

trunk

Files:

• include/helpers/comctl.h (modified) (5 diffs)
• include/helpers/dosh.h (modified) (6 diffs)
• include/helpers/except.h (modified) (1 diff)
• include/helpers/stringh.h (modified) (1 diff)
• include/helpers/winh.h (modified) (1 diff)
• src/helpers/cctl_tooltip.c (modified) (29 diffs)
• src/helpers/comctl.c (modified) (1 diff)
• src/helpers/dialog.c (modified) (1 diff)
• src/helpers/dosh.c (modified) (12 diffs)
• src/helpers/except.c (modified) (4 diffs)
• src/helpers/gpih.c (modified) (1 diff)
• src/helpers/stringh.c (modified) (1 diff)
• src/helpers/winh.c (modified) (1 diff)

trunk/include/helpers/comctl.h

@@ -36 +36 @@
 #ifndef COMCTL_HEADER_INCLUDED
     #define COMCTL_HEADER_INCLUDED
+
+    /* ******************************************************************
+     *
+     *   "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       cxMiniIcon;         // system mini icon size
+
+        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                0x0001
+
+    #define XBF_PRESSED             0x00010000
+    #define XBF_BACKGROUND          0x00020000
+    #define XBF_INUSE               0x00040000
+
+    VOID ctlPaintXButton(HPS hps,
+                         ULONG fl,
+                         PXBUTTONDATA pxbd);
 
     /* ******************************************************************
@@ -670 +708 @@
     /*
      *@@ TOOLTIPTEXT:
-     *      identifies a tool for which text is to be displayed and
-     *      receives the text for the tool. The tool must fill all
-     *      fields of this structure.
-     *
-     *      This structure is used with the TTN_NEEDTEXT notification.
+     *      identifies a tool for which text is to
+     *      be displayed and receives the text for
+     *      the tool. The tool must fill all fields
+     *      of this structure.
+     *
+     *      This structure is used with the TTN_NEEDTEXT
+     *      notification.
      *
      *@@changed V0.9.7 (2001-01-03) [umoeller]: got rid of this win95 crap
@@ -693 +733 @@
                     // out: with TTFMT_PSZ, pointer to a string that contains the
                     // tool text. Note that this is not copied into the tooltip...
-                    // so this must point to a static buffer.
+                    // so this must point to a static buffer that is valid while
+                    // the tooltip is showing.
         HMODULE hmod;
                     // out: with TTFMT_STRINGRES, the module handle of the resource.
@@ -790 +831 @@
      *      -- mp1 USHORT usID;
      *             USHORT usNotifyCode == TTN_NEEDTEXT
-     *      -- ULONG mp2: identifier of the tool, as in TOOLINFO.uId.
+     *      -- ULONG mp2: PTOOLINFO of the tool for which the
+     *             tool is about to be displayed.
      *
      *      Return value: always 0.
@@ -808 +850 @@
      *      -- mp1 USHORT usID;
      *             USHORT usNotifyCode == TTN_NEEDTEXT
-     *      -- ULONG mp2: identifier of the tool, as in TOOLINFO.uId.
+     *      -- ULONG mp2: PTOOLINFO of the tool for which the
+     *             tooltip was visible.
      *
      *      Return value: always 0.

trunk/include/helpers/dosh.h

@@ -66 +66 @@
      ********************************************************************/
 
-    VOID XWPENTRY doshEnumDrives(PSZ pszBuffer,
-                                 const char *pcszFileSystem,
-                                 BOOL fSkipRemoveables);
-    typedef VOID XWPENTRY DOSHENUMDRIVES(PSZ pszBuffer,
-                                         const char *pcszFileSystem,
-                                         BOOL fSkipRemoveables);
-    typedef DOSHENUMDRIVES *PDOSHENUMDRIVES;
-
-    CHAR doshQueryBootDrive(VOID);
-
-    APIRET doshAssertDrive(ULONG ulLogicalDrive);
-
-    APIRET doshSetLogicalMap(ULONG ulLogicalDrive);
-
-    APIRET XWPENTRY doshQueryDiskSize(ULONG ulLogicalDrive, double *pdSize);
-    typedef APIRET XWPENTRY DOSHQUERYDISKSIZE(ULONG ulLogicalDrive, double *pdSize);
-    typedef DOSHQUERYDISKSIZE *PDOSHQUERYDISKSIZE;
-
-    APIRET XWPENTRY doshQueryDiskFree(ULONG ulLogicalDrive, double *pdFree);
-    typedef APIRET XWPENTRY DOSHQUERYDISKFREE(ULONG ulLogicalDrive, double *pdFree);
-    typedef DOSHQUERYDISKFREE *PDOSHQUERYDISKFREE;
-
-    APIRET XWPENTRY doshQueryDiskFSType(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
-    typedef APIRET XWPENTRY DOSHQUERYDISKFSTYPE(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
-    typedef DOSHQUERYDISKFSTYPE *PDOSHQUERYDISKFSTYPE;
-
     APIRET doshIsFixedDisk(ULONG  ulLogicalDrive,
                            PBOOL  pfFixed);
@@ -102 +76 @@
         #define DEVATTR_GREATER16MB 0x0004      // physical device driver supports physical addresses > 16 MB
 
-        #pragma pack(1)
+        // #pragma pack(1)
 
         /*
-         *@@ DRIVEPARAMS:
+         * DRIVEPARAMS:
          *      structure used for doshQueryDiskParams.
+         * removed this, we can directly use BIOSPARAMETERBLOCK
+         * V0.9.13 (2001-06-14) [umoeller]
          */
 
-        typedef struct _DRIVEPARAMS
+        /* typedef struct _DRIVEPARAMS
         {
             BIOSPARAMETERBLOCK bpb;
@@ -116 +92 @@
                         // in the OS2 headers as follows:
 
-                        /*
                         typedef struct _BIOSPARAMETERBLOCK {
-                          USHORT     usBytesPerSector;
+                    0     USHORT     usBytesPerSector;
                                         //  Number of bytes per sector.
-                          BYTE       bSectorsPerCluster;
+                    2     BYTE       bSectorsPerCluster;
                                         //  Number of sectors per cluster.
-                          USHORT     usReservedSectors;
+                    3     USHORT     usReservedSectors;
                                         //  Number of reserved sectors.
-                          BYTE       cFATs;
+                    5     BYTE       cFATs;
                                         //  Number of FATs.
-                          USHORT     cRootEntries;
+                    6     USHORT     cRootEntries;
                                         //  Number of root directory entries.
-                          USHORT     cSectors;
+                    8     USHORT     cSectors;
                                         //  Number of sectors.
-                          BYTE       bMedia;
+                    10    BYTE       bMedia;
                                         //  Media descriptor.
-                          USHORT     usSectorsPerFAT;
+                    11    USHORT     usSectorsPerFAT;
                                         //  Number of secctors per FAT.
-                          USHORT     usSectorsPerTrack;
+                    13    USHORT     usSectorsPerTrack;
                                         //  Number of sectors per track.
-                          USHORT     cHeads;
+                    15    USHORT     cHeads;
                                         //  Number of heads.
-                          ULONG      cHiddenSectors;
+                    17    ULONG      cHiddenSectors;
                                         //  Number of hidden sectors.
-                          ULONG      cLargeSectors;
+                    21    ULONG      cLargeSectors;
                                         //  Number of large sectors.
-                          BYTE       abReserved[6];
+                    25    BYTE       abReserved[6];
                                         //  Reserved.
-                          USHORT     cCylinders;
+                    31    USHORT     cCylinders;
                                         //  Number of cylinders defined for the physical
                                         // device.
-                          BYTE       bDeviceType;
+                    33    BYTE       bDeviceType;
                                         //  Physical layout of the specified device.
-                          USHORT     fsDeviceAttr;
+                    34    USHORT     fsDeviceAttr;
                                         //  A bit field that returns flag information
                                         //  about the specified drive.
-                        } BIOSPARAMETERBLOCK; */
+                        } BIOSPARAMETERBLOCK;
+
+            // removed the following fields... these are already
+            // in the extended BPB structure, as defined in the
+            // Toolkit's BIOSPARAMETERBLOCK struct. Checked this,
+            // the definition is the same for the Toolkit 3 and 4.5.
 
             USHORT  usCylinders;
@@ -167 +147 @@
                         // --  5:  Fixed disk
                         // --  6:  Tape drive
-                        // --  7:  Other (includes 1.44MB 3.5-inch diskette drive)
+                        // --  7:  Other (includes 1.44MB 3.5-inch diskette drive
+                        //         and CD-ROMs)
                         // --  8:  R/W optical disk
                         // --  9:  3.5-inch 4.0MB diskette drive (2.88MB formatted)
@@ -173 +154 @@
                         // DEVATTR_* flags
         } DRIVEPARAMS, *PDRIVEPARAMS;
-        #pragma pack()
+        #pragma pack() */
 
         APIRET doshQueryDiskParams(ULONG ulLogicalDrive,
-                                   PDRIVEPARAMS pdp);
+                                   PBIOSPARAMETERBLOCK pdp);
     #endif
+
+    VOID XWPENTRY doshEnumDrives(PSZ pszBuffer,
+                                 const char *pcszFileSystem,
+                                 BOOL fSkipRemoveables);
+    typedef VOID XWPENTRY DOSHENUMDRIVES(PSZ pszBuffer,
+                                         const char *pcszFileSystem,
+                                         BOOL fSkipRemoveables);
+    typedef DOSHENUMDRIVES *PDOSHENUMDRIVES;
+
+    CHAR doshQueryBootDrive(VOID);
+
+    #define ERROR_AUDIO_CD_ROM      10000
+
+    #define ASSERTFL_MIXEDMODECD    0x0001
+
+    APIRET doshAssertDrive(ULONG ulLogicalDrive,
+                           ULONG fl);
+
+    APIRET doshSetLogicalMap(ULONG ulLogicalDrive);
+
+    APIRET XWPENTRY doshQueryDiskSize(ULONG ulLogicalDrive, double *pdSize);
+    typedef APIRET XWPENTRY DOSHQUERYDISKSIZE(ULONG ulLogicalDrive, double *pdSize);
+    typedef DOSHQUERYDISKSIZE *PDOSHQUERYDISKSIZE;
+
+    APIRET XWPENTRY doshQueryDiskFree(ULONG ulLogicalDrive, double *pdFree);
+    typedef APIRET XWPENTRY DOSHQUERYDISKFREE(ULONG ulLogicalDrive, double *pdFree);
+    typedef DOSHQUERYDISKFREE *PDOSHQUERYDISKFREE;
+
+    APIRET XWPENTRY doshQueryDiskFSType(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
+    typedef APIRET XWPENTRY DOSHQUERYDISKFSTYPE(ULONG ulLogicalDrive, PSZ pszBuf, ULONG cbBuf);
+    typedef DOSHQUERYDISKFSTYPE *PDOSHQUERYDISKFSTYPE;
 
     APIRET doshQueryDiskLabel(ULONG ulLogicalDrive,
@@ -303 +315 @@
     APIRET doshSetPathAttr(const char* pcszFile,
                            ULONG ulAttr);
+
+    APIRET doshOpenExisting(const char *pcszFilename,
+                            ULONG ulOpenFlags,
+                            HFILE *phf);
+
+    APIRET doshWriteAt(HFILE hf,
+                       LONG lOffset,
+                       ULONG ulMethod,
+                       ULONG cb,
+                       PBYTE pbData);
+
+    APIRET doshReadAt(HFILE hf,
+                      LONG lOffset,
+                      ULONG ulMethod,
+                      ULONG cb,
+                      PBYTE pbData);
 
     APIRET doshLoadTextFile(const char *pcszFile,

trunk/include/helpers/except.h

@@ -140 +140 @@
     extern PFNEXCHOOKERROR G_pfnExcHookError;
 
+    extern ULONG G_ulExplainExceptionRunning;
+
     /********************************************************************
      *

trunk/include/helpers/stringh.h

@@ -157 +157 @@
      ********************************************************************/
 
-    VOID strhArrayAppend(PSZ *ppszRoot,
-                         const char *pcszNew,
-                         PULONG pcbRoot);
+    VOID XWPENTRY strhArrayAppend(PSZ *ppszRoot,
+                                  const char *pcszNew,
+                                  ULONG cbNew,
+                                  PULONG pcbRoot);
 
     PSZ strhCreateDump(PBYTE pb,

trunk/include/helpers/winh.h

@@ -83 +83 @@
     #ifdef WINH_STANDARDWRAPPERS
 
-        MRESULT _Optlink winhSendMsg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+        MRESULT XWPENTRY winhSendMsg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
         #define WinSendMsg(a,b,c,d) winhSendMsg((a),(b),(c),(d))
 
-        BOOL _Optlink winhPostMsg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+        BOOL XWPENTRY winhPostMsg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
         #define WinPostMsg(a,b,c,d) winhPostMsg((a),(b),(c),(d))
 
-        HWND _Optlink winhWindowFromID(HWND hwnd, ULONG id);
+        HWND XWPENTRY winhWindowFromID(HWND hwnd, ULONG id);
         #define WinWindowFromID(a,b) winhWindowFromID((a),(b))
 
-        HWND _Optlink winhQueryWindow(HWND hwnd, LONG lCode);
+        HWND XWPENTRY winhQueryWindow(HWND hwnd, LONG lCode);
         #define WinQueryWindow(a,b) winhQueryWindow((a),(b))
 
+        PVOID XWPENTRY winhQueryWindowPtr(HWND hwnd, LONG index);
+        #define WinQueryWindowPtr(a,b) winhQueryWindowPtr((a),(b))
+
+        BOOL XWPENTRY winhSetWindowText(HWND hwnd, const char *pcsz);
+        #define WinSetWindowText(a,b) winhSetWindowText((a),(b))
+
+        BOOL XWPENTRY winhSetDlgItemText(HWND hwnd, ULONG id, const char *pcsz);
+        #define WinSetDlgItemText(a,b,c) winhSetDlgItemText((a),(b),(c))
     #endif
 

trunk/src/helpers/cctl_tooltip.c

@@ -89 +89 @@
  *
  ********************************************************************/
-
-// screen size
-LONG        G_cxScreen = 0,
-            G_cyScreen = 0;
 
 // linked list of all tools which were subclassed for tooltip
@@ -365 +361 @@
     ULONG       ulTooltipID;        // from WM_CREATE
 
+    LONG        cxScreen,
+                cyScreen;
+
     BOOL        fIsActive;          // TRUE per default; changed by TTM_ACTIVATE
 
@@ -407 +406 @@
  */
 
-VOID UpdateTooltipPresColors(HWND hwndTooltip,      // in: tooltip control
-                             PTOOLTIPDATA pttd)     // in/out: tooltip data struct (QWL_USER) with color fields
-{
+VOID UpdateTooltipPresColors(HWND hwndTooltip)      // in: tooltip control
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+
     // tooltip background color:
     pttd->lBackColor = winhQueryPresColor(hwndTooltip,
@@ -433 +433 @@
 
 /*
- *@@ PaintTooltip:
- *      this gets called from ctl_fnwpTooltip upon WM_PAINT.
+ *@@ TtmCreate:
+ *      implementation for WM_CREATE in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmCreate(HWND hwndTooltip,
+                  MPARAM mp2)
+{
+    PTOOLTIPDATA pttd;
+    PCREATESTRUCT pcs = (PCREATESTRUCT)mp2;
+
+    // allocate and initialize tooltip data
+    pttd = (PTOOLTIPDATA)malloc(sizeof(TOOLTIPDATA));
+    if (pttd)
+    {
+        CHAR        szFont[256];
+        memset(pttd, 0, sizeof(TOOLTIPDATA));
+        WinSetWindowPtr(hwndTooltip, 1, pttd);
+
+        pttd->hwndOwner = pcs->hwndOwner;
+        pttd->hab = WinQueryAnchorBlock(hwndTooltip);
+        pttd->ulTooltipID = pcs->id;
+
+        pttd->cxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN);
+        pttd->cyScreen = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
+
+        pttd->fIsActive = TRUE;
+
+        // default timeouts
+        pttd->ulTimeoutInitial = 1000;
+        pttd->ulTimeoutAutopop = 5000;
+        pttd->ulTimeoutReshow = 500;
+
+        // get colors from presparams/syscolors
+        UpdateTooltipPresColors(hwndTooltip);
+
+        // check if font presparam set
+        if (WinQueryPresParam(hwndTooltip,
+                              PP_FONTNAMESIZE, 0,
+                              NULL,
+                              sizeof(szFont),
+                              szFont,
+                              QPF_NOINHERIT)
+                == 0)
+        {
+            // no: set default font presparam
+            // (we never want the System Proportional font)
+            winhSetWindowFont(hwndTooltip,
+                              NULL);      // default (WarpSans or 8.Helv)
+        }
+
+        pttd->pszPaintText = strdup("undefined");
+
+        lstInit(&pttd->llTools, TRUE);      // auto-free items
+
+        // override CREATESTRUCT
+        WinSetWindowPos(hwndTooltip,
+                        HWND_TOP,
+                        50, 50,
+                        100, 100,
+                        SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_HIDE);
+
+        return (MPARAM)FALSE;
+    }
+    else
+        // malloc failed:
+        return (MPARAM)TRUE;
+}
+
+/*
+ *@@ TtmTimer:
+ *      implementation for WM_TIMER in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+BOOL TtmTimer(HWND hwndTooltip, MPARAM mp1)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    USHORT  usTimer = SHORT1FROMMP(mp1);
+
+    switch (usTimer)
+    {
+        case TOOLTIP_ID_TIMER_INITIAL:
+            // _Pmpf(("WM_TIMER: Stopping initial timer: %d", usTimer));
+            // _Pmpf((__FUNCTION__ ": TOOLTIP_ID_TIMER_INITIAL"));
+            WinStopTimer(pttd->hab,
+                         hwndTooltip,
+                         usTimer);
+            pttd->idTimerInitial = 0;
+
+            if (pttd->fIsActive)
+                // show tooltip
+                WinPostMsg(hwndTooltip, TTM_SHOWTOOLTIPNOW, (MPARAM)TRUE, 0);
+        break;
+
+        case TOOLTIP_ID_TIMER_AUTOPOP:
+            // _Pmpf(("WM_TIMER: Stopping autopop timer: %d", usTimer));
+            WinStopTimer(pttd->hab,
+                         hwndTooltip,
+                         usTimer);
+            pttd->idTimerAutopop = 0;
+            WinPostMsg(hwndTooltip, TTM_SHOWTOOLTIPNOW, (MPARAM)FALSE, 0);
+        break;
+
+        default:
+            return FALSE;
+    } // end switch
+
+    return (TRUE);
+}
+
+/*
+ *@@ TtmPaint:
+ *      implementation for WM_PAINT in ctl_fnwpTooltip.
  *
  *@@added V0.9.1 (99-11-30) [umoeller]
  */
 
-VOID PaintTooltip(HWND hwndTooltip,
-                  PTOOLTIPDATA pttd)
-{
+VOID TtmPaint(HWND hwndTooltip)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
     HPS         hps = WinBeginPaint(hwndTooltip, NULLHANDLE, NULL);
     POINTL      ptl = {0, 0};
@@ -525 +639 @@
 
 /*
+ *@@ TtmDestroy:
+ *      implementation for WM_DESTROY in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID TtmDestroy(HWND hwndTooltip)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    // stop timers
+    if (pttd->idTimerInitial)
+        WinStopTimer(pttd->hab,
+                     hwndTooltip,
+                     pttd->idTimerInitial);
+    if (pttd->idTimerAutopop)
+        WinStopTimer(pttd->hab,
+                     hwndTooltip,
+                     pttd->idTimerAutopop);
+    if (pttd->pszPaintText)
+        free(pttd->pszPaintText);
+
+    // un-subclass all tools that we subclassed
+    // V0.9.12 (2001-04-28) [umoeller]
+    if (LockSubclassedTools())
+    {
+        PLISTNODE pNode;
+        PSUBCLASSEDTOOL pst;
+        for (pNode = lstQueryFirstNode(&pttd->llTools);
+             pNode;
+             pNode = pNode->pNext)
+        {
+            PTOOLINFO pti = (PTOOLINFO)pNode->pItemData;
+            if (pst = FindSubclassedTool(pti->hwndTool))
+                UnSubclassTool(pti->hwndTool);
+        }
+
+        UnlockSubclassedTools();
+    }
+    // end V0.9.12 (2001-04-28) [umoeller]
+
+    lstClear(&pttd->llTools);
+
+    free(pttd);
+}
+
+/*
+ *@@ TtmAddTool:
+ *      implementation for TTM_ADDTOOL in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmAddTool(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    if (mp2)
+    {
+        PTOOLINFO ptiPassed = (PTOOLINFO)mp2,
+                  ptiNew = (PTOOLINFO)malloc(sizeof(TOOLINFO));
+        if (ptiNew)
+        {
+            memcpy(ptiNew, ptiPassed, sizeof(TOOLINFO));
+            lstAppendItem(&pttd->llTools,
+                          ptiNew);
+
+            if (    (ptiPassed->ulFlags & TTF_SUBCLASS)
+                 && (LockSubclassedTools()) // V0.9.12 (2001-04-28) [umoeller]
+               )
+            {
+                // caller wants this tool to be subclassed:
+                // well, do it then
+                SubclassTool(hwndTooltip,
+                             ptiPassed->hwndTool);
+
+                UnlockSubclassedTools();
+            }
+
+            return ((MPARAM)TRUE);
+        }
+    }
+
+    return (MPARAM)FALSE;
+}
+
+/*
+ *@@ TtmDelTool:
+ *      implementation for TTM_DELTOOL in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ *@@changed V0.9.13 (2001-06-21) [umoeller]: fixed missing unlock
+ *@@changed V0.9.13 (2001-06-21) [umoeller]: fixed endless loop
+ */
+
+VOID TtmDelTool(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
+    if (ptiSearch)
+    {
+        PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);
+        while (pToolNode)
+        {
+            PTOOLINFO ptiThis = (PTOOLINFO)pToolNode->pItemData;
+            if (    (ptiThis->hwndToolOwner == ptiSearch->hwndToolOwner)
+                 && (ptiThis->hwndTool == ptiSearch->hwndTool)
+               )
+            {
+                // found:
+
+                // V0.9.12 (2001-04-28) [umoeller]
+                // unsubclass if this was subclassed
+                if (ptiThis->ulFlags & TTF_SUBCLASS)
+                {
+                    if (LockSubclassedTools())
+                    {
+                        UnSubclassTool(ptiSearch->hwndTool);
+
+                        UnlockSubclassedTools();
+                                // was missing V0.9.13 (2001-06-21) [umoeller]
+                    }
+                }
+
+                // remove the tool from the list
+                lstRemoveNode(&pttd->llTools, pToolNode);
+
+                break;
+            }
+
+            pToolNode = pToolNode->pNext;
+                    // fixed endless loop V0.9.13 (2001-06-21) [umoeller]
+        }
+    }
+}
+
+/*
+ *@@ TtmRelayEvent:
+ *      implementation for TTM_RELAYEVENT in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID TtmRelayEvent(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PQMSG pqmsg = (PQMSG)mp2;
+    if (pqmsg)
+    {
+        POINTL      ptlPointer;
+        PLISTNODE   pToolNode;
+
+        if (pttd->idTimerInitial)
+        {
+            // _Pmpf(("TTM_RELAYEVENT: Stopping timer: %d", pttd->idTimerInitial));
+            WinStopTimer(pttd->hab,
+                         hwndTooltip,
+                         TOOLTIP_ID_TIMER_INITIAL);
+            pttd->idTimerInitial = 0;
+        }
+
+        WinQueryPointerPos(HWND_DESKTOP, &ptlPointer);
+
+        // find TOOLINFO from mouse position
+        pttd->ptiMouseOver = NULL;
+        pToolNode = lstQueryFirstNode(&pttd->llTools);
+        while (pToolNode)
+        {
+            PTOOLINFO pti = (PTOOLINFO)pToolNode->pItemData;
+            if (pti->hwndTool == pqmsg->hwnd)
+            {
+                // _Pmpf((__FUNCTION__ ": found tool"));
+                pttd->ptiMouseOver = pti;
+                break;
+            }
+            pToolNode = pToolNode->pNext;
+        }
+
+        if (    (ptlPointer.x != pttd->ptlPointerLast.x)
+             || (ptlPointer.y != pttd->ptlPointerLast.y)
+             || (pqmsg->msg == WM_BUTTON1DOWN)
+             || (pqmsg->msg == WM_BUTTON2DOWN)
+             || (pqmsg->msg == WM_BUTTON3DOWN)
+           )
+        {
+            // mouse pos changed:
+            // hide tooltip
+            WinPostMsg(hwndTooltip,
+                       TTM_SHOWTOOLTIPNOW,
+                       (MPARAM)FALSE,
+                       0);
+            memcpy(&pttd->ptlPointerLast, &ptlPointer, sizeof(POINTL));
+
+            // _Pmpf((__FUNCTION__ ": pttd->ptiMouseOver: 0x%lX", pttd->ptiMouseOver));
+            // _Pmpf((__FUNCTION__ ": pttd->fIsActive: 0x%lX", pttd->fIsActive));
+            if (    (pttd->ptiMouseOver)
+                 && (pttd->fIsActive)
+               )
+            {
+                // tool found and tooltip is activated:
+                pttd->idTimerInitial = WinStartTimer(pttd->hab,
+                                                     hwndTooltip,
+                                                     TOOLTIP_ID_TIMER_INITIAL,
+                                                     pttd->ulTimeoutInitial);
+                // _Pmpf(("TTM_RELAYEVENT: Started timer: %d", pttd->idTimerInitial));
+            }
+        }
+    } // end if (pqmsg)
+}
+
+/*
+ *@@ TtmGetDelayTime:
+ *      implementation for TTM_GETDELAYTIME in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmGetDelayTime(HWND hwndTooltip, MPARAM mp1)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    switch ((ULONG)mp1)
+    {
+        case TTDT_AUTOPOP:
+            return (MRESULT)pttd->ulTimeoutAutopop;
+
+        case TTDT_INITIAL:
+            return (MRESULT)pttd->ulTimeoutInitial;
+
+        case TTDT_RESHOW:
+            return (MRESULT)pttd->ulTimeoutReshow;
+    }
+
+    return (0);
+}
+
+/*
+ *@@ TtmSetDelayTime:
+ *      implementation for TTM_SETDELAYTIME in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID TtmSetDelayTime(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    ULONG   iDelay = (ULONG)mp2;
+    switch (SHORT1FROMMP(mp1))
+    {
+        case TTDT_AUTOMATIC:
+            pttd->ulTimeoutInitial = iDelay;
+            pttd->ulTimeoutAutopop = iDelay * 5;
+            pttd->ulTimeoutReshow = iDelay / 2;
+        break;
+
+        case TTDT_AUTOPOP:
+            pttd->ulTimeoutAutopop = iDelay;
+        break;
+
+        case TTDT_INITIAL:
+            pttd->ulTimeoutInitial = iDelay;
+        break;
+
+        case TTDT_RESHOW:
+            pttd->ulTimeoutReshow = iDelay;
+        break;
+    }
+}
+
+/*
+ *@@ TtmGetText:
+ *      implementation for TTM_GETTEXT in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID TtmGetText(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PTOOLINFO pti = (PTOOLINFO)mp2;
+
+    if (pti->pszText == PSZ_TEXTCALLBACK)
+    {
+        // TTN_NEEDTEXT notification desired:
+        // compose values for that msg
+        TOOLTIPTEXT ttt = {0};
+        // _Pmpf(("TTM_GETTEXT: PSZ_TEXTCALLBACK... sending TTN_NEEDTEXT"));
+        ttt.hwndTooltip = hwndTooltip;
+        ttt.hwndTool = pti->hwndTool;
+        WinSendMsg(pti->hwndToolOwner,
+                   WM_CONTROL,
+                   MPFROM2SHORT(pttd->ulTooltipID,  // tooltip control wnd ID
+                                TTN_NEEDTEXT),
+                   &ttt);
+
+        // in case of error: set lpszText to NULL; this
+        // is not specified in the docs however.
+        pti->pszText = NULL;
+
+        switch (ttt.ulFormat)
+        {
+            case TTFMT_PSZ:
+                if (ttt.pszText)
+                    pti->pszText = ttt.pszText;
+            break;
+
+            case TTFMT_STRINGRES:
+                    // @@todo
+            break;
+        }
+    }
+}
+
+/*
+ *@@ TtmEnumTools:
+ *      implementation for TTM_ENUMTOOLS in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmEnumTools(HWND hwndTooltip, MPARAM mp1, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
+    if (ptiTarget)
+    {
+        PTOOLINFO ptiFound = (PTOOLINFO)lstItemFromIndex(&pttd->llTools,
+                                                         SHORT1FROMMP(mp1));
+        if (ptiFound)
+        {
+            memcpy(ptiTarget, ptiFound, sizeof(TOOLINFO));
+            return (MRESULT)TRUE;
+        }
+    }
+
+    return (MRESULT)FALSE;
+}
+
+/*
+ *@@ TtmGetCurrentTool:
+ *      implementation for TTM_GETCURRENTTOOL in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmGetCurrentTool(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
+    if (ptiTarget)
+    {
+        if (pttd->ptiMouseOver)
+        {
+            memcpy(ptiTarget, pttd->ptiMouseOver, sizeof(TOOLINFO));
+            return (MPARAM)TRUE;
+        }
+    }
+
+    return ((MPARAM)FALSE);
+}
+
+/*
+ *@@ TtmGetToolInfo:
+ *      implementation for TTM_GETTOOLINFO in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+MRESULT TtmGetToolInfo(HWND hwndTooltip, MPARAM mp2)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+    PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
+    if (ptiSearch)
+    {
+        PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);
+        while (pToolNode)
+        {
+            PTOOLINFO ptiThis = (PTOOLINFO)pToolNode->pItemData;
+            if (    (ptiThis->hwndToolOwner == ptiSearch->hwndToolOwner)
+                 && (ptiThis->hwndTool == ptiSearch->hwndTool)
+               )
+            {
+                // found:
+                memcpy(ptiSearch, ptiThis, sizeof(TOOLINFO));
+                return (MPARAM)TRUE;
+            }
+            pToolNode = pToolNode->pNext;
+        }
+    }
+
+    return ((MPARAM)FALSE);
+}
+
+/*
+ *@@ FormatTooltip:
+ *      formats the tooltip window according to
+ *      its text (which is assumed to be in
+ *      pttd->pszPaintText) and positions it
+ *      on the screen.
+ *
+ *      This does not change the visibility
+ *      of the tooltip; if it is not yet visible,
+ *      you must show it afterwards.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID FormatTooltip(HWND hwndTooltip,
+                   PTOOLTIPDATA pttd,
+                   PPOINTL pptlPointer)      // in: current pointer pos or NULL
+{
+    // find out how much space we need
+    RECTL   rcl = { 0, 0, 300, 1000 };
+    POINTL  ptlTooltip;
+    LONG    cx, cy;
+    ULONG   ulStyle = WinQueryWindowULong(hwndTooltip, QWL_STYLE);
+
+    HPS hps = WinGetPS(hwndTooltip);
+
+    winhDrawFormattedText(hps,
+                          &rcl,
+                          pttd->pszPaintText,
+                          DT_LEFT | DT_TOP | DT_WORDBREAK | DT_QUERYEXTENT);
+    WinReleasePS(hps);
+
+    // calc width and height of tooltip
+    cx = rcl.xRight + 2*TOOLTIP_CX_BORDER;
+    cy = (rcl.yTop - rcl.yBottom) + 2*TOOLTIP_CY_BORDER;
+
+    // calc x and y pos of tooltip:
+
+    // per default, use pointer pos
+    ptlTooltip.x = pptlPointer->x - cx/2;
+    ptlTooltip.y = pptlPointer->y - cy;
+
+    // do we need the tool's position?
+    if (    pttd->ptiMouseOver->ulFlags
+                & (TTF_CENTER_X_ON_TOOL | TTF_POS_Y_ABOVE_TOOL | TTF_POS_Y_BELOW_TOOL)
+       )
+    {
+        // yes:
+        SWP     swpTool;
+        POINTL  ptlTool;
+        WinQueryWindowPos(pttd->ptiMouseOver->hwndTool, &swpTool);
+        ptlTool.x = swpTool.x;
+        ptlTool.y = swpTool.y;
+        // convert x, y to desktop points
+        WinMapWindowPoints(WinQueryWindow(pttd->ptiMouseOver->hwndTool,
+                                          QW_PARENT), // hwndFrom
+                           HWND_DESKTOP,            // hwndTo
+                           &ptlTool,
+                           1);
+
+        // X
+        if (pttd->ptiMouseOver->ulFlags & TTF_CENTER_X_ON_TOOL)
+            // center X on tool:
+            ptlTooltip.x = ptlTool.x + ((swpTool.cx - cx) / 2L);
+
+        // Y
+        if (pttd->ptiMouseOver->ulFlags & TTF_POS_Y_ABOVE_TOOL)
+            ptlTooltip.y = ptlTool.y + swpTool.cy;
+        else if (pttd->ptiMouseOver->ulFlags & TTF_POS_Y_BELOW_TOOL)
+            ptlTooltip.y = ptlTool.y - cy;
+    }
+
+    // if "shy mouse" is enabled, make
+    // sure the tool tip is not under the
+    // mouse pointer
+    if (ulStyle & TTF_SHYMOUSE)
+    {
+        // we need to subtract the current mouse
+        // pointer's hot spot from the current
+        // pointer position
+        HPOINTER    hptr = WinQueryPointer(HWND_DESKTOP);
+        POINTERINFO pi;
+        if (WinQueryPointerInfo(hptr, &pi))
+        {
+            // calc bottom edge of mouse pointer rect
+            ULONG yBottomPointer = (pptlPointer->y - pi.yHotspot);
+            // _Pmpf(("yHotspot: %d", pi.yHotspot));
+            if (   (ptlTooltip.y + cy) // top edge of tool tip
+                 > yBottomPointer
+               )
+            {
+                ptlTooltip.y = pptlPointer->y - cy - pi.yHotspot;
+            }
+        }
+    }
+
+    // constrain to screen
+    if (ptlTooltip.x < 0)
+        ptlTooltip.x = 0;
+    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 shadow is enabled,
+    // enlarge; the shadow might by
+    // off-screen now, but that's OK
+    if (ulStyle & TTS_SHADOW)
+    {
+        cx += TT_SHADOWOFS;
+        cy += TT_SHADOWOFS;
+        ptlTooltip.y -= TT_SHADOWOFS;
+    }
+
+    // set tooltip position at the pos we calculated
+    // and show tooltip
+    WinSetWindowPos(hwndTooltip,
+                    HWND_TOP,
+                    ptlTooltip.x,
+                    ptlTooltip.y,
+                    cx,
+                    cy,
+                    SWP_MOVE | SWP_SIZE | SWP_ZORDER);
+}
+
+/*
+ *@@ TtmUpdateTipText:
+ *      implementation for TTM_UPDATETIPTEXT in ctl_fnwpTooltip.
+ *
+ *@@added V0.9.13 (2001-06-21) [umoeller]
+ */
+
+VOID TtmUpdateTipText(HWND hwndTooltip,
+                      const char *pcszNewText)
+{
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+
+    // has text really changed?
+    if (    (    (pttd->pszPaintText)
+              && (pcszNewText)
+              && (strcmp(pttd->pszPaintText, pcszNewText))
+            )
+         || (pttd->pszPaintText && !pcszNewText)
+         || (!pttd->pszPaintText && pcszNewText)
+       )
+    {
+        // yes:
+        if (pttd->pszPaintText)
+        {
+            free(pttd->pszPaintText);
+            pttd->pszPaintText = NULL;
+        }
+
+        if (pcszNewText)
+            pttd->pszPaintText = strdup(pcszNewText);
+
+        if (pttd->fIsVisible)
+        {
+            // currently showing:
+            // reformat
+            POINTL ptlPointer;
+            WinQueryPointerPos(HWND_DESKTOP, &ptlPointer);
+            FormatTooltip(hwndTooltip,
+                          pttd,
+                          &ptlPointer);
+            WinInvalidateRect(hwndTooltip, NULL, FALSE);
+        }
+    }
+}
+
+/*
  *@@ TtmShowTooltip:
  *      implementation for TTM_SHOW_TOOLTIP.
@@ -537 +1214 @@
 
 VOID TtmShowTooltip(HWND hwndTooltip,
-                    PTOOLTIPDATA pttd,
                     BOOL fShow)  // if TRUE: show, else: HIDE
 {
-    // _Pmpf((__FUNCTION__ ": fShow %d", fShow));
+    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
     if (fShow)
     {
@@ -566 +1242 @@
             // mouse not moved since timer was started:
             // find the current TOOLINFO
-            // _Pmpf((__FUNCTION__ ": mouse not moved... pttd->ptiMouseOver 0x%lX", pttd->ptiMouseOver));
             if (pttd->ptiMouseOver)
             {
@@ -582 +1257 @@
             }
 
-            // _Pmpf((__FUNCTION__ ": pttd->pszPaintText %s",
-               //      (pttd->pszPaintText) ? pttd->pszPaintText : "NULL"));
-
             if (pttd->pszPaintText)
             {
-                // find out how much space we need
-                RECTL   rcl = { 0, 0, 300, 1000 };
-                POINTL  ptlTooltip;
-                LONG    cx, cy;
-                ULONG   ulStyle = WinQueryWindowULong(hwndTooltip, QWL_STYLE);
-
-                G_cxScreen = WinQuerySysValue(HWND_DESKTOP, SV_CXSCREEN),
-                G_cyScreen = WinQuerySysValue(HWND_DESKTOP, SV_CYSCREEN);
-
-                hps = WinGetPS(hwndTooltip);
-                winhDrawFormattedText(hps,
-                                      &rcl,
-                                      pttd->pszPaintText,
-                                      DT_LEFT | DT_TOP | DT_WORDBREAK | DT_QUERYEXTENT);
-                WinReleasePS(hps);
-
-                // calc width and height of tooltip
-                cx = rcl.xRight + 2*TOOLTIP_CX_BORDER;
-                cy = (rcl.yTop - rcl.yBottom) + 2*TOOLTIP_CY_BORDER;
-
-                // calc x and y pos of tooltip:
-
-                // per default, use pointer pos
-                ptlTooltip.x = ptlPointer.x - cx/2;
-                ptlTooltip.y = ptlPointer.y - cy;
-
-                // do we need the tool's position?
-                if (    pttd->ptiMouseOver->ulFlags
-                     & (TTF_CENTER_X_ON_TOOL | TTF_POS_Y_ABOVE_TOOL | TTF_POS_Y_BELOW_TOOL)
-                   )
-                {
-                    // yes:
-                    SWP     swpTool;
-                    POINTL  ptlTool;
-                    WinQueryWindowPos(pttd->ptiMouseOver->hwndTool, &swpTool);
-                    ptlTool.x = swpTool.x;
-                    ptlTool.y = swpTool.y;
-                    // convert x, y to desktop points
-                    WinMapWindowPoints(WinQueryWindow(pttd->ptiMouseOver->hwndTool,
-                                                      QW_PARENT), // hwndFrom
-                                       HWND_DESKTOP,            // hwndTo
-                                       &ptlTool,
-                                       1);
-
-                    // X
-                    if (pttd->ptiMouseOver->ulFlags & TTF_CENTER_X_ON_TOOL)
-                        // center X on tool:
-                        ptlTooltip.x = ptlTool.x + ((swpTool.cx - cx) / 2L);
-
-                    // Y
-                    if (pttd->ptiMouseOver->ulFlags & TTF_POS_Y_ABOVE_TOOL)
-                        ptlTooltip.y = ptlTool.y + swpTool.cy;
-                    else if (pttd->ptiMouseOver->ulFlags & TTF_POS_Y_BELOW_TOOL)
-                        ptlTooltip.y = ptlTool.y - cy;
-                }
-
-                // if "shy mouse" is enabled, make
-                // sure the tool tip is not under the
-                // mouse pointer
-                if (ulStyle & TTF_SHYMOUSE)
-                {
-                    // we need to subtract the current mouse
-                    // pointer's hot spot from the current
-                    // pointer position
-                    HPOINTER    hptr = WinQueryPointer(HWND_DESKTOP);
-                    POINTERINFO pi;
-                    if (WinQueryPointerInfo(hptr, &pi))
-                    {
-                        /* ULONG cyPointer = WinQuerySysValue(HWND_DESKTOP,
-                                                           SV_CYPOINTER); */
-                        // calc bottom edge of mouse pointer rect
-                        ULONG yBottomPointer = (ptlPointer.y - pi.yHotspot);
-                        // _Pmpf(("yHotspot: %d", pi.yHotspot));
-                        if (   (ptlTooltip.y + cy) // top edge of tool tip
-                             > yBottomPointer
-                           )
-                        {
-                            ptlTooltip.y = ptlPointer.y - cy - pi.yHotspot;
-                        }
-                    }
-                }
-
-                // constrain to screen
-                if (ptlTooltip.x < 0)
-                    ptlTooltip.x = 0;
-                if (ptlTooltip.y < 0)
-                    ptlTooltip.y = 0;
-                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,
-                // enlarge; the shadow might by
-                // off-screen now, but that's OK
-                if (ulStyle & TTS_SHADOW)
-                {
-                    cx += TT_SHADOWOFS;
-                    cy += TT_SHADOWOFS;
-                    ptlTooltip.y -= TT_SHADOWOFS;
-                }
-
-                // notify owner
+                FormatTooltip(hwndTooltip,
+                              pttd,
+                              &ptlPointer);
+
+                // notify owner (TTN_SHOW)
                 WinSendMsg(pttd->hwndOwner,
                            WM_CONTROL,
                            MPFROM2SHORT(pttd->ulTooltipID,  // tooltip control wnd ID
                                         TTN_SHOW),
-                           0);
-
-                // set tooltip position at the pos we calculated
-                // and show tooltip
-                WinSetWindowPos(hwndTooltip,
-                                HWND_TOP,
-                                ptlTooltip.x,
-                                ptlTooltip.y,
-                                cx, cy,
-                                SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW);
+                           pttd->ptiMouseOver);
+
+                WinShowWindow(hwndTooltip, TRUE);
                 pttd->fIsVisible = TRUE;
 
@@ -723 +1290 @@
         if (pttd->fIsVisible)
         {
+            // notify owner (TTN_POP)
             WinSendMsg(pttd->hwndOwner,
                        WM_CONTROL,
                        MPFROM2SHORT(pttd->ulTooltipID,  // tooltip control wnd ID
                                     TTN_POP),
-                       0);
+                       pttd->ptiMouseOver);
             WinShowWindow(hwndTooltip, FALSE);
         }
@@ -840 +1408 @@
     MRESULT mrc = 0;
 
-    PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
-
     TRY_LOUD(excpt1)
     {
@@ -857 +1423 @@
 
             case WM_CREATE:
-            {
-                PCREATESTRUCT pcs = (PCREATESTRUCT)mp2;
-
-                // allocate and initialize tooltip data
-                pttd = (PTOOLTIPDATA)malloc(sizeof(TOOLTIPDATA));
-                if (pttd)
-                {
-                    CHAR        szFont[256];
-                    memset(pttd, 0, sizeof(TOOLTIPDATA));
-                    WinSetWindowPtr(hwndTooltip, 1, pttd);
-
-                    pttd->hwndOwner = pcs->hwndOwner;
-                    pttd->hab = WinQueryAnchorBlock(hwndTooltip);
-                    pttd->ulTooltipID = pcs->id;
-
-                    pttd->fIsActive = TRUE;
-
-                    // default timeouts
-                    pttd->ulTimeoutInitial = 1000;
-                    pttd->ulTimeoutAutopop = 5000;
-                    pttd->ulTimeoutReshow = 500;
-
-                    // get colors from presparams/syscolors
-                    UpdateTooltipPresColors(hwndTooltip, pttd);
-
-                    // check if font presparam set
-                    if (WinQueryPresParam(hwndTooltip,
-                                          PP_FONTNAMESIZE, 0,
-                                          NULL,
-                                          sizeof(szFont),
-                                          szFont,
-                                          QPF_NOINHERIT)
-                            == 0)
-                    {
-                        // no: set default font presparam
-                        // (we never want the System Proportional font)
-                        winhSetWindowFont(hwndTooltip,
-                                          NULL);      // default (WarpSans or 8.Helv)
-                    }
-
-                    pttd->pszPaintText = strdup("undefined");
-
-                    lstInit(&pttd->llTools, TRUE);      // auto-free items
-
-                    // override CREATESTRUCT
-                    WinSetWindowPos(hwndTooltip,
-                                    HWND_TOP,
-                                    50, 50,
-                                    100, 100,
-                                    SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_HIDE);
-
-                    mrc = (MPARAM)FALSE;
-                }
-                else
-                    // malloc failed:
-                    mrc = (MPARAM)TRUE;
-            break; }
-
-            /*
-             * WM_DESTROY:
-             *      clean up upon destruction.
-             */
-
-            case WM_DESTROY:
-                // stop timers
-                if (pttd->idTimerInitial)
-                    WinStopTimer(pttd->hab,
-                                 hwndTooltip,
-                                 pttd->idTimerInitial);
-                if (pttd->idTimerAutopop)
-                    WinStopTimer(pttd->hab,
-                                 hwndTooltip,
-                                 pttd->idTimerAutopop);
-                if (pttd->pszPaintText)
-                    free(pttd->pszPaintText);
-
-                // un-subclass all tools that we subclassed
-                // V0.9.12 (2001-04-28) [umoeller]
-                if (LockSubclassedTools())
-                {
-                    PLISTNODE pNode;
-                    PSUBCLASSEDTOOL pst;
-                    for (pNode = lstQueryFirstNode(&pttd->llTools);
-                         pNode;
-                         pNode = pNode->pNext)
-                    {
-                        PTOOLINFO pti = (PTOOLINFO)pNode->pItemData;
-                        if (pst = FindSubclassedTool(pti->hwndTool))
-                            UnSubclassTool(pti->hwndTool);
-                    }
-
-                    UnlockSubclassedTools();
-                }
-                // end V0.9.12 (2001-04-28) [umoeller]
-
-                lstClear(&pttd->llTools);
-
-                free(pttd);
-
-                mrc = (MPARAM)0;
+                mrc = TtmCreate(hwndTooltip, mp2);
             break;
 
@@ -979 +1446 @@
 
             case WM_TIMER:      // done
-            {
-                USHORT  usTimer = SHORT1FROMMP(mp1);
-
-                switch (usTimer)
-                {
-                    case TOOLTIP_ID_TIMER_INITIAL:
-                        // _Pmpf(("WM_TIMER: Stopping initial timer: %d", usTimer));
-                        // _Pmpf((__FUNCTION__ ": TOOLTIP_ID_TIMER_INITIAL"));
-                        WinStopTimer(pttd->hab,
-                                     hwndTooltip,
-                                     usTimer);
-                        pttd->idTimerInitial = 0;
-
-                        if (pttd->fIsActive)
-                            // show tooltip
-                            WinPostMsg(hwndTooltip, TTM_SHOWTOOLTIPNOW, (MPARAM)TRUE, 0);
-                    break;
-
-                    case TOOLTIP_ID_TIMER_AUTOPOP:
-                        // _Pmpf(("WM_TIMER: Stopping autopop timer: %d", usTimer));
-                        WinStopTimer(pttd->hab,
-                                     hwndTooltip,
-                                     usTimer);
-                        pttd->idTimerAutopop = 0;
-                        WinPostMsg(hwndTooltip, TTM_SHOWTOOLTIPNOW, (MPARAM)FALSE, 0);
-                    break;
-
-                    default:
-                        mrc = WinDefWindowProc(hwndTooltip, msg, mp1, mp2);
-                } // end switch
-
-            break; }
+                if (!TtmTimer(hwndTooltip, mp1))
+                    mrc = WinDefWindowProc(hwndTooltip, msg, mp1, mp2);
+            break;
 
             /*
@@ -1018 +1456 @@
 
             case WM_PAINT:      // done
-                PaintTooltip(hwndTooltip, pttd);
+                TtmPaint(hwndTooltip);
             break;
 
@@ -1037 +1475 @@
                     case PP_MENUHILITEBGNDCOLOR:
                         // re-query our presparams
-                        UpdateTooltipPresColors(hwndTooltip, pttd);
+                        UpdateTooltipPresColors(hwndTooltip);
                 }
             break; }
@@ -1047 +1485 @@
 
             case WM_SYSCOLORCHANGE:
-                UpdateTooltipPresColors(hwndTooltip, pttd);
+                UpdateTooltipPresColors(hwndTooltip);
+            break;
+
+            /*
+             * WM_DESTROY:
+             *      clean up upon destruction.
+             */
+
+            case WM_DESTROY:
+                TtmDestroy(hwndTooltip);
             break;
 
@@ -1062 +1509 @@
 
             case TTM_ACTIVATE:      // done
-                pttd->fIsActive = (BOOL)mp1;
-                if (!pttd->fIsActive)
+            {
+                PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
+                if (!(pttd->fIsActive = (BOOL)mp1))
                     // disable: hide tooltip
                     WinPostMsg(hwndTooltip, TTM_SHOWTOOLTIPNOW, (MPARAM)FALSE, 0);
+            }
             break;
 
@@ -1121 +1570 @@
 
             case TTM_ADDTOOL:       // done
-                mrc = (MPARAM)FALSE;
-                if (mp2)
-                {
-                    PTOOLINFO ptiPassed = (PTOOLINFO)mp2,
-                              ptiNew = (PTOOLINFO)malloc(sizeof(TOOLINFO));
-                    if (ptiNew)
-                    {
-                        memcpy(ptiNew, ptiPassed, sizeof(TOOLINFO));
-                        lstAppendItem(&pttd->llTools,
-                                      ptiNew);
-
-                        if (    (ptiPassed->ulFlags & TTF_SUBCLASS)
-                             && (LockSubclassedTools()) // V0.9.12 (2001-04-28) [umoeller]
-                           )
-                        {
-                            // caller wants this tool to be subclassed:
-                            // well, do it then
-                            SubclassTool(hwndTooltip,
-                                         ptiPassed->hwndTool);
-
-                            UnlockSubclassedTools();
-                        }
-
-                        mrc = (MPARAM)TRUE;
-                    }
-                }
+                mrc = TtmAddTool(hwndTooltip, mp2);
             break;
 
@@ -1156 +1580 @@
              *      --  mp1: always 0.
              *      --  PTOOLINFO mp2: information about the tool;
-             *              all fields except cbSize, hwnd, uID are
-             *              ignored.
+             *              all fields except cbSize, hwndToolOwner,
+             *              and hwndTool are ignored.
              *
              *      Return value: 0 always.
@@ -1163 +1587 @@
 
             case TTM_DELTOOL:       // done
-            {
-                PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
-                if (ptiSearch)
-                {
-                    PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);
-                    while (pToolNode)
-                    {
-                        PTOOLINFO ptiThis = (PTOOLINFO)pToolNode->pItemData;
-                        if (    (ptiThis->hwndToolOwner == ptiSearch->hwndToolOwner)
-                             && (ptiThis->hwndTool == ptiSearch->hwndTool)
-                           )
-                        {
-                            // found:
-
-                            // V0.9.12 (2001-04-28) [umoeller]
-                            // unsubclass if this was subclassed
-                            if (ptiThis->ulFlags & TTF_SUBCLASS)
-                            {
-                                if (LockSubclassedTools())
-                                {
-                                    UnSubclassTool(ptiSearch->hwndTool);
-                                }
-                            }
-
-                            // remove the tool from the list
-                            lstRemoveNode(&pttd->llTools, pToolNode);
-
-                            break;
-                        }
-                    }
-                    pToolNode = pToolNode->pNext;
-                }
-            break; }
+                TtmDelTool(hwndTooltip, mp2);
+            break;
 
             /*
@@ -1293 +1686 @@
 
             case TTM_RELAYEVENT:
-            {
-                PQMSG pqmsg = (PQMSG)mp2;
-                if (pqmsg)
-                {
-                    POINTL      ptlPointer;
-                    PLISTNODE   pToolNode;
-
-                    if (pttd->idTimerInitial)
-                    {
-                        // _Pmpf(("TTM_RELAYEVENT: Stopping timer: %d", pttd->idTimerInitial));
-                        WinStopTimer(pttd->hab,
-                                     hwndTooltip,
-                                     TOOLTIP_ID_TIMER_INITIAL);
-                        pttd->idTimerInitial = 0;
-                    }
-
-                    WinQueryPointerPos(HWND_DESKTOP, &ptlPointer);
-
-                    // find TOOLINFO from mouse position
-                    pttd->ptiMouseOver = NULL;
-                    pToolNode = lstQueryFirstNode(&pttd->llTools);
-                    while (pToolNode)
-                    {
-                        PTOOLINFO pti = (PTOOLINFO)pToolNode->pItemData;
-                        if (pti->hwndTool == pqmsg->hwnd)
-                        {
-                            // _Pmpf((__FUNCTION__ ": found tool"));
-                            pttd->ptiMouseOver = pti;
-                            break;
-                        }
-                        pToolNode = pToolNode->pNext;
-                    }
-
-                    if (    (ptlPointer.x != pttd->ptlPointerLast.x)
-                         || (ptlPointer.y != pttd->ptlPointerLast.y)
-                         || (pqmsg->msg == WM_BUTTON1DOWN)
-                         || (pqmsg->msg == WM_BUTTON2DOWN)
-                         || (pqmsg->msg == WM_BUTTON3DOWN)
-                       )
-                    {
-                        // mouse pos changed:
-                        // hide tooltip
-                        WinPostMsg(hwndTooltip,
-                                   TTM_SHOWTOOLTIPNOW,
-                                   (MPARAM)FALSE,
-                                   0);
-                        memcpy(&pttd->ptlPointerLast, &ptlPointer, sizeof(POINTL));
-
-                        // _Pmpf((__FUNCTION__ ": pttd->ptiMouseOver: 0x%lX", pttd->ptiMouseOver));
-                        // _Pmpf((__FUNCTION__ ": pttd->fIsActive: 0x%lX", pttd->fIsActive));
-                        if (    (pttd->ptiMouseOver)
-                             && (pttd->fIsActive)
-                           )
-                        {
-                            // tool found and tooltip is activated:
-                            pttd->idTimerInitial = WinStartTimer(pttd->hab,
-                                                                 hwndTooltip,
-                                                                 TOOLTIP_ID_TIMER_INITIAL,
-                                                                 pttd->ulTimeoutInitial);
-                            // _Pmpf(("TTM_RELAYEVENT: Started timer: %d", pttd->idTimerInitial));
-                        }
-                    }
-                } // end if (pqmsg)
-            break; }
+                TtmRelayEvent(hwndTooltip, mp2);
+            break;
 
             /*
@@ -1376 +1707 @@
 
             case TTM_GETDELAYTIME:
-                switch ((ULONG)mp1)
-                {
-                    case TTDT_AUTOPOP:
-                        mrc = (MRESULT)pttd->ulTimeoutAutopop;
-                    break;
-
-                    case TTDT_INITIAL:
-                        mrc = (MRESULT)pttd->ulTimeoutInitial;
-                    break;
-
-                    case TTDT_RESHOW:
-                        mrc = (MRESULT)pttd->ulTimeoutReshow;
-                    break;
-                }
+                mrc = TtmGetDelayTime(hwndTooltip, mp1);
             break;
 
@@ -1433 +1751 @@
 
             case TTM_SETDELAYTIME:  // done
-            {
-                ULONG   iDelay = (ULONG)mp2;
-                switch (SHORT1FROMMP(mp1))
-                {
-                    case TTDT_AUTOMATIC:
-                        pttd->ulTimeoutInitial = iDelay;
-                        pttd->ulTimeoutAutopop = iDelay * 5;
-                        pttd->ulTimeoutReshow = iDelay / 2;
-                    break;
-
-                    case TTDT_AUTOPOP:
-                        pttd->ulTimeoutAutopop = iDelay;
-                    break;
-
-                    case TTDT_INITIAL:
-                        pttd->ulTimeoutInitial = iDelay;
-                    break;
-
-                    case TTDT_RESHOW:
-                        pttd->ulTimeoutReshow = iDelay;
-                    break;
-                }
-            break; }
+                TtmSetDelayTime(hwndTooltip, mp1, mp2);
+            break;
 
             /*
@@ -1464 +1761 @@
              *      -- mp1: always 0
              *      -- PTOOLINFO mp2: pointer to a TOOLINFO structure.
-             *         When sending the message, the hwnd and uId members
-             *         identify a tool. If the tooltip control includes
-             *         the tool, the lpszText member receives the pointer
-             *         to the string.
+             *         hwndTool identifies a tool. If the tooltip control
+             *         includes the tool, the pszText member receives
+             *         the pointer to the string on output.
              *
              *      Return value: 0 always.
@@ -1477 +1773 @@
 
             case TTM_GETTEXT:       // done, I think
-            {
-                PTOOLINFO pti = (PTOOLINFO)mp2;
-
-                if (pti->pszText == PSZ_TEXTCALLBACK)
-                {
-                    // TTN_NEEDTEXT notification desired:
-                    // compose values for that msg
-                    TOOLTIPTEXT ttt = {0};
-                    // _Pmpf(("TTM_GETTEXT: PSZ_TEXTCALLBACK... sending TTN_NEEDTEXT"));
-                    ttt.hwndTooltip = hwndTooltip;
-                    ttt.hwndTool = pti->hwndTool;
-                    WinSendMsg(pti->hwndToolOwner,
-                               WM_CONTROL,
-                               MPFROM2SHORT(pttd->ulTooltipID,  // tooltip control wnd ID
-                                            TTN_NEEDTEXT),
-                               &ttt);
-
-                    // in case of error: set lpszText to NULL; this
-                    // is not specified in the docs however.
-                    pti->pszText = NULL;
-
-                    switch (ttt.ulFormat)
-                    {
-                        case TTFMT_PSZ:
-                            if (ttt.pszText)
-                                pti->pszText = ttt.pszText;
-                        break;
-
-                        case TTFMT_STRINGRES:
-                                // @@todo
-                        break;
-                    }
-                }
-            break; }
+                TtmGetText(hwndTooltip, mp2);
+            break;
 
             /*
              *@@ TTM_UPDATETIPTEXT:
-             *      sets the tooltip text for a tool.
+             *      sets the current tooltip text explicitly,
+             *      no matter for what tool the tooltip is
+             *      currently being displayed. This might be
+             *      useful if you want to dynamically update
+             *      the tooltip display.
+             *
+             *      If the tooltip is currently showing,
+             *      it is reformatted with the new text.
+             *
+             *      Note that the change is not permanent;
+             *      if the mouse moves over a different
+             *      tool next, the change will be lost.
              *
              *      Parameters:
-             *      -- mp1: always 0.
-             *      -- PTOOLINFO mp2: pointer to a TOOLINFO structure.
-             *         The "hinst" and "lpszText" members must specify
-             *         the instance handle and the pointer to the text.
-             *         The "hwnd" and "uId" members identify the tool
-             *         to update.
+             *      -- PSZ mp1: new text to display.
+             *
+             *@@added V0.9.13 (2001-06-21) [umoeller]
              */
 
             case TTM_UPDATETIPTEXT:
+                TtmUpdateTipText(hwndTooltip, (PSZ)mp1);
             break;
 
@@ -1593 +1866 @@
 
             case TTM_ENUMTOOLS:         // done
-            {
-                PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
-                mrc = (MPARAM)FALSE;
-                if (ptiTarget)
-                {
-                    PTOOLINFO ptiFound = (PTOOLINFO)lstItemFromIndex(&pttd->llTools,
-                                                                     SHORT1FROMMP(mp1));
-                    if (ptiFound)
-                    {
-                        memcpy(ptiTarget, ptiFound, sizeof(TOOLINFO));
-                        mrc = (MRESULT)TRUE;
-                    }
-                }
-            break; }
+                mrc = TtmEnumTools(hwndTooltip, mp1, mp2);
+            break;
 
             /*
              *@@ TTM_GETCURRENTTOOL:
-             *      this message retrieves the information that the tooltip control
-             *      maintains for the _current_ tool; that is, the one for which
-             *      the tooltip control is currently displaying text.
+             *      this message retrieves the information that the
+             *      tooltip control maintains for the _current_ tool;
+             *      that is, the one for which the tooltip control
+             *      is currently displaying text.
              *
              *      Parameters:
@@ -1623 +1885 @@
 
             case TTM_GETCURRENTTOOL:        // done
-            {
-                PTOOLINFO ptiTarget = (PTOOLINFO)mp2;
-                mrc = (MPARAM)FALSE;
-                if (ptiTarget)
-                {
-                    if (pttd->ptiMouseOver)
-                    {
-                        memcpy(ptiTarget, pttd->ptiMouseOver, sizeof(TOOLINFO));
-                        mrc = (MPARAM)TRUE;
-                    }
-                }
-            break; }
+                mrc = TtmGetCurrentTool(hwndTooltip, mp2);
+            break;
 
             /*
@@ -1644 +1896 @@
 
             case TTM_GETTOOLCOUNT:          // done
+            {
+                PTOOLTIPDATA pttd = (PTOOLTIPDATA)WinQueryWindowPtr(hwndTooltip, 1);
                 mrc = (MPARAM)lstCountItems(&pttd->llTools);
-            break;
+            break; }
 
             /*
@@ -1665 +1919 @@
 
             case TTM_GETTOOLINFO:       // done
-            {
-                PTOOLINFO ptiSearch = (PTOOLINFO)mp2;
-                mrc = (MPARAM)FALSE;
-                if (ptiSearch)
-                {
-                    PLISTNODE pToolNode = lstQueryFirstNode(&pttd->llTools);
-                    while (pToolNode)
-                    {
-                        PTOOLINFO ptiThis = (PTOOLINFO)pToolNode->pItemData;
-                        if (    (ptiThis->hwndToolOwner == ptiSearch->hwndToolOwner)
-                             && (ptiThis->hwndTool == ptiSearch->hwndTool)
-                           )
-                        {
-                            // found:
-                            memcpy(ptiSearch, ptiThis, sizeof(TOOLINFO));
-                            mrc = (MPARAM)TRUE;
-                            break;
-                        }
-                        pToolNode = pToolNode->pNext;
-                    }
-                }
-            break; }
+                mrc = TtmGetToolInfo(hwndTooltip, mp2);
+            break;
 
             /*
@@ -1712 +1946 @@
              *
              *      This is not part of the Win95 message set but used
-             *      in the OS/2 implementation only. This calls TtmShowTooltip
-             *      in turn.
+             *      in the OS/2 implementation only. This calls
+             *      TtmShowTooltip in turn.
              */
 
             case TTM_SHOWTOOLTIPNOW:
-                // _Pmpf((__FUNCTION__ ": TTM_SHOWTOOLTIPNOW %d", mp1));
-                TtmShowTooltip(hwndTooltip, pttd, (BOOL)mp1);
+                TtmShowTooltip(hwndTooltip, (BOOL)mp1);
             break;
 

trunk/src/helpers/comctl.c

@@ -118 +118 @@
 /* ******************************************************************
  *
- *   Global variables
+ *   "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]
+ */
+
+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;
+    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;
+    }
+    else
+    {
+        lLeft = pxbd->lcol3DLight;
+        lRight = pxbd->lcol3DDark;
+    }
+
+    if (ulBorder)
+    {
+        // button border:
+
+        // now paint button frame
+        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
+                    pxbd->lMiddle);
+
+    // 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->cxMiniIcon) / 2);
+        ptl.y = rclWin.yBottom + ((cy - pxbd->cxMiniIcon) / 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,
+                    &ptl);
+            GpiSetPattern(hps, PATSYM_DIAG1);
+            ptl2.x = ptl.x + pxbd->cxMiniIcon + 1; // inclusive!
+            ptl2.y = ptl.y + pxbd->cxMiniIcon + 1; // inclusive!
+            GpiBox(hps,
+                   DRO_FILL,
+                   &ptl2,
+                   0,
+                   0);
+        }
+
+        // now paint icon
+        GpiIntersectClipRectangle(hps, &rclWin);    // exclusive!
+        WinDrawPointer(hps,
+                       // center this in remaining rectl
+                       ptl.x + ulOfs,
+                       ptl.y - ulOfs,
+                       pxbd->hptr,
+                       DP_MINI);
+    }
+}
 
 /*

trunk/src/helpers/dialog.c

@@ -1165 +1165 @@
  +                                        "My Dlg Title",
  +                                        DlgTemplate,      // DLGHITEM array
- +                                        ARRAYITEMSIZE(DlgTemplate),
+ +                                        ARRAYITEMCOUNT(DlgTemplate),
  +                                        NULL))
  +          {

trunk/src/helpers/dosh.c

@@ -251 +251 @@
 
 /*
+ *@@ doshDevIOCtl:
+ *
+ *      Works with those IOCtls where the buffer
+ *      size parameters are always the same anyway,
+ *      which applies to all IOCtls I have seen
+ *      so far.
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshDevIOCtl(HFILE hf,
+                    ULONG ulCategory,
+                    ULONG ulFunction,
+                    PVOID pvParams,
+                    ULONG cbParams,
+                    PVOID pvData,
+                    ULONG cbData)
+{
+    return (DosDevIOCtl(hf,
+                        ulCategory,
+                        ulFunction,
+                        pvParams, cbParams, &cbParams,
+                        pvData, cbData, &cbData));
+}
+
+/*
  *@@category: Helpers\Control program helpers\Shared memory management
  *      helpers for allocating and requesting shared memory.
@@ -285 +311 @@
 {
     PVOID   pvrc = NULL;
-    APIRET  arc = DosAllocSharedMem((PVOID*)(&pvrc),
+    APIRET  arc = DosAllocSharedMem((PVOID*)&pvrc,
                                     (PSZ)pcszName,
                                     ulSize,
@@ -312 +338 @@
 {
     PVOID pvrc = NULL;
-    APIRET arc = DosGetNamedSharedMem((PVOID*)(pvrc),
+    APIRET arc = DosGetNamedSharedMem((PVOID*)pvrc,
                                       (PSZ)pcszName,
                                       PAG_READ | PAG_WRITE);
@@ -332 +358 @@
  *
  ********************************************************************/
+
+/*
+ *@@ doshIsFixedDisk:
+ *      checks whether a disk is fixed or removeable.
+ *      ulLogicalDrive must be 1 for drive A:, 2 for B:, ...
+ *      The result is stored in *pfFixed.
+ *      Returns DOS error code.
+ *
+ *      From my testing, this function does _not_ provoke
+ *      "drive not ready" popups, even if the disk is not
+ *      ready.
+ *
+ *      Warning: This uses DosDevIOCtl, which has proved
+ *      to cause problems with some device drivers for
+ *      removeable disks.
+ */
+
+APIRET doshIsFixedDisk(ULONG  ulLogicalDrive,   // in: 1 for A:, 2 for B:, 3 for C:, ...
+                       PBOOL  pfFixed)          // out: TRUE for fixed disks
+{
+    APIRET arc = ERROR_INVALID_DRIVE;
+
+    if (ulLogicalDrive)
+    {
+        // parameter packet
+        #pragma pack(1)
+        struct {
+            UCHAR   command,
+                    drive;
+        } parms;
+        #pragma pack()
+
+        // data packet
+        UCHAR ucNonRemoveable;
+
+        parms.drive = (UCHAR)(ulLogicalDrive-1);
+        arc = doshDevIOCtl((HFILE)-1,
+                           IOCTL_DISK,
+                           DSK_BLOCKREMOVABLE,
+                           &parms, sizeof(parms),
+                           &ucNonRemoveable, sizeof(ucNonRemoveable));
+
+        if (arc == NO_ERROR)
+            *pfFixed = (BOOL)ucNonRemoveable;
+    }
+
+    return (arc);
+}
+
+/*
+ *@@ doshQueryDiskParams:
+ *      this retrieves more information about a given drive,
+ *      which is stored in the specified BIOSPARAMETERBLOCK
+ *      structure.
+ *
+ *      BIOSPARAMETERBLOCK is defined in the Toolkit headers,
+ *      and from my testing, it's the same with the Toolkits
+ *      3 and 4.5.
+ *
+ *      If NO_ERROR is returned, the bDeviceType field can
+ *      be one of the following (according to CPREF):
+ *
+ *      --  0:  48 TPI low-density diskette drive
+ *      --  1:  96 TPI high-density diskette drive
+ *      --  2:  3.5-inch 720KB diskette drive
+ *      --  3:  8-Inch single-density diskette drive
+ *      --  4:  8-Inch double-density diskette drive
+ *      --  5:  Fixed disk
+ *      --  6:  Tape drive
+ *      --  7:  Other (includes 1.44MB 3.5-inch diskette drive)
+ *      --  8:  R/W optical disk
+ *      --  9:  3.5-inch 4.0MB diskette drive (2.88MB formatted)
+ *
+ *      From my testing, this function does _not_ provoke
+ *      "drive not ready" popups, even if the disk is not
+ *      ready.
+ *
+ *      Warning: This uses DosDevIOCtl, which has proved
+ *      to cause problems with some device drivers for
+ *      removeable disks.
+ *
+ *      This returns the DOS error code of DosDevIOCtl.
+ *
+ *@@added V0.9.0 [umoeller]
+ *@@changed V0.9.13 (2001-06-14) [umoeller]: changed prototype to use BIOSPARAMETERBLOCK directly
+ *@@changed V0.9.13 (2001-06-14) [umoeller]: now querying standard media, no redetermine
+ */
+
+APIRET doshQueryDiskParams(ULONG ulLogicalDrive,        // in:  1 for A:, 2 for B:, 3 for C:, ...
+                           PBIOSPARAMETERBLOCK pdp)     // out: drive parameters
+{
+    APIRET arc = ERROR_INVALID_DRIVE;
+
+    if (ulLogicalDrive)
+    {
+        #pragma pack(1)
+        // parameter packet
+        struct {
+            UCHAR   ucCommand,
+                    ucDrive;
+        } parms;
+        #pragma pack()
+
+        parms.ucCommand = 0;    // 0 = return standard media,
+                                // 1 = read currently inserted media
+                                // (1 doesn't work any more, returns arc 87
+                                // V0.9.13 (2001-06-14) [umoeller])
+        parms.ucDrive=(UCHAR)(ulLogicalDrive-1);
+
+        // zero the structure V0.9.13 (2001-06-14) [umoeller]
+        memset(pdp, 0, sizeof(BIOSPARAMETERBLOCK));
+
+        arc = doshDevIOCtl((HFILE)-1,
+                           IOCTL_DISK,
+                           DSK_GETDEVICEPARAMS,
+                           &parms, sizeof(parms),
+                           pdp,   sizeof(BIOSPARAMETERBLOCK));
+
+        if (!arc)
+        {
+            _Pmpf(("      bDeviceType: %d", pdp->bDeviceType));
+            _Pmpf(("      bytes per sector: %d", pdp->usBytesPerSector));
+            _Pmpf(("      sectors per track: %d", pdp->usSectorsPerTrack));
+        }
+    }
+
+    return (arc);
+}
+
+/*
+ *@@ doshIsCDROM:
+ *      tests the specified BIOSPARAMETERBLOCK
+ *      for whether it represents a CD-ROM drive.
+ *
+ *      The BIOSPARAMETERBLOCK must be filled
+ *      first using doshQueryDiskParams.
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+BOOL doshIsCDROM(PBIOSPARAMETERBLOCK pdp)
+{
+    return (    (pdp)
+             && (pdp->bDeviceType == 7)     // "other"
+             && (pdp->usBytesPerSector == 2048)
+             && (pdp->usSectorsPerTrack == (USHORT)-1)
+           );
+}
 
 /*
@@ -376 +550 @@
     while (ulLogicalDrive <= 26)
     {
-        UCHAR nonRemovable=0;
-        ULONG parmSize=2;
-        ULONG dataLen=1;
-
         #pragma pack(1)
         struct
@@ -387 +557 @@
         #pragma pack()
 
+        // data packet
+        UCHAR nonRemovable=0;
+
         parms.drive=(UCHAR)(ulLogicalDrive-1);
-        arc = DosDevIOCtl((HFILE)-1,
-                          IOCTL_DISK,
-                          DSK_BLOCKREMOVABLE,
-                          &parms,
-                          parmSize,
-                          &parmSize,
-                          &nonRemovable,
-                          1,
-                          &dataLen);
+        arc = doshDevIOCtl((HFILE)-1,
+                           IOCTL_DISK,
+                           DSK_BLOCKREMOVABLE,
+                           &parms, sizeof(parms),
+                           &nonRemovable, sizeof(nonRemovable));
 
         if (    // fixed disk and non-removeable
@@ -468 +637 @@
  *      those ugly white "Drive not ready" popups.
  *
+ *      "fl" can specify additional flags for testing
+ *      and can be any combination of:
+ *
+ *      --  ASSERTFL_MIXEDMODECD: whether to allow
+ *          mixed-mode CD-ROMs. See error codes below.
+ *
  *      This returns (from my testing):
+ *
  *      -- NO_ERROR: drive is available.
+ *
  *      -- ERROR_INVALID_DRIVE (15): drive letter does not exist.
- *      -- ERROR_NOT_READY (21): drive exists, but is not ready
- *                  (e.g. CD-ROM drive without CD inserted).
- *      -- ERROR_NOT_SUPPORTED (50): this is returned by the RAMFS.IFS
- *                  file system; apparently, the IFS doesn't support
- *                  DASD opening.
+ *
+ *      -- ERROR_NOT_READY (21): drive exists, but is not ready.
+ *                  This is produced by floppies and CD-ROM drives
+ *                  which do not have valid media inserted.
+ *
+ *      -- ERROR_AUDIO_CD_ROM (10000): special error code returned
+ *                  only by this function if a CD-ROM drive has audio
+ *                  media inserted.
+ *
+ *                  If ASSERTFL_MIXEDMODECD was specified, ERROR_AUDIO_CD_ROM
+ *                  is returned _only_ if _no_ data tracks are
+ *                  present on a CD-ROM. Since OS/2 is not very
+ *                  good at handling mixed-mode CDs, this might not
+ *                  be desireable.
+ *
+ *                  If ASSERTFL_MIXEDMODECD was not set, ERROR_AUDIO_CD_ROM
+ *                  will be returned already if _one_ audio track is present.
  *
  *@@changed V0.9.1 (99-12-13) [umoeller]: rewritten, prototype changed. Now using DosOpen on the drive instead of DosError.
@@ -484 +673 @@
  *@@changed V0.9.9 (2001-03-19) [pr]: validate drive number
  *@@changed V0.9.11 (2001-04-23) [umoeller]: added an extra check for floppies
- */
-
-APIRET doshAssertDrive(ULONG ulLogicalDrive) // in: 1 for A:, 2 for B:, 3 for C:, ...
-{
-    CHAR    szDrive[3] = "C:";
+ *@@changed V0.9.13 (2001-06-14) [umoeller]: added "fl" parameter and lots of CD-ROM checks
+ */
+
+APIRET doshAssertDrive(ULONG ulLogicalDrive,    // in: 1 for A:, 2 for B:, 3 for C:, ...
+                       ULONG fl)                // in: ASSERTFL_* flags
+{
     HFILE   hfDrive = 0;
     ULONG   ulTemp = 0;
-    APIRET  arc;
+    APIRET  arc = NO_ERROR;
+    BOOL    fFixed = FALSE,
+            fCDROM = FALSE;
 
     if ((ulLogicalDrive < 1) || (ulLogicalDrive > 26))
         return(ERROR_PATH_NOT_FOUND);
 
-    szDrive[0] = 'A' + ulLogicalDrive - 1;
-
-    arc = DosOpen(szDrive,   // "C:", "D:", ...
-                  &hfDrive,
-                  &ulTemp,
-                  0,
-                  FILE_NORMAL,
-                  OPEN_ACTION_FAIL_IF_NEW
-                         | OPEN_ACTION_OPEN_IF_EXISTS,
-                  OPEN_FLAGS_DASD
-                         | OPEN_FLAGS_FAIL_ON_ERROR
-                         | OPEN_FLAGS_NOINHERIT     // V0.9.6 (2000-11-25) [pr]
-                         | OPEN_ACCESS_READONLY
-                         | OPEN_SHARE_DENYNONE,
-                  NULL);
-
-    // _Pmpf((__FUNCTION__ ": DosOpen(OPEN_FLAGS_DASD) returned %d", arc));
+    arc = doshIsFixedDisk(ulLogicalDrive,
+                          &fFixed);    // V0.9.13 (2001-06-14) [umoeller]
+
+    _Pmpf((__FUNCTION__ ": doshIsFixedDisk returned %d for disk %d", arc, ulLogicalDrive));
+    _Pmpf(("   fFixed is %d", fFixed));
+
+    if (!arc)
+        if (!fFixed)
+        {
+            // removeable disk:
+            // check if it's a CD-ROM
+            BIOSPARAMETERBLOCK bpb;
+            arc = doshQueryDiskParams(ulLogicalDrive,
+                                      &bpb);
+            _Pmpf(("   doshQueryDiskParams returned %d", arc));
+
+            if (    (!arc)
+                 && (doshIsCDROM(&bpb))
+               )
+            {
+                _Pmpf(("   --> is CD-ROM"));
+                fCDROM = TRUE;
+            }
+        }
+
+    if (!arc)
+    {
+        CHAR    szDrive[3] = "C:";
+        szDrive[0] = 'A' + ulLogicalDrive - 1;
+        arc = DosOpen(szDrive,   // "C:", "D:", ...
+                      &hfDrive,
+                      &ulTemp,
+                      0,
+                      FILE_NORMAL,
+                      OPEN_ACTION_FAIL_IF_NEW
+                             | OPEN_ACTION_OPEN_IF_EXISTS,
+                      OPEN_FLAGS_DASD
+                             | OPEN_FLAGS_FAIL_ON_ERROR
+                             | OPEN_FLAGS_NOINHERIT     // V0.9.6 (2000-11-25) [pr]
+                  //            | OPEN_ACCESS_READONLY  // V0.9.13 (2001-06-14) [umoeller]
+                             | OPEN_SHARE_DENYNONE,
+                      NULL);
+
+        _Pmpf(("   DosOpen(OPEN_FLAGS_DASD) returned %d", arc));
+
+        // this still returns NO_ERROR for audio CDs in a
+        // CD-ROM drive...
+        // however, the WPS then attempts to read in the
+        // root directory for audio CDs, which produces
+        // a "sector not found" error box...
+
+        if (!arc && hfDrive && fCDROM)     // determined above
+        {
+            ULONG ulAudioTracks = 0,
+                  ulDataTracks = 0;
+
+            CHAR cds1[4] = { 'C', 'D', '0', '1' };
+            CHAR cds2[4];
+            // check for proper driver signature
+            if (!(arc = doshDevIOCtl(hfDrive,
+                                     IOCTL_CDROMDISK,
+                                     CDROMDISK_GETDRIVER,
+                                     &cds1, sizeof(cds1),
+                                     &cds2, sizeof(cds2))))
+            {
+                if (memcmp(&cds1, &cds2, 4))
+                    // this is not a CD-ROM then:
+                    arc = NO_ERROR;
+                else
+                {
+                    struct {
+                        UCHAR   ucFirstTrack,
+                                ucLastTrack;
+                        ULONG   ulLeadOut;
+                    } cdat;
+
+                    // get track count
+                    if (!(arc = doshDevIOCtl(hfDrive,
+                                             IOCTL_CDROMAUDIO,
+                                             CDROMAUDIO_GETAUDIODISK,
+                                             &cds1, sizeof(cds1),
+                                             &cdat, sizeof(cdat))))
+                    {
+                        // still no error: build the audio TOC
+                        ULONG i;
+                        for (i = cdat.ucFirstTrack;
+                             i <= cdat.ucLastTrack;
+                             i++)
+                        {
+                            BYTE cdtp[5] =
+                              { 'C', 'D', '0', '1', (UCHAR)i };
+
+                            struct {
+                                ULONG   ulTrackAddress;
+                                BYTE    bFlags;
+                            } trackdata;
+
+                            if (!(arc = doshDevIOCtl(hfDrive,
+                                                     IOCTL_CDROMAUDIO,
+                                                     CDROMAUDIO_GETAUDIOTRACK,
+                                                     &cdtp, sizeof(cdtp),
+                                                     &trackdata, sizeof(trackdata))))
+                            {
+                                if (trackdata.bFlags & 64)
+                                    ulDataTracks++;
+                                else
+                                {
+                                    ulAudioTracks++;
+
+                                    if (!(fl & ASSERTFL_MIXEDMODECD))
+                                    {
+                                        // caller doesn't want mixed mode:
+                                        // stop here
+                                        ulDataTracks = 0;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        _Pmpf(("   got %d audio, %d data tracks",
+                                    ulAudioTracks, ulDataTracks));
+
+                        if (!ulDataTracks)
+                            arc = ERROR_AUDIO_CD_ROM;       // special private error code (10000)
+                    }
+                    else
+                    {
+                        // not audio disk:
+                        // go on then
+                        _Pmpf(("   CDROMAUDIO_GETAUDIODISK returned %d", arc));
+                        arc = NO_ERROR;
+                    }
+                }
+            }
+            else
+            {
+                // not CD-ROM: go on then
+                _Pmpf(("   CDROMDISK_GETDRIVER returned %d", arc));
+                arc = NO_ERROR;
+            }
+        }
+    }
 
     switch (arc)
@@ -544 +862 @@
                                      &fsa,
                                      sizeof(fsa));
+                _Pmpf(("   re-checked, DosQueryFSInfo returned %d", arc));
             }
         break;
-
-        case NO_ERROR:
-            DosClose(hfDrive);
-        break;
-    }
+    }
+
+    if (hfDrive)
+        DosClose(hfDrive);
 
     return (arc);
@@ -597 +915 @@
         paramsize = sizeof(param);
         datasize = sizeof(data);
-        rc = DosDevIOCtl(fd,
-                         IOCTL_DISK, DSK_SETLOGICALMAP,
-                         &param, paramsize, &paramsize,
-                         &data, datasize, &datasize);
+        rc = doshDevIOCtl(fd,
+                          IOCTL_DISK, DSK_SETLOGICALMAP,
+                          &param, sizeof(param),
+                          &data, sizeof(data));
         DosClose(fd);
     }
@@ -700 +1018 @@
                    (CHAR*)(&pfsqBuffer->szName) + pfsqBuffer->cbName + 1);
         }
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshIsFixedDisk:
- *      checks whether a disk is fixed or removeable.
- *      ulLogicalDrive must be 1 for drive A:, 2 for B:, ...
- *      The result is stored in *pfFixed.
- *      Returns DOS error code.
- *
- *      Warning: This uses DosDevIOCtl, which has proved
- *      to cause problems with some device drivers for
- *      removeable disks.
- */
-
-APIRET doshIsFixedDisk(ULONG  ulLogicalDrive,   // in: 1 for A:, 2 for B:, 3 for C:, ...
-                       PBOOL  pfFixed)          // out: TRUE for fixed disks
-{
-    APIRET arc = ERROR_INVALID_DRIVE;
-
-    if (ulLogicalDrive)
-    {
-        // parameter packet
-        #pragma pack(1)
-        struct {
-            UCHAR command, drive;
-        } parms;
-        #pragma pack()
-
-        // data packet
-        UCHAR ucNonRemoveable;
-
-        ULONG ulParmSize = sizeof(parms);
-        ULONG ulDataSize = sizeof(ucNonRemoveable);
-
-        parms.drive = (UCHAR)(ulLogicalDrive-1);
-        arc = DosDevIOCtl((HFILE)-1,
-                          IOCTL_DISK,
-                          DSK_BLOCKREMOVABLE,
-                          &parms,
-                          ulParmSize,
-                          &ulParmSize,
-                          &ucNonRemoveable,
-                          ulDataSize,
-                          &ulDataSize);
-
-        if (arc == NO_ERROR)
-            *pfFixed = (BOOL)ucNonRemoveable;
-    }
-
-    return (arc);
-}
-
-/*
- *@@ doshQueryDiskParams:
- *      this retrieves more information about a given drive,
- *      which is stored in the specified DRIVEPARAMS structure
- *      (dosh.h).
- *
- *      Warning: This uses DosDevIOCtl, which has proved
- *      to cause problems with some device drivers for
- *      removeable disks.
- *
- *      This returns the DOS error code of DosDevIOCtl.
- *
- *@@added V0.9.0 [umoeller]
- */
-
-APIRET doshQueryDiskParams(ULONG ulLogicalDrive,        // in:  1 for A:, 2 for B:, 3 for C:, ...
-                           PDRIVEPARAMS pdp)            // out: drive parameters
-{
-    APIRET arc = ERROR_INVALID_DRIVE;
-
-    if (ulLogicalDrive)
-    {
-        #pragma pack(1)
-        // parameter packet
-        struct {
-            UCHAR command, drive;
-        } parms;
-        #pragma pack()
-
-        ULONG ulParmSize = sizeof(parms);
-        ULONG ulDataSize = sizeof(DRIVEPARAMS);
-
-        parms.command = 1; // read currently inserted media
-        parms.drive=(UCHAR)(ulLogicalDrive-1);
-
-        arc = DosDevIOCtl((HFILE)-1,
-                          IOCTL_DISK,
-                          DSK_GETDEVICEPARAMS,
-                          // parameter packet:
-                          &parms, ulParmSize, &ulParmSize,
-                          // data packet: DRIVEPARAMS structure
-                          pdp,    ulDataSize, &ulDataSize);
     }
 
@@ -1109 +1330 @@
     }
     return (rc);
+}
+
+/*
+ *@@ doshOpenExisting:
+ *      opens an existing file for read-write access. Does
+ *      not create a new file if the file doesn't exist.
+ *
+ *      This is just a simple wrapper around DosOpen.
+ *
+ *      ulOpenFlags is passed to DosOpen. Should be one
+ *      of:
+ *
+ *      --  for read-only access:
+ *
+ +              OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY
+ *
+ *      --  for read-write access:
+ *
+ +              OPEN_SHARE_DENYREADWRITE | OPEN_ACCESS_READWRITE
+ *
+ *      In addition, you can specify
+ *
+ +          OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_RANDOM
+ +                          | OPEN_FLAGS_NOINHERIT
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshOpenExisting(const char *pcszFilename,   // in: file name
+                        ULONG ulOpenFlags,          // in: open flags
+                        HFILE *phf)                 // out: OS/2 file handle
+{
+    ULONG ulAction;
+    return (DosOpen((PSZ)pcszFilename,
+                    phf,
+                    &ulAction,
+                    0,          // cbFile
+                    0,          // attributes
+                    OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                    ulOpenFlags,
+                    NULL));     // EAs
+}
+
+/*
+ *@@ doshWriteAt:
+ *      writes cb bytes (pointed to by pbData) to the
+ *      position specified by ulMethod and lOffset into
+ *      the file specified by hf.
+ *
+ *      If ulMethod is FILE_BEGIN, lOffset specifies the
+ *      offset from the beginning of the file. With
+ *      FILE_CURRENT, lOffset is considered from the
+ *      current file pointer, and with FILE_END, it is
+ *      considered from the end of the file.
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshWriteAt(HFILE hf,        // in: OS/2 file handle
+                   LONG lOffset,    // in: offset to write at (depends on ulMethod)
+                   ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
+                   ULONG cb,        // in: bytes to write
+                   PBYTE pbData)    // in: ptr to bytes to write (must be cb bytes)
+{
+    APIRET arc;
+    ULONG ulDummy;
+    if (!(arc = DosSetFilePtr(hf,
+                              lOffset,
+                              ulMethod,
+                              &ulDummy)))
+        arc = DosWrite(hf,
+                       pbData,
+                       cb,
+                       &ulDummy);
+
+    return (arc);
+}
+
+/*
+ *@@ doshReadAt:
+ *      reads cb bytes from the position specified by
+ *      ulMethod and lOffset into the buffer pointed to
+ *      by pbData, which should be cb bytes in size.
+ *
+ *      Use lOffset and ulMethod as with doshWriteAt.
+ *
+ *@@added V0.9.13 (2001-06-14) [umoeller]
+ */
+
+APIRET doshReadAt(HFILE hf,        // in: OS/2 file handle
+                  LONG lOffset,    // in: offset to write at (depends on ulMethod)
+                  ULONG ulMethod,  // in: one of FILE_BEGIN, FILE_CURRENT, FILE_END
+                  ULONG cb,        // in: bytes to write
+                  PBYTE pbData)    // out: read buffer (must be cb bytes)
+{
+    APIRET arc;
+    ULONG ulDummy;
+    if (!(arc = DosSetFilePtr(hf,
+                              lOffset,
+                              ulMethod,
+                              &ulDummy)))
+        arc = DosRead(hf,
+                      pbData,
+                      cb,
+                      &ulDummy);
+
+    return (arc);
 }
 

trunk/src/helpers/except.c

@@ -260 +260 @@
 BOOL            G_fBeepOnException = TRUE;
 
+ULONG           G_ulExplainExceptionRunning = 0;
+    // global flag which is != 0 if some exception handler
+    // is inside excExplainException, so that XShutdown can
+    // wait until the trap log is done;
+    // this is exported thru except.h
+    // V0.9.13 (2001-06-19) [umoeller]
+
 /*
  *@@category: Helpers\Control program helpers\Exceptions/debugging
@@ -452 +459 @@
  *@@changed V0.9.3 (2000-05-03) [umoeller]: fixed crashes
  *@@changed V0.9.6 (2000-11-06) [umoeller]: added more register dumps
+ *@@changed V0.9.13 (2001-06-19) [umoeller]: added global flag for whether this is running
  */
 
@@ -472 +480 @@
 
     ULONG       ulOldPriority = 0x0100; // regular, delta 0
+
+    // raise global flag for whether this func is running
+    // V0.9.13 (2001-06-19) [umoeller]
+    G_ulExplainExceptionRunning++;
 
     // raise this thread's priority, because this
@@ -750 +762 @@
                    (UCHAR)ulOldPriority,
                    0);     // current thread
+
+    // lower global flag again V0.9.13 (2001-06-19) [umoeller]
+    G_ulExplainExceptionRunning--;
 }
 

trunk/src/helpers/gpih.c

@@ -1207 +1207 @@
     }
 
-    _Pmpf((__FUNCTION__ ": returning lcid %d", lLCIDReturn));
+    // _Pmpf((__FUNCTION__ ": returning lcid %d", lLCIDReturn));
 
     return (lLCIDReturn);

trunk/src/helpers/stringh.c

@@ -1642 +1642 @@
  *      Note: On the first call, *ppszRoot and *pcbRoot
  *      _must_ be both NULL, or this crashes.
+ *
+ *@@changed V0.9.13 (2001-06-21) [umoeller]: added cbNew
  */
 
 VOID strhArrayAppend(PSZ *ppszRoot,         // in: root of array
                      const char *pcszNew,   // in: string to append
+                     ULONG cbNew,           // in: size of that string or 0 to run strlen() here
                      PULONG pcbRoot)        // in/out: size of array
 {
-    ULONG cbNew = strlen(pcszNew);
-    PSZ pszTemp = (PSZ)malloc(*pcbRoot
-                              + cbNew
-                              + 1);    // two null bytes
+    PSZ pszTemp;
+
+    if (!cbNew)     // V0.9.13 (2001-06-21) [umoeller]
+        cbNew = strlen(pcszNew);
+
+    pszTemp = (PSZ)malloc(*pcbRoot
+                          + cbNew
+                          + 1);    // two null bytes
     if (*ppszRoot)
     {

trunk/src/helpers/winh.c

@@ -160 +160 @@
         // put the call in brackets so the macro won't apply here
         return ((WinQueryWindow)(hwnd, lCode));
+    }
+
+    /*
+     *@@ winhQueryWindowPtr:
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    PVOID winhQueryWindowPtr(HWND hwnd, LONG index)
+    {
+        // put the call in brackets so the macro won't apply here
+        return ((WinQueryWindowPtr)(hwnd, index));
+    }
+
+    /*
+     *@@ winhSetWindowText:
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    BOOL winhSetWindowText(HWND hwnd, const char *pcsz)
+    {
+        // put the call in brackets so the macro won't apply here
+        return (WinSetWindowText)(hwnd, (PSZ)pcsz);
+    }
+
+    /*
+     *@@ winhSetDlgItemText:
+     *
+     *@@added V0.9.13 (2001-06-21) [umoeller]
+     */
+
+    BOOL winhSetDlgItemText(HWND hwnd, ULONG id, const char *pcsz)
+    {
+        // put the call in brackets so the macro won't apply here
+        return (WinSetDlgItemText)(hwnd, id, (PSZ)pcsz);
     }