Changeset 21547

Timestamp:

Jan 8, 2011, 1:41:39 PM (14 years ago)

Author:

dmik

Message:

os2wrap2.h: Added wrappers for ERROR_, OBJ_ and PAG_ constants. Placed the sed commands to a separate script to simplify future re-generation.

Location:

trunk/include

Files:

• os2wrap2.h (modified) (11 diffs)
• os2wrap2_gen.sh (added)

trunk/include/os2wrap2.h ¶

@@ -14 +14 @@
 #endif
 
-/*
-   Redefine all OS/2 typedefs to those having the "os2_" prefix to avoid
-   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 '
-{
-  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|QSV|RGN|RT|SEM|SEVERITY|SIS|SV|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)))
@@ -47 +21 @@
 #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
@@ -147 +122 @@
 #define os2_SEVERITY_SEVERE 0x000c
 #define os2_SEVERITY_UNRECOVERABLE 0x0010
+#define os2_NO_ERROR 0
+#define os2_ERROR_INVALID_FUNCTION 1
+#define os2_ERROR_FILE_NOT_FOUND 2
+#define os2_ERROR_PATH_NOT_FOUND 3
+#define os2_ERROR_TOO_MANY_OPEN_FILES 4
+#define os2_ERROR_ACCESS_DENIED 5
+#define os2_ERROR_INVALID_HANDLE 6
+#define os2_ERROR_ARENA_TRASHED 7
+#define os2_ERROR_NOT_ENOUGH_MEMORY 8
+#define os2_ERROR_INVALID_BLOCK 9
+#define os2_ERROR_BAD_ENVIRONMENT 10
+#define os2_ERROR_BAD_FORMAT 11
+#define os2_ERROR_INVALID_ACCESS 12
+#define os2_ERROR_INVALID_DATA 13
+#define os2_ERROR_INVALID_DRIVE 15
+#define os2_ERROR_CURRENT_DIRECTORY 16
+#define os2_ERROR_NOT_SAME_DEVICE 17
+#define os2_ERROR_NO_MORE_FILES 18
+#define os2_ERROR_WRITE_PROTECT 19
+#define os2_ERROR_BAD_UNIT 20
+#define os2_ERROR_NOT_READY 21
+#define os2_ERROR_BAD_COMMAND 22
+#define os2_ERROR_CRC 23
+#define os2_ERROR_BAD_LENGTH 24
+#define os2_ERROR_SEEK 25
+#define os2_ERROR_NOT_DOS_DISK 26
+#define os2_ERROR_SECTOR_NOT_FOUND 27
+#define os2_ERROR_OUT_OF_PAPER 28
+#define os2_ERROR_WRITE_FAULT 29
+#define os2_ERROR_READ_FAULT 30
+#define os2_ERROR_GEN_FAILURE 31
+#define os2_ERROR_SHARING_VIOLATION 32
+#define os2_ERROR_LOCK_VIOLATION 33
+#define os2_ERROR_WRONG_DISK 34
+#define os2_ERROR_FCB_UNAVAILABLE 35
+#define os2_ERROR_SHARING_BUFFER_EXCEEDED 36
+#define os2_ERROR_CODE_PAGE_MISMATCHED 37
+#define os2_ERROR_HANDLE_EOF 38
+#define os2_ERROR_HANDLE_DISK_FULL 39
+#define os2_ERROR_NOT_SUPPORTED 50
+#define os2_ERROR_REM_NOT_LIST 51
+#define os2_ERROR_DUP_NAME 52
+#define os2_ERROR_BAD_NETPATH 53
+#define os2_ERROR_NETWORK_BUSY 54
+#define os2_ERROR_DEV_NOT_EXIST 55
+#define os2_ERROR_TOO_MANY_CMDS 56
+#define os2_ERROR_ADAP_HDW_ERR 57
+#define os2_ERROR_BAD_NET_RESP 58
+#define os2_ERROR_UNEXP_NET_ERR 59
+#define os2_ERROR_BAD_REM_ADAP 60
+#define os2_ERROR_PRINTQ_FULL 61
+#define os2_ERROR_NO_SPOOL_SPACE 62
+#define os2_ERROR_PRINT_CANCELLED 63
+#define os2_ERROR_NETNAME_DELETED 64
+#define os2_ERROR_NETWORK_ACCESS_DENIED 65
+#define os2_ERROR_BAD_DEV_TYPE 66
+#define os2_ERROR_BAD_NET_NAME 67
+#define os2_ERROR_TOO_MANY_NAMES 68
+#define os2_ERROR_TOO_MANY_SESS 69
+#define os2_ERROR_SHARING_PAUSED 70
+#define os2_ERROR_REQ_NOT_ACCEP 71
+#define os2_ERROR_REDIR_PAUSED 72
+#define os2_ERROR_SBCS_ATT_WRITE_PROT 73
+#define os2_ERROR_SBCS_GENERAL_FAILURE 74
+#define os2_ERROR_XGA_OUT_MEMORY 75
+#define os2_ERROR_FILE_EXISTS 80
+#define os2_ERROR_DUP_FCB 81
+#define os2_ERROR_CANNOT_MAKE 82
+#define os2_ERROR_FAIL_I24 83
+#define os2_ERROR_OUT_OF_STRUCTURES 84
+#define os2_ERROR_ALREADY_ASSIGNED 85
+#define os2_ERROR_INVALID_PASSWORD 86
+#define os2_ERROR_INVALID_PARAMETER 87
+#define os2_ERROR_NET_WRITE_FAULT 88
+#define os2_ERROR_NO_PROC_SLOTS 89
+#define os2_ERROR_NOT_FROZEN 90
+#define os2_ERROR_SYS_COMP_NOT_LOADED 90 /*!*/
+#define os2_ERROR_NO_ITEMS 93
+#define os2_ERROR_INTERRUPT 95
+#define os2_ERROR_DEVICE_IN_USE 99
+#define os2_ERROR_TOO_MANY_SEMAPHORES 100
+#define os2_ERROR_EXCL_SEM_ALREADY_OWNED 101
+#define os2_ERROR_SEM_IS_SET 102
+#define os2_ERROR_TOO_MANY_SEM_REQUESTS 103
+#define os2_ERROR_INVALID_AT_INTERRUPT_TIME 104
+#define os2_ERROR_SEM_OWNER_DIED 105
+#define os2_ERROR_SEM_USER_LIMIT 106
+#define os2_ERROR_DISK_CHANGE 107
+#define os2_ERROR_DRIVE_LOCKED 108
+#define os2_ERROR_BROKEN_PIPE 109
+#define os2_ERROR_OPEN_FAILED 110
+#define os2_ERROR_BUFFER_OVERFLOW 111
+#define os2_ERROR_DISK_FULL 112
+#define os2_ERROR_NO_MORE_SEARCH_HANDLES 113
+#define os2_ERROR_INVALID_TARGET_HANDLE 114
+#define os2_ERROR_PROTECTION_VIOLATION 115
+#define os2_ERROR_VIOKBD_REQUEST 116
+#define os2_ERROR_INVALID_CATEGORY 117
+#define os2_ERROR_INVALID_VERIFY_SWITCH 118
+#define os2_ERROR_BAD_DRIVER_LEVEL 119
+#define os2_ERROR_CALL_NOT_IMPLEMENTED 120
+#define os2_ERROR_SEM_TIMEOUT 121
+#define os2_ERROR_INSUFFICIENT_BUFFER 122
+#define os2_ERROR_INVALID_NAME 123
+#define os2_ERROR_INVALID_LEVEL 124
+#define os2_ERROR_NO_VOLUME_LABEL 125
+#define os2_ERROR_MOD_NOT_FOUND 126
+#define os2_ERROR_PROC_NOT_FOUND 127
+#define os2_ERROR_WAIT_NO_CHILDREN 128
+#define os2_ERROR_CHILD_NOT_COMPLETE 129
+#define os2_ERROR_DIRECT_ACCESS_HANDLE 130
+#define os2_ERROR_NEGATIVE_SEEK 131
+#define os2_ERROR_SEEK_ON_DEVICE 132
+#define os2_ERROR_IS_JOIN_TARGET 133
+#define os2_ERROR_IS_JOINED 134
+#define os2_ERROR_IS_SUBSTED 135
+#define os2_ERROR_NOT_JOINED 136
+#define os2_ERROR_NOT_SUBSTED 137
+#define os2_ERROR_JOIN_TO_JOIN 138
+#define os2_ERROR_SUBST_TO_SUBST 139
+#define os2_ERROR_JOIN_TO_SUBST 140
+#define os2_ERROR_SUBST_TO_JOIN 141
+#define os2_ERROR_BUSY_DRIVE 142
+#define os2_ERROR_SAME_DRIVE 143
+#define os2_ERROR_DIR_NOT_ROOT 144
+#define os2_ERROR_DIR_NOT_EMPTY 145
+#define os2_ERROR_IS_SUBST_PATH 146
+#define os2_ERROR_IS_JOIN_PATH 147
+#define os2_ERROR_PATH_BUSY 148
+#define os2_ERROR_IS_SUBST_TARGET 149
+#define os2_ERROR_SYSTEM_TRACE 150
+#define os2_ERROR_INVALID_EVENT_COUNT 151
+#define os2_ERROR_TOO_MANY_MUXWAITERS 152
+#define os2_ERROR_INVALID_LIST_FORMAT 153
+#define os2_ERROR_LABEL_TOO_LONG 154
+#define os2_ERROR_TOO_MANY_TCBS 155
+#define os2_ERROR_SIGNAL_REFUSED 156
+#define os2_ERROR_DISCARDED 157
+#define os2_ERROR_NOT_LOCKED 158
+#define os2_ERROR_BAD_THREADID_ADDR 159
+#define os2_ERROR_BAD_ARGUMENTS 160
+#define os2_ERROR_BAD_PATHNAME 161
+#define os2_ERROR_SIGNAL_PENDING 162
+#define os2_ERROR_UNCERTAIN_MEDIA 163
+#define os2_ERROR_MAX_THRDS_REACHED 164
+#define os2_ERROR_MONITORS_NOT_SUPPORTED 165
+#define os2_ERROR_UNC_DRIVER_NOT_INSTALLED 166
+#define os2_ERROR_LOCK_FAILED 167
+#define os2_ERROR_SWAPIO_FAILED 168
+#define os2_ERROR_SWAPIN_FAILED 169
+#define os2_ERROR_BUSY 170
+#define os2_ERROR_CANCEL_VIOLATION 173
+#define os2_ERROR_ATOMIC_LOCK_NOT_SUPPORTED 174
+#define os2_ERROR_READ_LOCKS_NOT_SUPPORTED 175
+#define os2_ERROR_INVALID_SEGMENT_NUMBER 180
+#define os2_ERROR_INVALID_CALLGATE 181
+#define os2_ERROR_INVALID_ORDINAL 182
+#define os2_ERROR_ALREADY_EXISTS 183
+#define os2_ERROR_NO_CHILD_PROCESS 184
+#define os2_ERROR_CHILD_ALIVE_NOWAIT 185
+#define os2_ERROR_INVALID_FLAG_NUMBER 186
+#define os2_ERROR_SEM_NOT_FOUND 187
+#define os2_ERROR_INVALID_STARTING_CODESEG 188
+#define os2_ERROR_INVALID_STACKSEG 189
+#define os2_ERROR_INVALID_MODULETYPE 190
+#define os2_ERROR_INVALID_EXE_SIGNATURE 191
+#define os2_ERROR_EXE_MARKED_INVALID 192
+#define os2_ERROR_BAD_EXE_FORMAT 193
+#define os2_ERROR_ITERATED_DATA_EXCEEDS_64K 194
+#define os2_ERROR_INVALID_MINALLOCSIZE 195
+#define os2_ERROR_DYNLINK_FROM_INVALID_RING 196
+#define os2_ERROR_IOPL_NOT_ENABLED 197
+#define os2_ERROR_INVALID_SEGDPL 198
+#define os2_ERROR_AUTODATASEG_EXCEEDS_64K 199
+#define os2_ERROR_RING2SEG_MUST_BE_MOVABLE 200
+#define os2_ERROR_RELOCSRC_CHAIN_EXCEEDS_SEGLIMIT 201
+#define os2_ERROR_INFLOOP_IN_RELOC_CHAIN 202
+#define os2_ERROR_ENVVAR_NOT_FOUND 203
+#define os2_ERROR_NOT_CURRENT_CTRY 204
+#define os2_ERROR_NO_SIGNAL_SENT 205
+#define os2_ERROR_FILENAME_EXCED_RANGE 206
+#define os2_ERROR_RING2_STACK_IN_USE 207
+#define os2_ERROR_META_EXPANSION_TOO_LONG 208
+#define os2_ERROR_INVALID_SIGNAL_NUMBER 209
+#define os2_ERROR_THREAD_1_INACTIVE 210
+#define os2_ERROR_INFO_NOT_AVAIL 211
+#define os2_ERROR_LOCKED 212
+#define os2_ERROR_BAD_DYNALINK 213
+#define os2_ERROR_TOO_MANY_MODULES 214
+#define os2_ERROR_NESTING_NOT_ALLOWED 215
+#define os2_ERROR_CANNOT_SHRINK 216
+#define os2_ERROR_ZOMBIE_PROCESS 217
+#define os2_ERROR_STACK_IN_HIGH_MEMORY 218
+#define os2_ERROR_INVALID_EXITROUTINE_RING 219
+#define os2_ERROR_GETBUF_FAILED 220
+#define os2_ERROR_FLUSHBUF_FAILED 221
+#define os2_ERROR_TRANSFER_TOO_LONG 222
+#define os2_ERROR_FORCENOSWAP_FAILED 223
+#define os2_ERROR_SMG_NO_TARGET_WINDOW 224
+#define os2_ERROR_NO_CHILDREN 228
+#define os2_ERROR_INVALID_SCREEN_GROUP 229
+#define os2_ERROR_BAD_PIPE 230
+#define os2_ERROR_PIPE_BUSY 231
+#define os2_ERROR_NO_DATA 232
+#define os2_ERROR_PIPE_NOT_CONNECTED 233
+#define os2_ERROR_MORE_DATA 234
+#define os2_ERROR_VC_DISCONNECTED 240
+#define os2_ERROR_CIRCULARITY_REQUESTED 250
+#define os2_ERROR_DIRECTORY_IN_CDS 251
+#define os2_ERROR_INVALID_FSD_NAME 252
+#define os2_ERROR_INVALID_PATH 253
+#define os2_ERROR_INVALID_EA_NAME 254
+#define os2_ERROR_EA_LIST_INCONSISTENT 255
+#define os2_ERROR_EA_LIST_TOO_LONG 256
+#define os2_ERROR_NO_META_MATCH 257
+#define os2_ERROR_FINDNOTIFY_TIMEOUT 258
+#define os2_ERROR_NO_MORE_ITEMS 259
+#define os2_ERROR_SEARCH_STRUC_REUSED 260
+#define os2_ERROR_CHAR_NOT_FOUND 261
+#define os2_ERROR_TOO_MUCH_STACK 262
+#define os2_ERROR_INVALID_ATTR 263
+#define os2_ERROR_INVALID_STARTING_RING 264
+#define os2_ERROR_INVALID_DLL_INIT_RING 265
+#define os2_ERROR_CANNOT_COPY 266
+#define os2_ERROR_DIRECTORY 267
+#define os2_ERROR_OPLOCKED_FILE 268
+#define os2_ERROR_OPLOCK_THREAD_EXISTS 269
+#define os2_ERROR_VOLUME_CHANGED 270
+#define os2_ERROR_FINDNOTIFY_HANDLE_IN_USE 271
+#define os2_ERROR_FINDNOTIFY_HANDLE_CLOSED 272
+#define os2_ERROR_NOTIFY_OBJECT_REMOVED 273
+#define os2_ERROR_ALREADY_SHUTDOWN 274
+#define os2_ERROR_EAS_DIDNT_FIT 275
+#define os2_ERROR_EA_FILE_CORRUPT 276
+#define os2_ERROR_EA_TABLE_FULL 277
+#define os2_ERROR_INVALID_EA_HANDLE 278
+#define os2_ERROR_NO_CLUSTER 279
+#define os2_ERROR_CREATE_EA_FILE 280
+#define os2_ERROR_CANNOT_OPEN_EA_FILE 281
+#define os2_ERROR_EAS_NOT_SUPPORTED 282
+#define os2_ERROR_NEED_EAS_FOUND 283
+#define os2_ERROR_DUPLICATE_HANDLE 284
+#define os2_ERROR_DUPLICATE_NAME 285
+#define os2_ERROR_EMPTY_MUXWAIT 286
+#define os2_ERROR_MUTEX_OWNED 287
+#define os2_ERROR_NOT_OWNER 288
+#define os2_ERROR_PARAM_TOO_SMALL 289
+#define os2_ERROR_TOO_MANY_HANDLES 290
+#define os2_ERROR_TOO_MANY_OPENS 291
+#define os2_ERROR_WRONG_TYPE 292
+#define os2_ERROR_UNUSED_CODE 293
+#define os2_ERROR_THREAD_NOT_TERMINATED 294
+#define os2_ERROR_INIT_ROUTINE_FAILED 295
+#define os2_ERROR_MODULE_IN_USE 296
+#define os2_ERROR_NOT_ENOUGH_WATCHPOINTS 297
+#define os2_ERROR_TOO_MANY_POSTS 298
+#define os2_ERROR_ALREADY_POSTED 299
+#define os2_ERROR_ALREADY_RESET 300
+#define os2_ERROR_SEM_BUSY 301
+#define os2_ERROR_INVALID_PROCID 303
+#define os2_ERROR_INVALID_PDELTA 304
+#define os2_ERROR_NOT_DESCENDANT 305
+#define os2_ERROR_NOT_SESSION_MANAGER 306
+#define os2_ERROR_INVALID_PCLASS 307
+#define os2_ERROR_INVALID_SCOPE 308
+#define os2_ERROR_INVALID_THREADID 309
+#define os2_ERROR_DOSSUB_SHRINK 310
+#define os2_ERROR_DOSSUB_NOMEM 311
+#define os2_ERROR_DOSSUB_OVERLAP 312
+#define os2_ERROR_DOSSUB_BADSIZE 313
+#define os2_ERROR_DOSSUB_BADFLAG 314
+#define os2_ERROR_DOSSUB_BADSELECTOR 315
+#define os2_ERROR_MR_MSG_TOO_LONG 316
+#define os2_ERROR_MR_MID_NOT_FOUND 317
+#define os2_ERROR_MR_UN_ACC_MSGF 318
+#define os2_ERROR_MR_INV_MSGF_FORMAT 319
+#define os2_ERROR_MR_INV_IVCOUNT 320
+#define os2_ERROR_MR_UN_PERFORM 321
+#define os2_ERROR_TS_WAKEUP 322
+#define os2_ERROR_TS_SEMHANDLE 323
+#define os2_ERROR_TS_NOTIMER 324
+#define os2_ERROR_TS_HANDLE 326
+#define os2_ERROR_TS_DATETIME 327
+#define os2_ERROR_SYS_INTERNAL 328
+#define os2_ERROR_QUE_CURRENT_NAME 329
+#define os2_ERROR_QUE_PROC_NOT_OWNED 330
+#define os2_ERROR_QUE_PROC_OWNED 331
+#define os2_ERROR_QUE_DUPLICATE 332
+#define os2_ERROR_QUE_ELEMENT_NOT_EXIST 333
+#define os2_ERROR_QUE_NO_MEMORY 334
+#define os2_ERROR_QUE_INVALID_NAME 335
+#define os2_ERROR_QUE_INVALID_PRIORITY 336
+#define os2_ERROR_QUE_INVALID_HANDLE 337
+#define os2_ERROR_QUE_LINK_NOT_FOUND 338
+#define os2_ERROR_QUE_MEMORY_ERROR 339
+#define os2_ERROR_QUE_PREV_AT_END 340
+#define os2_ERROR_QUE_PROC_NO_ACCESS 341
+#define os2_ERROR_QUE_EMPTY 342
+#define os2_ERROR_QUE_NAME_NOT_EXIST 343
+#define os2_ERROR_QUE_NOT_INITIALIZED 344
+#define os2_ERROR_QUE_UNABLE_TO_ACCESS 345
+#define os2_ERROR_QUE_UNABLE_TO_ADD 346
+#define os2_ERROR_QUE_UNABLE_TO_INIT 347
+#define os2_ERROR_VIO_INVALID_MASK 349
+#define os2_ERROR_VIO_PTR 350
+#define os2_ERROR_VIO_APTR 351
+#define os2_ERROR_VIO_RPTR 352
+#define os2_ERROR_VIO_CPTR 353
+#define os2_ERROR_VIO_LPTR 354
+#define os2_ERROR_VIO_MODE 355
+#define os2_ERROR_VIO_WIDTH 356
+#define os2_ERROR_VIO_ATTR 357
+#define os2_ERROR_VIO_ROW 358
+#define os2_ERROR_VIO_COL 359
+#define os2_ERROR_VIO_TOPROW 360
+#define os2_ERROR_VIO_BOTROW 361
+#define os2_ERROR_VIO_RIGHTCOL 362
+#define os2_ERROR_VIO_LEFTCOL 363
+#define os2_ERROR_SCS_CALL 364
+#define os2_ERROR_SCS_VALUE 365
+#define os2_ERROR_VIO_WAIT_FLAG 366
+#define os2_ERROR_VIO_UNLOCK 367
+#define os2_ERROR_SGS_NOT_SESSION_MGR 368
+#define os2_ERROR_SMG_INVALID_SGID 369
+#define os2_ERROR_SMG_INVALID_SESSION_ID 369 /*!*/
+#define os2_ERROR_SMG_NOSG 370
+#define os2_ERROR_SMG_NO_SESSIONS 370 /*!*/
+#define os2_ERROR_SMG_GRP_NOT_FOUND 371
+#define os2_ERROR_SMG_SESSION_NOT_FOUND 371 /*!*/
+#define os2_ERROR_SMG_SET_TITLE 372
+#define os2_ERROR_KBD_PARAMETER 373
+#define os2_ERROR_KBD_NO_DEVICE 374
+#define os2_ERROR_KBD_INVALID_IOWAIT 375
+#define os2_ERROR_KBD_INVALID_LENGTH 376
+#define os2_ERROR_KBD_INVALID_ECHO_MASK 377
+#define os2_ERROR_KBD_INVALID_INPUT_MASK 378
+#define os2_ERROR_MON_INVALID_PARMS 379
+#define os2_ERROR_MON_INVALID_DEVNAME 380
+#define os2_ERROR_MON_INVALID_HANDLE 381
+#define os2_ERROR_MON_BUFFER_TOO_SMALL 382
+#define os2_ERROR_MON_BUFFER_EMPTY 383
+#define os2_ERROR_MON_DATA_TOO_LARGE 384
+#define os2_ERROR_MOUSE_NO_DEVICE 385
+#define os2_ERROR_MOUSE_INV_HANDLE 386
+#define os2_ERROR_MOUSE_INV_PARMS 387
+#define os2_ERROR_MOUSE_CANT_RESET 388
+#define os2_ERROR_MOUSE_DISPLAY_PARMS 389
+#define os2_ERROR_MOUSE_INV_MODULE 390
+#define os2_ERROR_MOUSE_INV_ENTRY_PT 391
+#define os2_ERROR_MOUSE_INV_MASK 392
+#define os2_ERROR_INVALID_FREQUENCY 395
+#define os2_ERROR_NLS_NO_COUNTRY_FILE 396
+#define os2_ERROR_NLS_OPEN_FAILED 397
+#define os2_ERROR_NLS_NO_CTRY_CODE 398
+#define os2_ERROR_NLS_TABLE_TRUNCATED 399
+#define os2_ERROR_NLS_BAD_TYPE 400
+#define os2_ERROR_NLS_TYPE_NOT_FOUND 401
+#define os2_ERROR_VIO_SMG_ONLY 402
+#define os2_ERROR_VIO_INVALID_ASCIIZ 403
+#define os2_ERROR_VIO_DEREGISTER 404
+#define os2_ERROR_VIO_NO_POPUP 405
+#define os2_ERROR_VIO_EXISTING_POPUP 406
+#define os2_ERROR_KBD_SMG_ONLY 407
+#define os2_ERROR_KBD_INVALID_ASCIIZ 408
+#define os2_ERROR_KBD_INVALID_MASK 409
+#define os2_ERROR_KBD_REGISTER 410
+#define os2_ERROR_KBD_DEREGISTER 411
+#define os2_ERROR_MOUSE_SMG_ONLY 412
+#define os2_ERROR_MOUSE_INVALID_ASCIIZ 413
+#define os2_ERROR_MOUSE_INVALID_MASK 414
+#define os2_ERROR_MOUSE_REGISTER 415
+#define os2_ERROR_MOUSE_DEREGISTER 416
+#define os2_ERROR_SMG_BAD_ACTION 417
+#define os2_ERROR_SMG_INVALID_CALL 418
+#define os2_ERROR_SCS_SG_NOTFOUND 419
+#define os2_ERROR_SCS_NOT_SHELL 420
+#define os2_ERROR_VIO_INVALID_PARMS 421
+#define os2_ERROR_VIO_FUNCTION_OWNED 422
+#define os2_ERROR_VIO_RETURN 423
+#define os2_ERROR_SCS_INVALID_FUNCTION 424
+#define os2_ERROR_SCS_NOT_SESSION_MGR 425
+#define os2_ERROR_VIO_REGISTER 426
+#define os2_ERROR_VIO_NO_MODE_THREAD 427
+#define os2_ERROR_VIO_NO_SAVE_RESTORE_THD 428
+#define os2_ERROR_VIO_IN_BG 429
+#define os2_ERROR_VIO_ILLEGAL_DURING_POPUP 430
+#define os2_ERROR_SMG_NOT_BASESHELL 431
+#define os2_ERROR_SMG_BAD_STATUSREQ 432
+#define os2_ERROR_QUE_INVALID_WAIT 433
+#define os2_ERROR_VIO_LOCK 434
+#define os2_ERROR_MOUSE_INVALID_IOWAIT 435
+#define os2_ERROR_VIO_INVALID_HANDLE 436
+#define os2_ERROR_VIO_ILLEGAL_DURING_LOCK 437
+#define os2_ERROR_VIO_INVALID_LENGTH 438
+#define os2_ERROR_KBD_INVALID_HANDLE 439
+#define os2_ERROR_KBD_NO_MORE_HANDLE 440
+#define os2_ERROR_KBD_CANNOT_CREATE_KCB 441
+#define os2_ERROR_KBD_CODEPAGE_LOAD_INCOMPL 442
+#define os2_ERROR_KBD_INVALID_CODEPAGE_ID 443
+#define os2_ERROR_KBD_NO_CODEPAGE_SUPPORT 444
+#define os2_ERROR_KBD_FOCUS_REQUIRED 445
+#define os2_ERROR_KBD_FOCUS_ALREADY_ACTIVE 446
+#define os2_ERROR_KBD_KEYBOARD_BUSY 447
+#define os2_ERROR_KBD_INVALID_CODEPAGE 448
+#define os2_ERROR_KBD_UNABLE_TO_FOCUS 449
+#define os2_ERROR_SMG_SESSION_NON_SELECT 450
+#define os2_ERROR_SMG_SESSION_NOT_FOREGRND 451
+#define os2_ERROR_SMG_SESSION_NOT_PARENT 452
+#define os2_ERROR_SMG_INVALID_START_MODE 453
+#define os2_ERROR_SMG_INVALID_RELATED_OPT 454
+#define os2_ERROR_SMG_INVALID_BOND_OPTION 455
+#define os2_ERROR_SMG_INVALID_SELECT_OPT 456
+#define os2_ERROR_SMG_START_IN_BACKGROUND 457
+#define os2_ERROR_SMG_INVALID_STOP_OPTION 458
+#define os2_ERROR_SMG_BAD_RESERVE 459
+#define os2_ERROR_SMG_PROCESS_NOT_PARENT 460
+#define os2_ERROR_SMG_INVALID_DATA_LENGTH 461
+#define os2_ERROR_SMG_NOT_BOUND 462
+#define os2_ERROR_SMG_RETRY_SUB_ALLOC 463
+#define os2_ERROR_KBD_DETACHED 464
+#define os2_ERROR_VIO_DETACHED 465
+#define os2_ERROR_MOU_DETACHED 466
+#define os2_ERROR_VIO_FONT 467
+#define os2_ERROR_VIO_USER_FONT 468
+#define os2_ERROR_VIO_BAD_CP 469
+#define os2_ERROR_VIO_NO_CP 470
+#define os2_ERROR_VIO_NA_CP 471
+#define os2_ERROR_INVALID_CODE_PAGE 472
+#define os2_ERROR_CPLIST_TOO_SMALL 473
+#define os2_ERROR_CP_NOT_MOVED 474
+#define os2_ERROR_MODE_SWITCH_INIT 475
+#define os2_ERROR_CODE_PAGE_NOT_FOUND 476
+#define os2_ERROR_UNEXPECTED_SLOT_RETURNED 477
+#define os2_ERROR_SMG_INVALID_TRACE_OPTION 478
+#define os2_ERROR_VIO_INTERNAL_RESOURCE 479
+#define os2_ERROR_VIO_SHELL_INIT 480
+#define os2_ERROR_SMG_NO_HARD_ERRORS 481
+#define os2_ERROR_CP_SWITCH_INCOMPLETE 482
+#define os2_ERROR_VIO_TRANSPARENT_POPUP 483
+#define os2_ERROR_CRITSEC_OVERFLOW 484
+#define os2_ERROR_CRITSEC_UNDERFLOW 485
+#define os2_ERROR_VIO_BAD_RESERVE 486
+#define os2_ERROR_INVALID_ADDRESS 487
+#define os2_ERROR_ZERO_SELECTORS_REQUESTED 488
+#define os2_ERROR_NOT_ENOUGH_SELECTORS_AVA 489
+#define os2_ERROR_INVALID_SELECTOR 490
+#define os2_ERROR_SMG_INVALID_PROGRAM_TYPE 491
+#define os2_ERROR_SMG_INVALID_PGM_CONTROL 492
+#define os2_ERROR_SMG_INVALID_INHERIT_OPT 493
+#define os2_ERROR_VIO_EXTENDED_SG 494
+#define os2_ERROR_VIO_NOT_PRES_MGR_SG 495
+#define os2_ERROR_VIO_SHIELD_OWNED 496
+#define os2_ERROR_VIO_NO_MORE_HANDLES 497
+#define os2_ERROR_VIO_SEE_ERROR_LOG 498
+#define os2_ERROR_VIO_ASSOCIATED_DC 499
+#define os2_ERROR_KBD_NO_CONSOLE 500
+#define os2_ERROR_MOUSE_NO_CONSOLE 501
+#define os2_ERROR_MOUSE_INVALID_HANDLE 502
+#define os2_ERROR_SMG_INVALID_DEBUG_PARMS 503
+#define os2_ERROR_KBD_EXTENDED_SG 504
+#define os2_ERROR_MOU_EXTENDED_SG 505
+#define os2_ERROR_SMG_INVALID_ICON_FILE 506
+#define os2_ERROR_TRC_PID_NON_EXISTENT 507
+#define os2_ERROR_TRC_COUNT_ACTIVE 508
+#define os2_ERROR_TRC_SUSPENDED_BY_COUNT 509
+#define os2_ERROR_TRC_COUNT_INACTIVE 510
+#define os2_ERROR_TRC_COUNT_REACHED 511
+#define os2_ERROR_NO_MC_TRACE 512
+#define os2_ERROR_MC_TRACE 513
+#define os2_ERROR_TRC_COUNT_ZERO 514
+#define os2_ERROR_SMG_TOO_MANY_DDS 515
+#define os2_ERROR_SMG_INVALID_NOTIFICATION 516
+#define os2_ERROR_LF_INVALID_FUNCTION 517
+#define os2_ERROR_LF_NOT_AVAIL 518
+#define os2_ERROR_LF_SUSPENDED 519
+#define os2_ERROR_LF_BUF_TOO_SMALL 520
+#define os2_ERROR_LF_BUFFER_CORRUPTED 521
+#define os2_ERROR_LF_BUFFER_FULL 521 /*!*/
+#define os2_ERROR_LF_INVALID_DAEMON 522
+#define os2_ERROR_LF_INVALID_RECORD 522 /*!*/
+#define os2_ERROR_LF_INVALID_TEMPL 523
+#define os2_ERROR_LF_INVALID_SERVICE 523 /*!*/
+#define os2_ERROR_LF_GENERAL_FAILURE 524
+#define os2_ERROR_LF_INVALID_ID 525
+#define os2_ERROR_LF_INVALID_HANDLE 526
+#define os2_ERROR_LF_NO_ID_AVAIL 527
+#define os2_ERROR_LF_TEMPLATE_AREA_FULL 528
+#define os2_ERROR_LF_ID_IN_USE 529
+#define os2_ERROR_MOU_NOT_INITIALIZED 530
+#define os2_ERROR_MOUINITREAL_DONE 531
+#define os2_ERROR_DOSSUB_CORRUPTED 532
+#define os2_ERROR_MOUSE_CALLER_NOT_SUBSYS 533
+#define os2_ERROR_ARITHMETIC_OVERFLOW 534
+#define os2_ERROR_TMR_NO_DEVICE 535
+#define os2_ERROR_TMR_INVALID_TIME 536
+#define os2_ERROR_PVW_INVALID_ENTITY 537
+#define os2_ERROR_PVW_INVALID_ENTITY_TYPE 538
+#define os2_ERROR_PVW_INVALID_SPEC 539
+#define os2_ERROR_PVW_INVALID_RANGE_TYPE 540
+#define os2_ERROR_PVW_INVALID_COUNTER_BLK 541
+#define os2_ERROR_PVW_INVALID_TEXT_BLK 542
+#define os2_ERROR_PRF_NOT_INITIALIZED 543
+#define os2_ERROR_PRF_ALREADY_INITIALIZED 544
+#define os2_ERROR_PRF_NOT_STARTED 545
+#define os2_ERROR_PRF_ALREADY_STARTED 546
+#define os2_ERROR_PRF_TIMER_OUT_OF_RANGE 547
+#define os2_ERROR_PRF_TIMER_RESET 548
+#define os2_ERROR_VDD_LOCK_USEAGE_DENIED 639
+#define os2_ERROR_TIMEOUT 640
+#define os2_ERROR_VDM_DOWN 641
+#define os2_ERROR_VDM_LIMIT 642
+#define os2_ERROR_VDD_NOT_FOUND 643
+#define os2_ERROR_INVALID_CALLER 644
+#define os2_ERROR_PID_MISMATCH 645
+#define os2_ERROR_INVALID_VDD_HANDLE 646
+#define os2_ERROR_VLPT_NO_SPOOLER 647
+#define os2_ERROR_VCOM_DEVICE_BUSY 648
+#define os2_ERROR_VLPT_DEVICE_BUSY 649
+#define os2_ERROR_NESTING_TOO_DEEP 650
+#define os2_ERROR_VDD_MISSING 651
+#define os2_ERROR_BIDI_INVALID_LENGTH 671
+#define os2_ERROR_BIDI_INVALID_INCREMENT 672
+#define os2_ERROR_BIDI_INVALID_COMBINATION 673
+#define os2_ERROR_BIDI_INVALID_RESERVED 674
+#define os2_ERROR_BIDI_INVALID_EFFECT 675
+#define os2_ERROR_BIDI_INVALID_CSDREC 676
+#define os2_ERROR_BIDI_INVALID_CSDSTATE 677
+#define os2_ERROR_BIDI_INVALID_LEVEL 678
+#define os2_ERROR_BIDI_INVALID_TYPE_SUPPORT 679
+#define os2_ERROR_BIDI_INVALID_ORIENTATION 680
+#define os2_ERROR_BIDI_INVALID_NUM_SHAPE 681
+#define os2_ERROR_BIDI_INVALID_CSD 682
+#define os2_ERROR_BIDI_NO_SUPPORT 683
+#define os2_ERROR_IMP_INVALID_PARM 691
+#define os2_ERROR_IMP_INVALID_LENGTH 692
+#define os2_ERROR_MON_BAD_BUFFER 730
+#define os2_ERROR_MODULE_CORRUPTED 731
+#define os2_ERROR_SM_OUTOF_SWAPFILE 1477
+#define os2_ERROR_LF_TIMEOUT 2055
+#define os2_ERROR_LF_SUSPEND_SUCCESS 2057
+#define os2_ERROR_LF_RESUME_SUCCESS 2058
+#define os2_ERROR_LF_REDIRECT_SUCCESS 2059
+#define os2_ERROR_LF_REDIRECT_FAILURE 2060
+#define os2_ERROR_SWAPPER_NOT_ACTIVE 32768
+#define os2_ERROR_INVALID_SWAPID 32769
+#define os2_ERROR_IOERR_SWAP_FILE 32770
+#define os2_ERROR_SWAP_TABLE_FULL 32771
+#define os2_ERROR_SWAP_FILE_FULL 32772
+#define os2_ERROR_CANT_INIT_SWAPPER 32773
+#define os2_ERROR_SWAPPER_ALREADY_INIT 32774
+#define os2_ERROR_PMM_INSUFFICIENT_MEMORY 32775
+#define os2_ERROR_PMM_INVALID_FLAGS 32776
+#define os2_ERROR_PMM_INVALID_ADDRESS 32777
+#define os2_ERROR_PMM_LOCK_FAILED 32778
+#define os2_ERROR_PMM_UNLOCK_FAILED 32779
+#define os2_ERROR_PMM_MOVE_INCOMPLETE 32780
+#define os2_ERROR_UCOM_DRIVE_RENAMED 32781
+#define os2_ERROR_UCOM_FILENAME_TRUNCATED 32782
+#define os2_ERROR_UCOM_BUFFER_LENGTH 32783
+#define os2_ERROR_MON_CHAIN_HANDLE 32784
+#define os2_ERROR_MON_NOT_REGISTERED 32785
+#define os2_ERROR_SMG_ALREADY_TOP 32786
+#define os2_ERROR_PMM_ARENA_MODIFIED 32787
+#define os2_ERROR_SMG_PRINTER_OPEN 32788
+#define os2_ERROR_PMM_SET_FLAGS_FAILED 32789
+#define os2_ERROR_INVALID_DOS_DD 32790
+#define os2_ERROR_BLOCKED 32791
+#define os2_ERROR_NOBLOCK 32792
+#define os2_ERROR_INSTANCE_SHARED 32793
+#define os2_ERROR_NO_OBJECT 32794
+#define os2_ERROR_PARTIAL_ATTACH 32795
+#define os2_ERROR_INCACHE 32796
+#define os2_ERROR_SWAP_IO_PROBLEMS 32797
+#define os2_ERROR_CROSSES_OBJECT_BOUNDARY 32798
+#define os2_ERROR_LONGLOCK 32799
+#define os2_ERROR_SHORTLOCK 32800
+#define os2_ERROR_UVIRTLOCK 32801
+#define os2_ERROR_ALIASLOCK 32802
+#define os2_ERROR_ALIAS 32803
+#define os2_ERROR_NO_MORE_HANDLES 32804
+#define os2_ERROR_SCAN_TERMINATED 32805
+#define os2_ERROR_TERMINATOR_NOT_FOUND 32806
+#define os2_ERROR_NOT_DIRECT_CHILD 32807
+#define os2_ERROR_DELAY_FREE 32808
+#define os2_ERROR_GUARDPAGE 32809
+#define os2_ERROR_SWAPERROR 32900
+#define os2_ERROR_LDRERROR 32901
+#define os2_ERROR_NOMEMORY 32902
+#define os2_ERROR_NOACCESS 32903
+#define os2_ERROR_NO_DLL_TERM 32904
+#define os2_ERROR_CPSIO_CODE_PAGE_INVALID 65026
+#define os2_ERROR_CPSIO_NO_SPOOLER 65027
+#define os2_ERROR_CPSIO_FONT_ID_INVALID 65028
+#define os2_ERROR_CPSIO_INTERNAL_ERROR 65033
+#define os2_ERROR_CPSIO_INVALID_PTR_NAME 65034
+#define os2_ERROR_CPSIO_NOT_ACTIVE 65037
+#define os2_ERROR_CPSIO_PID_FULL 65039
+#define os2_ERROR_CPSIO_PID_NOT_FOUND 65040
+#define os2_ERROR_CPSIO_READ_CTL_SEQ 65043
+#define os2_ERROR_CPSIO_READ_FNT_DEF 65045
+#define os2_ERROR_CPSIO_WRITE_ERROR 65047
+#define os2_ERROR_CPSIO_WRITE_FULL_ERROR 65048
+#define os2_ERROR_CPSIO_WRITE_HANDLE_BAD 65049
+#define os2_ERROR_CPSIO_SWIT_LOAD 65074
+#define os2_ERROR_CPSIO_INV_COMMAND 65077
+#define os2_ERROR_CPSIO_NO_FONT_SWIT 65078
+#define os2_ERROR_ENTRY_IS_CALLGATE 65079
+#define os2_ERROR_USER_DEFINED_BASE 0xFF00
+#define os2_ERROR_I24_WRITE_PROTECT 0
+#define os2_ERROR_I24_BAD_UNIT 1
+#define os2_ERROR_I24_NOT_READY 2
+#define os2_ERROR_I24_BAD_COMMAND 3
+#define os2_ERROR_I24_CRC 4
+#define os2_ERROR_I24_BAD_LENGTH 5
+#define os2_ERROR_I24_SEEK 6
+#define os2_ERROR_I24_NOT_DOS_DISK 7
+#define os2_ERROR_I24_SECTOR_NOT_FOUND 8
+#define os2_ERROR_I24_OUT_OF_PAPER 9
+#define os2_ERROR_I24_WRITE_FAULT 10
+#define os2_ERROR_I24_READ_FAULT 11
+#define os2_ERROR_I24_GEN_FAILURE 12
+#define os2_ERROR_I24_DISK_CHANGE 13
+#define os2_ERROR_I24_WRONG_DISK 15
+#define os2_ERROR_I24_UNCERTAIN_MEDIA 16
+#define os2_ERROR_I24_CHAR_CALL_INTERRUPTED 17
+#define os2_ERROR_I24_NO_MONITOR_SUPPORT 18
+#define os2_ERROR_I24_INVALID_PARAMETER 19
+#define os2_ERROR_I24_DEVICE_IN_USE 20
+#define os2_ERROR_I24_QUIET_INIT_FAIL 21
 #define _PANOSE os2__PANOSE
 #define PANOSE os2_PANOSE
@@ -155 +759 @@
 #define FATTRS os2_FATTRS
 #define PFATTRS os2_PFATTRS
+#define os2_PAG_READ 0x0001
+#define os2_PAG_WRITE 0x0002
+#define os2_PAG_EXECUTE 0x0004
+#define os2_PAG_GUARD 0x0008
+#define os2_PAG_COMMIT 0x0010
+#define os2_PAG_DECOMMIT 0x0020
+#define os2_OBJ_TILE 0x0040
+#define os2_OBJ_PROTECTED 0x0080
+#define os2_OBJ_GETTABLE 0x0100
+#define os2_OBJ_GIVEABLE 0x0200
+#define os2_OBJ_ANY 0x0400
+#define os2_OBJ_SELMAPALL 0x0800
+#define os2_PAG_DEFAULT 0x0400
+#define os2_PAG_SHARED 0x2000
+#define os2_PAG_FREE 0x4000
+#define os2_PAG_BASE 0x00010000
+#define os2_PAG_NPOUT 0x0000
+#define os2_PAG_PRESENT 0x0001
+#define os2_PAG_NPIN 0x0002
+#define os2_PAG_PRESMASK 0x0003
+#define os2_PAG_INVALID 0x0000
+#define os2_PAG_RESIDENT 0x0010
+#define os2_PAG_SWAPPABLE 0x0020
+#define os2_PAG_DISCARDABLE 0x0030
+#define os2_PAG_TYPEMASK 0x0030
+#define os2_fPERM (os2_PAG_EXECUTE | os2_PAG_READ | os2_PAG_WRITE)
+#define os2_fSHARE (os2_OBJ_GETTABLE | os2_OBJ_GIVEABLE)
+#define os2_fALLOC (fPERM | os2_OBJ_TILE | os2_PAG_COMMIT)
+#define os2_fALLOCSHR (fPERM | fSHARE | os2_OBJ_TILE | os2_PAG_COMMIT)
+#define os2_fSET (fPERM|os2_PAG_COMMIT|os2_PAG_DECOMMIT|os2_PAG_DEFAULT)
 #define HFILE os2_HFILE
 #define PHFILE os2_PHFILE
@@ -282 +916 @@
 #define LISTIOL os2_LISTIOL
 #define PLISTIOL os2_PLISTIOL
+#define os2_ERROR_OCCURRED 0x0080
 #define _DCBINFO os2__DCBINFO
 #define DCBINFO os2_DCBINFO
@@ -1847 +2482 @@
 #define LINFOSEG os2_LINFOSEG
 #define PLINFOSEG os2_PLINFOSEG
+#define os2_OBJ_LOCATION 0x01000000
+#define os2_OBJ_FORK 0x02000000
+#define os2_DosAllocMem (a, b, c)       DosAllocMemEx((a),(b),(c) | os2_OBJ_FORK)
+#define os2_DosAllocSharedMem (a,b,c,d) DosAllocSharedMemEx((a),(b),(c),(d) | os2_OBJ_FORK)
 
 /* include the main OS/2 API wrapper */
 #include <os2wrap.h>
-
-/*
-   Undefine all typedefs prefixed with "os2_" at the beginning and original
-   versions of macros. The command to generate this block is:
-
-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|QSV|RGN|RT|SEM|SEVERITY|SIS|SV|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
@@ -1882 +2496 @@
 #undef OFFSETOF
 #undef _THUNK_PTR_SIZE_OK
+
 #undef APIENTRY
 #undef EXPENTRY
@@ -1982 +2597 @@
 #undef SEVERITY_SEVERE
 #undef SEVERITY_UNRECOVERABLE
+#undef NO_ERROR
+#undef ERROR_INVALID_FUNCTION
+#undef ERROR_FILE_NOT_FOUND
+#undef ERROR_PATH_NOT_FOUND
+#undef ERROR_TOO_MANY_OPEN_FILES
+#undef ERROR_ACCESS_DENIED
+#undef ERROR_INVALID_HANDLE
+#undef ERROR_ARENA_TRASHED
+#undef ERROR_NOT_ENOUGH_MEMORY
+#undef ERROR_INVALID_BLOCK
+#undef ERROR_BAD_ENVIRONMENT
+#undef ERROR_BAD_FORMAT
+#undef ERROR_INVALID_ACCESS
+#undef ERROR_INVALID_DATA
+#undef ERROR_INVALID_DRIVE
+#undef ERROR_CURRENT_DIRECTORY
+#undef ERROR_NOT_SAME_DEVICE
+#undef ERROR_NO_MORE_FILES
+#undef ERROR_WRITE_PROTECT
+#undef ERROR_BAD_UNIT
+#undef ERROR_NOT_READY
+#undef ERROR_BAD_COMMAND
+#undef ERROR_CRC
+#undef ERROR_BAD_LENGTH
+#undef ERROR_SEEK
+#undef ERROR_NOT_DOS_DISK
+#undef ERROR_SECTOR_NOT_FOUND
+#undef ERROR_OUT_OF_PAPER
+#undef ERROR_WRITE_FAULT
+#undef ERROR_READ_FAULT
+#undef ERROR_GEN_FAILURE
+#undef ERROR_SHARING_VIOLATION
+#undef ERROR_LOCK_VIOLATION
+#undef ERROR_WRONG_DISK
+#undef ERROR_FCB_UNAVAILABLE
+#undef ERROR_SHARING_BUFFER_EXCEEDED
+#undef ERROR_CODE_PAGE_MISMATCHED
+#undef ERROR_HANDLE_EOF
+#undef ERROR_HANDLE_DISK_FULL
+#undef ERROR_NOT_SUPPORTED
+#undef ERROR_REM_NOT_LIST
+#undef ERROR_DUP_NAME
+#undef ERROR_BAD_NETPATH
+#undef ERROR_NETWORK_BUSY
+#undef ERROR_DEV_NOT_EXIST
+#undef ERROR_TOO_MANY_CMDS
+#undef ERROR_ADAP_HDW_ERR
+#undef ERROR_BAD_NET_RESP
+#undef ERROR_UNEXP_NET_ERR
+#undef ERROR_BAD_REM_ADAP
+#undef ERROR_PRINTQ_FULL
+#undef ERROR_NO_SPOOL_SPACE
+#undef ERROR_PRINT_CANCELLED
+#undef ERROR_NETNAME_DELETED
+#undef ERROR_NETWORK_ACCESS_DENIED
+#undef ERROR_BAD_DEV_TYPE
+#undef ERROR_BAD_NET_NAME
+#undef ERROR_TOO_MANY_NAMES
+#undef ERROR_TOO_MANY_SESS
+#undef ERROR_SHARING_PAUSED
+#undef ERROR_REQ_NOT_ACCEP
+#undef ERROR_REDIR_PAUSED
+#undef ERROR_SBCS_ATT_WRITE_PROT
+#undef ERROR_SBCS_GENERAL_FAILURE
+#undef ERROR_XGA_OUT_MEMORY
+#undef ERROR_FILE_EXISTS
+#undef ERROR_DUP_FCB
+#undef ERROR_CANNOT_MAKE
+#undef ERROR_FAIL_I24
+#undef ERROR_OUT_OF_STRUCTURES
+#undef ERROR_ALREADY_ASSIGNED
+#undef ERROR_INVALID_PASSWORD
+#undef ERROR_INVALID_PARAMETER
+#undef ERROR_NET_WRITE_FAULT
+#undef ERROR_NO_PROC_SLOTS
+#undef ERROR_NOT_FROZEN
+#undef ERROR_SYS_COMP_NOT_LOADED
+#undef ERROR_NO_ITEMS
+#undef ERROR_INTERRUPT
+#undef ERROR_DEVICE_IN_USE
+#undef ERROR_TOO_MANY_SEMAPHORES
+#undef ERROR_EXCL_SEM_ALREADY_OWNED
+#undef ERROR_SEM_IS_SET
+#undef ERROR_TOO_MANY_SEM_REQUESTS
+#undef ERROR_INVALID_AT_INTERRUPT_TIME
+#undef ERROR_SEM_OWNER_DIED
+#undef ERROR_SEM_USER_LIMIT
+#undef ERROR_DISK_CHANGE
+#undef ERROR_DRIVE_LOCKED
+#undef ERROR_BROKEN_PIPE
+#undef ERROR_OPEN_FAILED
+#undef ERROR_BUFFER_OVERFLOW
+#undef ERROR_DISK_FULL
+#undef ERROR_NO_MORE_SEARCH_HANDLES
+#undef ERROR_INVALID_TARGET_HANDLE
+#undef ERROR_PROTECTION_VIOLATION
+#undef ERROR_VIOKBD_REQUEST
+#undef ERROR_INVALID_CATEGORY
+#undef ERROR_INVALID_VERIFY_SWITCH
+#undef ERROR_BAD_DRIVER_LEVEL
+#undef ERROR_CALL_NOT_IMPLEMENTED
+#undef ERROR_SEM_TIMEOUT
+#undef ERROR_INSUFFICIENT_BUFFER
+#undef ERROR_INVALID_NAME
+#undef ERROR_INVALID_LEVEL
+#undef ERROR_NO_VOLUME_LABEL
+#undef ERROR_MOD_NOT_FOUND
+#undef ERROR_PROC_NOT_FOUND
+#undef ERROR_WAIT_NO_CHILDREN
+#undef ERROR_CHILD_NOT_COMPLETE
+#undef ERROR_DIRECT_ACCESS_HANDLE
+#undef ERROR_NEGATIVE_SEEK
+#undef ERROR_SEEK_ON_DEVICE
+#undef ERROR_IS_JOIN_TARGET
+#undef ERROR_IS_JOINED
+#undef ERROR_IS_SUBSTED
+#undef ERROR_NOT_JOINED
+#undef ERROR_NOT_SUBSTED
+#undef ERROR_JOIN_TO_JOIN
+#undef ERROR_SUBST_TO_SUBST
+#undef ERROR_JOIN_TO_SUBST
+#undef ERROR_SUBST_TO_JOIN
+#undef ERROR_BUSY_DRIVE
+#undef ERROR_SAME_DRIVE
+#undef ERROR_DIR_NOT_ROOT
+#undef ERROR_DIR_NOT_EMPTY
+#undef ERROR_IS_SUBST_PATH
+#undef ERROR_IS_JOIN_PATH
+#undef ERROR_PATH_BUSY
+#undef ERROR_IS_SUBST_TARGET
+#undef ERROR_SYSTEM_TRACE
+#undef ERROR_INVALID_EVENT_COUNT
+#undef ERROR_TOO_MANY_MUXWAITERS
+#undef ERROR_INVALID_LIST_FORMAT
+#undef ERROR_LABEL_TOO_LONG
+#undef ERROR_TOO_MANY_TCBS
+#undef ERROR_SIGNAL_REFUSED
+#undef ERROR_DISCARDED
+#undef ERROR_NOT_LOCKED
+#undef ERROR_BAD_THREADID_ADDR
+#undef ERROR_BAD_ARGUMENTS
+#undef ERROR_BAD_PATHNAME
+#undef ERROR_SIGNAL_PENDING
+#undef ERROR_UNCERTAIN_MEDIA
+#undef ERROR_MAX_THRDS_REACHED
+#undef ERROR_MONITORS_NOT_SUPPORTED
+#undef ERROR_UNC_DRIVER_NOT_INSTALLED
+#undef ERROR_LOCK_FAILED
+#undef ERROR_SWAPIO_FAILED
+#undef ERROR_SWAPIN_FAILED
+#undef ERROR_BUSY
+#undef ERROR_CANCEL_VIOLATION
+#undef ERROR_ATOMIC_LOCK_NOT_SUPPORTED
+#undef ERROR_READ_LOCKS_NOT_SUPPORTED
+#undef ERROR_INVALID_SEGMENT_NUMBER
+#undef ERROR_INVALID_CALLGATE
+#undef ERROR_INVALID_ORDINAL
+#undef ERROR_ALREADY_EXISTS
+#undef ERROR_NO_CHILD_PROCESS
+#undef ERROR_CHILD_ALIVE_NOWAIT
+#undef ERROR_INVALID_FLAG_NUMBER
+#undef ERROR_SEM_NOT_FOUND
+#undef ERROR_INVALID_STARTING_CODESEG
+#undef ERROR_INVALID_STACKSEG
+#undef ERROR_INVALID_MODULETYPE
+#undef ERROR_INVALID_EXE_SIGNATURE
+#undef ERROR_EXE_MARKED_INVALID
+#undef ERROR_BAD_EXE_FORMAT
+#undef ERROR_ITERATED_DATA_EXCEEDS_64K
+#undef ERROR_INVALID_MINALLOCSIZE
+#undef ERROR_DYNLINK_FROM_INVALID_RING
+#undef ERROR_IOPL_NOT_ENABLED
+#undef ERROR_INVALID_SEGDPL
+#undef ERROR_AUTODATASEG_EXCEEDS_64K
+#undef ERROR_RING2SEG_MUST_BE_MOVABLE
+#undef ERROR_RELOCSRC_CHAIN_EXCEEDS_SEGLIMIT
+#undef ERROR_INFLOOP_IN_RELOC_CHAIN
+#undef ERROR_ENVVAR_NOT_FOUND
+#undef ERROR_NOT_CURRENT_CTRY
+#undef ERROR_NO_SIGNAL_SENT
+#undef ERROR_FILENAME_EXCED_RANGE
+#undef ERROR_RING2_STACK_IN_USE
+#undef ERROR_META_EXPANSION_TOO_LONG
+#undef ERROR_INVALID_SIGNAL_NUMBER
+#undef ERROR_THREAD_1_INACTIVE
+#undef ERROR_INFO_NOT_AVAIL
+#undef ERROR_LOCKED
+#undef ERROR_BAD_DYNALINK
+#undef ERROR_TOO_MANY_MODULES
+#undef ERROR_NESTING_NOT_ALLOWED
+#undef ERROR_CANNOT_SHRINK
+#undef ERROR_ZOMBIE_PROCESS
+#undef ERROR_STACK_IN_HIGH_MEMORY
+#undef ERROR_INVALID_EXITROUTINE_RING
+#undef ERROR_GETBUF_FAILED
+#undef ERROR_FLUSHBUF_FAILED
+#undef ERROR_TRANSFER_TOO_LONG
+#undef ERROR_FORCENOSWAP_FAILED
+#undef ERROR_SMG_NO_TARGET_WINDOW
+#undef ERROR_NO_CHILDREN
+#undef ERROR_INVALID_SCREEN_GROUP
+#undef ERROR_BAD_PIPE
+#undef ERROR_PIPE_BUSY
+#undef ERROR_NO_DATA
+#undef ERROR_PIPE_NOT_CONNECTED
+#undef ERROR_MORE_DATA
+#undef ERROR_VC_DISCONNECTED
+#undef ERROR_CIRCULARITY_REQUESTED
+#undef ERROR_DIRECTORY_IN_CDS
+#undef ERROR_INVALID_FSD_NAME
+#undef ERROR_INVALID_PATH
+#undef ERROR_INVALID_EA_NAME
+#undef ERROR_EA_LIST_INCONSISTENT
+#undef ERROR_EA_LIST_TOO_LONG
+#undef ERROR_NO_META_MATCH
+#undef ERROR_FINDNOTIFY_TIMEOUT
+#undef ERROR_NO_MORE_ITEMS
+#undef ERROR_SEARCH_STRUC_REUSED
+#undef ERROR_CHAR_NOT_FOUND
+#undef ERROR_TOO_MUCH_STACK
+#undef ERROR_INVALID_ATTR
+#undef ERROR_INVALID_STARTING_RING
+#undef ERROR_INVALID_DLL_INIT_RING
+#undef ERROR_CANNOT_COPY
+#undef ERROR_DIRECTORY
+#undef ERROR_OPLOCKED_FILE
+#undef ERROR_OPLOCK_THREAD_EXISTS
+#undef ERROR_VOLUME_CHANGED
+#undef ERROR_FINDNOTIFY_HANDLE_IN_USE
+#undef ERROR_FINDNOTIFY_HANDLE_CLOSED
+#undef ERROR_NOTIFY_OBJECT_REMOVED
+#undef ERROR_ALREADY_SHUTDOWN
+#undef ERROR_EAS_DIDNT_FIT
+#undef ERROR_EA_FILE_CORRUPT
+#undef ERROR_EA_TABLE_FULL
+#undef ERROR_INVALID_EA_HANDLE
+#undef ERROR_NO_CLUSTER
+#undef ERROR_CREATE_EA_FILE
+#undef ERROR_CANNOT_OPEN_EA_FILE
+#undef ERROR_EAS_NOT_SUPPORTED
+#undef ERROR_NEED_EAS_FOUND
+#undef ERROR_DUPLICATE_HANDLE
+#undef ERROR_DUPLICATE_NAME
+#undef ERROR_EMPTY_MUXWAIT
+#undef ERROR_MUTEX_OWNED
+#undef ERROR_NOT_OWNER
+#undef ERROR_PARAM_TOO_SMALL
+#undef ERROR_TOO_MANY_HANDLES
+#undef ERROR_TOO_MANY_OPENS
+#undef ERROR_WRONG_TYPE
+#undef ERROR_UNUSED_CODE
+#undef ERROR_THREAD_NOT_TERMINATED
+#undef ERROR_INIT_ROUTINE_FAILED
+#undef ERROR_MODULE_IN_USE
+#undef ERROR_NOT_ENOUGH_WATCHPOINTS
+#undef ERROR_TOO_MANY_POSTS
+#undef ERROR_ALREADY_POSTED
+#undef ERROR_ALREADY_RESET
+#undef ERROR_SEM_BUSY
+#undef ERROR_INVALID_PROCID
+#undef ERROR_INVALID_PDELTA
+#undef ERROR_NOT_DESCENDANT
+#undef ERROR_NOT_SESSION_MANAGER
+#undef ERROR_INVALID_PCLASS
+#undef ERROR_INVALID_SCOPE
+#undef ERROR_INVALID_THREADID
+#undef ERROR_DOSSUB_SHRINK
+#undef ERROR_DOSSUB_NOMEM
+#undef ERROR_DOSSUB_OVERLAP
+#undef ERROR_DOSSUB_BADSIZE
+#undef ERROR_DOSSUB_BADFLAG
+#undef ERROR_DOSSUB_BADSELECTOR
+#undef ERROR_MR_MSG_TOO_LONG
+#undef ERROR_MR_MID_NOT_FOUND
+#undef ERROR_MR_UN_ACC_MSGF
+#undef ERROR_MR_INV_MSGF_FORMAT
+#undef ERROR_MR_INV_IVCOUNT
+#undef ERROR_MR_UN_PERFORM
+#undef ERROR_TS_WAKEUP
+#undef ERROR_TS_SEMHANDLE
+#undef ERROR_TS_NOTIMER
+#undef ERROR_TS_HANDLE
+#undef ERROR_TS_DATETIME
+#undef ERROR_SYS_INTERNAL
+#undef ERROR_QUE_CURRENT_NAME
+#undef ERROR_QUE_PROC_NOT_OWNED
+#undef ERROR_QUE_PROC_OWNED
+#undef ERROR_QUE_DUPLICATE
+#undef ERROR_QUE_ELEMENT_NOT_EXIST
+#undef ERROR_QUE_NO_MEMORY
+#undef ERROR_QUE_INVALID_NAME
+#undef ERROR_QUE_INVALID_PRIORITY
+#undef ERROR_QUE_INVALID_HANDLE
+#undef ERROR_QUE_LINK_NOT_FOUND
+#undef ERROR_QUE_MEMORY_ERROR
+#undef ERROR_QUE_PREV_AT_END
+#undef ERROR_QUE_PROC_NO_ACCESS
+#undef ERROR_QUE_EMPTY
+#undef ERROR_QUE_NAME_NOT_EXIST
+#undef ERROR_QUE_NOT_INITIALIZED
+#undef ERROR_QUE_UNABLE_TO_ACCESS
+#undef ERROR_QUE_UNABLE_TO_ADD
+#undef ERROR_QUE_UNABLE_TO_INIT
+#undef ERROR_VIO_INVALID_MASK
+#undef ERROR_VIO_PTR
+#undef ERROR_VIO_APTR
+#undef ERROR_VIO_RPTR
+#undef ERROR_VIO_CPTR
+#undef ERROR_VIO_LPTR
+#undef ERROR_VIO_MODE
+#undef ERROR_VIO_WIDTH
+#undef ERROR_VIO_ATTR
+#undef ERROR_VIO_ROW
+#undef ERROR_VIO_COL
+#undef ERROR_VIO_TOPROW
+#undef ERROR_VIO_BOTROW
+#undef ERROR_VIO_RIGHTCOL
+#undef ERROR_VIO_LEFTCOL
+#undef ERROR_SCS_CALL
+#undef ERROR_SCS_VALUE
+#undef ERROR_VIO_WAIT_FLAG
+#undef ERROR_VIO_UNLOCK
+#undef ERROR_SGS_NOT_SESSION_MGR
+#undef ERROR_SMG_INVALID_SGID
+#undef ERROR_SMG_INVALID_SESSION_ID
+#undef ERROR_SMG_NOSG
+#undef ERROR_SMG_NO_SESSIONS
+#undef ERROR_SMG_GRP_NOT_FOUND
+#undef ERROR_SMG_SESSION_NOT_FOUND
+#undef ERROR_SMG_SET_TITLE
+#undef ERROR_KBD_PARAMETER
+#undef ERROR_KBD_NO_DEVICE
+#undef ERROR_KBD_INVALID_IOWAIT
+#undef ERROR_KBD_INVALID_LENGTH
+#undef ERROR_KBD_INVALID_ECHO_MASK
+#undef ERROR_KBD_INVALID_INPUT_MASK
+#undef ERROR_MON_INVALID_PARMS
+#undef ERROR_MON_INVALID_DEVNAME
+#undef ERROR_MON_INVALID_HANDLE
+#undef ERROR_MON_BUFFER_TOO_SMALL
+#undef ERROR_MON_BUFFER_EMPTY
+#undef ERROR_MON_DATA_TOO_LARGE
+#undef ERROR_MOUSE_NO_DEVICE
+#undef ERROR_MOUSE_INV_HANDLE
+#undef ERROR_MOUSE_INV_PARMS
+#undef ERROR_MOUSE_CANT_RESET
+#undef ERROR_MOUSE_DISPLAY_PARMS
+#undef ERROR_MOUSE_INV_MODULE
+#undef ERROR_MOUSE_INV_ENTRY_PT
+#undef ERROR_MOUSE_INV_MASK
+#undef ERROR_INVALID_FREQUENCY
+#undef ERROR_NLS_NO_COUNTRY_FILE
+#undef ERROR_NLS_OPEN_FAILED
+#undef ERROR_NLS_NO_CTRY_CODE
+#undef ERROR_NLS_TABLE_TRUNCATED
+#undef ERROR_NLS_BAD_TYPE
+#undef ERROR_NLS_TYPE_NOT_FOUND
+#undef ERROR_VIO_SMG_ONLY
+#undef ERROR_VIO_INVALID_ASCIIZ
+#undef ERROR_VIO_DEREGISTER
+#undef ERROR_VIO_NO_POPUP
+#undef ERROR_VIO_EXISTING_POPUP
+#undef ERROR_KBD_SMG_ONLY
+#undef ERROR_KBD_INVALID_ASCIIZ
+#undef ERROR_KBD_INVALID_MASK
+#undef ERROR_KBD_REGISTER
+#undef ERROR_KBD_DEREGISTER
+#undef ERROR_MOUSE_SMG_ONLY
+#undef ERROR_MOUSE_INVALID_ASCIIZ
+#undef ERROR_MOUSE_INVALID_MASK
+#undef ERROR_MOUSE_REGISTER
+#undef ERROR_MOUSE_DEREGISTER
+#undef ERROR_SMG_BAD_ACTION
+#undef ERROR_SMG_INVALID_CALL
+#undef ERROR_SCS_SG_NOTFOUND
+#undef ERROR_SCS_NOT_SHELL
+#undef ERROR_VIO_INVALID_PARMS
+#undef ERROR_VIO_FUNCTION_OWNED
+#undef ERROR_VIO_RETURN
+#undef ERROR_SCS_INVALID_FUNCTION
+#undef ERROR_SCS_NOT_SESSION_MGR
+#undef ERROR_VIO_REGISTER
+#undef ERROR_VIO_NO_MODE_THREAD
+#undef ERROR_VIO_NO_SAVE_RESTORE_THD
+#undef ERROR_VIO_IN_BG
+#undef ERROR_VIO_ILLEGAL_DURING_POPUP
+#undef ERROR_SMG_NOT_BASESHELL
+#undef ERROR_SMG_BAD_STATUSREQ
+#undef ERROR_QUE_INVALID_WAIT
+#undef ERROR_VIO_LOCK
+#undef ERROR_MOUSE_INVALID_IOWAIT
+#undef ERROR_VIO_INVALID_HANDLE
+#undef ERROR_VIO_ILLEGAL_DURING_LOCK
+#undef ERROR_VIO_INVALID_LENGTH
+#undef ERROR_KBD_INVALID_HANDLE
+#undef ERROR_KBD_NO_MORE_HANDLE
+#undef ERROR_KBD_CANNOT_CREATE_KCB
+#undef ERROR_KBD_CODEPAGE_LOAD_INCOMPL
+#undef ERROR_KBD_INVALID_CODEPAGE_ID
+#undef ERROR_KBD_NO_CODEPAGE_SUPPORT
+#undef ERROR_KBD_FOCUS_REQUIRED
+#undef ERROR_KBD_FOCUS_ALREADY_ACTIVE
+#undef ERROR_KBD_KEYBOARD_BUSY
+#undef ERROR_KBD_INVALID_CODEPAGE
+#undef ERROR_KBD_UNABLE_TO_FOCUS
+#undef ERROR_SMG_SESSION_NON_SELECT
+#undef ERROR_SMG_SESSION_NOT_FOREGRND
+#undef ERROR_SMG_SESSION_NOT_PARENT
+#undef ERROR_SMG_INVALID_START_MODE
+#undef ERROR_SMG_INVALID_RELATED_OPT
+#undef ERROR_SMG_INVALID_BOND_OPTION
+#undef ERROR_SMG_INVALID_SELECT_OPT
+#undef ERROR_SMG_START_IN_BACKGROUND
+#undef ERROR_SMG_INVALID_STOP_OPTION
+#undef ERROR_SMG_BAD_RESERVE
+#undef ERROR_SMG_PROCESS_NOT_PARENT
+#undef ERROR_SMG_INVALID_DATA_LENGTH
+#undef ERROR_SMG_NOT_BOUND
+#undef ERROR_SMG_RETRY_SUB_ALLOC
+#undef ERROR_KBD_DETACHED
+#undef ERROR_VIO_DETACHED
+#undef ERROR_MOU_DETACHED
+#undef ERROR_VIO_FONT
+#undef ERROR_VIO_USER_FONT
+#undef ERROR_VIO_BAD_CP
+#undef ERROR_VIO_NO_CP
+#undef ERROR_VIO_NA_CP
+#undef ERROR_INVALID_CODE_PAGE
+#undef ERROR_CPLIST_TOO_SMALL
+#undef ERROR_CP_NOT_MOVED
+#undef ERROR_MODE_SWITCH_INIT
+#undef ERROR_CODE_PAGE_NOT_FOUND
+#undef ERROR_UNEXPECTED_SLOT_RETURNED
+#undef ERROR_SMG_INVALID_TRACE_OPTION
+#undef ERROR_VIO_INTERNAL_RESOURCE
+#undef ERROR_VIO_SHELL_INIT
+#undef ERROR_SMG_NO_HARD_ERRORS
+#undef ERROR_CP_SWITCH_INCOMPLETE
+#undef ERROR_VIO_TRANSPARENT_POPUP
+#undef ERROR_CRITSEC_OVERFLOW
+#undef ERROR_CRITSEC_UNDERFLOW
+#undef ERROR_VIO_BAD_RESERVE
+#undef ERROR_INVALID_ADDRESS
+#undef ERROR_ZERO_SELECTORS_REQUESTED
+#undef ERROR_NOT_ENOUGH_SELECTORS_AVA
+#undef ERROR_INVALID_SELECTOR
+#undef ERROR_SMG_INVALID_PROGRAM_TYPE
+#undef ERROR_SMG_INVALID_PGM_CONTROL
+#undef ERROR_SMG_INVALID_INHERIT_OPT
+#undef ERROR_VIO_EXTENDED_SG
+#undef ERROR_VIO_NOT_PRES_MGR_SG
+#undef ERROR_VIO_SHIELD_OWNED
+#undef ERROR_VIO_NO_MORE_HANDLES
+#undef ERROR_VIO_SEE_ERROR_LOG
+#undef ERROR_VIO_ASSOCIATED_DC
+#undef ERROR_KBD_NO_CONSOLE
+#undef ERROR_MOUSE_NO_CONSOLE
+#undef ERROR_MOUSE_INVALID_HANDLE
+#undef ERROR_SMG_INVALID_DEBUG_PARMS
+#undef ERROR_KBD_EXTENDED_SG
+#undef ERROR_MOU_EXTENDED_SG
+#undef ERROR_SMG_INVALID_ICON_FILE
+#undef ERROR_TRC_PID_NON_EXISTENT
+#undef ERROR_TRC_COUNT_ACTIVE
+#undef ERROR_TRC_SUSPENDED_BY_COUNT
+#undef ERROR_TRC_COUNT_INACTIVE
+#undef ERROR_TRC_COUNT_REACHED
+#undef ERROR_NO_MC_TRACE
+#undef ERROR_MC_TRACE
+#undef ERROR_TRC_COUNT_ZERO
+#undef ERROR_SMG_TOO_MANY_DDS
+#undef ERROR_SMG_INVALID_NOTIFICATION
+#undef ERROR_LF_INVALID_FUNCTION
+#undef ERROR_LF_NOT_AVAIL
+#undef ERROR_LF_SUSPENDED
+#undef ERROR_LF_BUF_TOO_SMALL
+#undef ERROR_LF_BUFFER_CORRUPTED
+#undef ERROR_LF_BUFFER_FULL
+#undef ERROR_LF_INVALID_DAEMON
+#undef ERROR_LF_INVALID_RECORD
+#undef ERROR_LF_INVALID_TEMPL
+#undef ERROR_LF_INVALID_SERVICE
+#undef ERROR_LF_GENERAL_FAILURE
+#undef ERROR_LF_INVALID_ID
+#undef ERROR_LF_INVALID_HANDLE
+#undef ERROR_LF_NO_ID_AVAIL
+#undef ERROR_LF_TEMPLATE_AREA_FULL
+#undef ERROR_LF_ID_IN_USE
+#undef ERROR_MOU_NOT_INITIALIZED
+#undef ERROR_MOUINITREAL_DONE
+#undef ERROR_DOSSUB_CORRUPTED
+#undef ERROR_MOUSE_CALLER_NOT_SUBSYS
+#undef ERROR_ARITHMETIC_OVERFLOW
+#undef ERROR_TMR_NO_DEVICE
+#undef ERROR_TMR_INVALID_TIME
+#undef ERROR_PVW_INVALID_ENTITY
+#undef ERROR_PVW_INVALID_ENTITY_TYPE
+#undef ERROR_PVW_INVALID_SPEC
+#undef ERROR_PVW_INVALID_RANGE_TYPE
+#undef ERROR_PVW_INVALID_COUNTER_BLK
+#undef ERROR_PVW_INVALID_TEXT_BLK
+#undef ERROR_PRF_NOT_INITIALIZED
+#undef ERROR_PRF_ALREADY_INITIALIZED
+#undef ERROR_PRF_NOT_STARTED
+#undef ERROR_PRF_ALREADY_STARTED
+#undef ERROR_PRF_TIMER_OUT_OF_RANGE
+#undef ERROR_PRF_TIMER_RESET
+#undef ERROR_VDD_LOCK_USEAGE_DENIED
+#undef ERROR_TIMEOUT
+#undef ERROR_VDM_DOWN
+#undef ERROR_VDM_LIMIT
+#undef ERROR_VDD_NOT_FOUND
+#undef ERROR_INVALID_CALLER
+#undef ERROR_PID_MISMATCH
+#undef ERROR_INVALID_VDD_HANDLE
+#undef ERROR_VLPT_NO_SPOOLER
+#undef ERROR_VCOM_DEVICE_BUSY
+#undef ERROR_VLPT_DEVICE_BUSY
+#undef ERROR_NESTING_TOO_DEEP
+#undef ERROR_VDD_MISSING
+#undef ERROR_BIDI_INVALID_LENGTH
+#undef ERROR_BIDI_INVALID_INCREMENT
+#undef ERROR_BIDI_INVALID_COMBINATION
+#undef ERROR_BIDI_INVALID_RESERVED
+#undef ERROR_BIDI_INVALID_EFFECT
+#undef ERROR_BIDI_INVALID_CSDREC
+#undef ERROR_BIDI_INVALID_CSDSTATE
+#undef ERROR_BIDI_INVALID_LEVEL
+#undef ERROR_BIDI_INVALID_TYPE_SUPPORT
+#undef ERROR_BIDI_INVALID_ORIENTATION
+#undef ERROR_BIDI_INVALID_NUM_SHAPE
+#undef ERROR_BIDI_INVALID_CSD
+#undef ERROR_BIDI_NO_SUPPORT
+#undef ERROR_IMP_INVALID_PARM
+#undef ERROR_IMP_INVALID_LENGTH
+#undef ERROR_MON_BAD_BUFFER
+#undef ERROR_MODULE_CORRUPTED
+#undef ERROR_SM_OUTOF_SWAPFILE
+#undef ERROR_LF_TIMEOUT
+#undef ERROR_LF_SUSPEND_SUCCESS
+#undef ERROR_LF_RESUME_SUCCESS
+#undef ERROR_LF_REDIRECT_SUCCESS
+#undef ERROR_LF_REDIRECT_FAILURE
+#undef ERROR_SWAPPER_NOT_ACTIVE
+#undef ERROR_INVALID_SWAPID
+#undef ERROR_IOERR_SWAP_FILE
+#undef ERROR_SWAP_TABLE_FULL
+#undef ERROR_SWAP_FILE_FULL
+#undef ERROR_CANT_INIT_SWAPPER
+#undef ERROR_SWAPPER_ALREADY_INIT
+#undef ERROR_PMM_INSUFFICIENT_MEMORY
+#undef ERROR_PMM_INVALID_FLAGS
+#undef ERROR_PMM_INVALID_ADDRESS
+#undef ERROR_PMM_LOCK_FAILED
+#undef ERROR_PMM_UNLOCK_FAILED
+#undef ERROR_PMM_MOVE_INCOMPLETE
+#undef ERROR_UCOM_DRIVE_RENAMED
+#undef ERROR_UCOM_FILENAME_TRUNCATED
+#undef ERROR_UCOM_BUFFER_LENGTH
+#undef ERROR_MON_CHAIN_HANDLE
+#undef ERROR_MON_NOT_REGISTERED
+#undef ERROR_SMG_ALREADY_TOP
+#undef ERROR_PMM_ARENA_MODIFIED
+#undef ERROR_SMG_PRINTER_OPEN
+#undef ERROR_PMM_SET_FLAGS_FAILED
+#undef ERROR_INVALID_DOS_DD
+#undef ERROR_BLOCKED
+#undef ERROR_NOBLOCK
+#undef ERROR_INSTANCE_SHARED
+#undef ERROR_NO_OBJECT
+#undef ERROR_PARTIAL_ATTACH
+#undef ERROR_INCACHE
+#undef ERROR_SWAP_IO_PROBLEMS
+#undef ERROR_CROSSES_OBJECT_BOUNDARY
+#undef ERROR_LONGLOCK
+#undef ERROR_SHORTLOCK
+#undef ERROR_UVIRTLOCK
+#undef ERROR_ALIASLOCK
+#undef ERROR_ALIAS
+#undef ERROR_NO_MORE_HANDLES
+#undef ERROR_SCAN_TERMINATED
+#undef ERROR_TERMINATOR_NOT_FOUND
+#undef ERROR_NOT_DIRECT_CHILD
+#undef ERROR_DELAY_FREE
+#undef ERROR_GUARDPAGE
+#undef ERROR_SWAPERROR
+#undef ERROR_LDRERROR
+#undef ERROR_NOMEMORY
+#undef ERROR_NOACCESS
+#undef ERROR_NO_DLL_TERM
+#undef ERROR_CPSIO_CODE_PAGE_INVALID
+#undef ERROR_CPSIO_NO_SPOOLER
+#undef ERROR_CPSIO_FONT_ID_INVALID
+#undef ERROR_CPSIO_INTERNAL_ERROR
+#undef ERROR_CPSIO_INVALID_PTR_NAME
+#undef ERROR_CPSIO_NOT_ACTIVE
+#undef ERROR_CPSIO_PID_FULL
+#undef ERROR_CPSIO_PID_NOT_FOUND
+#undef ERROR_CPSIO_READ_CTL_SEQ
+#undef ERROR_CPSIO_READ_FNT_DEF
+#undef ERROR_CPSIO_WRITE_ERROR
+#undef ERROR_CPSIO_WRITE_FULL_ERROR
+#undef ERROR_CPSIO_WRITE_HANDLE_BAD
+#undef ERROR_CPSIO_SWIT_LOAD
+#undef ERROR_CPSIO_INV_COMMAND
+#undef ERROR_CPSIO_NO_FONT_SWIT
+#undef ERROR_ENTRY_IS_CALLGATE
+#undef ERROR_USER_DEFINED_BASE
+#undef ERROR_I24_WRITE_PROTECT
+#undef ERROR_I24_BAD_UNIT
+#undef ERROR_I24_NOT_READY
+#undef ERROR_I24_BAD_COMMAND
+#undef ERROR_I24_CRC
+#undef ERROR_I24_BAD_LENGTH
+#undef ERROR_I24_SEEK
+#undef ERROR_I24_NOT_DOS_DISK
+#undef ERROR_I24_SECTOR_NOT_FOUND
+#undef ERROR_I24_OUT_OF_PAPER
+#undef ERROR_I24_WRITE_FAULT
+#undef ERROR_I24_READ_FAULT
+#undef ERROR_I24_GEN_FAILURE
+#undef ERROR_I24_DISK_CHANGE
+#undef ERROR_I24_WRONG_DISK
+#undef ERROR_I24_UNCERTAIN_MEDIA
+#undef ERROR_I24_CHAR_CALL_INTERRUPTED
+#undef ERROR_I24_NO_MONITOR_SUPPORT
+#undef ERROR_I24_INVALID_PARAMETER
+#undef ERROR_I24_DEVICE_IN_USE
+#undef ERROR_I24_QUIET_INIT_FAIL
 #undef _PANOSE
 #undef PANOSE
@@ -1990 +3234 @@
 #undef FATTRS
 #undef PFATTRS
+#undef PAG_READ
+#undef PAG_WRITE
+#undef PAG_EXECUTE
+#undef PAG_GUARD
+#undef PAG_COMMIT
+#undef PAG_DECOMMIT
+#undef OBJ_TILE
+#undef OBJ_PROTECTED
+#undef OBJ_GETTABLE
+#undef OBJ_GIVEABLE
+#undef OBJ_ANY
+#undef OBJ_SELMAPALL
+#undef PAG_DEFAULT
+#undef PAG_SHARED
+#undef PAG_FREE
+#undef PAG_BASE
+#undef PAG_NPOUT
+#undef PAG_PRESENT
+#undef PAG_NPIN
+#undef PAG_PRESMASK
+#undef PAG_INVALID
+#undef PAG_RESIDENT
+#undef PAG_SWAPPABLE
+#undef PAG_DISCARDABLE
+#undef PAG_TYPEMASK
+#undef fPERM
+#undef fSHARE
+#undef fALLOC
+#undef fALLOCSHR
+#undef fSET
 #undef HFILE
 #undef PHFILE
@@ -2117 +3391 @@
 #undef LISTIOL
 #undef PLISTIOL
+#undef ERROR_OCCURRED
 #undef _DCBINFO
 #undef DCBINFO
@@ -3642 +4917 @@
 #undef LINFOSEG
 #undef PLINFOSEG
+#undef OBJ_LOCATION
+#undef OBJ_FORK
+#undef DosAllocMem
+#undef DosAllocSharedMem
 
 #endif /* __OS2WRAP2_H__ */
+