Context Navigation

← Previous Change
Next Change →

os2wrap2.h

Timestamp:

Aug 23, 2010, 2:07:38 AM (15 years ago)

Author:

dmik

Message:

os2wrap2.h: Fixed a lot of broken definitions (in fact, all macros were incorrectly redefined) and added more constants and typedefs.

File:

: 1 edited

trunk/include/os2wrap2.h (modified) (58 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/include/os2wrap2.h

-              r21379
+              r21423
 /*
    Redefine all OS/2 typedefs to those having the "os2_" prefix to avoid
+   conflicts with Windows typedefs. The defines are generated with the following
+   command on the respective OS/2 headers:
+   conflicts with Windows typedefs. Also define "os2_" versions of all
+   macros. The defines are generated with the following command on the
+   respective OS/2 headers:
+sed -nr \
+  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define _\1 os2__\1\
+#define \1 os2_\1/p' \
+  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define \1 os2_\1/p' \
+  -e 's/^[[:space:]]*#define[[:space:]]+((CONTEXT|CS|EH|EXCEPTION|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#define \1 os2_\1/p' \
+sed -nr '
+{
+  s/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+([A-Za-z_][A-Za-z0-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define \1 os2_\1/p
+  td
+  s/^[[:space:]]*}[[:space:]]*([A-Z_][A-Z0-9_]+)[[:space:]]*;[[:space:]]*$/#define \1 os2_\1/p
+  td
+  s/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z0-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#define \1 os2_\1/p
+  td
+}
+/^[[:space:]]*#define[[:space:]]+/ {
+  :a;/\\$/{N;ba}
+  s/([^A-Za-z0-9_])(MAKE[A-Z0-9]+)([^A-Za-z0-9_])/\1 \2 \3/g
+  s/([^A-Za-z0-9_])(((CONTEXT|CS|DM|DT|EH|EXCEPTION|FDM|FNTM|HWND|MB|MIA|NP|QS|RGN|RT|SEM|SEVERITY|SWP|TA|WC|WM|WS|(WIN|GPI|DEV|SPL)ERR)_([A-Z0-9_]+))|((P?VOID|(API|EXP)ENTRY|P(CMD|CHR|MSE)MSG|ERRORID|PCMDMSG|SEL|HWND|MPARAM|MRESULT|LHANDLE|SHANDLE|BOOL|(LO|HI|P)?U?(LONG|SHORT|CHAR|BYTE)|MPFROM[A-Z0-9]+|MAKE[A-Z0-9]+)([^A-Za-z0-9_])))/\1os2_\2/g
+  tb;bd
+  :b
+  s/^[[:space:]]*#define[[:space:]]+(os2_)?([A-Za-z_][A-Za-z0-9_]+)[[:space:]]*(.*)/#define os2_\2 \3/p
+}
+:d
+'
  */
+#define os2__THUNK_PASCAL_FUNCTION (FUN) os2_APIENTRY _16_##FUN
+#define os2_MAKE16P (sel,off)   ((_far16ptr)((sel) << 16 | (off)))
+#define os2_MAKEP (sel,off)     _libc_16to32 ( os2_MAKE16P  (sel, off))
+#define os2_SELECTOROF (farptr) ((os2_SEL)((farptr) >> 16))
+#define os2_OFFSETOF (farptr)   ((os2_USHORT)(farptr))
+#define os2__THUNK_PTR_SIZE_OK (ptr,size) \
+  (((os2_ULONG)(ptr) & ~0xffff) == (((os2_ULONG)(ptr) + (size) - 1) & ~0xffff))
+#define os2_APIENTRY _System
+#define os2_EXPENTRY _System
+#define os2_VOID void
+#define os2_NULLHANDLE ((os2_LHANDLE)0)
+#define os2_NULLSHANDLE ((os2_SHANDLE)0)
 #define INT os2_INT
 #define UINT os2_UINT
 …
 #define HMUX os2_HMUX
 #define PHMUX os2_PHMUX
+#define os2_FIELDOFFSET (t,f)  ((os2_SHORT)&(((t *)0)->f))
+#define os2_MAKETYPE (v,t)        (*((t *)&v))
+#define os2_MAKEUSHORT (l,h)      (((os2_USHORT)(l)) | ((os2_USHORT)(h))<<8)
+#define os2_MAKESHORT (l,h)       ((os2_SHORT) os2_MAKEUSHORT (l, h))
+#define os2_MAKEULONG (l,h)       ((os2_ULONG)(((os2_USHORT)(l)) | ((os2_ULONG)((os2_USHORT)(h)))<<16))
+#define os2_MAKELONG (l,h)        ((os2_LONG) os2_MAKEULONG (l, h))
+#define os2_LOUCHAR (w)   ((os2_UCHAR)(w))
+#define os2_HIUCHAR (w)   ((os2_UCHAR)((os2_USHORT)(w)>>8))
+#define os2_LOBYTE (x)    os2_LOUCHAR(x)
+#define os2_HIBYTE (x)    os2_HIUCHAR(x)
+#define os2_LOUSHORT (x)          ((os2_USHORT)((os2_ULONG)(x)))
+#define os2_HIUSHORT (x)          ((os2_USHORT)((os2_ULONG)(x)>>16))
+#define os2_WINERR_BASE 0x1000
+#define os2_GPIERR_BASE 0x2000
+#define os2_DEVERR_BASE 0x3000
+#define os2_SPLERR_BASE 0x4000
+#define os2_SEVERITY_NOERROR 0x0000
+#define os2_SEVERITY_WARNING 0x0004
+#define os2_SEVERITY_ERROR 0x0008
+#define os2_SEVERITY_SEVERE 0x000c
+#define os2_SEVERITY_UNRECOVERABLE 0x0010
 #define _PANOSE os2__PANOSE
 #define PANOSE os2_PANOSE
 …
 #define PFSINFO os2_PFSINFO
 #define _LISTIO_CB os2__LISTIO_CB
 #define LISTIO_CB os2_LISTIO_CB
+#define LISTIO os2_LISTIO
 #define PLISTIO os2_PLISTIO
 #define _LISTIO_CBL os2__LISTIO_CBL
 #define LISTIO_CBL os2_LISTIO_CBL
+#define LISTIOL os2_LISTIOL
 #define PLISTIOL os2_PLISTIOL
 #define _DCBINFO os2__DCBINFO
 …
 #define COUNTRYINFO os2_COUNTRYINFO
 #define PCOUNTRYINFO os2_PCOUNTRYINFO
 #define RT_POINTER os2_RT_POINTER
 #define RT_BITMAP os2_RT_BITMAP
 #define RT_MENU os2_RT_MENU
 #define RT_DIALOG os2_RT_DIALOG
 #define RT_STRING os2_RT_STRING
 #define RT_FONTDIR os2_RT_FONTDIR
 #define RT_FONT os2_RT_FONT
 #define RT_ACCELTABLE os2_RT_ACCELTABLE
 #define RT_RCDATA os2_RT_RCDATA
 #define RT_MESSAGE os2_RT_MESSAGE
 #define RT_DLGINCLUDE os2_RT_DLGINCLUDE
 #define RT_VKEYTBL os2_RT_VKEYTBL
 #define RT_KEYTBL os2_RT_KEYTBL
 #define RT_CHARTBL os2_RT_CHARTBL
 #define RT_DISPLAYINFO os2_RT_DISPLAYINFO
 #define RT_FKASHORT os2_RT_FKASHORT
 #define RT_FKALONG os2_RT_FKALONG
 #define RT_HELPTABLE os2_RT_HELPTABLE
 #define RT_HELPSUBTABLE os2_RT_HELPSUBTABLE
 #define RT_FDDIR os2_RT_FDDIR
 #define RT_FD os2_RT_FD
 #define RT_MAX os2_RT_MAX
 #define RT_RESNAMES os2_RT_RESNAMES
+#define os2_RT_POINTER 1
+#define os2_RT_BITMAP 2
+#define os2_RT_MENU 3
+#define os2_RT_DIALOG 4
+#define os2_RT_STRING 5
+#define os2_RT_FONTDIR 6
+#define os2_RT_FONT 7
+#define os2_RT_ACCELTABLE 8
+#define os2_RT_RCDATA 9
+#define os2_RT_MESSAGE 10
+#define os2_RT_DLGINCLUDE 11
+#define os2_RT_VKEYTBL 12
+#define os2_RT_KEYTBL 13
+#define os2_RT_CHARTBL 14
+#define os2_RT_DISPLAYINFO 15
+#define os2_RT_FKASHORT 16
+#define os2_RT_FKALONG 17
+#define os2_RT_HELPTABLE 18
+#define os2_RT_HELPSUBTABLE 19
+#define os2_RT_FDDIR 20
+#define os2_RT_FD 21
+#define os2_RT_MAX 22
+#define os2_RT_RESNAMES 255
 #define _RESULTCODES os2__RESULTCODES
 #define RESULTCODES os2_RESULTCODES
 #define PRESULTCODES os2_PRESULTCODES
+#define tib2_s os2_tib2_s
+#define TIB2 os2_TIB2
 #define PTIB2 os2_PTIB2
+#define tib_s os2_tib_s
+#define TIB os2_TIB
 #define PTIB os2_PTIB
+#define pib_s os2_pib_s
+#define PIB os2_PIB
 #define PPIB os2_PPIB
 #define PFNTHREAD os2_PFNTHREAD
 …
 #define STATUSDATA os2_STATUSDATA
 #define PSTATUSDATA os2_PSTATUSDATA
+#define os2_SEM_INDEFINITE_WAIT ((os2_ULONG)-1)
+#define os2_SEM_IMMEDIATE_RETURN 0
 #define HEV os2_HEV
 #define PHEV os2_PHEV
 #define _PSEMRECORD os2__PSEMRECORD
+#define SEMRECORD os2_SEMRECORD
 #define PSEMRECORD os2_PSEMRECORD
+#define PSEMRECORD os2_PSEMRECORD
+#define os2_NP_INDEFINITE_WAIT ((os2_ULONG)-1)
+#define os2_NP_DEFAULT_WAIT 0
+#define os2_NP_STATE_DISCONNECTED 1
+#define os2_NP_STATE_LISTENING 2
+#define os2_NP_STATE_CONNECTED 3
+#define os2_NP_STATE_CLOSING 4
+#define os2_NP_ACCESS_INBOUND 0x0000
+#define os2_NP_ACCESS_OUTBOUND 0x0001
+#define os2_NP_ACCESS_DUPLEX 0x0002
+#define os2_NP_INHERIT 0x0000
+#define os2_NP_NOINHERIT 0x0080
+#define os2_NP_WRITEBEHIND 0x0000
+#define os2_NP_NOWRITEBEHIND 0x4000
+#define os2_NP_READMODE_BYTE 0x0000
+#define os2_NP_READMODE_MESSAGE 0x0100
+#define os2_NP_TYPE_BYTE 0x0000
+#define os2_NP_TYPE_MESSAGE 0x0400
+#define os2_NP_END_CLIENT 0x0000
+#define os2_NP_END_SERVER 0x4000
+#define os2_NP_WAIT 0x0000
+#define os2_NP_NOWAIT 0x8000
+#define os2_NP_UNLIMITED_INSTANCES 0x00ff
+#define os2_NP_NBLK os2_NP_NOWAIT
+#define os2_NP_SERVER os2_NP_END_SERVER
+#define os2_NP_WMESG os2_NP_TYPE_MESSAGE
+#define os2_NP_RMESG os2_NP_READMODE_MESSAGE
+#define os2_NP_ICOUNT 0x00ff
 #define _AVAILDATA os2__AVAILDATA
 #define AVAILDATA os2_AVAILDATA
 …
 #define REQUESTDATA os2_REQUESTDATA
 #define PREQUESTDATA os2_PREQUESTDATA
+#define CONTEXT_CONTROL os2_CONTEXT_CONTROL
+#define CONTEXT_INTEGER os2_CONTEXT_INTEGER
+#define CONTEXT_SEGMENTS os2_CONTEXT_SEGMENTS
+#define CONTEXT_FLOATING_POINT os2_CONTEXT_FLOATING_POINT
+#define CONTEXT_FULL os2_CONTEXT_FULL
+#define EH_NONCONTINUABLE os2_EH_NONCONTINUABLE
+#define EH_UNWINDING os2_EH_UNWINDING
+#define EH_EXIT_UNWIND os2_EH_EXIT_UNWIND
+#define EH_STACK_INVALID os2_EH_STACK_INVALID
+#define EH_NESTED_CALL os2_EH_NESTED_CALL
+#define os2_CONTEXT_CONTROL 0x0001
+#define os2_CONTEXT_INTEGER 0x0002
+#define os2_CONTEXT_SEGMENTS 0x0004
+#define os2_CONTEXT_FLOATING_POINT 0x0008
+#define os2_CONTEXT_FULL (os2_CONTEXT_CONTROL | os2_CONTEXT_INTEGER | \
+                                  os2_CONTEXT_SEGMENTS | os2_CONTEXT_FLOATING_POINT)
+#define os2_EH_NONCONTINUABLE 0x0001
+#define os2_EH_UNWINDING 0x0002
+#define os2_EH_EXIT_UNWIND 0x0004
+#define os2_EH_STACK_INVALID 0x0008
+#define os2_EH_NESTED_CALL 0x0010
+#define _fpreg os2__fpreg
+#define FPREG os2_FPREG
 #define PFPREG os2_PFPREG
 #define _CONTEXT os2__CONTEXT
 #define CONTEXT os2_CONTEXT
+#define CONTEXTRECORD os2_CONTEXTRECORD
 #define PCONTEXTRECORD os2_PCONTEXTRECORD
 #define EXCEPTION_MAXIMUM_PARAMETERS os2_EXCEPTION_MAXIMUM_PARAMETERS
+#define os2_EXCEPTION_MAXIMUM_PARAMETERS 4
 #define _EXCEPTIONREPORTRECORD os2__EXCEPTIONREPORTRECORD
 #define EXCEPTIONREPORTRECORD os2_EXCEPTIONREPORTRECORD
 …
 #define HTIMER os2_HTIMER
 #define PHTIMER os2_PHTIMER
+#define os2_PADSHORT os2_USHORT pad_sh
+#define os2_PADCHAR os2_UCHAR  pad_ch
+#define os2_QS_PROCESS 0x0001
+#define os2_QS_SEMAPHORE 0x0002
+#define os2_QS_MTE 0x0004
+#define os2_QS_FILESYS 0x0008
+#define os2_QS_SHMEMORY 0x0010
+#define os2_QS_DISK 0x0020
+#define os2_QS_HWCONFIG 0x0040
+#define os2_QS_NAMEDPIPE 0x0080
+#define os2_QS_THREAD 0x0100
+#define os2_QS_MODVER 0x0200
+#define os2_QS_SUPPORTED (os2_QS_PROCESS|os2_QS_SEMAPHORE|os2_QS_MTE|os2_QS_FILESYS|os2_QS_SHMEMORY|os2_QS_MODVER)
+#define os2_QS_END 0L
+#define os2_QS_SYSSEM_WAITING 0x01
+#define os2_QS_SYSSEM_MUXWAITING 0x02
+#define os2_QS_SYSSEM_OWNER_DIED 0x04
+#define os2_QS_SYSSEM_EXCLUSIVE 0x08
+#define os2_QS_SYSSEM_NAME_CLEANUP 0x10
+#define os2_QS_SYSSEM_THREAD_OWNER_DIED 0x20
+#define os2_QS_SYSSEM_EXITLIST_OWNER 0x40
+#define os2_QS_DC_SEM_SHARED 0x0001
+#define os2_QS_DCMW_WAIT_ANY 0x0002
+#define os2_QS_DCMW_WAIT_ALL 0x0004
+#define os2_QS_DCM_MUTEX_SEM 0x0008
+#define os2_QS_DCE_EVENT_SEM 0x0010
+#define os2_QS_DCMW_MUX_SEM 0x0020
+#define os2_QS_DC_SEM_PM 0x0040
+#define os2_QS_DE_POSTED 0x0040
+#define os2_QS_DM_OWNER_DIED 0x0080
+#define os2_QS_DMW_MTX_MUX 0x0100
+#define os2_QS_DHO_SEM_OPEN 0x0200
+#define os2_QS_DE_16BIT_MW 0x0400
+#define os2_QS_DCE_POSTONE 0x0800
+#define os2_QS_DCE_AUTORESET 0x1000
 #define _QWORD os2__QWORD
 #define QWORD os2_QWORD
 …
 #define _QSMUX os2__QSMUX
 #define QSMUX os2_QSMUX
+#define QSHUN os2_QSHUN
 #define _QSS32REC os2__QSS32REC
 #define QSS32REC os2_QSS32REC
 …
 #define HSPINLOCK os2_HSPINLOCK
 #define PHSPINLOCK os2_PHSPINLOCK
+#define _TStat os2__TStat
+#define _uDB os2__uDB
 #define _RXSTRING os2__RXSTRING
 #define RXSTRING os2_RXSTRING
 …
 #define RXSYSEXIT os2_RXSYSEXIT
 #define PRXSYSEXIT os2_PRXSYSEXIT
+#define os2_MAKERXSTRING (r,p,l) \
+    ((r).strptr = (PCH)p, (r).strlength = (os2_ULONG)l)
 #define _SHVBLOCK os2__SHVBLOCK
 #define SHVBLOCK os2_SHVBLOCK
 …
 #define RXSIOTRD_PARM os2_RXSIOTRD_PARM
 #define _RXSIODR_PARM os2__RXSIODR_PARM
 #define RXSIODR_PARM os2_RXSIODR_PARM
+#define RXSIODTR_PARM os2_RXSIODTR_PARM
 #define _RXHLT_FLAGS os2__RXHLT_FLAGS
 #define RXHLT_FLAGS os2_RXHLT_FLAGS
 …
 #define _RXTRCTST_PARM os2__RXTRCTST_PARM
 #define RXTRCTST_PARM os2_RXTRCTST_PARM
 #define WM_DBCSFIRST os2_WM_DBCSFIRST
 #define WM_DBCSLAST os2_WM_DBCSLAST
 #define WC_FRAME os2_WC_FRAME
 #define WC_COMBOBOX os2_WC_COMBOBOX
 #define WC_BUTTON os2_WC_BUTTON
 #define WC_MENU os2_WC_MENU
 #define WC_STATIC os2_WC_STATIC
 #define WC_ENTRYFIELD os2_WC_ENTRYFIELD
 #define WC_LISTBOX os2_WC_LISTBOX
 #define WC_SCROLLBAR os2_WC_SCROLLBAR
 #define WC_TITLEBAR os2_WC_TITLEBAR
 #define WC_MLE os2_WC_MLE
 #define WC_APPSTAT os2_WC_APPSTAT
 #define WC_KBDSTAT os2_WC_KBDSTAT
 #define WC_PECIC os2_WC_PECIC
 #define WC_DBE_KKPOPUP os2_WC_DBE_KKPOPUP
 #define WC_SPINBUTTON os2_WC_SPINBUTTON
 #define WC_CONTAINER os2_WC_CONTAINER
 #define WC_SLIDER os2_WC_SLIDER
 #define WC_VALUESET os2_WC_VALUESET
 #define WC_NOTEBOOK os2_WC_NOTEBOOK
 #define WC_PENFIRST os2_WC_PENFIRST
 #define WC_PENLAST os2_WC_PENLAST
 #define WC_MMPMFIRST os2_WC_MMPMFIRST
 #define WC_CIRCULARSLIDER os2_WC_CIRCULARSLIDER
 #define WC_MMPMLAST os2_WC_MMPMLAST
 #define WS_VISIBLE os2_WS_VISIBLE
 #define WS_DISABLED os2_WS_DISABLED
 #define WS_CLIPCHILDREN os2_WS_CLIPCHILDREN
 #define WS_CLIPSIBLINGS os2_WS_CLIPSIBLINGS
 #define WS_PARENTCLIP os2_WS_PARENTCLIP
 #define WS_SAVEBITS os2_WS_SAVEBITS
 #define WS_SYNCPAINT os2_WS_SYNCPAINT
 #define WS_MINIMIZED os2_WS_MINIMIZED
 #define WS_MAXIMIZED os2_WS_MAXIMIZED
 #define WS_ANIMATE os2_WS_ANIMATE
 #define WS_GROUP os2_WS_GROUP
 #define WS_TABSTOP os2_WS_TABSTOP
 #define WS_MULTISELECT os2_WS_MULTISELECT
 #define CS_MOVENOTIFY os2_CS_MOVENOTIFY
 #define CS_SIZEREDRAW os2_CS_SIZEREDRAW
 #define CS_HITTEST os2_CS_HITTEST
 #define CS_PUBLIC os2_CS_PUBLIC
 #define CS_FRAME os2_CS_FRAME
 #define CS_CLIPCHILDREN os2_CS_CLIPCHILDREN
 #define CS_CLIPSIBLINGS os2_CS_CLIPSIBLINGS
 #define CS_PARENTCLIP os2_CS_PARENTCLIP
 #define CS_SAVEBITS os2_CS_SAVEBITS
 #define CS_SYNCPAINT os2_CS_SYNCPAINT
 #define DT_LEFT os2_DT_LEFT
 #define DT_QUERYEXTENT os2_DT_QUERYEXTENT
 #define DT_UNDERSCORE os2_DT_UNDERSCORE
 #define DT_STRIKEOUT os2_DT_STRIKEOUT
 #define DT_TEXTATTRS os2_DT_TEXTATTRS
 #define DT_EXTERNALLEADING os2_DT_EXTERNALLEADING
 #define DT_CENTER os2_DT_CENTER
 #define DT_RIGHT os2_DT_RIGHT
 #define DT_TOP os2_DT_TOP
 #define DT_VCENTER os2_DT_VCENTER
 #define DT_BOTTOM os2_DT_BOTTOM
 #define DT_HALFTONE os2_DT_HALFTONE
 #define DT_MNEMONIC os2_DT_MNEMONIC
 #define DT_WORDBREAK os2_DT_WORDBREAK
 #define DT_ERASERECT os2_DT_ERASERECT
 #define SWP_SIZE os2_SWP_SIZE
 #define SWP_MOVE os2_SWP_MOVE
 #define SWP_ZORDER os2_SWP_ZORDER
 #define SWP_SHOW os2_SWP_SHOW
 #define SWP_HIDE os2_SWP_HIDE
 #define SWP_NOREDRAW os2_SWP_NOREDRAW
 #define SWP_NOADJUST os2_SWP_NOADJUST
 #define SWP_ACTIVATE os2_SWP_ACTIVATE
 #define SWP_DEACTIVATE os2_SWP_DEACTIVATE
 #define SWP_EXTSTATECHANGE os2_SWP_EXTSTATECHANGE
 #define SWP_MINIMIZE os2_SWP_MINIMIZE
 #define SWP_MAXIMIZE os2_SWP_MAXIMIZE
 #define SWP_RESTORE os2_SWP_RESTORE
 #define SWP_FOCUSACTIVATE os2_SWP_FOCUSACTIVATE
 #define SWP_FOCUSDEACTIVATE os2_SWP_FOCUSDEACTIVATE
 #define SWP_NOAUTOCLOSE os2_SWP_NOAUTOCLOSE
 #define HWND_DESKTOP os2_HWND_DESKTOP
 #define HWND_OBJECT os2_HWND_OBJECT
 #define HWND_TOP os2_HWND_TOP
 #define HWND_BOTTOM os2_HWND_BOTTOM
 #define HWND_THREADCAPTURE os2_HWND_THREADCAPTURE
+#define os2_WM_DBCSFIRST 0x00b0
+#define os2_WM_DBCSLAST 0x00cf
+#define os2_WC_FRAME ((PSZ)0xffff0001)
+#define os2_WC_COMBOBOX ((PSZ)0xffff0002)
+#define os2_WC_BUTTON ((PSZ)0xffff0003)
+#define os2_WC_MENU ((PSZ)0xffff0004)
+#define os2_WC_STATIC ((PSZ)0xffff0005)
+#define os2_WC_ENTRYFIELD ((PSZ)0xffff0006)
+#define os2_WC_LISTBOX ((PSZ)0xffff0007)
+#define os2_WC_SCROLLBAR ((PSZ)0xffff0008)
+#define os2_WC_TITLEBAR ((PSZ)0xffff0009)
+#define os2_WC_MLE ((PSZ)0xffff000a)
+#define os2_WC_APPSTAT ((PSZ)0xffff0010)
+#define os2_WC_KBDSTAT ((PSZ)0xffff0011)
+#define os2_WC_PECIC ((PSZ)0xffff0012)
+#define os2_WC_DBE_KKPOPUP ((PSZ)0xffff0013)
+#define os2_WC_SPINBUTTON ((PSZ)0xffff0020)
+#define os2_WC_CONTAINER ((PSZ)0xffff0025)
+#define os2_WC_SLIDER ((PSZ)0xffff0026)
+#define os2_WC_VALUESET ((PSZ)0xffff0027)
+#define os2_WC_NOTEBOOK ((PSZ)0xffff0028)
+#define os2_WC_PENFIRST ((PSZ)0xffff0029)
+#define os2_WC_PENLAST ((PSZ)0xffff002c)
+#define os2_WC_MMPMFIRST ((PSZ)0xffff0040)
+#define os2_WC_CIRCULARSLIDER ((PSZ)0xffff0041)
+#define os2_WC_MMPMLAST ((PSZ)0xffff004f)
+#define os2_WS_VISIBLE 0x80000000
+#define os2_WS_DISABLED 0x40000000
+#define os2_WS_CLIPCHILDREN 0x20000000
+#define os2_WS_CLIPSIBLINGS 0x10000000
+#define os2_WS_PARENTCLIP 0x08000000
+#define os2_WS_SAVEBITS 0x04000000
+#define os2_WS_SYNCPAINT 0x02000000
+#define os2_WS_MINIMIZED 0x01000000
+#define os2_WS_MAXIMIZED 0x00800000
+#define os2_WS_ANIMATE 0x00400000
+#define os2_WS_GROUP 0x00010000
+#define os2_WS_TABSTOP 0x00020000
+#define os2_WS_MULTISELECT 0x00040000
+#define os2_CS_MOVENOTIFY 0x00000001
+#define os2_CS_SIZEREDRAW 0x00000004
+#define os2_CS_HITTEST 0x00000008
+#define os2_CS_PUBLIC 0x00000010
+#define os2_CS_FRAME 0x00000020
+#define os2_CS_CLIPCHILDREN 0x20000000
+#define os2_CS_CLIPSIBLINGS 0x10000000
+#define os2_CS_PARENTCLIP 0x08000000
+#define os2_CS_SAVEBITS 0x04000000
+#define os2_CS_SYNCPAINT 0x02000000
+#define os2_DT_LEFT 0x00000000
+#define os2_DT_QUERYEXTENT 0x00000002
+#define os2_DT_UNDERSCORE 0x00000010
+#define os2_DT_STRIKEOUT 0x00000020
+#define os2_DT_TEXTATTRS 0x00000040
+#define os2_DT_EXTERNALLEADING 0x00000080
+#define os2_DT_CENTER 0x00000100
+#define os2_DT_RIGHT 0x00000200
+#define os2_DT_TOP 0x00000000
+#define os2_DT_VCENTER 0x00000400
+#define os2_DT_BOTTOM 0x00000800
+#define os2_DT_HALFTONE 0x00001000
+#define os2_DT_MNEMONIC 0x00002000
+#define os2_DT_WORDBREAK 0x00004000
+#define os2_DT_ERASERECT 0x00008000
+#define os2_SWP_SIZE 0x0001
+#define os2_SWP_MOVE 0x0002
+#define os2_SWP_ZORDER 0x0004
+#define os2_SWP_SHOW 0x0008
+#define os2_SWP_HIDE 0x0010
+#define os2_SWP_NOREDRAW 0x0020
+#define os2_SWP_NOADJUST 0x0040
+#define os2_SWP_ACTIVATE 0x0080
+#define os2_SWP_DEACTIVATE 0x0100
+#define os2_SWP_EXTSTATECHANGE 0x0200
+#define os2_SWP_MINIMIZE 0x0400
+#define os2_SWP_MAXIMIZE 0x0800
+#define os2_SWP_RESTORE 0x1000
+#define os2_SWP_FOCUSACTIVATE 0x2000
+#define os2_SWP_FOCUSDEACTIVATE 0x4000
+#define os2_SWP_NOAUTOCLOSE 0x8000
+#define os2_HWND_DESKTOP ((os2_HWND)1)
+#define os2_HWND_OBJECT ((os2_HWND)2)
+#define os2_HWND_TOP ((os2_HWND)3)
+#define os2_HWND_BOTTOM ((os2_HWND)4)
+#define os2_HWND_THREADCAPTURE ((os2_HWND)5)
 #define HACCEL os2_HACCEL
 #define HRGN os2_HRGN
 …
 #define PERRORID os2_PERRORID
 #define PFNWP os2_PFNWP
+#define os2_ERRORIDERROR (errid)                (os2_LOUSHORT (errid))
+#define os2_ERRORIDSEV (errid)          (os2_HIUSHORT (errid))
+#define os2_MAKEERRORID (sev,error)             (os2_ERRORID)( os2_MAKEULONG  ((error), (sev)))
 #define _POINTL os2__POINTL
 #define POINTL os2_POINTL
 …
 #define RECTL os2_RECTL
 #define PRECTL os2_PRECTL
 #define WM_NULL os2_WM_NULL
 #define WM_CREATE os2_WM_CREATE
 #define WM_DESTROY os2_WM_DESTROY
 #define WM_ENABLE os2_WM_ENABLE
 #define WM_SHOW os2_WM_SHOW
 #define WM_MOVE os2_WM_MOVE
 #define WM_SIZE os2_WM_SIZE
 #define WM_ADJUSTWINDOWPOS os2_WM_ADJUSTWINDOWPOS
 #define WM_CALCVALIDRECTS os2_WM_CALCVALIDRECTS
 #define WM_SETWINDOWPARAMS os2_WM_SETWINDOWPARAMS
 #define WM_QUERYWINDOWPARAMS os2_WM_QUERYWINDOWPARAMS
 #define WM_HITTEST os2_WM_HITTEST
 #define WM_ACTIVATE os2_WM_ACTIVATE
 #define WM_SETFOCUS os2_WM_SETFOCUS
 #define WM_SETSELECTION os2_WM_SETSELECTION
 #define WM_PPAINT os2_WM_PPAINT
 #define WM_PSETFOCUS os2_WM_PSETFOCUS
 #define WM_PSYSCOLORCHANGE os2_WM_PSYSCOLORCHANGE
 #define WM_PSIZE os2_WM_PSIZE
 #define WM_PACTIVATE os2_WM_PACTIVATE
 #define WM_PCONTROL os2_WM_PCONTROL
 #define WM_COMMAND os2_WM_COMMAND
 #define WM_SYSCOMMAND os2_WM_SYSCOMMAND
 #define WM_HELP os2_WM_HELP
 #define WM_PAINT os2_WM_PAINT
 #define WM_TIMER os2_WM_TIMER
 #define WM_SEM1 os2_WM_SEM1
 #define WM_SEM2 os2_WM_SEM2
 #define WM_SEM3 os2_WM_SEM3
 #define WM_SEM4 os2_WM_SEM4
 #define WM_CLOSE os2_WM_CLOSE
 #define WM_QUIT os2_WM_QUIT
 #define WM_SYSCOLORCHANGE os2_WM_SYSCOLORCHANGE
 #define WM_SYSVALUECHANGED os2_WM_SYSVALUECHANGED
 #define WM_APPTERMINATENOTIFY os2_WM_APPTERMINATENOTIFY
 #define WM_PRESPARAMCHANGED os2_WM_PRESPARAMCHANGED
 #define WM_CONTROL os2_WM_CONTROL
 #define WM_VSCROLL os2_WM_VSCROLL
 #define WM_HSCROLL os2_WM_HSCROLL
 #define WM_INITMENU os2_WM_INITMENU
 #define WM_MENUSELECT os2_WM_MENUSELECT
 #define WM_MENUEND os2_WM_MENUEND
 #define WM_DRAWITEM os2_WM_DRAWITEM
 #define WM_MEASUREITEM os2_WM_MEASUREITEM
 #define WM_CONTROLPOINTER os2_WM_CONTROLPOINTER
 #define WM_QUERYDLGCODE os2_WM_QUERYDLGCODE
 #define WM_INITDLG os2_WM_INITDLG
 #define WM_SUBSTITUTESTRING os2_WM_SUBSTITUTESTRING
 #define WM_MATCHMNEMONIC os2_WM_MATCHMNEMONIC
 #define WM_SAVEAPPLICATION os2_WM_SAVEAPPLICATION
 #define WM_HELPBASE os2_WM_HELPBASE
 #define WM_HELPTOP os2_WM_HELPTOP
 #define WM_USER os2_WM_USER
+#define os2_WM_NULL 0x0000
+#define os2_WM_CREATE 0x0001
+#define os2_WM_DESTROY 0x0002
+#define os2_WM_ENABLE 0x0004
+#define os2_WM_SHOW 0x0005
+#define os2_WM_MOVE 0x0006
+#define os2_WM_SIZE 0x0007
+#define os2_WM_ADJUSTWINDOWPOS 0x0008
+#define os2_WM_CALCVALIDRECTS 0x0009
+#define os2_WM_SETWINDOWPARAMS 0x000a
+#define os2_WM_QUERYWINDOWPARAMS 0x000b
+#define os2_WM_HITTEST 0x000c
+#define os2_WM_ACTIVATE 0x000d
+#define os2_WM_SETFOCUS 0x000f
+#define os2_WM_SETSELECTION 0x0010
+#define os2_WM_PPAINT 0x0011
+#define os2_WM_PSETFOCUS 0x0012
+#define os2_WM_PSYSCOLORCHANGE 0x0013
+#define os2_WM_PSIZE 0x0014
+#define os2_WM_PACTIVATE 0x0015
+#define os2_WM_PCONTROL 0x0016
+#define os2_WM_COMMAND 0x0020
+#define os2_WM_SYSCOMMAND 0x0021
+#define os2_WM_HELP 0x0022
+#define os2_WM_PAINT 0x0023
+#define os2_WM_TIMER 0x0024
+#define os2_WM_SEM1 0x0025
+#define os2_WM_SEM2 0x0026
+#define os2_WM_SEM3 0x0027
+#define os2_WM_SEM4 0x0028
+#define os2_WM_CLOSE 0x0029
+#define os2_WM_QUIT 0x002a
+#define os2_WM_SYSCOLORCHANGE 0x002b
+#define os2_WM_SYSVALUECHANGED 0x002d
+#define os2_WM_APPTERMINATENOTIFY 0x002e
+#define os2_WM_PRESPARAMCHANGED 0x002f
+#define os2_WM_CONTROL 0x0030
+#define os2_WM_VSCROLL 0x0031
+#define os2_WM_HSCROLL 0x0032
+#define os2_WM_INITMENU 0x0033
+#define os2_WM_MENUSELECT 0x0034
+#define os2_WM_MENUEND 0x0035
+#define os2_WM_DRAWITEM 0x0036
+#define os2_WM_MEASUREITEM 0x0037
+#define os2_WM_CONTROLPOINTER 0x0038
+#define os2_WM_QUERYDLGCODE 0x003a
+#define os2_WM_INITDLG 0x003b
+#define os2_WM_SUBSTITUTESTRING 0x003c
+#define os2_WM_MATCHMNEMONIC 0x003d
+#define os2_WM_SAVEAPPLICATION 0x003e
+#define os2_WM_HELPBASE 0x0f00
+#define os2_WM_HELPTOP 0x0fff
+#define os2_WM_USER 0x1000
 #define _QMSG os2__QMSG
 #define QMSG os2_QMSG
 #define PQMSG os2_PQMSG
 #define _COMMANDMSG os2__COMMANDMSG
 #define COMMANDMSG os2_COMMANDMSG
+#define CMDMSG os2_CMDMSG
 #define PCMDMSG os2_PCMDMSG
 #define _MQINFO os2__MQINFO
 #define MQINFO os2_MQINFO
 #define PMQINFO os2_PMQINFO
+#define os2_COMMANDMSG (pmsg)   ((os2_PCMDMSG)((os2_PBYTE)pmsg + sizeof (os2_ULONG)))
 #define _SWP os2__SWP
 #define SWP os2_SWP
 …
 #define ICONINFO os2_ICONINFO
 #define PICONINFO os2_PICONINFO
+#define os2_MPVOID ((os2_MPARAM)0)
+#define os2_MPFROMP (x)         ((os2_MPARAM)((os2_ULONG)(x)))
+#define os2_MPFROMHWND (x)              ((os2_MPARAM)(os2_HWND)(x))
+#define os2_MPFROMCHAR (x)              ((os2_MPARAM)(os2_ULONG)(os2_USHORT)(x))
+#define os2_MPFROMSHORT (x)             ((os2_MPARAM)(os2_ULONG)(os2_USHORT)(x))
+#define os2_MPFROM2SHORT (x1,x2)        ((os2_MPARAM) os2_MAKELONG  (x1, x2))
+#define os2_MPFROMSH2CH (s,c1,c2)       ((os2_MPARAM) os2_MAKELONG  (s,  os2_MAKESHORT  (c1, c2)))
+#define os2_MPFROMLONG (x)              ((os2_MPARAM)(os2_ULONG)(x))
+#define os2_PVOIDFROMMP (mp)            ((os2_PVOID)(mp))
+#define os2_HWNDFROMMP (mp)             ((os2_HWND)(mp))
+#define os2_CHAR1FROMMP (mp)            ((os2_UCHAR)(os2_ULONG)(mp))
+#define os2_CHAR2FROMMP (mp)            ((os2_UCHAR)((os2_ULONG)mp >> 8))
+#define os2_CHAR3FROMMP (mp)            ((os2_UCHAR)((os2_ULONG)mp >> 16))
+#define os2_CHAR4FROMMP (mp)            ((os2_UCHAR)((os2_ULONG)mp >> 24))
+#define os2_SHORT1FROMMP (mp)   ((os2_USHORT)(os2_ULONG)(mp))
+#define os2_SHORT2FROMMP (mp)   ((os2_USHORT)((os2_ULONG)mp >> 16))
+#define os2_LONGFROMMP (mp)             ((os2_ULONG)(mp))
+#define os2_MRFROMP (x)         ((os2_MRESULT)(os2_PVOID)(x))
+#define os2_MRFROMSHORT (x)             ((os2_MRESULT)(os2_ULONG)(os2_USHORT)(x))
+#define os2_MRFROM2SHORT (x1,x2)        ((os2_MRESULT) os2_MAKELONG  (x1, x2))
+#define os2_MRFROMLONG (x)              ((os2_MRESULT)(os2_ULONG)(x))
+#define os2_PVOIDFROMMR (mr)            ((os2_VOID *)(mr))
+#define os2_SHORT1FROMMR (mr)   ((os2_USHORT)((os2_ULONG)mr))
+#define os2_SHORT2FROMMR (mr)   ((os2_USHORT)((os2_ULONG)mr >> 16))
+#define os2_LONGFROMMR (mr)             ((os2_ULONG)(mr))
 #define _FRAMECDATA os2__FRAMECDATA
 #define FRAMECDATA os2_FRAMECDATA
 #define PFRAMECDATA os2_PFRAMECDATA
 #define WM_FLASHWINDOW os2_WM_FLASHWINDOW
 #define WM_FORMATFRAME os2_WM_FORMATFRAME
 #define WM_UPDATEFRAME os2_WM_UPDATEFRAME
 #define WM_FOCUSCHANGE os2_WM_FOCUSCHANGE
 #define WM_SETBORDERSIZE os2_WM_SETBORDERSIZE
 #define WM_TRACKFRAME os2_WM_TRACKFRAME
 #define WM_MINMAXFRAME os2_WM_MINMAXFRAME
 #define WM_SETICON os2_WM_SETICON
 #define WM_QUERYICON os2_WM_QUERYICON
 #define WM_SETACCELTABLE os2_WM_SETACCELTABLE
 #define WM_QUERYACCELTABLE os2_WM_QUERYACCELTABLE
 #define WM_TRANSLATEACCEL os2_WM_TRANSLATEACCEL
 #define WM_QUERYTRACKINFO os2_WM_QUERYTRACKINFO
 #define WM_QUERYBORDERSIZE os2_WM_QUERYBORDERSIZE
 #define WM_NEXTMENU os2_WM_NEXTMENU
 #define WM_ERASEBACKGROUND os2_WM_ERASEBACKGROUND
 #define WM_QUERYFRAMEINFO os2_WM_QUERYFRAMEINFO
 #define WM_QUERYFOCUSCHAIN os2_WM_QUERYFOCUSCHAIN
 #define WM_OWNERPOSCHANGE os2_WM_OWNERPOSCHANGE
 #define WM_CALCFRAMERECT os2_WM_CALCFRAMERECT
 #define WM_WINDOWPOSCHANGED os2_WM_WINDOWPOSCHANGED
 #define WM_ADJUSTFRAMEPOS os2_WM_ADJUSTFRAMEPOS
 #define WM_QUERYFRAMECTLCOUNT os2_WM_QUERYFRAMECTLCOUNT
 #define WM_QUERYHELPINFO os2_WM_QUERYHELPINFO
 #define WM_SETHELPINFO os2_WM_SETHELPINFO
 #define WM_ERROR os2_WM_ERROR
 #define WM_REALIZEPALETTE os2_WM_REALIZEPALETTE
+#define os2_WM_FLASHWINDOW 0x0040
+#define os2_WM_FORMATFRAME 0x0041
+#define os2_WM_UPDATEFRAME 0x0042
+#define os2_WM_FOCUSCHANGE 0x0043
+#define os2_WM_SETBORDERSIZE 0x0044
+#define os2_WM_TRACKFRAME 0x0045
+#define os2_WM_MINMAXFRAME 0x0046
+#define os2_WM_SETICON 0x0047
+#define os2_WM_QUERYICON 0x0048
+#define os2_WM_SETACCELTABLE 0x0049
+#define os2_WM_QUERYACCELTABLE 0x004a
+#define os2_WM_TRANSLATEACCEL 0x004b
+#define os2_WM_QUERYTRACKINFO 0x004c
+#define os2_WM_QUERYBORDERSIZE 0x004d
+#define os2_WM_NEXTMENU 0x004e
+#define os2_WM_ERASEBACKGROUND 0x004f
+#define os2_WM_QUERYFRAMEINFO 0x0050
+#define os2_WM_QUERYFOCUSCHAIN 0x0051
+#define os2_WM_OWNERPOSCHANGE 0x0052
+#define os2_WM_CALCFRAMERECT 0x0053
+#define os2_WM_WINDOWPOSCHANGED 0x0055
+#define os2_WM_ADJUSTFRAMEPOS 0x0056
+#define os2_WM_QUERYFRAMECTLCOUNT 0x0059
+#define os2_WM_QUERYHELPINFO 0x005b
+#define os2_WM_SETHELPINFO 0x005c
+#define os2_WM_ERROR 0x005d
+#define os2_WM_REALIZEPALETTE 0x005e
 #define HSAVEWP os2_HSAVEWP
 #define _QVERSDATA os2__QVERSDATA
 #define QVERSDATA os2_QVERSDATA
 #define PQVERSDATA os2_PQVERSDATA
 #define WM_QUERYCONVERTPOS os2_WM_QUERYCONVERTPOS
+#define os2_WM_QUERYCONVERTPOS 0x00b0
 #define _CLASSINFO os2__CLASSINFO
 #define CLASSINFO os2_CLASSINFO
 …
 #define HATOMTBL os2_HATOMTBL
 #define ATOM os2_ATOM
+#define os2_MAKEINTATOM (x)             ((PCH) os2_MAKEULONG  (x, 0xffff))
 #define _BTNCDATA os2__BTNCDATA
 #define BTNCDATA os2_BTNCDATA
 …
 #define USERBUTTON os2_USERBUTTON
 #define PUSERBUTTON os2_PUSERBUTTON
 #define WM_RENDERFMT os2_WM_RENDERFMT
 #define WM_RENDERALLFMTS os2_WM_RENDERALLFMTS
 #define WM_DESTROYCLIPBOARD os2_WM_DESTROYCLIPBOARD
 #define WM_PAINTCLIPBOARD os2_WM_PAINTCLIPBOARD
 #define WM_SIZECLIPBOARD os2_WM_SIZECLIPBOARD
 #define WM_HSCROLLCLIPBOARD os2_WM_HSCROLLCLIPBOARD
 #define WM_VSCROLLCLIPBOARD os2_WM_VSCROLLCLIPBOARD
 #define WM_DRAWCLIPBOARD os2_WM_DRAWCLIPBOARD
+#define os2_WM_RENDERFMT 0x0060
+#define os2_WM_RENDERALLFMTS 0x0061
+#define os2_WM_DESTROYCLIPBOARD 0x0062
+#define os2_WM_PAINTCLIPBOARD 0x0063
+#define os2_WM_SIZECLIPBOARD 0x0064
+#define os2_WM_HSCROLLCLIPBOARD 0x0065
+#define os2_WM_VSCROLLCLIPBOARD 0x0066
+#define os2_WM_DRAWCLIPBOARD 0x0067
 #define _CPTEXT os2__CPTEXT
 #define CPTEXT os2_CPTEXT
 …
 #define MFP os2_MFP
 #define PMFP os2_PMFP
 #define WM_DDE_FIRST os2_WM_DDE_FIRST
 #define WM_DDE_INITIATE os2_WM_DDE_INITIATE
 #define WM_DDE_REQUEST os2_WM_DDE_REQUEST
 #define WM_DDE_ACK os2_WM_DDE_ACK
 #define WM_DDE_DATA os2_WM_DDE_DATA
 #define WM_DDE_ADVISE os2_WM_DDE_ADVISE
 #define WM_DDE_UNADVISE os2_WM_DDE_UNADVISE
 #define WM_DDE_POKE os2_WM_DDE_POKE
 #define WM_DDE_EXECUTE os2_WM_DDE_EXECUTE
 #define WM_DDE_TERMINATE os2_WM_DDE_TERMINATE
 #define WM_DDE_INITIATEACK os2_WM_DDE_INITIATEACK
 #define WM_DDE_LAST os2_WM_DDE_LAST
+#define os2_WM_DDE_FIRST 0x00a0
+#define os2_WM_DDE_INITIATE 0x00a0
+#define os2_WM_DDE_REQUEST 0x00a1
+#define os2_WM_DDE_ACK 0x00a2
+#define os2_WM_DDE_DATA 0x00a3
+#define os2_WM_DDE_ADVISE 0x00a4
+#define os2_WM_DDE_UNADVISE 0x00a5
+#define os2_WM_DDE_POKE 0x00a6
+#define os2_WM_DDE_EXECUTE 0x00a7
+#define os2_WM_DDE_TERMINATE 0x00a8
+#define os2_WM_DDE_INITIATEACK 0x00a9
+#define os2_WM_DDE_LAST 0x00af
 #define _CONVCONTEXT os2__CONVCONTEXT
 #define CONVCONTEXT os2_CONVCONTEXT
 …
 #define DDESTRUCT os2_DDESTRUCT
 #define PDDESTRUCT os2_PDDESTRUCT
+#define os2_DDES_PABDATA (pddes) \
+    (((os2_PBYTE)pddes) + ((PDDESTRUCT)pddes)->offabData)
+#define os2_DDEI_PCONVCONTEXT (pddei) \
+    ((PCONVCONTEXT)((os2_PBYTE)pddei + pddei->offConvContext))
 #define _CURSORINFO os2__CURSORINFO
 #define CURSORINFO os2_CURSORINFO
 …
 #define DESKTOP os2_DESKTOP
 #define PDESKTOP os2_PDESKTOP
 #define MB_OK os2_MB_OK
 #define MB_OKCANCEL os2_MB_OKCANCEL
 #define MB_RETRYCANCEL os2_MB_RETRYCANCEL
 #define MB_ABORTRETRYIGNORE os2_MB_ABORTRETRYIGNORE
 #define MB_YESNO os2_MB_YESNO
 #define MB_YESNOCANCEL os2_MB_YESNOCANCEL
 #define MB_CANCEL os2_MB_CANCEL
 #define MB_ENTER os2_MB_ENTER
 #define MB_ENTERCANCEL os2_MB_ENTERCANCEL
 #define MB_NOICON os2_MB_NOICON
 #define MB_CUANOTIFICATION os2_MB_CUANOTIFICATION
 #define MB_ICONQUESTION os2_MB_ICONQUESTION
 #define MB_ICONEXCLAMATION os2_MB_ICONEXCLAMATION
 #define MB_CUAWARNING os2_MB_CUAWARNING
 #define MB_ICONASTERISK os2_MB_ICONASTERISK
 #define MB_ICONHAND os2_MB_ICONHAND
 #define MB_CUACRITICAL os2_MB_CUACRITICAL
 #define MB_QUERY os2_MB_QUERY
 #define MB_WARNING os2_MB_WARNING
 #define MB_INFORMATION os2_MB_INFORMATION
 #define MB_CRITICAL os2_MB_CRITICAL
 #define MB_ERROR os2_MB_ERROR
 #define MB_CUSTOMICON os2_MB_CUSTOMICON
 #define MB_DEFBUTTON1 os2_MB_DEFBUTTON1
 #define MB_DEFBUTTON2 os2_MB_DEFBUTTON2
 #define MB_DEFBUTTON3 os2_MB_DEFBUTTON3
 #define MB_APPLMODAL os2_MB_APPLMODAL
 #define MB_SYSTEMMODAL os2_MB_SYSTEMMODAL
 #define MB_HELP os2_MB_HELP
 #define MB_MOVEABLE os2_MB_MOVEABLE
 #define MB_NONMODAL os2_MB_NONMODAL
+#define os2_MB_OK 0x0000
+#define os2_MB_OKCANCEL 0x0001
+#define os2_MB_RETRYCANCEL 0x0002
+#define os2_MB_ABORTRETRYIGNORE 0x0003
+#define os2_MB_YESNO 0x0004
+#define os2_MB_YESNOCANCEL 0x0005
+#define os2_MB_CANCEL 0x0006
+#define os2_MB_ENTER 0x0007
+#define os2_MB_ENTERCANCEL 0x0008
+#define os2_MB_NOICON 0x0000
+#define os2_MB_CUANOTIFICATION 0x0000
+#define os2_MB_ICONQUESTION 0x0010
+#define os2_MB_ICONEXCLAMATION 0x0020
+#define os2_MB_CUAWARNING 0x0020
+#define os2_MB_ICONASTERISK 0x0030
+#define os2_MB_ICONHAND 0x0040
+#define os2_MB_CUACRITICAL 0x0040
+#define os2_MB_QUERY os2_MB_ICONQUESTION
+#define os2_MB_WARNING os2_MB_CUAWARNING
+#define os2_MB_INFORMATION os2_MB_ICONASTERISK
+#define os2_MB_CRITICAL os2_MB_CUACRITICAL
+#define os2_MB_ERROR os2_MB_CRITICAL
+#define os2_MB_CUSTOMICON 0x0080
+#define os2_MB_DEFBUTTON1 0x0000
+#define os2_MB_DEFBUTTON2 0x0100
+#define os2_MB_DEFBUTTON3 0x0200
+#define os2_MB_APPLMODAL 0x0000
+#define os2_MB_SYSTEMMODAL 0x1000
+#define os2_MB_HELP 0x2000
+#define os2_MB_MOVEABLE 0x4000
+#define os2_MB_NONMODAL 0x8000
 #define _MB2D os2__MB2D
 #define MB2D os2_MB2D
 …
 #define MB2INFO os2_MB2INFO
 #define PMB2INFO os2_PMB2INFO
+#define os2_WinCheckButton (hwndDlg,id,usCheckState) \
+    ((os2_ULONG)WinSendDlgItemMsg (hwndDlg, id, BM_SETCHECK, \
+                               os2_MPFROMSHORT (usCheckState), (os2_MPARAM)NULL))
+#define os2_WinIsControlEnabled (hwndDlg,id) \
+    ((os2_BOOL)WinIsWindowEnabled (WinWindowFromID (hwndDlg, id)))
+#define os2_WinQueryButtonCheckstate (hwndDlg,id) \
+    ((os2_ULONG)WinSendDlgItemMsg (hwndDlg, id, BM_QUERYCHECK, \
+                               (os2_MPARAM)NULL, (os2_MPARAM)NULL))
 #define _DLGTITEM os2__DLGTITEM
 #define DLGTITEM os2_DLGTITEM
 …
 #define SMHSTRUCT os2_SMHSTRUCT
 #define PSMHSTRUCT os2_PSMHSTRUCT
 #define WM_MOUSEFIRST os2_WM_MOUSEFIRST
 #define WM_MOUSEMOVE os2_WM_MOUSEMOVE
 #define WM_BUTTONCLICKFIRST os2_WM_BUTTONCLICKFIRST
 #define WM_BUTTON1DOWN os2_WM_BUTTON1DOWN
 #define WM_BUTTON1UP os2_WM_BUTTON1UP
 #define WM_BUTTON1DBLCLK os2_WM_BUTTON1DBLCLK
 #define WM_BUTTON2DOWN os2_WM_BUTTON2DOWN
 #define WM_BUTTON2UP os2_WM_BUTTON2UP
 #define WM_BUTTON2DBLCLK os2_WM_BUTTON2DBLCLK
 #define WM_BUTTON3DOWN os2_WM_BUTTON3DOWN
 #define WM_BUTTON3UP os2_WM_BUTTON3UP
 #define WM_BUTTON3DBLCLK os2_WM_BUTTON3DBLCLK
 #define WM_BUTTONCLICKLAST os2_WM_BUTTONCLICKLAST
 #define WM_MOUSELAST os2_WM_MOUSELAST
 #define WM_CHAR os2_WM_CHAR
 #define WM_VIOCHAR os2_WM_VIOCHAR
 #define WM_JOURNALNOTIFY os2_WM_JOURNALNOTIFY
 #define WM_MOUSEMAP os2_WM_MOUSEMAP
 #define WM_VRNDISABLED os2_WM_VRNDISABLED
 #define WM_VRNENABLED os2_WM_VRNENABLED
 #define WM_EXTMOUSEFIRST os2_WM_EXTMOUSEFIRST
 #define WM_CHORD os2_WM_CHORD
 #define WM_BUTTON1MOTIONSTART os2_WM_BUTTON1MOTIONSTART
 #define WM_BUTTON1MOTIONEND os2_WM_BUTTON1MOTIONEND
 #define WM_BUTTON1CLICK os2_WM_BUTTON1CLICK
 #define WM_BUTTON2MOTIONSTART os2_WM_BUTTON2MOTIONSTART
 #define WM_BUTTON2MOTIONEND os2_WM_BUTTON2MOTIONEND
 #define WM_BUTTON2CLICK os2_WM_BUTTON2CLICK
 #define WM_BUTTON3MOTIONSTART os2_WM_BUTTON3MOTIONSTART
 #define WM_BUTTON3MOTIONEND os2_WM_BUTTON3MOTIONEND
 #define WM_BUTTON3CLICK os2_WM_BUTTON3CLICK
 #define WM_EXTMOUSELAST os2_WM_EXTMOUSELAST
 #define WM_MOUSETRANSLATEFIRST os2_WM_MOUSETRANSLATEFIRST
 #define WM_BEGINDRAG os2_WM_BEGINDRAG
 #define WM_ENDDRAG os2_WM_ENDDRAG
 #define WM_SINGLESELECT os2_WM_SINGLESELECT
 #define WM_OPEN os2_WM_OPEN
 #define WM_CONTEXTMENU os2_WM_CONTEXTMENU
 #define WM_CONTEXTHELP os2_WM_CONTEXTHELP
 #define WM_TEXTEDIT os2_WM_TEXTEDIT
 #define WM_BEGINSELECT os2_WM_BEGINSELECT
 #define WM_ENDSELECT os2_WM_ENDSELECT
 #define WM_MOUSETRANSLATELAST os2_WM_MOUSETRANSLATELAST
 #define WM_PICKUP os2_WM_PICKUP
 #define WM_PENFIRST os2_WM_PENFIRST
 #define WM_PENLAST os2_WM_PENLAST
 #define WM_MMPMFIRST os2_WM_MMPMFIRST
 #define WM_MMPMLAST os2_WM_MMPMLAST
 #define WM_BIDI_FIRST os2_WM_BIDI_FIRST
 #define WM_BIDI_LAST os2_WM_BIDI_LAST
+#define os2_WM_MOUSEFIRST 0x0070
+#define os2_WM_MOUSEMOVE 0x0070
+#define os2_WM_BUTTONCLICKFIRST 0x0071
+#define os2_WM_BUTTON1DOWN 0x0071
+#define os2_WM_BUTTON1UP 0x0072
+#define os2_WM_BUTTON1DBLCLK 0x0073
+#define os2_WM_BUTTON2DOWN 0x0074
+#define os2_WM_BUTTON2UP 0x0075
+#define os2_WM_BUTTON2DBLCLK 0x0076
+#define os2_WM_BUTTON3DOWN 0x0077
+#define os2_WM_BUTTON3UP 0x0078
+#define os2_WM_BUTTON3DBLCLK 0x0079
+#define os2_WM_BUTTONCLICKLAST 0x0079
+#define os2_WM_MOUSELAST 0x0079
+#define os2_WM_CHAR 0x007a
+#define os2_WM_VIOCHAR 0x007b
+#define os2_WM_JOURNALNOTIFY 0x007c
+#define os2_WM_MOUSEMAP 0x007d
+#define os2_WM_VRNDISABLED 0x007e
+#define os2_WM_VRNENABLED 0x007f
+#define os2_WM_EXTMOUSEFIRST 0x0410
+#define os2_WM_CHORD 0x0410
+#define os2_WM_BUTTON1MOTIONSTART 0x0411
+#define os2_WM_BUTTON1MOTIONEND 0x0412
+#define os2_WM_BUTTON1CLICK 0x0413
+#define os2_WM_BUTTON2MOTIONSTART 0x0414
+#define os2_WM_BUTTON2MOTIONEND 0x0415
+#define os2_WM_BUTTON2CLICK 0x0416
+#define os2_WM_BUTTON3MOTIONSTART 0x0417
+#define os2_WM_BUTTON3MOTIONEND 0x0418
+#define os2_WM_BUTTON3CLICK 0x0419
+#define os2_WM_EXTMOUSELAST 0x0419
+#define os2_WM_MOUSETRANSLATEFIRST 0x0420
+#define os2_WM_BEGINDRAG 0x0420
+#define os2_WM_ENDDRAG 0x0421
+#define os2_WM_SINGLESELECT 0x0422
+#define os2_WM_OPEN 0x0423
+#define os2_WM_CONTEXTMENU 0x0424
+#define os2_WM_CONTEXTHELP 0x0425
+#define os2_WM_TEXTEDIT 0x0426
+#define os2_WM_BEGINSELECT 0x0427
+#define os2_WM_ENDSELECT 0x0428
+#define os2_WM_MOUSETRANSLATELAST 0x0428
+#define os2_WM_PICKUP 0x0429
+#define os2_WM_PENFIRST 0x0481
+#define os2_WM_PENLAST 0x049f
+#define os2_WM_MMPMFIRST 0x0500
+#define os2_WM_MMPMLAST 0x05ff
+#define os2_WM_BIDI_FIRST 0x0bd0
+#define os2_WM_BIDI_LAST 0x0bff
 #define _CHARMSG os2__CHARMSG
 #define CHARMSG os2_CHARMSG
+#define CHRMSG os2_CHRMSG
 #define PCHRMSG os2_PCHRMSG
 #define _MOUSEMSG os2__MOUSEMSG
 #define MOUSEMSG os2_MOUSEMSG
+#define MSEMSG os2_MSEMSG
 #define PMSEMSG os2_PMSEMSG
+#define os2_CHARMSG (pmsg)              ((os2_PCHRMSG)((os2_PBYTE)pmsg + sizeof (os2_ULONG)))
+#define os2_MOUSEMSG (pmsg)             ((os2_PMSEMSG)((os2_PBYTE)pmsg + sizeof (os2_ULONG)))
 #define _LBOXINFO os2__LBOXINFO
 #define LBOXINFO os2_LBOXINFO
 #define PLBOXINFO os2_PLBOXINFO
+#define os2_WinDeleteLboxItem (hwndLbox,index) \
+    ((os2_LONG)WinSendMsg (hwndLbox, LM_DELETEITEM, os2_MPFROMLONG (index), \
+                       (os2_MPARAM)NULL))
+#define os2_WinInsertLboxItem (hwndLbox,index,psz) \
+    ((os2_LONG)WinSendMsg (hwndLbox, LM_INSERTITEM, os2_MPFROMLONG(index), \
+                       os2_MPFROMP (psz)))
+#define os2_WinQueryLboxCount (hwndLbox) \
+    ((os2_LONG)WinSendMsg (hwndLbox, LM_QUERYITEMCOUNT, (os2_MPARAM)NULL, \
+                       (os2_MPARAM)NULL))
+#define os2_WinQueryLboxItemText (hwndLbox,index,psz,cchMax) \
+    ((os2_LONG)WinSendMsg (hwndLbox, LM_QUERYITEMTEXT, \
+                       os2_MPFROM2SHORT((index), (cchMax)), os2_MPFROMP (psz)))
+#define os2_WinQueryLboxItemTextLength (hwndLbox,index) \
+    ((os2_SHORT)WinSendMsg (hwndLbox, LM_QUERYITEMTEXTLENGTH, \
+                        os2_MPFROMSHORT (index), (os2_MPARAM)NULL))
+#define os2_WinQueryLboxSelectedItem (hwndLbox) \
+    ((os2_LONG)WinSendMsg (hwndLbox, LM_QUERYSELECTION, os2_MPFROMLONG (LIT_FIRST), \
+                       (os2_MPARAM)NULL))
+#define os2_WinSetLboxItemText (hwndLbox,index,psz) \
+    ((os2_BOOL)WinSendMsg (hwndLbox, LM_SETITEMTEXT, \
+                       os2_MPFROMLONG (index), os2_MPFROMP (psz)))
+#define os2_MIA_NODISMISS 0x0020
+#define os2_MIA_FRAMED 0x1000
+#define os2_MIA_CHECKED 0x2000
+#define os2_MIA_DISABLED 0x4000
+#define os2_MIA_HILITED 0x8000
 #define _MENUITEM os2__MENUITEM
 #define MENUITEM os2_MENUITEM
 #define PMENUITEM os2_PMENUITEM
+#define _mti os2__mti
+#define MTI os2_MTI
+#define _mt os2__mt
+#define MT os2_MT
 #define LPMT os2_LPMT
 #define _OWNERITEM os2__OWNERITEM
 #define OWNERITEM os2_OWNERITEM
 #define POWNERITEM os2_POWNERITEM
+#define os2_WinCheckMenuItem (hwndMenu,id,fcheck) \
+    ((os2_BOOL)WinSendMsg (hwndMenu, MM_SETITEMATTR, \
+                       os2_MPFROM2SHORT (id, TRUE), \
+                       os2_MPFROM2SHORT (os2_MIA_CHECKED, \
+                                     ((os2_USHORT)(fcheck) ? os2_MIA_CHECKED : 0))))
+#define os2_WinEnableMenuItem (hwndMenu,id,fEnable) \
+    ((os2_BOOL)WinSendMsg (hwndMenu, MM_SETITEMATTR, os2_MPFROM2SHORT (id, TRUE), \
+                       os2_MPFROM2SHORT (os2_MIA_DISABLED, \
+                                     ((os2_USHORT)(fEnable) ? 0 : os2_MIA_DISABLED))))
+#define os2_WinIsMenuItemChecked (hwndMenu,id) \
+    ((os2_BOOL)WinSendMsg (hwndMenu, MM_QUERYITEMATTR, \
+                       os2_MPFROM2SHORT (id, TRUE), \
+                       os2_MPFROMLONG (os2_MIA_CHECKED)))
+#define os2_WinIsMenuItemEnabled (hwndMenu,id)  \
+    (!(os2_BOOL)WinSendMsg (hwndMenu, MM_QUERYITEMATTR, \
+                        os2_MPFROM2SHORT (id, TRUE), \
+                        os2_MPFROMLONG (os2_MIA_DISABLED)))
+#define os2_WinIsMenuItemValid (hwndMenu,id) \
+    ((os2_BOOL)WinSendMsg (hwndMenu, MM_ISITEMVALID, \
+                       os2_MPFROM2SHORT (id, TRUE), os2_MPFROMLONG (FALSE)))
+#define os2_WinSetMenuItemText (hwndMenu,id,psz) \
+    ((os2_BOOL)WinSendMsg (hwndMenu, MM_SETITEMTEXT, \
+                       os2_MPFROMLONG (id), os2_MPFROMP (psz)))
+#define os2_QS_KEY 0x0001
+#define os2_QS_MOUSEBUTTON 0x0002
+#define os2_QS_MOUSEMOVE 0x0004
+#define os2_QS_MOUSE 0x0006
+#define os2_QS_TIMER 0x0008
+#define os2_QS_PAINT 0x0010
+#define os2_QS_POSTMSG 0x0020
+#define os2_QS_SEM1 0x0040
+#define os2_QS_SEM2 0x0080
+#define os2_QS_SEM3 0x0100
+#define os2_QS_SEM4 0x0200
+#define os2_QS_SENDMSG 0x0400
+#define os2_QS_MSGINPUT 0x0800
 #define _WNDPARAMS os2__WNDPARAMS
 #define WNDPARAMS os2_WNDPARAMS
 …
 #define SBCDATA os2_SBCDATA
 #define PSBCDATA os2_PSBCDATA
 #define WM_MSGBOXINIT os2_WM_MSGBOXINIT
 #define WM_MSGBOXDISMISS os2_WM_MSGBOXDISMISS
 #define WM_CTLCOLORCHANGE os2_WM_CTLCOLORCHANGE
 #define WM_QUERYCTLTYPE os2_WM_QUERYCTLTYPE
+#define os2_WM_MSGBOXINIT 0x010e
+#define os2_WM_MSGBOXDISMISS 0x010f
+#define os2_WM_CTLCOLORCHANGE 0x0129
+#define os2_WM_QUERYCTLTYPE 0x0130 /*0x012a?*/
 #define _CTLCOLOR os2__CTLCOLOR
 #define CTLCOLOR os2_CTLCOLOR
 …
 #define LINE os2_LINE
 #define _FORMATRECT os2__FORMATRECT
 #define FORMATRECT os2_FORMATRECT
+#define MLEFORMATRECT os2_MLEFORMATRECT
 #define PFORMATRECT os2_PFORMATRECT
 #define _MLECTLDATA os2__MLECTLDATA
 …
 #define PMARGSTRUCT os2_PMARGSTRUCT
 #define _SEARCH os2__SEARCH
 #define SEARCH os2_SEARCH
+#define MLE_SEARCHDATA os2_MLE_SEARCHDATA
 #define PMLE_SEARCHDATA os2_PMLE_SEARCHDATA
 #define TA_NORMAL_HORIZ os2_TA_NORMAL_HORIZ
 #define TA_LEFT os2_TA_LEFT
 #define TA_CENTER os2_TA_CENTER
 #define TA_RIGHT os2_TA_RIGHT
 #define TA_STANDARD_HORIZ os2_TA_STANDARD_HORIZ
 #define TA_NORMAL_VERT os2_TA_NORMAL_VERT
 #define TA_TOP os2_TA_TOP
 #define TA_HALF os2_TA_HALF
 #define TA_BASE os2_TA_BASE
 #define TA_BOTTOM os2_TA_BOTTOM
 #define TA_STANDARD_VERT os2_TA_STANDARD_VERT
 #define RGN_ERROR os2_RGN_ERROR
 #define RGN_NULL os2_RGN_NULL
 #define RGN_RECT os2_RGN_RECT
 #define RGN_COMPLEX os2_RGN_COMPLEX
+#define os2_TA_NORMAL_HORIZ 0x0001
+#define os2_TA_LEFT 0x0002
+#define os2_TA_CENTER 0x0003
+#define os2_TA_RIGHT 0x0004
+#define os2_TA_STANDARD_HORIZ 0x0005
+#define os2_TA_NORMAL_VERT 0x0100
+#define os2_TA_TOP 0x0200
+#define os2_TA_HALF 0x0300
+#define os2_TA_BASE 0x0400
+#define os2_TA_BOTTOM 0x0500
+#define os2_TA_STANDARD_VERT 0x0600
+#define os2_RGN_ERROR 0
+#define os2_RGN_NULL 1
+#define os2_RGN_RECT 2
+#define os2_RGN_COMPLEX 3
 #define PBUNDLE os2_PBUNDLE
 #define FIXED os2_FIXED
 …
 #define IMAGEBUNDLE os2_IMAGEBUNDLE
 #define PIMAGEBUNDLE os2_PIMAGEBUNDLE
+#define os2_MAKEFIXED (i,f)  os2_MAKELONG (f,i)
+#define os2_FIXEDFRAC (fx)  (os2_LOUSHORT(fx))
+#define os2_FIXEDINT (fx)   ((os2_SHORT)HIUSHORT(fx))
 #define _RGB os2__RGB
 #define RGB os2_RGB
 …
 #define BITMAPARRAYFILEHEADER2 os2_BITMAPARRAYFILEHEADER2
 #define PBITMAPARRAYFILEHEADER2 os2_PBITMAPARRAYFILEHEADER2
+#define os2_DM_ERROR 0
+#define os2_DM_DRAW 1
+#define os2_DM_RETAIN 2
+#define os2_DM_DRAWANDRETAIN 3
 #define PDEVOPENDATA os2_PDEVOPENDATA
 #define _DRIVDATA os2__DRIVDATA
 …
 #define SWBLOCK os2_SWBLOCK
 #define PSWBLOCK os2_PSWBLOCK
+#define os2_FDM_FILTER (os2_WM_USER+40)
+#define os2_FDM_VALIDATE (os2_WM_USER+41)
+#define os2_FDM_ERROR (os2_WM_USER+42)
 #define APSZ os2_APSZ
 #define PAPSZ os2_PAPSZ
 …
 #define FILEDLG os2_FILEDLG
 #define PFILEDLG os2_PFILEDLG
+#define os2_FNTM_FACENAMECHANGED (os2_WM_USER+50)
+#define os2_FNTM_POINTSIZECHANGED (os2_WM_USER+51)
+#define os2_FNTM_STYLECHANGED (os2_WM_USER+52)
+#define os2_FNTM_COLORCHANGED (os2_WM_USER+53)
+#define os2_FNTM_UPDATEPREVIEW (os2_WM_USER+54)
+#define os2_FNTM_FILTERLIST (os2_WM_USER+55)
 #define _FONTDLG os2__FONTDLG
 #define FONTDLG os2_FONTDLG
 …
 #define BOOKPAGEINFO os2_BOOKPAGEINFO
 #define PBOOKPAGEINFO os2_PBOOKPAGEINFO
+#define WM_DRAGFIRST os2_WM_DRAGFIRST
+#define WM_DRAGLAST os2_WM_DRAGLAST
+#define os2_WM_DRAGFIRST 0x0310
+#define os2_WM_DRAGLAST 0x032f
+#define os2_DM_DROP 0x032f
+#define os2_DM_DRAGOVER 0x032e
+#define os2_DM_DRAGLEAVE 0x032d
+#define os2_DM_DROPHELP 0x032c
+#define os2_DM_ENDCONVERSATION 0x032b
+#define os2_DM_PRINT 0x032a
+#define os2_DM_RENDER 0x0329
+#define os2_DM_RENDERCOMPLETE 0x0328
+#define os2_DM_RENDERPREPARE 0x0327
+#define os2_DM_DRAGFILECOMPLETE 0x0326
+#define os2_DM_EMPHASIZETARGET 0x0325
+#define os2_DM_DRAGERROR 0x0324
+#define os2_DM_FILERENDERED 0x0323
+#define os2_DM_RENDERFILE 0x0322
+#define os2_DM_DRAGOVERNOTIFY 0x0321
+#define os2_DM_PRINTOBJECT 0x0320
+#define os2_DM_DISCARDOBJECT 0x031f
+#define os2_DM_DROPNOTIFY 0x031e
 #define HSTR os2_HSTR
 #define _DRAGIMAGE os2__DRAGIMAGE
 …
 #define QMJOBINFO os2_QMJOBINFO
 #define PQMJOBINFO os2_PQMJOBINFO
+#define HWND_PARENT os2_HWND_PARENT
+#define os2_CTRL_PREVIOUS_ID ((os2_USHORT)0x0001)
+#define os2_CTRL_SEARCH_ID ((os2_USHORT)0x0002)
+#define os2_CTRL_PRINT_ID ((os2_USHORT)0x0003)
+#define os2_CTRL_INDEX_ID ((os2_USHORT)0x0004)
+#define os2_CTRL_CONTENTS_ID ((os2_USHORT)0x0005)
+#define os2_CTRL_BACK_ID ((os2_USHORT)0x0006)
+#define os2_CTRL_FORWARD_ID ((os2_USHORT)0x0007)
+#define os2_CTRL_TUTORIAL_ID ((os2_USHORT)0x00ff)
+#define os2_CTRL_USER_ID_BASE ((os2_USHORT)0x0101)
+#define os2_HWND_PARENT (os2_HWND)NULL
 #define HELPSUBTABLE os2_HELPSUBTABLE
 #define PHELPSUBTABLE os2_PHELPSUBTABLE
 …
 #define PLINFOSEG os2_PLINFOSEG
-/* Some manually added redefinitionis not caught by sed */
-#define VOID os2_VOID
-#define FIELDOFFSET os2_FIELDOFFSET
-#define MAKETYPE os2_MAKETYPE
-#define MAKEUSHORT os2_MAKEUSHORT
-#define MAKESHORT os2_MAKESHORT
-#define MAKEULONG os2_MAKEULONG
-#define MAKELONG os2_MAKELONG
-#define LOUCHAR os2_LOUCHAR
-#define HIUCHAR os2_HIUCHAR
-#define LOBYTE os2_LOBYTE
-#define HIBYTE os2_HIBYTE
-#define LOUSHORT os2_LOUSHORT
-#define HIUSHORT os2_HIUSHORT
-#define WINERR_BASE os2_WINERR_BASE
-#define GPIERR_BASE os2_GPIERR_BASE
-#define DEVERR_BASE os2_DEVERR_BASE
-#define SPLERR_BASE os2_SPLERR_BASE
-#define SEVERITY_NOERROR os2_SEVERITY_NOERROR
-#define SEVERITY_WARNING os2_SEVERITY_WARNING
-#define SEVERITY_ERROR os2_SEVERITY_ERROR
-#define SEVERITY_SEVERE os2_SEVERITY_SEVERE
-#define SEVERITY_UNRECOVERABLE os2_SEVERITY_UNRECOVERABLE
-#define MAKE16P os2_MAKE16P
-#define MAKEP os2_MAKEP
-#define SELECTOROF os2_SELECTOROF
-#define OFFSETOF os2_OFFSETOF
-#define APIENTRY os2_APIENTRY
-#define EXPENTRY os2_EXPENTRY
 /* include the main OS/2 API wrapper */
 #include <os2wrap.h>
 /*
    Undefine all typedefs prefixed with "os2_" at the beginning. The command to
    generate this block is:
+   Undefine all typedefs prefixed with "os2_" at the beginning and original
+   versions of macros. The command to generate this block is:
+sed -nr \
+  -e 's/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+_([A-Z_][A-Z1-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef _\1\
+#undef \1/p' \
+  -e 's/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z1-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef \1/p' \
+  -e 's/^[[:space:]]*#define[[:space:]]+((CONTEXT|CS|EH|EXCEPTION|HWND|WC|MB|WM|WS|RGN|RT|DT|SWP|TA)_([A-Z1-9_]+))[[:space:]]+.*$/#undef \1/p' \
+sed -nr '
+{
+  s/^[[:space:]]*typedef[[:space:]]+struct[[:space:]]+([A-Za-z_][A-Za-z0-9_]+)([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef \1/p
+  td
+  s/^[[:space:]]*}[[:space:]]*([A-Z_][A-Z0-9_]+)[[:space:]]*;[[:space:]]*$/#undef \1/p
+  td
+  s/^[[:space:]]*typedef[[:space:]]+.+[[:space:]]+\**([A-Z_][A-Z0-9_]+)[[:space:]]*(\[.*\])?[[:space:]]*;([[:space:]]*[/]\*.*\*[/])?[[:space:]]*$/#undef \1/p
+  td
+}
+/^[[:space:]]*#define[[:space:]]+/ {
+  :a;/\\$/{N;ba}
+  s/([^A-Za-z0-9_])(MAKE[A-Z0-9]+)([^A-Za-z0-9_])/\1 \2 \3/g
+  s/([^A-Za-z0-9_])(((CONTEXT|CS|DM|DT|EH|EXCEPTION|FDM|FNTM|HWND|MB|MIA|NP|QS|RGN|RT|SEM|SEVERITY|SWP|TA|WC|WM|WS|(WIN|GPI|DEV|SPL)ERR)_([A-Z0-9_]+))|((P?VOID|(API|EXP)ENTRY|P(CMD|CHR|MSE)MSG|ERRORID|PCMDMSG|SEL|HWND|MPARAM|MRESULT|LHANDLE|SHANDLE|BOOL|(LO|HI|P)?U?(LONG|SHORT|CHAR|BYTE)|MPFROM[A-Z0-9]+|MAKE[A-Z0-9]+)([^A-Za-z0-9_])))/\1os2_\2/g
+  tb;bd
+  :b
+  s/^[[:space:]]*#define[[:space:]]+(os2_)?([A-Za-z_][A-Za-z0-9_]+)[[:space:]]*(.*)/#undef \2/p
+}
+:d
+'
  */
+#undef _THUNK_PASCAL_FUNCTION
+#undef MAKE16P
+#undef MAKEP
+#undef SELECTOROF
+#undef OFFSETOF
+#undef _THUNK_PTR_SIZE_OK
+#undef APIENTRY
+#undef EXPENTRY
+#undef VOID
+#undef NULLHANDLE
+#undef NULLSHANDLE
 #undef INT
 #undef UINT
 …
 #undef HMUX
 #undef PHMUX
+#undef FIELDOFFSET
+#undef MAKETYPE
+#undef MAKEUSHORT
+#undef MAKESHORT
+#undef MAKEULONG
+#undef MAKELONG
+#undef LOUCHAR
+#undef HIUCHAR
+#undef LOBYTE
+#undef HIBYTE
+#undef LOUSHORT
+#undef HIUSHORT
+#undef WINERR_BASE
+#undef GPIERR_BASE
+#undef DEVERR_BASE
+#undef SPLERR_BASE
+#undef SEVERITY_NOERROR
+#undef SEVERITY_WARNING
+#undef SEVERITY_ERROR
+#undef SEVERITY_SEVERE
+#undef SEVERITY_UNRECOVERABLE
 #undef _PANOSE
 #undef PANOSE
 …
 #undef PFSINFO
 #undef _LISTIO_CB
 #undef LISTIO_CB
+#undef LISTIO
 #undef PLISTIO
 #undef _LISTIO_CBL
 #undef LISTIO_CBL
+#undef LISTIOL
 #undef PLISTIOL
 #undef _DCBINFO
 …
 #undef RESULTCODES
 #undef PRESULTCODES
+#undef tib2_s
+#undef TIB2
 #undef PTIB2
+#undef tib_s
+#undef TIB
 #undef PTIB
+#undef pib_s
+#undef PIB
 #undef PPIB
 #undef PFNTHREAD
 …
 #undef STATUSDATA
 #undef PSTATUSDATA
+#undef SEM_INDEFINITE_WAIT
+#undef SEM_IMMEDIATE_RETURN
 #undef HEV
 #undef PHEV
 #undef _PSEMRECORD
+#undef SEMRECORD
 #undef PSEMRECORD
+#undef PSEMRECORD
+#undef NP_INDEFINITE_WAIT
+#undef NP_DEFAULT_WAIT
+#undef NP_STATE_DISCONNECTED
+#undef NP_STATE_LISTENING
+#undef NP_STATE_CONNECTED
+#undef NP_STATE_CLOSING
+#undef NP_ACCESS_INBOUND
+#undef NP_ACCESS_OUTBOUND
+#undef NP_ACCESS_DUPLEX
+#undef NP_INHERIT
+#undef NP_NOINHERIT
+#undef NP_WRITEBEHIND
+#undef NP_NOWRITEBEHIND
+#undef NP_READMODE_BYTE
+#undef NP_READMODE_MESSAGE
+#undef NP_TYPE_BYTE
+#undef NP_TYPE_MESSAGE
+#undef NP_END_CLIENT
+#undef NP_END_SERVER
+#undef NP_WAIT
+#undef NP_NOWAIT
+#undef NP_UNLIMITED_INSTANCES
+#undef NP_NBLK
+#undef NP_SERVER
+#undef NP_WMESG
+#undef NP_RMESG
+#undef NP_ICOUNT
 #undef _AVAILDATA
 #undef AVAILDATA
 …
 #undef EH_STACK_INVALID
 #undef EH_NESTED_CALL
+#undef _fpreg
+#undef FPREG
 #undef PFPREG
 #undef _CONTEXT
 #undef CONTEXT
+#undef CONTEXTRECORD
 #undef PCONTEXTRECORD
 #undef EXCEPTION_MAXIMUM_PARAMETERS
 …
 #undef HTIMER
 #undef PHTIMER
+#undef PADSHORT
+#undef PADCHAR
+#undef QS_PROCESS
+#undef QS_SEMAPHORE
+#undef QS_MTE
+#undef QS_FILESYS
+#undef QS_SHMEMORY
+#undef QS_DISK
+#undef QS_HWCONFIG
+#undef QS_NAMEDPIPE
+#undef QS_THREAD
+#undef QS_MODVER
+#undef QS_SUPPORTED
+#undef QS_END
+#undef QS_SYSSEM_WAITING
+#undef QS_SYSSEM_MUXWAITING
+#undef QS_SYSSEM_OWNER_DIED
+#undef QS_SYSSEM_EXCLUSIVE
+#undef QS_SYSSEM_NAME_CLEANUP
+#undef QS_SYSSEM_THREAD_OWNER_DIED
+#undef QS_SYSSEM_EXITLIST_OWNER
+#undef QS_DC_SEM_SHARED
+#undef QS_DCMW_WAIT_ANY
+#undef QS_DCMW_WAIT_ALL
+#undef QS_DCM_MUTEX_SEM
+#undef QS_DCE_EVENT_SEM
+#undef QS_DCMW_MUX_SEM
+#undef QS_DC_SEM_PM
+#undef QS_DE_POSTED
+#undef QS_DM_OWNER_DIED
+#undef QS_DMW_MTX_MUX
+#undef QS_DHO_SEM_OPEN
+#undef QS_DE_16BIT_MW
+#undef QS_DCE_POSTONE
+#undef QS_DCE_AUTORESET
 #undef _QWORD
 #undef QWORD
 …
 #undef _QSMUX
 #undef QSMUX
+#undef QSHUN
 #undef _QSS32REC
 #undef QSS32REC
 …
 #undef HSPINLOCK
 #undef PHSPINLOCK
+#undef _TStat
+#undef _uDB
 #undef _RXSTRING
 #undef RXSTRING
 …
 #undef RXSYSEXIT
 #undef PRXSYSEXIT
+#undef MAKERXSTRING
 #undef _SHVBLOCK
 #undef SHVBLOCK
 …
 #undef RXSIOTRD_PARM
 #undef _RXSIODR_PARM
 #undef RXSIODR_PARM
+#undef RXSIODTR_PARM
 #undef _RXHLT_FLAGS
 #undef RXHLT_FLAGS
 …
 #undef PERRORID
 #undef PFNWP
+#undef ERRORIDERROR
+#undef ERRORIDSEV
+#undef MAKEERRORID
 #undef _POINTL
 #undef POINTL
 …
 #undef PQMSG
 #undef _COMMANDMSG
 #undef COMMANDMSG
+#undef CMDMSG
 #undef PCMDMSG
 #undef _MQINFO
 #undef MQINFO
 #undef PMQINFO
+#undef COMMANDMSG
 #undef _SWP
 #undef SWP
 …
 #undef ICONINFO
 #undef PICONINFO
+#undef MPVOID
+#undef MPFROMP
+#undef MPFROMHWND
+#undef MPFROMCHAR
+#undef MPFROMSHORT
+#undef MPFROM2SHORT
+#undef MPFROMSH2CH
+#undef MPFROMLONG
+#undef PVOIDFROMMP
+#undef HWNDFROMMP
+#undef CHAR1FROMMP
+#undef CHAR2FROMMP
+#undef CHAR3FROMMP
+#undef CHAR4FROMMP
+#undef SHORT1FROMMP
+#undef SHORT2FROMMP
+#undef LONGFROMMP
+#undef MRFROMP
+#undef MRFROMSHORT
+#undef MRFROM2SHORT
+#undef MRFROMLONG
+#undef PVOIDFROMMR
+#undef SHORT1FROMMR
+#undef SHORT2FROMMR
+#undef LONGFROMMR
 #undef _FRAMECDATA
 #undef FRAMECDATA
 …
 #undef HATOMTBL
 #undef ATOM
+#undef MAKEINTATOM
 #undef _BTNCDATA
 #undef BTNCDATA
 …
 #undef DDESTRUCT
 #undef PDDESTRUCT
+#undef DDES_PABDATA
+#undef DDEI_PCONVCONTEXT
 #undef _CURSORINFO
 #undef CURSORINFO
 …
 #undef MB2INFO
 #undef PMB2INFO
+#undef WinCheckButton
+#undef WinIsControlEnabled
+#undef WinQueryButtonCheckstate
 #undef _DLGTITEM
 #undef DLGTITEM
 …
 #undef WM_BIDI_LAST
 #undef _CHARMSG
 #undef CHARMSG
+#undef CHRMSG
 #undef PCHRMSG
 #undef _MOUSEMSG
+#undef MSEMSG
+#undef PMSEMSG
+#undef CHARMSG
 #undef MOUSEMSG
-#undef PMSEMSG
 #undef _LBOXINFO
 #undef LBOXINFO
 #undef PLBOXINFO
+#undef WinDeleteLboxItem
+#undef WinInsertLboxItem
+#undef WinQueryLboxCount
+#undef WinQueryLboxItemText
+#undef WinQueryLboxItemTextLength
+#undef WinQueryLboxSelectedItem
+#undef WinSetLboxItemText
+#undef MIA_NODISMISS
+#undef MIA_FRAMED
+#undef MIA_CHECKED
+#undef MIA_DISABLED
+#undef MIA_HILITED
 #undef _MENUITEM
 #undef MENUITEM
 #undef PMENUITEM
+#undef _mti
+#undef MTI
+#undef _mt
+#undef MT
 #undef LPMT
 #undef _OWNERITEM
 #undef OWNERITEM
 #undef POWNERITEM
+#undef WinCheckMenuItem
+#undef WinEnableMenuItem
+#undef WinIsMenuItemChecked
+#undef WinIsMenuItemEnabled
+#undef WinIsMenuItemValid
+#undef WinSetMenuItemText
+#undef QS_KEY
+#undef QS_MOUSEBUTTON
+#undef QS_MOUSEMOVE
+#undef QS_MOUSE
+#undef QS_TIMER
+#undef QS_PAINT
+#undef QS_POSTMSG
+#undef QS_SEM1
+#undef QS_SEM2
+#undef QS_SEM3
+#undef QS_SEM4
+#undef QS_SENDMSG
+#undef QS_MSGINPUT
 #undef _WNDPARAMS
 #undef WNDPARAMS
 …
 #undef LINE
 #undef _FORMATRECT
 #undef FORMATRECT
+#undef MLEFORMATRECT
 #undef PFORMATRECT
 #undef _MLECTLDATA
 …
 #undef PMARGSTRUCT
 #undef _SEARCH
 #undef SEARCH
+#undef MLE_SEARCHDATA
 #undef PMLE_SEARCHDATA
 #undef TA_NORMAL_HORIZ
 …
 #undef IMAGEBUNDLE
 #undef PIMAGEBUNDLE
+#undef MAKEFIXED
+#undef FIXEDFRAC
+#undef FIXEDINT
 #undef _RGB
 #undef RGB
 …
 #undef BITMAPARRAYFILEHEADER2
 #undef PBITMAPARRAYFILEHEADER2
+#undef DM_ERROR
+#undef DM_DRAW
+#undef DM_RETAIN
+#undef DM_DRAWANDRETAIN
 #undef PDEVOPENDATA
 #undef _DRIVDATA
 …
 #undef SWBLOCK
 #undef PSWBLOCK
+#undef FDM_FILTER
+#undef FDM_VALIDATE
+#undef FDM_ERROR
 #undef APSZ
 #undef PAPSZ
 …
 #undef FILEDLG
 #undef PFILEDLG
+#undef FNTM_FACENAMECHANGED
+#undef FNTM_POINTSIZECHANGED
+#undef FNTM_STYLECHANGED
+#undef FNTM_COLORCHANGED
+#undef FNTM_UPDATEPREVIEW
+#undef FNTM_FILTERLIST
 #undef _FONTDLG
 #undef FONTDLG
 …
 #undef WM_DRAGFIRST
 #undef WM_DRAGLAST
+#undef DM_DROP
+#undef DM_DRAGOVER
+#undef DM_DRAGLEAVE
+#undef DM_DROPHELP
+#undef DM_ENDCONVERSATION
+#undef DM_PRINT
+#undef DM_RENDER
+#undef DM_RENDERCOMPLETE
+#undef DM_RENDERPREPARE
+#undef DM_DRAGFILECOMPLETE
+#undef DM_EMPHASIZETARGET
+#undef DM_DRAGERROR
+#undef DM_FILERENDERED
+#undef DM_RENDERFILE
+#undef DM_DRAGOVERNOTIFY
+#undef DM_PRINTOBJECT
+#undef DM_DISCARDOBJECT
+#undef DM_DROPNOTIFY
 #undef HSTR
 #undef _DRAGIMAGE
 …
 #undef QMJOBINFO
 #undef PQMJOBINFO
+#undef CTRL_PREVIOUS_ID
+#undef CTRL_SEARCH_ID
+#undef CTRL_PRINT_ID
+#undef CTRL_INDEX_ID
+#undef CTRL_CONTENTS_ID
+#undef CTRL_BACK_ID
+#undef CTRL_FORWARD_ID
+#undef CTRL_TUTORIAL_ID
+#undef CTRL_USER_ID_BASE
 #undef HWND_PARENT
 #undef HELPSUBTABLE
 …
 #undef PLINFOSEG
-/* Some manually added redefinitionis not caught by sed */
-#undef VOID
-#undef FIELDOFFSET
-#undef MAKETYPE
-#undef MAKEUSHORT
-#undef MAKESHORT
-#undef MAKEULONG
-#undef MAKELONG
-#undef LOUCHAR
-#undef HIUCHAR
-#undef LOBYTE
-#undef HIBYTE
-#undef LOUSHORT
-#undef HIUSHORT
-#undef WINERR_BASE
-#undef GPIERR_BASE
-#undef DEVERR_BASE
-#undef SPLERR_BASE
-#undef SEVERITY_NOERROR
-#undef SEVERITY_WARNING
-#undef SEVERITY_ERROR
-#undef SEVERITY_SEVERE
-#undef SEVERITY_UNRECOVERABLE
-#undef MAKE16P
-#undef MAKEP
-#undef SELECTOROF
-#undef OFFSETOF
-#undef APIENTRY
-#undef EXPENTRY
 #endif /* __OS2WRAP2_H__ */

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 21423 for trunk/include/os2wrap2.h

Legend:

trunk/include/os2wrap2.h

Download in other formats: