Changeset 81 for trunk/include/helpers

Timestamp:

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

Author:

umoeller

Message:

Tons of changes from the last weeks.

Location:

trunk/include/helpers

Files:

• comctl.h (modified) (5 diffs)
• dosh.h (modified) (6 diffs)
• except.h (modified) (1 diff)
• stringh.h (modified) (1 diff)
• winh.h (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