diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 2cbfb53..6ca58ec 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,5 +1,10 @@
 2012-07-27  Corinna Vinschen  <vinschen@redhat.com>
 
+	* Throughout, use __MSABI_LONG macro rather than 'L' qualifier
+	for numerical constants.
+
+2012-07-27  Corinna Vinschen  <vinschen@redhat.com>
+
 	* cdoex.h: Throughout, drop 'L' qualifier from numerical constants
 	defining const value.
 	* cdosys.h: Ditto.
diff --git a/mingw-w64-headers/include/accctrl.h b/mingw-w64-headers/include/accctrl.h
index 2262e9a..10b9cb5 100644
--- a/mingw-w64-headers/include/accctrl.h
+++ b/mingw-w64-headers/include/accctrl.h
@@ -209,14 +209,14 @@
     __MINGW_TYPEDEF_AW(ACTRL_AUDIT)
     __MINGW_TYPEDEF_AW(PACTRL_AUDIT)
 
-#define TRUSTEE_ACCESS_ALLOWED 0x00000001L
-#define TRUSTEE_ACCESS_READ 0x00000002L
-#define TRUSTEE_ACCESS_WRITE 0x00000004L
+#define TRUSTEE_ACCESS_ALLOWED __MSABI_LONG(0x00000001)
+#define TRUSTEE_ACCESS_READ __MSABI_LONG(0x00000002)
+#define TRUSTEE_ACCESS_WRITE __MSABI_LONG(0x00000004)
 
-#define TRUSTEE_ACCESS_EXPLICIT 0x00000001L
+#define TRUSTEE_ACCESS_EXPLICIT __MSABI_LONG(0x00000001)
 #define TRUSTEE_ACCESS_READ_WRITE (TRUSTEE_ACCESS_READ | TRUSTEE_ACCESS_WRITE)
 
-#define TRUSTEE_ACCESS_ALL 0xFFFFFFFFL
+#define TRUSTEE_ACCESS_ALL __MSABI_LONG(0xFFFFFFFF)
 
     typedef struct _TRUSTEE_ACCESSA {
       LPSTR lpProperty;
diff --git a/mingw-w64-headers/include/aclui.h b/mingw-w64-headers/include/aclui.h
index 858a05c..5975ac2 100644
--- a/mingw-w64-headers/include/aclui.h
+++ b/mingw-w64-headers/include/aclui.h
@@ -29,29 +29,29 @@
     GUID guidObjectType;
   } SI_OBJECT_INFO,*PSI_OBJECT_INFO;
 
-#define SI_EDIT_PERMS 0x00000000L
-#define SI_EDIT_OWNER 0x00000001L
-#define SI_EDIT_AUDITS 0x00000002L
-#define SI_CONTAINER 0x00000004L
-#define SI_READONLY 0x00000008L
-#define SI_ADVANCED 0x00000010L
-#define SI_RESET 0x00000020L
-#define SI_OWNER_READONLY 0x00000040L
-#define SI_EDIT_PROPERTIES 0x00000080L
-#define SI_OWNER_RECURSE 0x00000100L
-#define SI_NO_ACL_PROTECT 0x00000200L
-#define SI_NO_TREE_APPLY 0x00000400L
-#define SI_PAGE_TITLE 0x00000800L
-#define SI_SERVER_IS_DC 0x00001000L
-#define SI_RESET_DACL_TREE 0x00004000L
-#define SI_RESET_SACL_TREE 0x00008000L
-#define SI_OBJECT_GUID 0x00010000L
-#define SI_EDIT_EFFECTIVE 0x00020000L
-#define SI_RESET_DACL 0x00040000L
-#define SI_RESET_SACL 0x00080000L
-#define SI_RESET_OWNER 0x00100000L
-#define SI_NO_ADDITIONAL_PERMISSION 0x00200000L
-#define SI_MAY_WRITE 0x10000000L
+#define SI_EDIT_PERMS __MSABI_LONG(0x00000000)
+#define SI_EDIT_OWNER __MSABI_LONG(0x00000001)
+#define SI_EDIT_AUDITS __MSABI_LONG(0x00000002)
+#define SI_CONTAINER __MSABI_LONG(0x00000004)
+#define SI_READONLY __MSABI_LONG(0x00000008)
+#define SI_ADVANCED __MSABI_LONG(0x00000010)
+#define SI_RESET __MSABI_LONG(0x00000020)
+#define SI_OWNER_READONLY __MSABI_LONG(0x00000040)
+#define SI_EDIT_PROPERTIES __MSABI_LONG(0x00000080)
+#define SI_OWNER_RECURSE __MSABI_LONG(0x00000100)
+#define SI_NO_ACL_PROTECT __MSABI_LONG(0x00000200)
+#define SI_NO_TREE_APPLY __MSABI_LONG(0x00000400)
+#define SI_PAGE_TITLE __MSABI_LONG(0x00000800)
+#define SI_SERVER_IS_DC __MSABI_LONG(0x00001000)
+#define SI_RESET_DACL_TREE __MSABI_LONG(0x00004000)
+#define SI_RESET_SACL_TREE __MSABI_LONG(0x00008000)
+#define SI_OBJECT_GUID __MSABI_LONG(0x00010000)
+#define SI_EDIT_EFFECTIVE __MSABI_LONG(0x00020000)
+#define SI_RESET_DACL __MSABI_LONG(0x00040000)
+#define SI_RESET_SACL __MSABI_LONG(0x00080000)
+#define SI_RESET_OWNER __MSABI_LONG(0x00100000)
+#define SI_NO_ADDITIONAL_PERMISSION __MSABI_LONG(0x00200000)
+#define SI_MAY_WRITE __MSABI_LONG(0x10000000)
 
 #define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS)
 
@@ -62,10 +62,10 @@
     DWORD dwFlags;
   } SI_ACCESS,*PSI_ACCESS;
 
-#define SI_ACCESS_SPECIFIC 0x00010000L
-#define SI_ACCESS_GENERAL 0x00020000L
-#define SI_ACCESS_CONTAINER 0x00040000L
-#define SI_ACCESS_PROPERTY 0x00080000L
+#define SI_ACCESS_SPECIFIC __MSABI_LONG(0x00010000)
+#define SI_ACCESS_GENERAL __MSABI_LONG(0x00020000)
+#define SI_ACCESS_CONTAINER __MSABI_LONG(0x00040000)
+#define SI_ACCESS_PROPERTY __MSABI_LONG(0x00080000)
 
   typedef struct _SI_INHERIT_TYPE {
     const GUID *pguid;
diff --git a/mingw-w64-headers/include/adtgen.h b/mingw-w64-headers/include/adtgen.h
index 13736df..25d71b6 100644
--- a/mingw-w64-headers/include/adtgen.h
+++ b/mingw-w64-headers/include/adtgen.h
@@ -23,13 +23,13 @@
 } AUDIT_PARAM_TYPE;
 
 #define AP_ParamTypeBits 8
-#define AP_ParamTypeMask 0x000000ffL
+#define AP_ParamTypeMask __MSABI_LONG(0x000000ff)
 
-#define AP_FormatHex (0x0001L << AP_ParamTypeBits)
-#define AP_AccessMask (0x0002L << AP_ParamTypeBits)
-#define AP_Filespec (0x0001L << AP_ParamTypeBits)
-#define AP_PrimaryLogonId (0x0001L << AP_ParamTypeBits)
-#define AP_ClientLogonId (0x0002L << AP_ParamTypeBits)
+#define AP_FormatHex (__MSABI_LONG(0x0001) << AP_ParamTypeBits)
+#define AP_AccessMask (__MSABI_LONG(0x0002) << AP_ParamTypeBits)
+#define AP_Filespec (__MSABI_LONG(0x0001) << AP_ParamTypeBits)
+#define AP_PrimaryLogonId (__MSABI_LONG(0x0001) << AP_ParamTypeBits)
+#define AP_ClientLogonId (__MSABI_LONG(0x0002) << AP_ParamTypeBits)
 
 #define ApExtractType(TypeFlags) ((AUDIT_PARAM_TYPE)(TypeFlags & AP_ParamTypeMask))
 #define ApExtractFlags(TypeFlags) ((TypeFlags & ~AP_ParamTypeMask))
diff --git a/mingw-w64-headers/include/avifmt.h b/mingw-w64-headers/include/avifmt.h
index 7caf65a..085a43d 100644
--- a/mingw-w64-headers/include/avifmt.h
+++ b/mingw-w64-headers/include/avifmt.h
@@ -102,11 +102,11 @@
     RECT rcFrame;
   } AVIStreamHeader;
 
-#define AVIIF_LIST 0x00000001L
-#define AVIIF_KEYFRAME 0x00000010L
+#define AVIIF_LIST __MSABI_LONG(0x00000001)
+#define AVIIF_KEYFRAME __MSABI_LONG(0x00000010)
 
-#define AVIIF_NOTIME 0x00000100L
-#define AVIIF_COMPUSE 0x0FFF0000L
+#define AVIIF_NOTIME __MSABI_LONG(0x00000100)
+#define AVIIF_COMPUSE __MSABI_LONG(0x0FFF0000)
 
   typedef struct {
     DWORD ckid;
diff --git a/mingw-w64-headers/include/azroles.h b/mingw-w64-headers/include/azroles.h
index 55116d0..ba4167f 100644
--- a/mingw-w64-headers/include/azroles.h
+++ b/mingw-w64-headers/include/azroles.h
@@ -2589,7 +2589,7 @@
 #endif
 
 #ifndef OLESCRIPT_E_SYNTAX
-#define OLESCRIPT_E_SYNTAX _HRESULT_TYPEDEF_(0x80020101L)
+#define OLESCRIPT_E_SYNTAX _HRESULT_TYPEDEF_(__MSABI_LONG(0x80020101))
 #endif
 
   extern RPC_IF_HANDLE __MIDL_itf_azroles_0279_v0_0_c_ifspec;
diff --git a/mingw-w64-headers/include/bitsmsg.h b/mingw-w64-headers/include/bitsmsg.h
index 4c9e748..678c5d4 100644
--- a/mingw-w64-headers/include/bitsmsg.h
+++ b/mingw-w64-headers/include/bitsmsg.h
@@ -7,119 +7,119 @@
 #define _BGCPYMSG_
 
 #ifndef BG_E_NOT_FOUND
-#define BG_E_NOT_FOUND 0x80200001L
-#define BG_E_INVALID_STATE 0x80200002L
-#define BG_E_EMPTY 0x80200003L
-#define BG_E_FILE_NOT_AVAILABLE 0x80200004L
-#define BG_E_PROTOCOL_NOT_AVAILABLE 0x80200005L
-#define BG_S_ERROR_CONTEXT_NONE 0x00200006L
-#define BG_E_ERROR_CONTEXT_UNKNOWN 0x80200007L
-#define BG_E_ERROR_CONTEXT_GENERAL_QUEUE_MANAGER 0x80200008L
-#define BG_E_ERROR_CONTEXT_LOCAL_FILE 0x80200009L
-#define BG_E_ERROR_CONTEXT_REMOTE_FILE 0x8020000AL
-#define BG_E_ERROR_CONTEXT_GENERAL_TRANSPORT 0x8020000BL
-#define BG_E_ERROR_CONTEXT_QUEUE_MANAGER_NOTIFICATION 0x8020000CL
-#define BG_E_DESTINATION_LOCKED 0x8020000DL
-#define BG_E_VOLUME_CHANGED 0x8020000EL
-#define BG_E_ERROR_INFORMATION_UNAVAILABLE 0x8020000FL
-#define BG_E_NETWORK_DISCONNECTED 0x80200010L
-#define BG_E_MISSING_FILE_SIZE 0x80200011L
-#define BG_E_INSUFFICIENT_HTTP_SUPPORT 0x80200012L
-#define BG_E_INSUFFICIENT_RANGE_SUPPORT 0x80200013L
-#define BG_E_REMOTE_NOT_SUPPORTED 0x80200014L
-#define BG_E_NEW_OWNER_DIFF_MAPPING 0x80200015L
-#define BG_E_NEW_OWNER_NO_FILE_ACCESS 0x80200016L
-#define BG_S_PARTIAL_COMPLETE 0x00200017L
-#define BG_E_PROXY_LIST_TOO_LARGE 0x80200018L
-#define BG_E_PROXY_BYPASS_LIST_TOO_LARGE 0x80200019L
-#define BG_S_UNABLE_TO_DELETE_FILES 0x0020001AL
-#define BG_E_INVALID_SERVER_RESPONSE 0x8020001BL
-#define BG_E_TOO_MANY_FILES 0x8020001CL
-#define BG_E_LOCAL_FILE_CHANGED 0x8020001DL
-#define BG_E_ERROR_CONTEXT_REMOTE_APPLICATION 0x8020001EL
-#define BG_E_SESSION_NOT_FOUND 0x8020001FL
-#define BG_E_TOO_LARGE 0x80200020L
-#define BG_E_STRING_TOO_LONG 0x80200021L
-#define BG_E_CLIENT_SERVER_PROTOCOL_MISMATCH 0x80200022L
-#define BG_E_SERVER_EXECUTE_ENABLE 0x80200023L
-#define BG_E_NO_PROGRESS 0x80200024L
-#define BG_E_USERNAME_TOO_LARGE 0x80200025L
-#define BG_E_PASSWORD_TOO_LARGE 0x80200026L
-#define BG_E_INVALID_AUTH_TARGET 0x80200027L
-#define BG_E_INVALID_AUTH_SCHEME 0x80200028L
-#define BG_E_FILE_NOT_FOUND 0x80200029L
-#define BG_S_PROXY_CHANGED 0x0020002AL
-#define BG_E_INVALID_RANGE 0x8020002BL
-#define BG_E_OVERLAPPING_RANGES 0x8020002CL
-#define BG_E_CONNECT_FAILURE 0x8020002DL
-#define BG_E_CONNECTION_CLOSED 0x8020002EL
-#define BG_E_KEEP_ALIVE_FAILURE 0x8020002FL
-#define BG_E_MESSAGE_LENGTH_LIMIT_EXCEEDED 0x80200030L
-#define BG_E_NAME_RESOLUTION_FAILURE 0x80200031L
-#define BG_E_PENDING 0x80200032L
-#define BG_E_PIPELINE_FAILURE 0x80200033L
-#define BG_E_PROTOCOL_ERROR 0x80200034L
-#define BG_E_PROXY_NAME_RESOLUTION_FAILURE 0x80200035L
-#define BG_E_RECEIVE_FAILURE 0x80200036L
-#define BG_E_REQUEST_CANCELED 0x80200037L
-#define BG_E_SECURE_CHANNEL_FAILURE 0x80200038L
-#define BG_E_SEND_FAILURE 0x80200039L
-#define BG_E_SERVER_PROTOCOL_VIOLATION 0x8020003AL
-#define BG_E_TIMEOUT 0x8020003BL
-#define BG_E_TRUST_FAILURE 0x8020003CL
-#define BG_E_UNKNOWN_ERROR 0x8020003DL
-#define BG_E_BLOCKED_BY_POLICY 0x8020003EL
-#define BG_E_INVALID_PROXY_INFO 0x8020003FL
-#define BG_E_INVALID_CREDENTIALS 0x80200040L
-#define BG_E_HTTP_ERROR_100 0x80190064L
-#define BG_E_HTTP_ERROR_101 0x80190065L
-#define BG_E_HTTP_ERROR_200 0x801900C8L
-#define BG_E_HTTP_ERROR_201 0x801900C9L
-#define BG_E_HTTP_ERROR_202 0x801900CAL
-#define BG_E_HTTP_ERROR_203 0x801900CBL
-#define BG_E_HTTP_ERROR_204 0x801900CCL
-#define BG_E_HTTP_ERROR_205 0x801900CDL
-#define BG_E_HTTP_ERROR_206 0x801900CEL
-#define BG_E_HTTP_ERROR_300 0x8019012CL
-#define BG_E_HTTP_ERROR_301 0x8019012DL
-#define BG_E_HTTP_ERROR_302 0x8019012EL
-#define BG_E_HTTP_ERROR_303 0x8019012FL
-#define BG_E_HTTP_ERROR_304 0x80190130L
-#define BG_E_HTTP_ERROR_305 0x80190131L
-#define BG_E_HTTP_ERROR_307 0x80190133L
-#define BG_E_HTTP_ERROR_400 0x80190190L
-#define BG_E_HTTP_ERROR_401 0x80190191L
-#define BG_E_HTTP_ERROR_402 0x80190192L
-#define BG_E_HTTP_ERROR_403 0x80190193L
-#define BG_E_HTTP_ERROR_404 0x80190194L
-#define BG_E_HTTP_ERROR_405 0x80190195L
-#define BG_E_HTTP_ERROR_406 0x80190196L
-#define BG_E_HTTP_ERROR_407 0x80190197L
-#define BG_E_HTTP_ERROR_408 0x80190198L
-#define BG_E_HTTP_ERROR_409 0x80190199L
-#define BG_E_HTTP_ERROR_410 0x8019019AL
-#define BG_E_HTTP_ERROR_411 0x8019019BL
-#define BG_E_HTTP_ERROR_412 0x8019019CL
-#define BG_E_HTTP_ERROR_413 0x8019019DL
-#define BG_E_HTTP_ERROR_414 0x8019019EL
-#define BG_E_HTTP_ERROR_415 0x8019019FL
-#define BG_E_HTTP_ERROR_416 0x801901A0L
-#define BG_E_HTTP_ERROR_417 0x801901A1L
-#define BG_E_HTTP_ERROR_449 0x801901C1L
-#define BG_E_HTTP_ERROR_500 0x801901F4L
-#define BG_E_HTTP_ERROR_501 0x801901F5L
-#define BG_E_HTTP_ERROR_502 0x801901F6L
-#define BG_E_HTTP_ERROR_503 0x801901F7L
-#define BG_E_HTTP_ERROR_504 0x801901F8L
-#define BG_E_HTTP_ERROR_505 0x801901F9L
-#define BITS_MC_JOB_CANCELLED 0x80194000L
-#define BITS_MC_FILE_DELETION_FAILED 0x80194001L
-#define BITS_MC_FILE_DELETION_FAILED_MORE 0x80194002L
-#define BITS_MC_JOB_PROPERTY_CHANGE 0x80194003L
-#define BITS_MC_JOB_TAKE_OWNERSHIP 0x80194004L
-#define BITS_MC_JOB_SCAVENGED 0x80194005L
-#define BITS_MC_JOB_NOTIFICATION_FAILURE 0x80194006L
-#define BITS_MC_STATE_FILE_CORRUPT 0x80194007L
-#define BITS_MC_FAILED_TO_START 0x80194008L
+#define BG_E_NOT_FOUND __MSABI_LONG(0x80200001)
+#define BG_E_INVALID_STATE __MSABI_LONG(0x80200002)
+#define BG_E_EMPTY __MSABI_LONG(0x80200003)
+#define BG_E_FILE_NOT_AVAILABLE __MSABI_LONG(0x80200004)
+#define BG_E_PROTOCOL_NOT_AVAILABLE __MSABI_LONG(0x80200005)
+#define BG_S_ERROR_CONTEXT_NONE __MSABI_LONG(0x00200006)
+#define BG_E_ERROR_CONTEXT_UNKNOWN __MSABI_LONG(0x80200007)
+#define BG_E_ERROR_CONTEXT_GENERAL_QUEUE_MANAGER __MSABI_LONG(0x80200008)
+#define BG_E_ERROR_CONTEXT_LOCAL_FILE __MSABI_LONG(0x80200009)
+#define BG_E_ERROR_CONTEXT_REMOTE_FILE __MSABI_LONG(0x8020000A)
+#define BG_E_ERROR_CONTEXT_GENERAL_TRANSPORT __MSABI_LONG(0x8020000B)
+#define BG_E_ERROR_CONTEXT_QUEUE_MANAGER_NOTIFICATION __MSABI_LONG(0x8020000C)
+#define BG_E_DESTINATION_LOCKED __MSABI_LONG(0x8020000D)
+#define BG_E_VOLUME_CHANGED __MSABI_LONG(0x8020000E)
+#define BG_E_ERROR_INFORMATION_UNAVAILABLE __MSABI_LONG(0x8020000F)
+#define BG_E_NETWORK_DISCONNECTED __MSABI_LONG(0x80200010)
+#define BG_E_MISSING_FILE_SIZE __MSABI_LONG(0x80200011)
+#define BG_E_INSUFFICIENT_HTTP_SUPPORT __MSABI_LONG(0x80200012)
+#define BG_E_INSUFFICIENT_RANGE_SUPPORT __MSABI_LONG(0x80200013)
+#define BG_E_REMOTE_NOT_SUPPORTED __MSABI_LONG(0x80200014)
+#define BG_E_NEW_OWNER_DIFF_MAPPING __MSABI_LONG(0x80200015)
+#define BG_E_NEW_OWNER_NO_FILE_ACCESS __MSABI_LONG(0x80200016)
+#define BG_S_PARTIAL_COMPLETE __MSABI_LONG(0x00200017)
+#define BG_E_PROXY_LIST_TOO_LARGE __MSABI_LONG(0x80200018)
+#define BG_E_PROXY_BYPASS_LIST_TOO_LARGE __MSABI_LONG(0x80200019)
+#define BG_S_UNABLE_TO_DELETE_FILES __MSABI_LONG(0x0020001A)
+#define BG_E_INVALID_SERVER_RESPONSE __MSABI_LONG(0x8020001B)
+#define BG_E_TOO_MANY_FILES __MSABI_LONG(0x8020001C)
+#define BG_E_LOCAL_FILE_CHANGED __MSABI_LONG(0x8020001D)
+#define BG_E_ERROR_CONTEXT_REMOTE_APPLICATION __MSABI_LONG(0x8020001E)
+#define BG_E_SESSION_NOT_FOUND __MSABI_LONG(0x8020001F)
+#define BG_E_TOO_LARGE __MSABI_LONG(0x80200020)
+#define BG_E_STRING_TOO_LONG __MSABI_LONG(0x80200021)
+#define BG_E_CLIENT_SERVER_PROTOCOL_MISMATCH __MSABI_LONG(0x80200022)
+#define BG_E_SERVER_EXECUTE_ENABLE __MSABI_LONG(0x80200023)
+#define BG_E_NO_PROGRESS __MSABI_LONG(0x80200024)
+#define BG_E_USERNAME_TOO_LARGE __MSABI_LONG(0x80200025)
+#define BG_E_PASSWORD_TOO_LARGE __MSABI_LONG(0x80200026)
+#define BG_E_INVALID_AUTH_TARGET __MSABI_LONG(0x80200027)
+#define BG_E_INVALID_AUTH_SCHEME __MSABI_LONG(0x80200028)
+#define BG_E_FILE_NOT_FOUND __MSABI_LONG(0x80200029)
+#define BG_S_PROXY_CHANGED __MSABI_LONG(0x0020002A)
+#define BG_E_INVALID_RANGE __MSABI_LONG(0x8020002B)
+#define BG_E_OVERLAPPING_RANGES __MSABI_LONG(0x8020002C)
+#define BG_E_CONNECT_FAILURE __MSABI_LONG(0x8020002D)
+#define BG_E_CONNECTION_CLOSED __MSABI_LONG(0x8020002E)
+#define BG_E_KEEP_ALIVE_FAILURE __MSABI_LONG(0x8020002F)
+#define BG_E_MESSAGE_LENGTH_LIMIT_EXCEEDED __MSABI_LONG(0x80200030)
+#define BG_E_NAME_RESOLUTION_FAILURE __MSABI_LONG(0x80200031)
+#define BG_E_PENDING __MSABI_LONG(0x80200032)
+#define BG_E_PIPELINE_FAILURE __MSABI_LONG(0x80200033)
+#define BG_E_PROTOCOL_ERROR __MSABI_LONG(0x80200034)
+#define BG_E_PROXY_NAME_RESOLUTION_FAILURE __MSABI_LONG(0x80200035)
+#define BG_E_RECEIVE_FAILURE __MSABI_LONG(0x80200036)
+#define BG_E_REQUEST_CANCELED __MSABI_LONG(0x80200037)
+#define BG_E_SECURE_CHANNEL_FAILURE __MSABI_LONG(0x80200038)
+#define BG_E_SEND_FAILURE __MSABI_LONG(0x80200039)
+#define BG_E_SERVER_PROTOCOL_VIOLATION __MSABI_LONG(0x8020003A)
+#define BG_E_TIMEOUT __MSABI_LONG(0x8020003B)
+#define BG_E_TRUST_FAILURE __MSABI_LONG(0x8020003C)
+#define BG_E_UNKNOWN_ERROR __MSABI_LONG(0x8020003D)
+#define BG_E_BLOCKED_BY_POLICY __MSABI_LONG(0x8020003E)
+#define BG_E_INVALID_PROXY_INFO __MSABI_LONG(0x8020003F)
+#define BG_E_INVALID_CREDENTIALS __MSABI_LONG(0x80200040)
+#define BG_E_HTTP_ERROR_100 __MSABI_LONG(0x80190064)
+#define BG_E_HTTP_ERROR_101 __MSABI_LONG(0x80190065)
+#define BG_E_HTTP_ERROR_200 __MSABI_LONG(0x801900C8)
+#define BG_E_HTTP_ERROR_201 __MSABI_LONG(0x801900C9)
+#define BG_E_HTTP_ERROR_202 __MSABI_LONG(0x801900CA)
+#define BG_E_HTTP_ERROR_203 __MSABI_LONG(0x801900CB)
+#define BG_E_HTTP_ERROR_204 __MSABI_LONG(0x801900CC)
+#define BG_E_HTTP_ERROR_205 __MSABI_LONG(0x801900CD)
+#define BG_E_HTTP_ERROR_206 __MSABI_LONG(0x801900CE)
+#define BG_E_HTTP_ERROR_300 __MSABI_LONG(0x8019012C)
+#define BG_E_HTTP_ERROR_301 __MSABI_LONG(0x8019012D)
+#define BG_E_HTTP_ERROR_302 __MSABI_LONG(0x8019012E)
+#define BG_E_HTTP_ERROR_303 __MSABI_LONG(0x8019012F)
+#define BG_E_HTTP_ERROR_304 __MSABI_LONG(0x80190130)
+#define BG_E_HTTP_ERROR_305 __MSABI_LONG(0x80190131)
+#define BG_E_HTTP_ERROR_307 __MSABI_LONG(0x80190133)
+#define BG_E_HTTP_ERROR_400 __MSABI_LONG(0x80190190)
+#define BG_E_HTTP_ERROR_401 __MSABI_LONG(0x80190191)
+#define BG_E_HTTP_ERROR_402 __MSABI_LONG(0x80190192)
+#define BG_E_HTTP_ERROR_403 __MSABI_LONG(0x80190193)
+#define BG_E_HTTP_ERROR_404 __MSABI_LONG(0x80190194)
+#define BG_E_HTTP_ERROR_405 __MSABI_LONG(0x80190195)
+#define BG_E_HTTP_ERROR_406 __MSABI_LONG(0x80190196)
+#define BG_E_HTTP_ERROR_407 __MSABI_LONG(0x80190197)
+#define BG_E_HTTP_ERROR_408 __MSABI_LONG(0x80190198)
+#define BG_E_HTTP_ERROR_409 __MSABI_LONG(0x80190199)
+#define BG_E_HTTP_ERROR_410 __MSABI_LONG(0x8019019A)
+#define BG_E_HTTP_ERROR_411 __MSABI_LONG(0x8019019B)
+#define BG_E_HTTP_ERROR_412 __MSABI_LONG(0x8019019C)
+#define BG_E_HTTP_ERROR_413 __MSABI_LONG(0x8019019D)
+#define BG_E_HTTP_ERROR_414 __MSABI_LONG(0x8019019E)
+#define BG_E_HTTP_ERROR_415 __MSABI_LONG(0x8019019F)
+#define BG_E_HTTP_ERROR_416 __MSABI_LONG(0x801901A0)
+#define BG_E_HTTP_ERROR_417 __MSABI_LONG(0x801901A1)
+#define BG_E_HTTP_ERROR_449 __MSABI_LONG(0x801901C1)
+#define BG_E_HTTP_ERROR_500 __MSABI_LONG(0x801901F4)
+#define BG_E_HTTP_ERROR_501 __MSABI_LONG(0x801901F5)
+#define BG_E_HTTP_ERROR_502 __MSABI_LONG(0x801901F6)
+#define BG_E_HTTP_ERROR_503 __MSABI_LONG(0x801901F7)
+#define BG_E_HTTP_ERROR_504 __MSABI_LONG(0x801901F8)
+#define BG_E_HTTP_ERROR_505 __MSABI_LONG(0x801901F9)
+#define BITS_MC_JOB_CANCELLED __MSABI_LONG(0x80194000)
+#define BITS_MC_FILE_DELETION_FAILED __MSABI_LONG(0x80194001)
+#define BITS_MC_FILE_DELETION_FAILED_MORE __MSABI_LONG(0x80194002)
+#define BITS_MC_JOB_PROPERTY_CHANGE __MSABI_LONG(0x80194003)
+#define BITS_MC_JOB_TAKE_OWNERSHIP __MSABI_LONG(0x80194004)
+#define BITS_MC_JOB_SCAVENGED __MSABI_LONG(0x80194005)
+#define BITS_MC_JOB_NOTIFICATION_FAILURE __MSABI_LONG(0x80194006)
+#define BITS_MC_STATE_FILE_CORRUPT __MSABI_LONG(0x80194007)
+#define BITS_MC_FAILED_TO_START __MSABI_LONG(0x80194008)
 #endif
 #endif
diff --git a/mingw-w64-headers/include/cdoexerr.h b/mingw-w64-headers/include/cdoexerr.h
index 1615881..78419b1 100644
--- a/mingw-w64-headers/include/cdoexerr.h
+++ b/mingw-w64-headers/include/cdoexerr.h
@@ -3,222 +3,222 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define categoryHeader 0x00000001L
-#define categoryUnused 0x00000002L
-#define categoryGeneral 0x00000003L
-#define CDO_E_UNCAUGHT_EXCEPTION 0x80040201L
-#define CDO_E_NOT_OPENED 0x80040202L
-#define CDO_E_UNSUPPORTED_DATASOURCE 0x80040203L
-#define CDO_E_INVALID_PROPERTYNAME 0x80040204L
-#define CDO_E_PROP_UNSUPPORTED 0x80040205L
-#define CDO_E_INACTIVE 0x80040206L
-#define CDO_E_NO_SUPPORT_FOR_OBJECTS 0x80040207L
-#define CDO_E_NOT_AVAILABLE 0x80040208L
-#define CDO_E_NO_DEFAULT_DROP_DIR 0x80040209L
-#define CDO_E_SMTP_SERVER_REQUIRED 0x8004020AL
-#define CDO_E_NNTP_SERVER_REQUIRED 0x8004020BL
-#define CDO_E_RECIPIENT_MISSING 0x8004020CL
-#define CDO_E_FROM_MISSING 0x8004020DL
-#define CDO_E_SENDER_REJECTED 0x8004020EL
-#define CDO_E_RECIPIENTS_REJECTED 0x8004020FL
-#define CDO_E_NNTP_POST_FAILED 0x80040210L
-#define CDO_E_SMTP_SEND_FAILED 0x80040211L
-#define CDO_E_CONNECTION_DROPPED 0x80040212L
-#define CDO_E_FAILED_TO_CONNECT 0x80040213L
-#define CDO_E_INVALID_POST 0x80040214L
-#define CDO_E_AUTHENTICATION_FAILURE 0x80040215L
-#define CDO_E_INVALID_CONTENT_TYPE 0x80040216L
-#define CDO_E_LOGON_FAILURE 0x80040217L
-#define CDO_E_HTTP_NOT_FOUND 0x80040218L
-#define CDO_E_HTTP_FORBIDDEN 0x80040219L
-#define CDO_E_HTTP_FAILED 0x8004021AL
-#define CDO_E_MULTIPART_NO_DATA 0x8004021BL
-#define CDO_E_INVALID_ENCODING_FOR_MULTIPART 0x8004021CL
-#define CDO_E_UNSAFE_OPERATION 0x8004021DL
-#define CDO_E_PROP_NOT_FOUND 0x8004021EL
-#define CDO_E_INVALID_SEND_OPTION 0x80040220L
-#define CDO_E_INVALID_POST_OPTION 0x80040221L
-#define CDO_E_NO_PICKUP_DIR 0x80040222L
-#define CDO_E_NOT_ALL_DELETED 0x80040223L
-#define CDO_E_NO_METHOD 0x80040224L
-#define CDO_E_PROP_READONLY 0x80040227L
-#define CDO_E_PROP_CANNOT_DELETE 0x80040228L
-#define CDO_E_BAD_DATA 0x80040229L
-#define CDO_E_PROP_NONHEADER 0x8004022AL
-#define CDO_E_INVALID_CHARSET 0x8004022BL
-#define CDO_E_ADOSTREAM_NOT_BOUND 0x8004022CL
-#define CDO_E_CONTENTPROPXML_NOT_FOUND 0x8004022DL
-#define CDO_E_CONTENTPROPXML_WRONG_CHARSET 0x8004022EL
-#define CDO_E_CONTENTPROPXML_PARSE_FAILED 0x8004022FL
-#define CDO_E_CONTENTPROPXML_CONVERT_FAILED 0x80040230L
-#define CDO_E_NO_DIRECTORIES_SPECIFIED 0x80040231L
-#define CDO_E_DIRECTORIES_UNREACHABLE 0x80040232L
-#define CDO_E_BAD_SENDER 0x80040233L
-#define CDO_E_SELF_BINDING 0x80040234L
-#define CDO_E_BAD_ATTENDEE_DATA 0x80040235L
-#define CDO_E_ARGUMENT1 0x80044000L
-#define CDO_E_ARGUMENT2 0x80044001L
-#define CDO_E_ARGUMENT3 0x80044002L
-#define CDO_E_ARGUMENT4 0x80044003L
-#define CDO_E_ARGUMENT5 0x80044004L
-#define CDO_E_NOT_FOUND 0x800CCE05L
-#define CDO_E_INVALID_ENCODING_TYPE 0x800CCE1DL
-#define IDS_ORIGINAL_MESSAGE 0x00011000L
-#define IDS_FROM 0x00011001L
-#define IDS_SENT 0x00011002L
-#define IDS_POSTED_AT 0x00011003L
-#define IDS_TO 0x00011004L
-#define IDS_CC 0x00011005L
-#define IDS_POSTED_TO 0x00011006L
-#define IDS_CONVERSATION 0x00011007L
-#define IDS_SUBJECT 0x00011008L
-#define IDS_IMPORTANCE 0x00011009L
-#define IDS_ON_BEHALF_OF 0x0001100AL
-#define IDS_FW 0x0001100BL
-#define IDS_RE 0x0001100CL
-#define IDS_CODEPAGE 0x0001100DL
+#define categoryHeader __MSABI_LONG(0x00000001)
+#define categoryUnused __MSABI_LONG(0x00000002)
+#define categoryGeneral __MSABI_LONG(0x00000003)
+#define CDO_E_UNCAUGHT_EXCEPTION __MSABI_LONG(0x80040201)
+#define CDO_E_NOT_OPENED __MSABI_LONG(0x80040202)
+#define CDO_E_UNSUPPORTED_DATASOURCE __MSABI_LONG(0x80040203)
+#define CDO_E_INVALID_PROPERTYNAME __MSABI_LONG(0x80040204)
+#define CDO_E_PROP_UNSUPPORTED __MSABI_LONG(0x80040205)
+#define CDO_E_INACTIVE __MSABI_LONG(0x80040206)
+#define CDO_E_NO_SUPPORT_FOR_OBJECTS __MSABI_LONG(0x80040207)
+#define CDO_E_NOT_AVAILABLE __MSABI_LONG(0x80040208)
+#define CDO_E_NO_DEFAULT_DROP_DIR __MSABI_LONG(0x80040209)
+#define CDO_E_SMTP_SERVER_REQUIRED __MSABI_LONG(0x8004020A)
+#define CDO_E_NNTP_SERVER_REQUIRED __MSABI_LONG(0x8004020B)
+#define CDO_E_RECIPIENT_MISSING __MSABI_LONG(0x8004020C)
+#define CDO_E_FROM_MISSING __MSABI_LONG(0x8004020D)
+#define CDO_E_SENDER_REJECTED __MSABI_LONG(0x8004020E)
+#define CDO_E_RECIPIENTS_REJECTED __MSABI_LONG(0x8004020F)
+#define CDO_E_NNTP_POST_FAILED __MSABI_LONG(0x80040210)
+#define CDO_E_SMTP_SEND_FAILED __MSABI_LONG(0x80040211)
+#define CDO_E_CONNECTION_DROPPED __MSABI_LONG(0x80040212)
+#define CDO_E_FAILED_TO_CONNECT __MSABI_LONG(0x80040213)
+#define CDO_E_INVALID_POST __MSABI_LONG(0x80040214)
+#define CDO_E_AUTHENTICATION_FAILURE __MSABI_LONG(0x80040215)
+#define CDO_E_INVALID_CONTENT_TYPE __MSABI_LONG(0x80040216)
+#define CDO_E_LOGON_FAILURE __MSABI_LONG(0x80040217)
+#define CDO_E_HTTP_NOT_FOUND __MSABI_LONG(0x80040218)
+#define CDO_E_HTTP_FORBIDDEN __MSABI_LONG(0x80040219)
+#define CDO_E_HTTP_FAILED __MSABI_LONG(0x8004021A)
+#define CDO_E_MULTIPART_NO_DATA __MSABI_LONG(0x8004021B)
+#define CDO_E_INVALID_ENCODING_FOR_MULTIPART __MSABI_LONG(0x8004021C)
+#define CDO_E_UNSAFE_OPERATION __MSABI_LONG(0x8004021D)
+#define CDO_E_PROP_NOT_FOUND __MSABI_LONG(0x8004021E)
+#define CDO_E_INVALID_SEND_OPTION __MSABI_LONG(0x80040220)
+#define CDO_E_INVALID_POST_OPTION __MSABI_LONG(0x80040221)
+#define CDO_E_NO_PICKUP_DIR __MSABI_LONG(0x80040222)
+#define CDO_E_NOT_ALL_DELETED __MSABI_LONG(0x80040223)
+#define CDO_E_NO_METHOD __MSABI_LONG(0x80040224)
+#define CDO_E_PROP_READONLY __MSABI_LONG(0x80040227)
+#define CDO_E_PROP_CANNOT_DELETE __MSABI_LONG(0x80040228)
+#define CDO_E_BAD_DATA __MSABI_LONG(0x80040229)
+#define CDO_E_PROP_NONHEADER __MSABI_LONG(0x8004022A)
+#define CDO_E_INVALID_CHARSET __MSABI_LONG(0x8004022B)
+#define CDO_E_ADOSTREAM_NOT_BOUND __MSABI_LONG(0x8004022C)
+#define CDO_E_CONTENTPROPXML_NOT_FOUND __MSABI_LONG(0x8004022D)
+#define CDO_E_CONTENTPROPXML_WRONG_CHARSET __MSABI_LONG(0x8004022E)
+#define CDO_E_CONTENTPROPXML_PARSE_FAILED __MSABI_LONG(0x8004022F)
+#define CDO_E_CONTENTPROPXML_CONVERT_FAILED __MSABI_LONG(0x80040230)
+#define CDO_E_NO_DIRECTORIES_SPECIFIED __MSABI_LONG(0x80040231)
+#define CDO_E_DIRECTORIES_UNREACHABLE __MSABI_LONG(0x80040232)
+#define CDO_E_BAD_SENDER __MSABI_LONG(0x80040233)
+#define CDO_E_SELF_BINDING __MSABI_LONG(0x80040234)
+#define CDO_E_BAD_ATTENDEE_DATA __MSABI_LONG(0x80040235)
+#define CDO_E_ARGUMENT1 __MSABI_LONG(0x80044000)
+#define CDO_E_ARGUMENT2 __MSABI_LONG(0x80044001)
+#define CDO_E_ARGUMENT3 __MSABI_LONG(0x80044002)
+#define CDO_E_ARGUMENT4 __MSABI_LONG(0x80044003)
+#define CDO_E_ARGUMENT5 __MSABI_LONG(0x80044004)
+#define CDO_E_NOT_FOUND __MSABI_LONG(0x800CCE05)
+#define CDO_E_INVALID_ENCODING_TYPE __MSABI_LONG(0x800CCE1D)
+#define IDS_ORIGINAL_MESSAGE __MSABI_LONG(0x00011000)
+#define IDS_FROM __MSABI_LONG(0x00011001)
+#define IDS_SENT __MSABI_LONG(0x00011002)
+#define IDS_POSTED_AT __MSABI_LONG(0x00011003)
+#define IDS_TO __MSABI_LONG(0x00011004)
+#define IDS_CC __MSABI_LONG(0x00011005)
+#define IDS_POSTED_TO __MSABI_LONG(0x00011006)
+#define IDS_CONVERSATION __MSABI_LONG(0x00011007)
+#define IDS_SUBJECT __MSABI_LONG(0x00011008)
+#define IDS_IMPORTANCE __MSABI_LONG(0x00011009)
+#define IDS_ON_BEHALF_OF __MSABI_LONG(0x0001100A)
+#define IDS_FW __MSABI_LONG(0x0001100B)
+#define IDS_RE __MSABI_LONG(0x0001100C)
+#define IDS_CODEPAGE __MSABI_LONG(0x0001100D)
 
 #ifdef CDOSVR
-#define IDS_CalendarFolder 0x0001100EL
-#define IDS_ContactsFolder 0x0001100FL
-#define IDS_DraftsFolder 0x00011010L
-#define IDS_JournalFolder 0x00011011L
-#define IDS_NotesFolder 0x00011012L
-#define IDS_TasksFolder 0x00011013L
+#define IDS_CalendarFolder __MSABI_LONG(0x0001100E)
+#define IDS_ContactsFolder __MSABI_LONG(0x0001100F)
+#define IDS_DraftsFolder __MSABI_LONG(0x00011010)
+#define IDS_JournalFolder __MSABI_LONG(0x00011011)
+#define IDS_NotesFolder __MSABI_LONG(0x00011012)
+#define IDS_TasksFolder __MSABI_LONG(0x00011013)
 #endif
 
-#define IDS_NewFolder 0x00011014L
-#define IDS_Location 0x00011015L
-#define IDS_StartTime 0x00011016L
-#define IDS_EndTime 0x00011017L
-#define IDS_TimeZone 0x00011018L
-#define IDS_LocalTime 0x00011019L
-#define IDS_Organizer 0x0001101AL
-#define IDS_ApptType 0x0001101BL
-#define IDS_SingleAppt 0x0001101CL
-#define IDS_SingleMtg 0x0001101DL
-#define IDS_RecurAppt 0x0001101EL
-#define IDS_RecurMtg 0x0001101FL
-#define IDS_Universal 0x00011100L
-#define IDS_Greenwich 0x00011101L
-#define IDS_Sarajevo 0x00011102L
-#define IDS_Paris 0x00011103L
-#define IDS_Berlin 0x00011104L
-#define IDS_EasternEurope 0x00011105L
-#define IDS_Prague 0x00011106L
-#define IDS_Athens 0x00011107L
-#define IDS_Brasilia 0x00011108L
-#define IDS_Atlantic 0x00011109L
-#define IDS_Eastern 0x0001110AL
-#define IDS_Central 0x0001110BL
-#define IDS_Mountain 0x0001110CL
-#define IDS_Pacific 0x0001110DL
-#define IDS_Alaska 0x0001110EL
-#define IDS_Hawaii 0x0001110FL
-#define IDS_Midway 0x00011110L
-#define IDS_Wellington 0x00011111L
-#define IDS_Brisbane 0x00011112L
-#define IDS_Adelaide 0x00011113L
-#define IDS_Tokyo 0x00011114L
-#define IDS_Singapore 0x00011115L
-#define IDS_Bangkok 0x00011116L
-#define IDS_Bombay 0x00011117L
-#define IDS_AbuDhabi 0x00011118L
-#define IDS_Tehran 0x00011119L
-#define IDS_Baghdad 0x0001111AL
-#define IDS_Israel 0x0001111BL
-#define IDS_Newfoundland 0x0001111CL
-#define IDS_Azores 0x0001111DL
-#define IDS_MidAtlantic 0x0001111EL
-#define IDS_Monrovia 0x0001111FL
-#define IDS_BuenosAires 0x00011120L
-#define IDS_Caracas 0x00011121L
-#define IDS_Indiana 0x00011122L
-#define IDS_Bogota 0x00011123L
-#define IDS_Saskatchewan 0x00011124L
-#define IDS_Mexico 0x00011125L
-#define IDS_Arizona 0x00011126L
-#define IDS_Eniwetok 0x00011127L
-#define IDS_Fiji 0x00011128L
-#define IDS_Magadan 0x00011129L
-#define IDS_Hobart 0x0001112AL
-#define IDS_Guam 0x0001112BL
-#define IDS_Darwin 0x0001112CL
-#define IDS_Beijing 0x0001112DL
-#define IDS_Almaty 0x0001112EL
-#define IDS_Islamabad 0x0001112FL
-#define IDS_Kabul 0x00011130L
-#define IDS_Cairo 0x00011131L
-#define IDS_Harare 0x00011132L
-#define IDS_Moscow 0x00011133L
-#define IDS_CapeVerde 0x00011134L
-#define IDS_Caucasus 0x00011135L
-#define IDS_CentralAmerica 0x00011136L
-#define IDS_EastAfrica 0x00011137L
-#define IDS_Melbourne 0x00011138L
-#define IDS_Ekaterinburg 0x00011139L
-#define IDS_Helsinki 0x0001113AL
-#define IDS_Greenland 0x0001113BL
-#define IDS_Rangoon 0x0001113CL
-#define IDS_Nepal 0x0001113DL
-#define IDS_Irkutsk 0x0001113EL
-#define IDS_Krasnoyarsk 0x0001113FL
-#define IDS_Santiago 0x00011140L
-#define IDS_SriLanka 0x00011141L
-#define IDS_Tonga 0x00011142L
-#define IDS_Vladivostok 0x00011143L
-#define IDS_WestCentralAfrica 0x00011144L
-#define IDS_Yakutsk 0x00011145L
-#define IDS_Dhaka 0x00011146L
-#define IDS_Seoul 0x00011147L
-#define IDS_Perth 0x00011148L
-#define IDS_Arab 0x00011149L
-#define IDS_Taipei 0x0001114AL
-#define IDS_Sydney2000 0x0001114BL
+#define IDS_NewFolder __MSABI_LONG(0x00011014)
+#define IDS_Location __MSABI_LONG(0x00011015)
+#define IDS_StartTime __MSABI_LONG(0x00011016)
+#define IDS_EndTime __MSABI_LONG(0x00011017)
+#define IDS_TimeZone __MSABI_LONG(0x00011018)
+#define IDS_LocalTime __MSABI_LONG(0x00011019)
+#define IDS_Organizer __MSABI_LONG(0x0001101A)
+#define IDS_ApptType __MSABI_LONG(0x0001101B)
+#define IDS_SingleAppt __MSABI_LONG(0x0001101C)
+#define IDS_SingleMtg __MSABI_LONG(0x0001101D)
+#define IDS_RecurAppt __MSABI_LONG(0x0001101E)
+#define IDS_RecurMtg __MSABI_LONG(0x0001101F)
+#define IDS_Universal __MSABI_LONG(0x00011100)
+#define IDS_Greenwich __MSABI_LONG(0x00011101)
+#define IDS_Sarajevo __MSABI_LONG(0x00011102)
+#define IDS_Paris __MSABI_LONG(0x00011103)
+#define IDS_Berlin __MSABI_LONG(0x00011104)
+#define IDS_EasternEurope __MSABI_LONG(0x00011105)
+#define IDS_Prague __MSABI_LONG(0x00011106)
+#define IDS_Athens __MSABI_LONG(0x00011107)
+#define IDS_Brasilia __MSABI_LONG(0x00011108)
+#define IDS_Atlantic __MSABI_LONG(0x00011109)
+#define IDS_Eastern __MSABI_LONG(0x0001110A)
+#define IDS_Central __MSABI_LONG(0x0001110B)
+#define IDS_Mountain __MSABI_LONG(0x0001110C)
+#define IDS_Pacific __MSABI_LONG(0x0001110D)
+#define IDS_Alaska __MSABI_LONG(0x0001110E)
+#define IDS_Hawaii __MSABI_LONG(0x0001110F)
+#define IDS_Midway __MSABI_LONG(0x00011110)
+#define IDS_Wellington __MSABI_LONG(0x00011111)
+#define IDS_Brisbane __MSABI_LONG(0x00011112)
+#define IDS_Adelaide __MSABI_LONG(0x00011113)
+#define IDS_Tokyo __MSABI_LONG(0x00011114)
+#define IDS_Singapore __MSABI_LONG(0x00011115)
+#define IDS_Bangkok __MSABI_LONG(0x00011116)
+#define IDS_Bombay __MSABI_LONG(0x00011117)
+#define IDS_AbuDhabi __MSABI_LONG(0x00011118)
+#define IDS_Tehran __MSABI_LONG(0x00011119)
+#define IDS_Baghdad __MSABI_LONG(0x0001111A)
+#define IDS_Israel __MSABI_LONG(0x0001111B)
+#define IDS_Newfoundland __MSABI_LONG(0x0001111C)
+#define IDS_Azores __MSABI_LONG(0x0001111D)
+#define IDS_MidAtlantic __MSABI_LONG(0x0001111E)
+#define IDS_Monrovia __MSABI_LONG(0x0001111F)
+#define IDS_BuenosAires __MSABI_LONG(0x00011120)
+#define IDS_Caracas __MSABI_LONG(0x00011121)
+#define IDS_Indiana __MSABI_LONG(0x00011122)
+#define IDS_Bogota __MSABI_LONG(0x00011123)
+#define IDS_Saskatchewan __MSABI_LONG(0x00011124)
+#define IDS_Mexico __MSABI_LONG(0x00011125)
+#define IDS_Arizona __MSABI_LONG(0x00011126)
+#define IDS_Eniwetok __MSABI_LONG(0x00011127)
+#define IDS_Fiji __MSABI_LONG(0x00011128)
+#define IDS_Magadan __MSABI_LONG(0x00011129)
+#define IDS_Hobart __MSABI_LONG(0x0001112A)
+#define IDS_Guam __MSABI_LONG(0x0001112B)
+#define IDS_Darwin __MSABI_LONG(0x0001112C)
+#define IDS_Beijing __MSABI_LONG(0x0001112D)
+#define IDS_Almaty __MSABI_LONG(0x0001112E)
+#define IDS_Islamabad __MSABI_LONG(0x0001112F)
+#define IDS_Kabul __MSABI_LONG(0x00011130)
+#define IDS_Cairo __MSABI_LONG(0x00011131)
+#define IDS_Harare __MSABI_LONG(0x00011132)
+#define IDS_Moscow __MSABI_LONG(0x00011133)
+#define IDS_CapeVerde __MSABI_LONG(0x00011134)
+#define IDS_Caucasus __MSABI_LONG(0x00011135)
+#define IDS_CentralAmerica __MSABI_LONG(0x00011136)
+#define IDS_EastAfrica __MSABI_LONG(0x00011137)
+#define IDS_Melbourne __MSABI_LONG(0x00011138)
+#define IDS_Ekaterinburg __MSABI_LONG(0x00011139)
+#define IDS_Helsinki __MSABI_LONG(0x0001113A)
+#define IDS_Greenland __MSABI_LONG(0x0001113B)
+#define IDS_Rangoon __MSABI_LONG(0x0001113C)
+#define IDS_Nepal __MSABI_LONG(0x0001113D)
+#define IDS_Irkutsk __MSABI_LONG(0x0001113E)
+#define IDS_Krasnoyarsk __MSABI_LONG(0x0001113F)
+#define IDS_Santiago __MSABI_LONG(0x00011140)
+#define IDS_SriLanka __MSABI_LONG(0x00011141)
+#define IDS_Tonga __MSABI_LONG(0x00011142)
+#define IDS_Vladivostok __MSABI_LONG(0x00011143)
+#define IDS_WestCentralAfrica __MSABI_LONG(0x00011144)
+#define IDS_Yakutsk __MSABI_LONG(0x00011145)
+#define IDS_Dhaka __MSABI_LONG(0x00011146)
+#define IDS_Seoul __MSABI_LONG(0x00011147)
+#define IDS_Perth __MSABI_LONG(0x00011148)
+#define IDS_Arab __MSABI_LONG(0x00011149)
+#define IDS_Taipei __MSABI_LONG(0x0001114A)
+#define IDS_Sydney2000 __MSABI_LONG(0x0001114B)
 
 #ifdef CDOSVR
-#define evtMethodCalled 0x00032000L
-#define evtMethodReturning 0x00032001L
-#define evtIsAborting 0xC0032002L
-#define evtExpansionInitialized 0x00032003L
-#define evtExpansionUnInitialized 0x00032004L
-#define evtExpansionInitializeFailed 0xC0032005L
-#define evtExpansionRegisterFailed 0xC0032006L
-#define evtExpansionMessageSaveChangesFailed 0xC0032007L
-#define evtExpansionMessageDeleteFailed 0xC0032008L
-#define evtExpansionFolderSaveChangesFailed 0xC0032009L
-#define evtExpansionTooManyInstancesPerDay 0x8003200AL
-#define evtMailboxCreateTotalFailure 0xC003200BL
-#define evtMailboxCreatePartialFailure 0xC003200CL
-#define evtUninitImplRestFailed 0xC003200DL
-#define evtExpandSavingAppt 0xC003200EL
-#define evtExpandDeletingAppt 0xC003200FL
-#define evtExpandQuery 0xC0032010L
-#define evtExpandFolderSetProps 0xC0032011L
-#define evtRegistryFailure 0xC0032012L
-#define evtExpStat 0xC0032013L
-#define evtDumpFcn 0xC0032014L
-#define evtSaveDeleteFailFBUpdate 0xC0032015L
-#define evtProcessingQueryCallback 0xC0032016L
-#define evtMailboxLocalizeTotalFailure 0xC0032017L
-#define evtMailboxLocalizePartialFailure 0xC0032018L
-#define evtExpandMaster 0xC0032019L
-#define evtExpansionInit 0xC003201AL
-#define evtFBGenerateMsg 0xC003201BL
-#define evtExpansionInstExpiryInPublicMDB 0x8003201CL
-#define evtUnhandledExceptionInitialization 0xC003201DL
-#define evtUnhandledExceptionShutdown 0xC003201EL
-#define evtUnhandledExceptionInitializationMDB 0xC003201FL
-#define evtUnhandledExceptionShutdownMDB 0xC0032020L
-#define evtUnhandledExceptionMsgSaveChanges 0xC0032021L
-#define evtUnhandledExceptionDelete 0xC0032022L
-#define evtUnhandledExceptionQuery 0xC0032023L
-#define evtUnhandledExceptionFolderSaveChanges 0xC0032024L
-#define evtCorruptedCalendar 0xC0032025L
-#define evtRebuildCalendar 0x80032026L
-#define evtCheckPrimaryCalendar 0x80032027L
-#define evtExpandMasterPF 0xC0032028L
-#define evtCorruptedPFCalendar 0xC0032029L
-#define evtRebuildPFCalendar 0x8003202AL
-#define evtMovingMailboxCallbackFailed 0x8003202BL
+#define evtMethodCalled __MSABI_LONG(0x00032000)
+#define evtMethodReturning __MSABI_LONG(0x00032001)
+#define evtIsAborting __MSABI_LONG(0xC0032002)
+#define evtExpansionInitialized __MSABI_LONG(0x00032003)
+#define evtExpansionUnInitialized __MSABI_LONG(0x00032004)
+#define evtExpansionInitializeFailed __MSABI_LONG(0xC0032005)
+#define evtExpansionRegisterFailed __MSABI_LONG(0xC0032006)
+#define evtExpansionMessageSaveChangesFailed __MSABI_LONG(0xC0032007)
+#define evtExpansionMessageDeleteFailed __MSABI_LONG(0xC0032008)
+#define evtExpansionFolderSaveChangesFailed __MSABI_LONG(0xC0032009)
+#define evtExpansionTooManyInstancesPerDay __MSABI_LONG(0x8003200A)
+#define evtMailboxCreateTotalFailure __MSABI_LONG(0xC003200B)
+#define evtMailboxCreatePartialFailure __MSABI_LONG(0xC003200C)
+#define evtUninitImplRestFailed __MSABI_LONG(0xC003200D)
+#define evtExpandSavingAppt __MSABI_LONG(0xC003200E)
+#define evtExpandDeletingAppt __MSABI_LONG(0xC003200F)
+#define evtExpandQuery __MSABI_LONG(0xC0032010)
+#define evtExpandFolderSetProps __MSABI_LONG(0xC0032011)
+#define evtRegistryFailure __MSABI_LONG(0xC0032012)
+#define evtExpStat __MSABI_LONG(0xC0032013)
+#define evtDumpFcn __MSABI_LONG(0xC0032014)
+#define evtSaveDeleteFailFBUpdate __MSABI_LONG(0xC0032015)
+#define evtProcessingQueryCallback __MSABI_LONG(0xC0032016)
+#define evtMailboxLocalizeTotalFailure __MSABI_LONG(0xC0032017)
+#define evtMailboxLocalizePartialFailure __MSABI_LONG(0xC0032018)
+#define evtExpandMaster __MSABI_LONG(0xC0032019)
+#define evtExpansionInit __MSABI_LONG(0xC003201A)
+#define evtFBGenerateMsg __MSABI_LONG(0xC003201B)
+#define evtExpansionInstExpiryInPublicMDB __MSABI_LONG(0x8003201C)
+#define evtUnhandledExceptionInitialization __MSABI_LONG(0xC003201D)
+#define evtUnhandledExceptionShutdown __MSABI_LONG(0xC003201E)
+#define evtUnhandledExceptionInitializationMDB __MSABI_LONG(0xC003201F)
+#define evtUnhandledExceptionShutdownMDB __MSABI_LONG(0xC0032020)
+#define evtUnhandledExceptionMsgSaveChanges __MSABI_LONG(0xC0032021)
+#define evtUnhandledExceptionDelete __MSABI_LONG(0xC0032022)
+#define evtUnhandledExceptionQuery __MSABI_LONG(0xC0032023)
+#define evtUnhandledExceptionFolderSaveChanges __MSABI_LONG(0xC0032024)
+#define evtCorruptedCalendar __MSABI_LONG(0xC0032025)
+#define evtRebuildCalendar __MSABI_LONG(0x80032026)
+#define evtCheckPrimaryCalendar __MSABI_LONG(0x80032027)
+#define evtExpandMasterPF __MSABI_LONG(0xC0032028)
+#define evtCorruptedPFCalendar __MSABI_LONG(0xC0032029)
+#define evtRebuildPFCalendar __MSABI_LONG(0x8003202A)
+#define evtMovingMailboxCallbackFailed __MSABI_LONG(0x8003202B)
 #endif
diff --git a/mingw-w64-headers/include/cdosyserr.h b/mingw-w64-headers/include/cdosyserr.h
index a426df1..6bdd203 100644
--- a/mingw-w64-headers/include/cdosyserr.h
+++ b/mingw-w64-headers/include/cdosyserr.h
@@ -3,260 +3,260 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define categoryHeader 0x00000001L
-#define categoryUnused 0x00000002L
-#define categoryGeneral 0x00000003L
-#define CDO_E_UNCAUGHT_EXCEPTION 0x80040201L
-#define CDO_E_NOT_OPENED 0x80040202L
-#define CDO_E_UNSUPPORTED_DATASOURCE 0x80040203L
-#define CDO_E_INVALID_PROPERTYNAME 0x80040204L
-#define CDO_E_PROP_UNSUPPORTED 0x80040205L
-#define CDO_E_INACTIVE 0x80040206L
-#define CDO_E_NO_SUPPORT_FOR_OBJECTS 0x80040207L
-#define CDO_E_NOT_AVAILABLE 0x80040208L
-#define CDO_E_NO_DEFAULT_DROP_DIR 0x80040209L
-#define CDO_E_SMTP_SERVER_REQUIRED 0x8004020AL
-#define CDO_E_NNTP_SERVER_REQUIRED 0x8004020BL
-#define CDO_E_RECIPIENT_MISSING 0x8004020CL
-#define CDO_E_FROM_MISSING 0x8004020DL
-#define CDO_E_SENDER_REJECTED 0x8004020EL
-#define CDO_E_RECIPIENTS_REJECTED 0x8004020FL
-#define CDO_E_NNTP_POST_FAILED 0x80040210L
-#define CDO_E_SMTP_SEND_FAILED 0x80040211L
-#define CDO_E_CONNECTION_DROPPED 0x80040212L
-#define CDO_E_FAILED_TO_CONNECT 0x80040213L
-#define CDO_E_INVALID_POST 0x80040214L
-#define CDO_E_AUTHENTICATION_FAILURE 0x80040215L
-#define CDO_E_INVALID_CONTENT_TYPE 0x80040216L
-#define CDO_E_LOGON_FAILURE 0x80040217L
-#define CDO_E_HTTP_NOT_FOUND 0x80040218L
-#define CDO_E_HTTP_FORBIDDEN 0x80040219L
-#define CDO_E_HTTP_FAILED 0x8004021AL
-#define CDO_E_MULTIPART_NO_DATA 0x8004021BL
-#define CDO_E_INVALID_ENCODING_FOR_MULTIPART 0x8004021CL
-#define CDO_E_UNSAFE_OPERATION 0x8004021DL
-#define CDO_E_PROP_NOT_FOUND 0x8004021EL
-#define CDO_E_INVALID_SEND_OPTION 0x80040220L
-#define CDO_E_INVALID_POST_OPTION 0x80040221L
-#define CDO_E_NO_PICKUP_DIR 0x80040222L
-#define CDO_E_NOT_ALL_DELETED 0x80040223L
-#define CDO_E_NO_METHOD 0x80040224L
-#define CDO_E_PROP_READONLY 0x80040227L
-#define CDO_E_PROP_CANNOT_DELETE 0x80040228L
-#define CDO_E_BAD_DATA 0x80040229L
-#define CDO_E_PROP_NONHEADER 0x8004022AL
-#define CDO_E_INVALID_CHARSET 0x8004022BL
-#define CDO_E_ADOSTREAM_NOT_BOUND 0x8004022CL
-#define CDO_E_CONTENTPROPXML_NOT_FOUND 0x8004022DL
-#define CDO_E_CONTENTPROPXML_WRONG_CHARSET 0x8004022EL
-#define CDO_E_CONTENTPROPXML_PARSE_FAILED 0x8004022FL
-#define CDO_E_CONTENTPROPXML_CONVERT_FAILED 0x80040230L
-#define CDO_E_NO_DIRECTORIES_SPECIFIED 0x80040231L
-#define CDO_E_DIRECTORIES_UNREACHABLE 0x80040232L
-#define CDO_E_BAD_SENDER 0x80040233L
-#define CDO_E_SELF_BINDING 0x80040234L
-#define CDO_E_BAD_ATTENDEE_DATA 0x80040235L
-#define CDO_E_ROLE_NOMORE_AVAILABLE 0x80040236L
+#define categoryHeader __MSABI_LONG(0x00000001)
+#define categoryUnused __MSABI_LONG(0x00000002)
+#define categoryGeneral __MSABI_LONG(0x00000003)
+#define CDO_E_UNCAUGHT_EXCEPTION __MSABI_LONG(0x80040201)
+#define CDO_E_NOT_OPENED __MSABI_LONG(0x80040202)
+#define CDO_E_UNSUPPORTED_DATASOURCE __MSABI_LONG(0x80040203)
+#define CDO_E_INVALID_PROPERTYNAME __MSABI_LONG(0x80040204)
+#define CDO_E_PROP_UNSUPPORTED __MSABI_LONG(0x80040205)
+#define CDO_E_INACTIVE __MSABI_LONG(0x80040206)
+#define CDO_E_NO_SUPPORT_FOR_OBJECTS __MSABI_LONG(0x80040207)
+#define CDO_E_NOT_AVAILABLE __MSABI_LONG(0x80040208)
+#define CDO_E_NO_DEFAULT_DROP_DIR __MSABI_LONG(0x80040209)
+#define CDO_E_SMTP_SERVER_REQUIRED __MSABI_LONG(0x8004020A)
+#define CDO_E_NNTP_SERVER_REQUIRED __MSABI_LONG(0x8004020B)
+#define CDO_E_RECIPIENT_MISSING __MSABI_LONG(0x8004020C)
+#define CDO_E_FROM_MISSING __MSABI_LONG(0x8004020D)
+#define CDO_E_SENDER_REJECTED __MSABI_LONG(0x8004020E)
+#define CDO_E_RECIPIENTS_REJECTED __MSABI_LONG(0x8004020F)
+#define CDO_E_NNTP_POST_FAILED __MSABI_LONG(0x80040210)
+#define CDO_E_SMTP_SEND_FAILED __MSABI_LONG(0x80040211)
+#define CDO_E_CONNECTION_DROPPED __MSABI_LONG(0x80040212)
+#define CDO_E_FAILED_TO_CONNECT __MSABI_LONG(0x80040213)
+#define CDO_E_INVALID_POST __MSABI_LONG(0x80040214)
+#define CDO_E_AUTHENTICATION_FAILURE __MSABI_LONG(0x80040215)
+#define CDO_E_INVALID_CONTENT_TYPE __MSABI_LONG(0x80040216)
+#define CDO_E_LOGON_FAILURE __MSABI_LONG(0x80040217)
+#define CDO_E_HTTP_NOT_FOUND __MSABI_LONG(0x80040218)
+#define CDO_E_HTTP_FORBIDDEN __MSABI_LONG(0x80040219)
+#define CDO_E_HTTP_FAILED __MSABI_LONG(0x8004021A)
+#define CDO_E_MULTIPART_NO_DATA __MSABI_LONG(0x8004021B)
+#define CDO_E_INVALID_ENCODING_FOR_MULTIPART __MSABI_LONG(0x8004021C)
+#define CDO_E_UNSAFE_OPERATION __MSABI_LONG(0x8004021D)
+#define CDO_E_PROP_NOT_FOUND __MSABI_LONG(0x8004021E)
+#define CDO_E_INVALID_SEND_OPTION __MSABI_LONG(0x80040220)
+#define CDO_E_INVALID_POST_OPTION __MSABI_LONG(0x80040221)
+#define CDO_E_NO_PICKUP_DIR __MSABI_LONG(0x80040222)
+#define CDO_E_NOT_ALL_DELETED __MSABI_LONG(0x80040223)
+#define CDO_E_NO_METHOD __MSABI_LONG(0x80040224)
+#define CDO_E_PROP_READONLY __MSABI_LONG(0x80040227)
+#define CDO_E_PROP_CANNOT_DELETE __MSABI_LONG(0x80040228)
+#define CDO_E_BAD_DATA __MSABI_LONG(0x80040229)
+#define CDO_E_PROP_NONHEADER __MSABI_LONG(0x8004022A)
+#define CDO_E_INVALID_CHARSET __MSABI_LONG(0x8004022B)
+#define CDO_E_ADOSTREAM_NOT_BOUND __MSABI_LONG(0x8004022C)
+#define CDO_E_CONTENTPROPXML_NOT_FOUND __MSABI_LONG(0x8004022D)
+#define CDO_E_CONTENTPROPXML_WRONG_CHARSET __MSABI_LONG(0x8004022E)
+#define CDO_E_CONTENTPROPXML_PARSE_FAILED __MSABI_LONG(0x8004022F)
+#define CDO_E_CONTENTPROPXML_CONVERT_FAILED __MSABI_LONG(0x80040230)
+#define CDO_E_NO_DIRECTORIES_SPECIFIED __MSABI_LONG(0x80040231)
+#define CDO_E_DIRECTORIES_UNREACHABLE __MSABI_LONG(0x80040232)
+#define CDO_E_BAD_SENDER __MSABI_LONG(0x80040233)
+#define CDO_E_SELF_BINDING __MSABI_LONG(0x80040234)
+#define CDO_E_BAD_ATTENDEE_DATA __MSABI_LONG(0x80040235)
+#define CDO_E_ROLE_NOMORE_AVAILABLE __MSABI_LONG(0x80040236)
 
 #ifdef CDOTASKS
-#define CDO_E_BAD_TASKTYPE_ONASSIGN 0x80040237L
-#define CDO_E_NOT_ASSIGNEDTO_USER 0x80040238L
+#define CDO_E_BAD_TASKTYPE_ONASSIGN __MSABI_LONG(0x80040237)
+#define CDO_E_NOT_ASSIGNEDTO_USER __MSABI_LONG(0x80040238)
 #endif
 
-#define CDO_E_OUTOFDATE 0x80040239L
-#define CDO_E_ARGUMENT1 0x80044000L
-#define CDO_E_ARGUMENT2 0x80044001L
-#define CDO_E_ARGUMENT3 0x80044002L
-#define CDO_E_ARGUMENT4 0x80044003L
-#define CDO_E_ARGUMENT5 0x80044004L
-#define CDO_E_NOT_FOUND 0x800CCE05L
-#define CDO_E_INVALID_ENCODING_TYPE 0x800CCE1DL
-#define IDS_ORIGINAL_MESSAGE 0x00011000L
-#define IDS_FROM 0x00011001L
-#define IDS_SENT 0x00011002L
-#define IDS_POSTED_AT 0x00011003L
-#define IDS_TO 0x00011004L
-#define IDS_CC 0x00011005L
-#define IDS_POSTED_TO 0x00011006L
-#define IDS_CONVERSATION 0x00011007L
-#define IDS_SUBJECT 0x00011008L
-#define IDS_IMPORTANCE 0x00011009L
-#define IDS_ON_BEHALF_OF 0x0001100AL
-#define IDS_FW 0x0001100BL
-#define IDS_RE 0x0001100CL
-#define IDS_CODEPAGE 0x0001100DL
+#define CDO_E_OUTOFDATE __MSABI_LONG(0x80040239)
+#define CDO_E_ARGUMENT1 __MSABI_LONG(0x80044000)
+#define CDO_E_ARGUMENT2 __MSABI_LONG(0x80044001)
+#define CDO_E_ARGUMENT3 __MSABI_LONG(0x80044002)
+#define CDO_E_ARGUMENT4 __MSABI_LONG(0x80044003)
+#define CDO_E_ARGUMENT5 __MSABI_LONG(0x80044004)
+#define CDO_E_NOT_FOUND __MSABI_LONG(0x800CCE05)
+#define CDO_E_INVALID_ENCODING_TYPE __MSABI_LONG(0x800CCE1D)
+#define IDS_ORIGINAL_MESSAGE __MSABI_LONG(0x00011000)
+#define IDS_FROM __MSABI_LONG(0x00011001)
+#define IDS_SENT __MSABI_LONG(0x00011002)
+#define IDS_POSTED_AT __MSABI_LONG(0x00011003)
+#define IDS_TO __MSABI_LONG(0x00011004)
+#define IDS_CC __MSABI_LONG(0x00011005)
+#define IDS_POSTED_TO __MSABI_LONG(0x00011006)
+#define IDS_CONVERSATION __MSABI_LONG(0x00011007)
+#define IDS_SUBJECT __MSABI_LONG(0x00011008)
+#define IDS_IMPORTANCE __MSABI_LONG(0x00011009)
+#define IDS_ON_BEHALF_OF __MSABI_LONG(0x0001100A)
+#define IDS_FW __MSABI_LONG(0x0001100B)
+#define IDS_RE __MSABI_LONG(0x0001100C)
+#define IDS_CODEPAGE __MSABI_LONG(0x0001100D)
 
 #ifdef CDOSVR
-#define IDS_CalendarFolder 0x0001100EL
-#define IDS_ContactsFolder 0x0001100FL
-#define IDS_DraftsFolder 0x00011010L
-#define IDS_JournalFolder 0x00011011L
-#define IDS_NotesFolder 0x00011012L
-#define IDS_TasksFolder 0x00011013L
+#define IDS_CalendarFolder __MSABI_LONG(0x0001100E)
+#define IDS_ContactsFolder __MSABI_LONG(0x0001100F)
+#define IDS_DraftsFolder __MSABI_LONG(0x00011010)
+#define IDS_JournalFolder __MSABI_LONG(0x00011011)
+#define IDS_NotesFolder __MSABI_LONG(0x00011012)
+#define IDS_TasksFolder __MSABI_LONG(0x00011013)
 #endif
 
-#define IDS_NewFolder 0x00011014L
-#define IDS_Location 0x00011015L
-#define IDS_StartTime 0x00011016L
-#define IDS_EndTime 0x00011017L
-#define IDS_TimeZone 0x00011018L
-#define IDS_LocalTime 0x00011019L
-#define IDS_Organizer 0x0001101AL
-#define IDS_ApptType 0x0001101BL
-#define IDS_SingleAppt 0x0001101CL
-#define IDS_SingleMtg 0x0001101DL
-#define IDS_RecurAppt 0x0001101EL
-#define IDS_RecurMtg 0x0001101FL
-#define IDS_Universal 0x00011100L
-#define IDS_Greenwich 0x00011101L
-#define IDS_Sarajevo 0x00011102L
-#define IDS_Paris 0x00011103L
-#define IDS_Berlin 0x00011104L
-#define IDS_EasternEurope 0x00011105L
-#define IDS_Prague 0x00011106L
-#define IDS_Athens 0x00011107L
-#define IDS_Brasilia 0x00011108L
-#define IDS_Atlantic 0x00011109L
-#define IDS_Eastern 0x0001110AL
-#define IDS_Central 0x0001110BL
-#define IDS_Mountain 0x0001110CL
-#define IDS_Pacific 0x0001110DL
-#define IDS_Alaska 0x0001110EL
-#define IDS_Hawaii 0x0001110FL
-#define IDS_Midway 0x00011110L
-#define IDS_Wellington 0x00011111L
-#define IDS_Brisbane 0x00011112L
-#define IDS_Adelaide 0x00011113L
-#define IDS_Tokyo 0x00011114L
-#define IDS_Singapore 0x00011115L
-#define IDS_Bangkok 0x00011116L
-#define IDS_Bombay 0x00011117L
-#define IDS_AbuDhabi 0x00011118L
-#define IDS_Tehran 0x00011119L
-#define IDS_Baghdad 0x0001111AL
-#define IDS_Israel 0x0001111BL
-#define IDS_Newfoundland 0x0001111CL
-#define IDS_Azores 0x0001111DL
-#define IDS_MidAtlantic 0x0001111EL
-#define IDS_Monrovia 0x0001111FL
-#define IDS_BuenosAires 0x00011120L
-#define IDS_Caracas 0x00011121L
-#define IDS_Indiana 0x00011122L
-#define IDS_Bogota 0x00011123L
-#define IDS_Saskatchewan 0x00011124L
-#define IDS_Mexico 0x00011125L
-#define IDS_Arizona 0x00011126L
-#define IDS_Eniwetok 0x00011127L
-#define IDS_Fiji 0x00011128L
-#define IDS_Magadan 0x00011129L
-#define IDS_Hobart 0x0001112AL
-#define IDS_Guam 0x0001112BL
-#define IDS_Darwin 0x0001112CL
-#define IDS_Beijing 0x0001112DL
-#define IDS_Almaty 0x0001112EL
-#define IDS_Islamabad 0x0001112FL
-#define IDS_Kabul 0x00011130L
-#define IDS_Cairo 0x00011131L
-#define IDS_Harare 0x00011132L
-#define IDS_Moscow 0x00011133L
-#define IDS_CapeVerde 0x00011134L
-#define IDS_Caucasus 0x00011135L
-#define IDS_CentralAmerica 0x00011136L
-#define IDS_EastAfrica 0x00011137L
-#define IDS_Melbourne 0x00011138L
-#define IDS_Ekaterinburg 0x00011139L
-#define IDS_Helsinki 0x0001113AL
-#define IDS_Greenland 0x0001113BL
-#define IDS_Rangoon 0x0001113CL
-#define IDS_Nepal 0x0001113DL
-#define IDS_Irkutsk 0x0001113EL
-#define IDS_Krasnoyarsk 0x0001113FL
-#define IDS_Santiago 0x00011140L
-#define IDS_SriLanka 0x00011141L
-#define IDS_Tonga 0x00011142L
-#define IDS_Vladivostok 0x00011143L
-#define IDS_WestCentralAfrica 0x00011144L
-#define IDS_Yakutsk 0x00011145L
-#define IDS_Dhaka 0x00011146L
-#define IDS_Seoul 0x00011147L
-#define IDS_Perth 0x00011148L
-#define IDS_Arab 0x00011149L
-#define IDS_Taipei 0x0001114AL
-#define IDS_Sydney2000 0x0001114BL
-#define IDS_Chihuahua 0x0001114CL
+#define IDS_NewFolder __MSABI_LONG(0x00011014)
+#define IDS_Location __MSABI_LONG(0x00011015)
+#define IDS_StartTime __MSABI_LONG(0x00011016)
+#define IDS_EndTime __MSABI_LONG(0x00011017)
+#define IDS_TimeZone __MSABI_LONG(0x00011018)
+#define IDS_LocalTime __MSABI_LONG(0x00011019)
+#define IDS_Organizer __MSABI_LONG(0x0001101A)
+#define IDS_ApptType __MSABI_LONG(0x0001101B)
+#define IDS_SingleAppt __MSABI_LONG(0x0001101C)
+#define IDS_SingleMtg __MSABI_LONG(0x0001101D)
+#define IDS_RecurAppt __MSABI_LONG(0x0001101E)
+#define IDS_RecurMtg __MSABI_LONG(0x0001101F)
+#define IDS_Universal __MSABI_LONG(0x00011100)
+#define IDS_Greenwich __MSABI_LONG(0x00011101)
+#define IDS_Sarajevo __MSABI_LONG(0x00011102)
+#define IDS_Paris __MSABI_LONG(0x00011103)
+#define IDS_Berlin __MSABI_LONG(0x00011104)
+#define IDS_EasternEurope __MSABI_LONG(0x00011105)
+#define IDS_Prague __MSABI_LONG(0x00011106)
+#define IDS_Athens __MSABI_LONG(0x00011107)
+#define IDS_Brasilia __MSABI_LONG(0x00011108)
+#define IDS_Atlantic __MSABI_LONG(0x00011109)
+#define IDS_Eastern __MSABI_LONG(0x0001110A)
+#define IDS_Central __MSABI_LONG(0x0001110B)
+#define IDS_Mountain __MSABI_LONG(0x0001110C)
+#define IDS_Pacific __MSABI_LONG(0x0001110D)
+#define IDS_Alaska __MSABI_LONG(0x0001110E)
+#define IDS_Hawaii __MSABI_LONG(0x0001110F)
+#define IDS_Midway __MSABI_LONG(0x00011110)
+#define IDS_Wellington __MSABI_LONG(0x00011111)
+#define IDS_Brisbane __MSABI_LONG(0x00011112)
+#define IDS_Adelaide __MSABI_LONG(0x00011113)
+#define IDS_Tokyo __MSABI_LONG(0x00011114)
+#define IDS_Singapore __MSABI_LONG(0x00011115)
+#define IDS_Bangkok __MSABI_LONG(0x00011116)
+#define IDS_Bombay __MSABI_LONG(0x00011117)
+#define IDS_AbuDhabi __MSABI_LONG(0x00011118)
+#define IDS_Tehran __MSABI_LONG(0x00011119)
+#define IDS_Baghdad __MSABI_LONG(0x0001111A)
+#define IDS_Israel __MSABI_LONG(0x0001111B)
+#define IDS_Newfoundland __MSABI_LONG(0x0001111C)
+#define IDS_Azores __MSABI_LONG(0x0001111D)
+#define IDS_MidAtlantic __MSABI_LONG(0x0001111E)
+#define IDS_Monrovia __MSABI_LONG(0x0001111F)
+#define IDS_BuenosAires __MSABI_LONG(0x00011120)
+#define IDS_Caracas __MSABI_LONG(0x00011121)
+#define IDS_Indiana __MSABI_LONG(0x00011122)
+#define IDS_Bogota __MSABI_LONG(0x00011123)
+#define IDS_Saskatchewan __MSABI_LONG(0x00011124)
+#define IDS_Mexico __MSABI_LONG(0x00011125)
+#define IDS_Arizona __MSABI_LONG(0x00011126)
+#define IDS_Eniwetok __MSABI_LONG(0x00011127)
+#define IDS_Fiji __MSABI_LONG(0x00011128)
+#define IDS_Magadan __MSABI_LONG(0x00011129)
+#define IDS_Hobart __MSABI_LONG(0x0001112A)
+#define IDS_Guam __MSABI_LONG(0x0001112B)
+#define IDS_Darwin __MSABI_LONG(0x0001112C)
+#define IDS_Beijing __MSABI_LONG(0x0001112D)
+#define IDS_Almaty __MSABI_LONG(0x0001112E)
+#define IDS_Islamabad __MSABI_LONG(0x0001112F)
+#define IDS_Kabul __MSABI_LONG(0x00011130)
+#define IDS_Cairo __MSABI_LONG(0x00011131)
+#define IDS_Harare __MSABI_LONG(0x00011132)
+#define IDS_Moscow __MSABI_LONG(0x00011133)
+#define IDS_CapeVerde __MSABI_LONG(0x00011134)
+#define IDS_Caucasus __MSABI_LONG(0x00011135)
+#define IDS_CentralAmerica __MSABI_LONG(0x00011136)
+#define IDS_EastAfrica __MSABI_LONG(0x00011137)
+#define IDS_Melbourne __MSABI_LONG(0x00011138)
+#define IDS_Ekaterinburg __MSABI_LONG(0x00011139)
+#define IDS_Helsinki __MSABI_LONG(0x0001113A)
+#define IDS_Greenland __MSABI_LONG(0x0001113B)
+#define IDS_Rangoon __MSABI_LONG(0x0001113C)
+#define IDS_Nepal __MSABI_LONG(0x0001113D)
+#define IDS_Irkutsk __MSABI_LONG(0x0001113E)
+#define IDS_Krasnoyarsk __MSABI_LONG(0x0001113F)
+#define IDS_Santiago __MSABI_LONG(0x00011140)
+#define IDS_SriLanka __MSABI_LONG(0x00011141)
+#define IDS_Tonga __MSABI_LONG(0x00011142)
+#define IDS_Vladivostok __MSABI_LONG(0x00011143)
+#define IDS_WestCentralAfrica __MSABI_LONG(0x00011144)
+#define IDS_Yakutsk __MSABI_LONG(0x00011145)
+#define IDS_Dhaka __MSABI_LONG(0x00011146)
+#define IDS_Seoul __MSABI_LONG(0x00011147)
+#define IDS_Perth __MSABI_LONG(0x00011148)
+#define IDS_Arab __MSABI_LONG(0x00011149)
+#define IDS_Taipei __MSABI_LONG(0x0001114A)
+#define IDS_Sydney2000 __MSABI_LONG(0x0001114B)
+#define IDS_Chihuahua __MSABI_LONG(0x0001114C)
 
 #ifdef CDOSVR
-#define evtMethodCalled 0x00032000L
-#define evtMethodReturning 0x00032001L
-#define evtIsAborting 0xC0032002L
-#define evtExpansionInitialized 0x00032003L
-#define evtExpansionUnInitialized 0x00032004L
-#define evtExpansionInitializeFailed 0xC0032005L
-#define evtExpansionRegisterFailed 0xC0032006L
-#define evtExpansionMessageSaveChangesFailed 0xC0032007L
-#define evtExpansionMessageDeleteFailed 0xC0032008L
-#define evtExpansionFolderSaveChangesFailed 0xC0032009L
-#define evtExpansionTooManyInstancesPerDay 0x8003200AL
-#define evtMailboxCreateTotalFailure 0xC003200BL
-#define evtMailboxCreatePartialFailure 0xC003200CL
-#define evtUninitImplRestFailed 0xC003200DL
-#define evtExpandSavingAppt 0xC003200EL
-#define evtExpandDeletingAppt 0xC003200FL
-#define evtExpandQuery 0xC0032010L
-#define evtExpandFolderSetProps 0xC0032011L
-#define evtRegistryFailure 0xC0032012L
-#define evtExpStat 0xC0032013L
-#define evtDumpFcn 0xC0032014L
-#define evtSaveDeleteFailFBUpdate 0xC0032015L
-#define evtProcessingQueryCallback 0xC0032016L
-#define evtMailboxLocalizeTotalFailure 0xC0032017L
-#define evtMailboxLocalizePartialFailure 0xC0032018L
-#define evtExpandMaster 0xC0032019L
-#define evtExpansionInit 0xC003201AL
-#define evtFBGenerateMsg 0xC003201BL
-#define evtExpansionInstExpiryInPublicMDB 0x8003201CL
-#define evtUnhandledExceptionInitialization 0xC003201DL
-#define evtUnhandledExceptionShutdown 0xC003201EL
-#define evtUnhandledExceptionInitializationMDB 0xC003201FL
-#define evtUnhandledExceptionShutdownMDB 0xC0032020L
-#define evtUnhandledExceptionMsgSaveChanges 0xC0032021L
-#define evtUnhandledExceptionDelete 0xC0032022L
-#define evtUnhandledExceptionQuery 0xC0032023L
-#define evtUnhandledExceptionFolderSaveChanges 0xC0032024L
-#define evtCorruptedCalendar 0xC0032025L
-#define evtRebuildCalendar 0x80032026L
-#define evtCheckPrimaryCalendar 0x80032027L
-#define evtExpandMasterPF 0xC0032028L
-#define evtCorruptedPFCalendar 0xC0032029L
-#define evtRebuildPFCalendar 0x8003202AL
-#define evtMovingMailboxCallbackFailed 0x8003202BL
-#define evtGetMsgClassFromMaster 0x8003202CL
-#define evtOpenURL 0x8003202DL
-#define evtStatusMsgSent 0x4003202EL
-#define evtSaveInvalidStartAppt 0xC003202FL
-#define evtSaveInvalidEndAppt 0x80032030L
-#define evtModifyInvalidAppt 0x80032031L
-#define evtDeleteInvalidAppt 0x80032032L
-#define evtBindToInvalidStartAppt 0xC0032033L
-#define evtBindToInvalidEndAppt 0x80032034L
-#define evtReloadLogType 0x40032035L
-#define evtBackgroundStarted 0x40032036L
-#define evtBackgroundStartFailed 0x80032037L
-#define evtBackgroundProcessing 0x40032038L
-#define evtBackgroundProcessingNoCals 0x40032039L
-#define evtBackgroundProcessingFinished 0x4003203AL
-#define evtBackgroundAwakeDueToShutdown 0x4003203BL
-#define evtBackgroundAwake 0x4003203CL
-#define evtBackgroundTerminating 0x4003203DL
-#define evtBackgroundRegisterTaskFailed 0xC003203EL
-#define evtBackgroundLogonFailed 0xC003203FL
-#define evtBackgroundGetMachineToken 0xC0032040L
-#define evtBackgroundSleepUntilNewCal 0x40032041L
-#define evtBackgroundQueued 0x40032042L
-#define evtBkExpDumpFcn 0xC0032043L
-#define evtSaveDurationTooLong 0x80032044L
-#define evtModifyDurationTooLong 0x80032045L
-#define evtDeleteDurationTooLong 0x80032046L
-#define evtTooManyIterationsForQuery 0x80032047L
-#define evtTooManyIterationsForFreebusy 0x80032048L
+#define evtMethodCalled __MSABI_LONG(0x00032000)
+#define evtMethodReturning __MSABI_LONG(0x00032001)
+#define evtIsAborting __MSABI_LONG(0xC0032002)
+#define evtExpansionInitialized __MSABI_LONG(0x00032003)
+#define evtExpansionUnInitialized __MSABI_LONG(0x00032004)
+#define evtExpansionInitializeFailed __MSABI_LONG(0xC0032005)
+#define evtExpansionRegisterFailed __MSABI_LONG(0xC0032006)
+#define evtExpansionMessageSaveChangesFailed __MSABI_LONG(0xC0032007)
+#define evtExpansionMessageDeleteFailed __MSABI_LONG(0xC0032008)
+#define evtExpansionFolderSaveChangesFailed __MSABI_LONG(0xC0032009)
+#define evtExpansionTooManyInstancesPerDay __MSABI_LONG(0x8003200A)
+#define evtMailboxCreateTotalFailure __MSABI_LONG(0xC003200B)
+#define evtMailboxCreatePartialFailure __MSABI_LONG(0xC003200C)
+#define evtUninitImplRestFailed __MSABI_LONG(0xC003200D)
+#define evtExpandSavingAppt __MSABI_LONG(0xC003200E)
+#define evtExpandDeletingAppt __MSABI_LONG(0xC003200F)
+#define evtExpandQuery __MSABI_LONG(0xC0032010)
+#define evtExpandFolderSetProps __MSABI_LONG(0xC0032011)
+#define evtRegistryFailure __MSABI_LONG(0xC0032012)
+#define evtExpStat __MSABI_LONG(0xC0032013)
+#define evtDumpFcn __MSABI_LONG(0xC0032014)
+#define evtSaveDeleteFailFBUpdate __MSABI_LONG(0xC0032015)
+#define evtProcessingQueryCallback __MSABI_LONG(0xC0032016)
+#define evtMailboxLocalizeTotalFailure __MSABI_LONG(0xC0032017)
+#define evtMailboxLocalizePartialFailure __MSABI_LONG(0xC0032018)
+#define evtExpandMaster __MSABI_LONG(0xC0032019)
+#define evtExpansionInit __MSABI_LONG(0xC003201A)
+#define evtFBGenerateMsg __MSABI_LONG(0xC003201B)
+#define evtExpansionInstExpiryInPublicMDB __MSABI_LONG(0x8003201C)
+#define evtUnhandledExceptionInitialization __MSABI_LONG(0xC003201D)
+#define evtUnhandledExceptionShutdown __MSABI_LONG(0xC003201E)
+#define evtUnhandledExceptionInitializationMDB __MSABI_LONG(0xC003201F)
+#define evtUnhandledExceptionShutdownMDB __MSABI_LONG(0xC0032020)
+#define evtUnhandledExceptionMsgSaveChanges __MSABI_LONG(0xC0032021)
+#define evtUnhandledExceptionDelete __MSABI_LONG(0xC0032022)
+#define evtUnhandledExceptionQuery __MSABI_LONG(0xC0032023)
+#define evtUnhandledExceptionFolderSaveChanges __MSABI_LONG(0xC0032024)
+#define evtCorruptedCalendar __MSABI_LONG(0xC0032025)
+#define evtRebuildCalendar __MSABI_LONG(0x80032026)
+#define evtCheckPrimaryCalendar __MSABI_LONG(0x80032027)
+#define evtExpandMasterPF __MSABI_LONG(0xC0032028)
+#define evtCorruptedPFCalendar __MSABI_LONG(0xC0032029)
+#define evtRebuildPFCalendar __MSABI_LONG(0x8003202A)
+#define evtMovingMailboxCallbackFailed __MSABI_LONG(0x8003202B)
+#define evtGetMsgClassFromMaster __MSABI_LONG(0x8003202C)
+#define evtOpenURL __MSABI_LONG(0x8003202D)
+#define evtStatusMsgSent __MSABI_LONG(0x4003202E)
+#define evtSaveInvalidStartAppt __MSABI_LONG(0xC003202F)
+#define evtSaveInvalidEndAppt __MSABI_LONG(0x80032030)
+#define evtModifyInvalidAppt __MSABI_LONG(0x80032031)
+#define evtDeleteInvalidAppt __MSABI_LONG(0x80032032)
+#define evtBindToInvalidStartAppt __MSABI_LONG(0xC0032033)
+#define evtBindToInvalidEndAppt __MSABI_LONG(0x80032034)
+#define evtReloadLogType __MSABI_LONG(0x40032035)
+#define evtBackgroundStarted __MSABI_LONG(0x40032036)
+#define evtBackgroundStartFailed __MSABI_LONG(0x80032037)
+#define evtBackgroundProcessing __MSABI_LONG(0x40032038)
+#define evtBackgroundProcessingNoCals __MSABI_LONG(0x40032039)
+#define evtBackgroundProcessingFinished __MSABI_LONG(0x4003203A)
+#define evtBackgroundAwakeDueToShutdown __MSABI_LONG(0x4003203B)
+#define evtBackgroundAwake __MSABI_LONG(0x4003203C)
+#define evtBackgroundTerminating __MSABI_LONG(0x4003203D)
+#define evtBackgroundRegisterTaskFailed __MSABI_LONG(0xC003203E)
+#define evtBackgroundLogonFailed __MSABI_LONG(0xC003203F)
+#define evtBackgroundGetMachineToken __MSABI_LONG(0xC0032040)
+#define evtBackgroundSleepUntilNewCal __MSABI_LONG(0x40032041)
+#define evtBackgroundQueued __MSABI_LONG(0x40032042)
+#define evtBkExpDumpFcn __MSABI_LONG(0xC0032043)
+#define evtSaveDurationTooLong __MSABI_LONG(0x80032044)
+#define evtModifyDurationTooLong __MSABI_LONG(0x80032045)
+#define evtDeleteDurationTooLong __MSABI_LONG(0x80032046)
+#define evtTooManyIterationsForQuery __MSABI_LONG(0x80032047)
+#define evtTooManyIterationsForFreebusy __MSABI_LONG(0x80032048)
 #endif
diff --git a/mingw-w64-headers/include/clusapi.h b/mingw-w64-headers/include/clusapi.h
index 5feecb1..aa31270 100644
--- a/mingw-w64-headers/include/clusapi.h
+++ b/mingw-w64-headers/include/clusapi.h
@@ -100,9 +100,9 @@
   } CLUSCTL_RESOURCE_STATE_CHANGE_REASON_STRUCT,*PCLUSCTL_RESOURCE_STATE_CHANGE_REASON_STRUCT;
 #endif
 
-#define CLUSAPI_READ_ACCESS 0x00000001L
-#define CLUSAPI_CHANGE_ACCESS 0x00000002L
-#define CLUSAPI_NO_ACCESS 0x00000004L
+#define CLUSAPI_READ_ACCESS __MSABI_LONG(0x00000001)
+#define CLUSAPI_CHANGE_ACCESS __MSABI_LONG(0x00000002)
+#define CLUSAPI_NO_ACCESS __MSABI_LONG(0x00000004)
 #define CLUSAPI_ALL_ACCESS (CLUSAPI_READ_ACCESS | CLUSAPI_CHANGE_ACCESS)
 
   typedef enum CLUSTER_SET_PASSWORD_FLAGS {
diff --git a/mingw-w64-headers/include/commctrl.h b/mingw-w64-headers/include/commctrl.h
index 1708780..a309bb9 100644
--- a/mingw-w64-headers/include/commctrl.h
+++ b/mingw-w64-headers/include/commctrl.h
@@ -280,8 +280,8 @@
 
 #ifndef NOIMAGEAPIS
 
-#define CLR_NONE 0xffffffffL
-#define CLR_DEFAULT 0xFF000000L
+#define CLR_NONE __MSABI_LONG(0xffffffff)
+#define CLR_DEFAULT __MSABI_LONG(0xFF000000)
 
 #ifndef HIMAGELIST
   struct _IMAGELIST;
@@ -1991,14 +1991,14 @@
 #define HOTKEY_CLASS __MINGW_NAME_AW(HOTKEY_CLASS)
 #endif
 
-#define CCS_TOP 0x1L
-#define CCS_NOMOVEY 0x2L
-#define CCS_BOTTOM 0x3L
-#define CCS_NORESIZE 0x4L
-#define CCS_NOPARENTALIGN 0x8L
-#define CCS_ADJUSTABLE 0x20L
-#define CCS_NODIVIDER 0x40L
-#define CCS_VERT 0x80L
+#define CCS_TOP __MSABI_LONG(0x1)
+#define CCS_NOMOVEY __MSABI_LONG(0x2)
+#define CCS_BOTTOM __MSABI_LONG(0x3)
+#define CCS_NORESIZE __MSABI_LONG(0x4)
+#define CCS_NOPARENTALIGN __MSABI_LONG(0x8)
+#define CCS_ADJUSTABLE __MSABI_LONG(0x20)
+#define CCS_NODIVIDER __MSABI_LONG(0x40)
+#define CCS_VERT __MSABI_LONG(0x80)
 #define CCS_LEFT (CCS_VERT | CCS_TOP)
 #define CCS_RIGHT (CCS_VERT | CCS_BOTTOM)
 #define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY)
@@ -4625,19 +4625,19 @@
 
 #ifndef NOFLATSBAPIS
 
-#define WSB_PROP_CYVSCROLL 0x1L
-#define WSB_PROP_CXHSCROLL 0x2L
-#define WSB_PROP_CYHSCROLL 0x4L
-#define WSB_PROP_CXVSCROLL 0x8L
-#define WSB_PROP_CXHTHUMB 0x10L
-#define WSB_PROP_CYVTHUMB 0x20L
-#define WSB_PROP_VBKGCOLOR 0x40L
-#define WSB_PROP_HBKGCOLOR 0x80L
-#define WSB_PROP_VSTYLE 0x100L
-#define WSB_PROP_HSTYLE 0x200L
-#define WSB_PROP_WINSTYLE 0x400L
-#define WSB_PROP_PALETTE 0x800L
-#define WSB_PROP_MASK 0xfffL
+#define WSB_PROP_CYVSCROLL __MSABI_LONG(0x1)
+#define WSB_PROP_CXHSCROLL __MSABI_LONG(0x2)
+#define WSB_PROP_CYHSCROLL __MSABI_LONG(0x4)
+#define WSB_PROP_CXVSCROLL __MSABI_LONG(0x8)
+#define WSB_PROP_CXHTHUMB __MSABI_LONG(0x10)
+#define WSB_PROP_CYVTHUMB __MSABI_LONG(0x20)
+#define WSB_PROP_VBKGCOLOR __MSABI_LONG(0x40)
+#define WSB_PROP_HBKGCOLOR __MSABI_LONG(0x80)
+#define WSB_PROP_VSTYLE __MSABI_LONG(0x100)
+#define WSB_PROP_HSTYLE __MSABI_LONG(0x200)
+#define WSB_PROP_WINSTYLE __MSABI_LONG(0x400)
+#define WSB_PROP_PALETTE __MSABI_LONG(0x800)
+#define WSB_PROP_MASK __MSABI_LONG(0xfff)
 
 #define FSB_FLAT_MODE 2
 #define FSB_ENCARTA_MODE 1
diff --git a/mingw-w64-headers/include/commdlg.h b/mingw-w64-headers/include/commdlg.h
index c8c1feb..555a08b 100644
--- a/mingw-w64-headers/include/commdlg.h
+++ b/mingw-w64-headers/include/commdlg.h
@@ -431,31 +431,31 @@
 #define CF_SCREENFONTS 0x1
 #define CF_PRINTERFONTS 0x2
 #define CF_BOTH (CF_SCREENFONTS | CF_PRINTERFONTS)
-#define CF_SHOWHELP 0x4L
-#define CF_ENABLEHOOK 0x8L
-#define CF_ENABLETEMPLATE 0x10L
-#define CF_ENABLETEMPLATEHANDLE 0x20L
-#define CF_INITTOLOGFONTSTRUCT 0x40L
-#define CF_USESTYLE 0x80L
-#define CF_EFFECTS 0x100L
-#define CF_APPLY 0x200L
-#define CF_ANSIONLY 0x400L
+#define CF_SHOWHELP __MSABI_LONG(0x4)
+#define CF_ENABLEHOOK __MSABI_LONG(0x8)
+#define CF_ENABLETEMPLATE __MSABI_LONG(0x10)
+#define CF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x20)
+#define CF_INITTOLOGFONTSTRUCT __MSABI_LONG(0x40)
+#define CF_USESTYLE __MSABI_LONG(0x80)
+#define CF_EFFECTS __MSABI_LONG(0x100)
+#define CF_APPLY __MSABI_LONG(0x200)
+#define CF_ANSIONLY __MSABI_LONG(0x400)
 #define CF_SCRIPTSONLY CF_ANSIONLY
-#define CF_NOVECTORFONTS 0x800L
+#define CF_NOVECTORFONTS __MSABI_LONG(0x800)
 #define CF_NOOEMFONTS CF_NOVECTORFONTS
-#define CF_NOSIMULATIONS 0x1000L
-#define CF_LIMITSIZE 0x2000L
-#define CF_FIXEDPITCHONLY 0x4000L
-#define CF_WYSIWYG 0x8000L
-#define CF_FORCEFONTEXIST 0x10000L
-#define CF_SCALABLEONLY 0x20000L
-#define CF_TTONLY 0x40000L
-#define CF_NOFACESEL 0x80000L
-#define CF_NOSTYLESEL 0x100000L
-#define CF_NOSIZESEL 0x200000L
-#define CF_SELECTSCRIPT 0x400000L
-#define CF_NOSCRIPTSEL 0x800000L
-#define CF_NOVERTFONTS 0x1000000L
+#define CF_NOSIMULATIONS __MSABI_LONG(0x1000)
+#define CF_LIMITSIZE __MSABI_LONG(0x2000)
+#define CF_FIXEDPITCHONLY __MSABI_LONG(0x4000)
+#define CF_WYSIWYG __MSABI_LONG(0x8000)
+#define CF_FORCEFONTEXIST __MSABI_LONG(0x10000)
+#define CF_SCALABLEONLY __MSABI_LONG(0x20000)
+#define CF_TTONLY __MSABI_LONG(0x40000)
+#define CF_NOFACESEL __MSABI_LONG(0x80000)
+#define CF_NOSTYLESEL __MSABI_LONG(0x100000)
+#define CF_NOSIZESEL __MSABI_LONG(0x200000)
+#define CF_SELECTSCRIPT __MSABI_LONG(0x400000)
+#define CF_NOSCRIPTSEL __MSABI_LONG(0x800000)
+#define CF_NOVERTFONTS __MSABI_LONG(0x1000000)
 
 #define SIMULATED_FONTTYPE 0x8000
 #define PRINTER_FONTTYPE 0x4000
diff --git a/mingw-w64-headers/include/compstui.h b/mingw-w64-headers/include/compstui.h
index 0994b55..c2580de 100644
--- a/mingw-w64-headers/include/compstui.h
+++ b/mingw-w64-headers/include/compstui.h
@@ -443,25 +443,25 @@
 #define ECBF_MASK                         0x00ff
 #endif
 
-#define OPTIF_COLLAPSE                 0x00000001L
-#define OPTIF_HIDE                     0x00000002L
-#define OPTIF_CALLBACK                 0x00000004L
-#define OPTIF_CHANGED                  0x00000008L
-#define OPTIF_CHANGEONCE               0x00000010L
-#define OPTIF_DISABLED                 0x00000020L
-#define OPTIF_ECB_CHECKED              0x00000040L
-#define OPTIF_EXT_HIDE                 0x00000080L
-#define OPTIF_EXT_DISABLED             0x00000100L
-#define OPTIF_SEL_AS_HICON             0x00000200L
-#define OPTIF_EXT_IS_EXTPUSH           0x00000400L
-#define OPTIF_NO_GROUPBOX_NAME         0x00000800L
-#define OPTIF_OVERLAY_WARNING_ICON     0x00001000L
-#define OPTIF_OVERLAY_STOP_ICON        0x00002000L
-#define OPTIF_OVERLAY_NO_ICON          0x00004000L
-#define OPTIF_INITIAL_TVITEM           0x00008000L
-#define OPTIF_HAS_POIEXT               0x00010000L
+#define OPTIF_COLLAPSE                 __MSABI_LONG(0x00000001)
+#define OPTIF_HIDE                     __MSABI_LONG(0x00000002)
+#define OPTIF_CALLBACK                 __MSABI_LONG(0x00000004)
+#define OPTIF_CHANGED                  __MSABI_LONG(0x00000008)
+#define OPTIF_CHANGEONCE               __MSABI_LONG(0x00000010)
+#define OPTIF_DISABLED                 __MSABI_LONG(0x00000020)
+#define OPTIF_ECB_CHECKED              __MSABI_LONG(0x00000040)
+#define OPTIF_EXT_HIDE                 __MSABI_LONG(0x00000080)
+#define OPTIF_EXT_DISABLED             __MSABI_LONG(0x00000100)
+#define OPTIF_SEL_AS_HICON             __MSABI_LONG(0x00000200)
+#define OPTIF_EXT_IS_EXTPUSH           __MSABI_LONG(0x00000400)
+#define OPTIF_NO_GROUPBOX_NAME         __MSABI_LONG(0x00000800)
+#define OPTIF_OVERLAY_WARNING_ICON     __MSABI_LONG(0x00001000)
+#define OPTIF_OVERLAY_STOP_ICON        __MSABI_LONG(0x00002000)
+#define OPTIF_OVERLAY_NO_ICON          __MSABI_LONG(0x00004000)
+#define OPTIF_INITIAL_TVITEM           __MSABI_LONG(0x00008000)
+#define OPTIF_HAS_POIEXT               __MSABI_LONG(0x00010000)
 
-#define OPTIF_MASK                     0x0001ffffL
+#define OPTIF_MASK                     __MSABI_LONG(0x0001ffff)
 
 
 #define DMPUB_NONE                     0
diff --git a/mingw-w64-headers/include/ddeml.h b/mingw-w64-headers/include/ddeml.h
index 75c8d1c..1fbdab5 100644
--- a/mingw-w64-headers/include/ddeml.h
+++ b/mingw-w64-headers/include/ddeml.h
@@ -173,12 +173,12 @@
 #define CBF_SKIP_DISCONNECTS 0x00200000
 #define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000
 
-#define APPCMD_CLIENTONLY 0x00000010L
-#define APPCMD_FILTERINITS 0x00000020L
-#define APPCMD_MASK 0x00000FF0L
+#define APPCMD_CLIENTONLY __MSABI_LONG(0x00000010)
+#define APPCMD_FILTERINITS __MSABI_LONG(0x00000020)
+#define APPCMD_MASK __MSABI_LONG(0x00000FF0)
 
-#define APPCLASS_STANDARD 0x00000000L
-#define APPCLASS_MASK 0x0000000FL
+#define APPCLASS_STANDARD __MSABI_LONG(0x00000000)
+#define APPCLASS_MASK __MSABI_LONG(0x0000000F)
 
   WINBOOL WINAPI DdeUninitialize(DWORD idInst);
   HCONVLIST WINAPI DdeConnectList(DWORD idInst,HSZ hszService,HSZ hszTopic,HCONVLIST hConvList,PCONVCONTEXT pCC);
@@ -349,7 +349,7 @@
   } MONCONVSTRUCT,*PMONCONVSTRUCT;
 
 #define MAX_MONITORS 4
-#define APPCLASS_MONITOR 0x00000001L
+#define APPCLASS_MONITOR __MSABI_LONG(0x00000001)
 #define XTYP_MONITOR (0x00F0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
 
 #define MF_HSZ_INFO 0x01000000
diff --git a/mingw-w64-headers/include/digitalv.h b/mingw-w64-headers/include/digitalv.h
index 1174082..f00d6d1 100644
--- a/mingw-w64-headers/include/digitalv.h
+++ b/mingw-w64-headers/include/digitalv.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-#define MCI_TEST 0x00000020L
+#define MCI_TEST __MSABI_LONG(0x00000020)
 
 #define MCI_CAPTURE 0x0870
 #define MCI_MONITOR 0x0871
@@ -35,27 +35,27 @@
 #define MCI_DGV_FILE_MODE_EDITING 0x0003
 #define MCI_DGV_FILE_MODE_IDLE 0x0004
 
-#define MCI_ON_S 0x00008000L
-#define MCI_OFF_S 0x00008001L
-#define MCI_DGV_FILE_S 0x00008002L
-#define MCI_DGV_INPUT_S 0x00008003L
+#define MCI_ON_S __MSABI_LONG(0x00008000)
+#define MCI_OFF_S __MSABI_LONG(0x00008001)
+#define MCI_DGV_FILE_S __MSABI_LONG(0x00008002)
+#define MCI_DGV_INPUT_S __MSABI_LONG(0x00008003)
 
-#define MCI_DGV_FILE_MODE_SAVING_S 0x00008004L
-#define MCI_DGV_FILE_MODE_LOADING_S 0x00008005L
-#define MCI_DGV_FILE_MODE_EDITING_S 0x00008006L
-#define MCI_DGV_FILE_MODE_IDLE_S 0x00008007L
+#define MCI_DGV_FILE_MODE_SAVING_S __MSABI_LONG(0x00008004)
+#define MCI_DGV_FILE_MODE_LOADING_S __MSABI_LONG(0x00008005)
+#define MCI_DGV_FILE_MODE_EDITING_S __MSABI_LONG(0x00008006)
+#define MCI_DGV_FILE_MODE_IDLE_S __MSABI_LONG(0x00008007)
 
-#define MCI_DGV_SETVIDEO_SRC_NTSC_S 0x00008010L
-#define MCI_DGV_SETVIDEO_SRC_RGB_S 0x00008011L
-#define MCI_DGV_SETVIDEO_SRC_SVIDEO_S 0x00008012L
-#define MCI_DGV_SETVIDEO_SRC_PAL_S 0x00008013L
-#define MCI_DGV_SETVIDEO_SRC_SECAM_S 0x00008014L
-#define MCI_DGV_SETVIDEO_SRC_GENERIC_S 0x00008015L
+#define MCI_DGV_SETVIDEO_SRC_NTSC_S __MSABI_LONG(0x00008010)
+#define MCI_DGV_SETVIDEO_SRC_RGB_S __MSABI_LONG(0x00008011)
+#define MCI_DGV_SETVIDEO_SRC_SVIDEO_S __MSABI_LONG(0x00008012)
+#define MCI_DGV_SETVIDEO_SRC_PAL_S __MSABI_LONG(0x00008013)
+#define MCI_DGV_SETVIDEO_SRC_SECAM_S __MSABI_LONG(0x00008014)
+#define MCI_DGV_SETVIDEO_SRC_GENERIC_S __MSABI_LONG(0x00008015)
 
-#define MCI_DGV_SETAUDIO_SRC_LEFT_S 0x00008020L
-#define MCI_DGV_SETAUDIO_SRC_RIGHT_S 0x00008021L
-#define MCI_DGV_SETAUDIO_SRC_AVERAGE_S 0x00008022L
-#define MCI_DGV_SETAUDIO_SRC_STEREO_S 0x00008023L
+#define MCI_DGV_SETAUDIO_SRC_LEFT_S __MSABI_LONG(0x00008020)
+#define MCI_DGV_SETAUDIO_SRC_RIGHT_S __MSABI_LONG(0x00008021)
+#define MCI_DGV_SETAUDIO_SRC_AVERAGE_S __MSABI_LONG(0x00008022)
+#define MCI_DGV_SETAUDIO_SRC_STEREO_S __MSABI_LONG(0x00008023)
 
 #define MM_MCISIGNAL 0x3CB
 
@@ -66,284 +66,284 @@
 #define MCIERR_DGV_DEVICE_MEMORY_FULL (MCIERR_CUSTOM_DRIVER_BASE+4)
 #define MCIERR_DGV_BAD_CLIPBOARD_RANGE (MCIERR_CUSTOM_DRIVER_BASE+5)
 
-#define MCI_DGV_METHOD_PRE 0x0000a000L
-#define MCI_DGV_METHOD_POST 0x0000a001L
-#define MCI_DGV_METHOD_DIRECT 0x0000a002L
+#define MCI_DGV_METHOD_PRE __MSABI_LONG(0x0000a000)
+#define MCI_DGV_METHOD_POST __MSABI_LONG(0x0000a001)
+#define MCI_DGV_METHOD_DIRECT __MSABI_LONG(0x0000a002)
 
-#define MCI_DGV_FF_AVSS 0x00004000L
-#define MCI_DGV_FF_AVI 0x00004001L
-#define MCI_DGV_FF_DIB 0x00004002L
-#define MCI_DGV_FF_RDIB 0x00004003L
-#define MCI_DGV_FF_JPEG 0x00004004L
-#define MCI_DGV_FF_RJPEG 0x00004005L
-#define MCI_DGV_FF_JFIF 0x00004006L
-#define MCI_DGV_FF_MPEG 0x00004007L
+#define MCI_DGV_FF_AVSS __MSABI_LONG(0x00004000)
+#define MCI_DGV_FF_AVI __MSABI_LONG(0x00004001)
+#define MCI_DGV_FF_DIB __MSABI_LONG(0x00004002)
+#define MCI_DGV_FF_RDIB __MSABI_LONG(0x00004003)
+#define MCI_DGV_FF_JPEG __MSABI_LONG(0x00004004)
+#define MCI_DGV_FF_RJPEG __MSABI_LONG(0x00004005)
+#define MCI_DGV_FF_JFIF __MSABI_LONG(0x00004006)
+#define MCI_DGV_FF_MPEG __MSABI_LONG(0x00004007)
 
-#define MCI_DGV_GETDEVCAPS_CAN_LOCK 0x00004000L
-#define MCI_DGV_GETDEVCAPS_CAN_STRETCH 0x00004001L
-#define MCI_DGV_GETDEVCAPS_CAN_FREEZE 0x00004002L
-#define MCI_DGV_GETDEVCAPS_MAX_WINDOWS 0x00004003L
-#define MCI_DGV_GETDEVCAPS_CAN_REVERSE 0x00004004L
-#define MCI_DGV_GETDEVCAPS_HAS_STILL 0x00004005L
-#define MCI_DGV_GETDEVCAPS_PALETTES 0x00004006L
-#define MCI_DGV_GETDEVCAPS_CAN_STR_IN 0x00004008L
-#define MCI_DGV_GETDEVCAPS_CAN_TEST 0x00004009L
-#define MCI_DGV_GETDEVCAPS_MAXIMUM_RATE 0x0000400aL
-#define MCI_DGV_GETDEVCAPS_MINIMUM_RATE 0x0000400bL
+#define MCI_DGV_GETDEVCAPS_CAN_LOCK __MSABI_LONG(0x00004000)
+#define MCI_DGV_GETDEVCAPS_CAN_STRETCH __MSABI_LONG(0x00004001)
+#define MCI_DGV_GETDEVCAPS_CAN_FREEZE __MSABI_LONG(0x00004002)
+#define MCI_DGV_GETDEVCAPS_MAX_WINDOWS __MSABI_LONG(0x00004003)
+#define MCI_DGV_GETDEVCAPS_CAN_REVERSE __MSABI_LONG(0x00004004)
+#define MCI_DGV_GETDEVCAPS_HAS_STILL __MSABI_LONG(0x00004005)
+#define MCI_DGV_GETDEVCAPS_PALETTES __MSABI_LONG(0x00004006)
+#define MCI_DGV_GETDEVCAPS_CAN_STR_IN __MSABI_LONG(0x00004008)
+#define MCI_DGV_GETDEVCAPS_CAN_TEST __MSABI_LONG(0x00004009)
+#define MCI_DGV_GETDEVCAPS_MAXIMUM_RATE __MSABI_LONG(0x0000400a)
+#define MCI_DGV_GETDEVCAPS_MINIMUM_RATE __MSABI_LONG(0x0000400b)
 
-#define MCI_DGV_CAPTURE_AS 0x00010000L
-#define MCI_DGV_CAPTURE_AT 0x00020000L
+#define MCI_DGV_CAPTURE_AS __MSABI_LONG(0x00010000)
+#define MCI_DGV_CAPTURE_AT __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_COPY_AT 0x00010000L
-#define MCI_DGV_COPY_AUDIO_STREAM 0x00020000L
-#define MCI_DGV_COPY_VIDEO_STREAM 0x00040000L
+#define MCI_DGV_COPY_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_COPY_AUDIO_STREAM __MSABI_LONG(0x00020000)
+#define MCI_DGV_COPY_VIDEO_STREAM __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_CUE_INPUT 0x00010000L
-#define MCI_DGV_CUE_OUTPUT 0x00020000L
-#define MCI_DGV_CUE_NOSHOW 0x00040000L
+#define MCI_DGV_CUE_INPUT __MSABI_LONG(0x00010000)
+#define MCI_DGV_CUE_OUTPUT __MSABI_LONG(0x00020000)
+#define MCI_DGV_CUE_NOSHOW __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_CUT_AT 0x00010000L
-#define MCI_DGV_CUT_AUDIO_STREAM 0x00020000L
-#define MCI_DGV_CUT_VIDEO_STREAM 0x00040000L
+#define MCI_DGV_CUT_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_CUT_AUDIO_STREAM __MSABI_LONG(0x00020000)
+#define MCI_DGV_CUT_VIDEO_STREAM __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_DELETE_AT 0x00010000L
-#define MCI_DGV_DELETE_AUDIO_STREAM 0x00020000L
-#define MCI_DGV_DELETE_VIDEO_STREAM 0x00040000L
+#define MCI_DGV_DELETE_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_DELETE_AUDIO_STREAM __MSABI_LONG(0x00020000)
+#define MCI_DGV_DELETE_VIDEO_STREAM __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_FREEZE_AT 0x00010000L
-#define MCI_DGV_FREEZE_OUTSIDE 0x00020000L
+#define MCI_DGV_FREEZE_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_FREEZE_OUTSIDE __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_INFO_TEXT 0x00010000L
+#define MCI_DGV_INFO_TEXT __MSABI_LONG(0x00010000)
 #define MCI_DGV_INFO_ITEM 0X00020000L
 
-#define MCI_INFO_VERSION 0x00000400L
+#define MCI_INFO_VERSION __MSABI_LONG(0x00000400)
 
-#define MCI_DGV_INFO_USAGE 0x00004000L
-#define MCI_DGV_INFO_AUDIO_QUALITY 0x00004001L
-#define MCI_DGV_INFO_STILL_QUALITY 0x00004002L
-#define MCI_DGV_INFO_VIDEO_QUALITY 0x00004003L
-#define MCI_DGV_INFO_AUDIO_ALG 0x00004004L
-#define MCI_DGV_INFO_STILL_ALG 0x00004005L
-#define MCI_DGV_INFO_VIDEO_ALG 0x00004006L
+#define MCI_DGV_INFO_USAGE __MSABI_LONG(0x00004000)
+#define MCI_DGV_INFO_AUDIO_QUALITY __MSABI_LONG(0x00004001)
+#define MCI_DGV_INFO_STILL_QUALITY __MSABI_LONG(0x00004002)
+#define MCI_DGV_INFO_VIDEO_QUALITY __MSABI_LONG(0x00004003)
+#define MCI_DGV_INFO_AUDIO_ALG __MSABI_LONG(0x00004004)
+#define MCI_DGV_INFO_STILL_ALG __MSABI_LONG(0x00004005)
+#define MCI_DGV_INFO_VIDEO_ALG __MSABI_LONG(0x00004006)
 
-#define MCI_DGV_LIST_ITEM 0x00010000L
-#define MCI_DGV_LIST_COUNT 0x00020000L
-#define MCI_DGV_LIST_NUMBER 0x00040000L
-#define MCI_DGV_LIST_ALG 0x00080000L
+#define MCI_DGV_LIST_ITEM __MSABI_LONG(0x00010000)
+#define MCI_DGV_LIST_COUNT __MSABI_LONG(0x00020000)
+#define MCI_DGV_LIST_NUMBER __MSABI_LONG(0x00040000)
+#define MCI_DGV_LIST_ALG __MSABI_LONG(0x00080000)
 
-#define MCI_DGV_LIST_AUDIO_ALG 0x00004000L
-#define MCI_DGV_LIST_AUDIO_QUALITY 0x00004001L
-#define MCI_DGV_LIST_AUDIO_STREAM 0x00004002L
-#define MCI_DGV_LIST_STILL_ALG 0x00004003L
-#define MCI_DGV_LIST_STILL_QUALITY 0x00004004L
-#define MCI_DGV_LIST_VIDEO_ALG 0x00004005L
-#define MCI_DGV_LIST_VIDEO_QUALITY 0x00004006L
-#define MCI_DGV_LIST_VIDEO_STREAM 0x00004007L
-#define MCI_DGV_LIST_VIDEO_SOURCE 0x00004008L
+#define MCI_DGV_LIST_AUDIO_ALG __MSABI_LONG(0x00004000)
+#define MCI_DGV_LIST_AUDIO_QUALITY __MSABI_LONG(0x00004001)
+#define MCI_DGV_LIST_AUDIO_STREAM __MSABI_LONG(0x00004002)
+#define MCI_DGV_LIST_STILL_ALG __MSABI_LONG(0x00004003)
+#define MCI_DGV_LIST_STILL_QUALITY __MSABI_LONG(0x00004004)
+#define MCI_DGV_LIST_VIDEO_ALG __MSABI_LONG(0x00004005)
+#define MCI_DGV_LIST_VIDEO_QUALITY __MSABI_LONG(0x00004006)
+#define MCI_DGV_LIST_VIDEO_STREAM __MSABI_LONG(0x00004007)
+#define MCI_DGV_LIST_VIDEO_SOURCE __MSABI_LONG(0x00004008)
 
-#define MCI_DGV_MONITOR_METHOD 0x00010000L
-#define MCI_DGV_MONITOR_SOURCE 0x00020000L
+#define MCI_DGV_MONITOR_METHOD __MSABI_LONG(0x00010000)
+#define MCI_DGV_MONITOR_SOURCE __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_MONITOR_INPUT 0x00004000L
-#define MCI_DGV_MONITOR_FILE 0x00004001L
+#define MCI_DGV_MONITOR_INPUT __MSABI_LONG(0x00004000)
+#define MCI_DGV_MONITOR_FILE __MSABI_LONG(0x00004001)
 
-#define MCI_DGV_OPEN_WS 0x00010000L
-#define MCI_DGV_OPEN_PARENT 0x00020000L
-#define MCI_DGV_OPEN_NOSTATIC 0x00040000L
-#define MCI_DGV_OPEN_16BIT 0x00080000L
-#define MCI_DGV_OPEN_32BIT 0x00100000L
+#define MCI_DGV_OPEN_WS __MSABI_LONG(0x00010000)
+#define MCI_DGV_OPEN_PARENT __MSABI_LONG(0x00020000)
+#define MCI_DGV_OPEN_NOSTATIC __MSABI_LONG(0x00040000)
+#define MCI_DGV_OPEN_16BIT __MSABI_LONG(0x00080000)
+#define MCI_DGV_OPEN_32BIT __MSABI_LONG(0x00100000)
 
-#define MCI_DGV_PASTE_AT 0x00010000L
-#define MCI_DGV_PASTE_AUDIO_STREAM 0x00020000L
-#define MCI_DGV_PASTE_VIDEO_STREAM 0x00040000L
-#define MCI_DGV_PASTE_INSERT 0x00080000L
-#define MCI_DGV_PASTE_OVERWRITE 0x00100000L
+#define MCI_DGV_PASTE_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_PASTE_AUDIO_STREAM __MSABI_LONG(0x00020000)
+#define MCI_DGV_PASTE_VIDEO_STREAM __MSABI_LONG(0x00040000)
+#define MCI_DGV_PASTE_INSERT __MSABI_LONG(0x00080000)
+#define MCI_DGV_PASTE_OVERWRITE __MSABI_LONG(0x00100000)
 
-#define MCI_DGV_PLAY_REPEAT 0x00010000L
-#define MCI_DGV_PLAY_REVERSE 0x00020000L
+#define MCI_DGV_PLAY_REPEAT __MSABI_LONG(0x00010000)
+#define MCI_DGV_PLAY_REVERSE __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_RECT 0x00010000L
-#define MCI_DGV_PUT_SOURCE 0x00020000L
-#define MCI_DGV_PUT_DESTINATION 0x00040000L
-#define MCI_DGV_PUT_FRAME 0x00080000L
-#define MCI_DGV_PUT_VIDEO 0x00100000L
-#define MCI_DGV_PUT_WINDOW 0x00200000L
-#define MCI_DGV_PUT_CLIENT 0x00400000L
+#define MCI_DGV_RECT __MSABI_LONG(0x00010000)
+#define MCI_DGV_PUT_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_DGV_PUT_DESTINATION __MSABI_LONG(0x00040000)
+#define MCI_DGV_PUT_FRAME __MSABI_LONG(0x00080000)
+#define MCI_DGV_PUT_VIDEO __MSABI_LONG(0x00100000)
+#define MCI_DGV_PUT_WINDOW __MSABI_LONG(0x00200000)
+#define MCI_DGV_PUT_CLIENT __MSABI_LONG(0x00400000)
 
-#define MCI_QUALITY_ITEM 0x00010000L
-#define MCI_QUALITY_NAME 0x00020000L
-#define MCI_QUALITY_ALG 0x00040000L
-#define MCI_QUALITY_DIALOG 0x00080000L
-#define MCI_QUALITY_HANDLE 0x00100000L
+#define MCI_QUALITY_ITEM __MSABI_LONG(0x00010000)
+#define MCI_QUALITY_NAME __MSABI_LONG(0x00020000)
+#define MCI_QUALITY_ALG __MSABI_LONG(0x00040000)
+#define MCI_QUALITY_DIALOG __MSABI_LONG(0x00080000)
+#define MCI_QUALITY_HANDLE __MSABI_LONG(0x00100000)
 
-#define MCI_QUALITY_ITEM_AUDIO 0x00004000L
-#define MCI_QUALITY_ITEM_STILL 0x00004001L
-#define MCI_QUALITY_ITEM_VIDEO 0x00004002L
+#define MCI_QUALITY_ITEM_AUDIO __MSABI_LONG(0x00004000)
+#define MCI_QUALITY_ITEM_STILL __MSABI_LONG(0x00004001)
+#define MCI_QUALITY_ITEM_VIDEO __MSABI_LONG(0x00004002)
 
-#define MCI_DGV_REALIZE_NORM 0x00010000L
-#define MCI_DGV_REALIZE_BKGD 0x00020000L
+#define MCI_DGV_REALIZE_NORM __MSABI_LONG(0x00010000)
+#define MCI_DGV_REALIZE_BKGD __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_RECORD_HOLD 0x00020000L
-#define MCI_DGV_RECORD_AUDIO_STREAM 0x00040000L
-#define MCI_DGV_RECORD_VIDEO_STREAM 0x00080000L
+#define MCI_DGV_RECORD_HOLD __MSABI_LONG(0x00020000)
+#define MCI_DGV_RECORD_AUDIO_STREAM __MSABI_LONG(0x00040000)
+#define MCI_DGV_RECORD_VIDEO_STREAM __MSABI_LONG(0x00080000)
 
-#define MCI_DGV_RESERVE_IN 0x00010000L
-#define MCI_DGV_RESERVE_SIZE 0x00020000L
+#define MCI_DGV_RESERVE_IN __MSABI_LONG(0x00010000)
+#define MCI_DGV_RESERVE_SIZE __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_RESTORE_FROM 0x00010000L
-#define MCI_DGV_RESTORE_AT 0x00020000L
+#define MCI_DGV_RESTORE_FROM __MSABI_LONG(0x00010000)
+#define MCI_DGV_RESTORE_AT __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_SAVE_ABORT 0x00020000L
-#define MCI_DGV_SAVE_KEEPRESERVE 0x00040000L
+#define MCI_DGV_SAVE_ABORT __MSABI_LONG(0x00020000)
+#define MCI_DGV_SAVE_KEEPRESERVE __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_SET_SEEK_EXACTLY 0x00010000L
-#define MCI_DGV_SET_SPEED 0x00020000L
-#define MCI_DGV_SET_STILL 0x00040000L
-#define MCI_DGV_SET_FILEFORMAT 0x00080000L
+#define MCI_DGV_SET_SEEK_EXACTLY __MSABI_LONG(0x00010000)
+#define MCI_DGV_SET_SPEED __MSABI_LONG(0x00020000)
+#define MCI_DGV_SET_STILL __MSABI_LONG(0x00040000)
+#define MCI_DGV_SET_FILEFORMAT __MSABI_LONG(0x00080000)
 
-#define MCI_DGV_SETAUDIO_OVER 0x00010000L
-#define MCI_DGV_SETAUDIO_CLOCKTIME 0x00020000L
-#define MCI_DGV_SETAUDIO_ALG 0x00040000L
-#define MCI_DGV_SETAUDIO_QUALITY 0x00080000L
-#define MCI_DGV_SETAUDIO_RECORD 0x00100000L
-#define MCI_DGV_SETAUDIO_LEFT 0x00200000L
-#define MCI_DGV_SETAUDIO_RIGHT 0x00400000L
-#define MCI_DGV_SETAUDIO_ITEM 0x00800000L
-#define MCI_DGV_SETAUDIO_VALUE 0x01000000L
-#define MCI_DGV_SETAUDIO_INPUT 0x02000000L
-#define MCI_DGV_SETAUDIO_OUTPUT 0x04000000L
+#define MCI_DGV_SETAUDIO_OVER __MSABI_LONG(0x00010000)
+#define MCI_DGV_SETAUDIO_CLOCKTIME __MSABI_LONG(0x00020000)
+#define MCI_DGV_SETAUDIO_ALG __MSABI_LONG(0x00040000)
+#define MCI_DGV_SETAUDIO_QUALITY __MSABI_LONG(0x00080000)
+#define MCI_DGV_SETAUDIO_RECORD __MSABI_LONG(0x00100000)
+#define MCI_DGV_SETAUDIO_LEFT __MSABI_LONG(0x00200000)
+#define MCI_DGV_SETAUDIO_RIGHT __MSABI_LONG(0x00400000)
+#define MCI_DGV_SETAUDIO_ITEM __MSABI_LONG(0x00800000)
+#define MCI_DGV_SETAUDIO_VALUE __MSABI_LONG(0x01000000)
+#define MCI_DGV_SETAUDIO_INPUT __MSABI_LONG(0x02000000)
+#define MCI_DGV_SETAUDIO_OUTPUT __MSABI_LONG(0x04000000)
 
-#define MCI_DGV_SETAUDIO_TREBLE 0x00004000L
-#define MCI_DGV_SETAUDIO_BASS 0x00004001L
-#define MCI_DGV_SETAUDIO_VOLUME 0x00004002L
-#define MCI_DGV_SETAUDIO_STREAM 0x00004003L
-#define MCI_DGV_SETAUDIO_SOURCE 0x00004004L
-#define MCI_DGV_SETAUDIO_SAMPLESPERSEC 0x00004005L
-#define MCI_DGV_SETAUDIO_AVGBYTESPERSEC 0x00004006L
-#define MCI_DGV_SETAUDIO_BLOCKALIGN 0x00004007L
-#define MCI_DGV_SETAUDIO_BITSPERSAMPLE 0x00004008L
+#define MCI_DGV_SETAUDIO_TREBLE __MSABI_LONG(0x00004000)
+#define MCI_DGV_SETAUDIO_BASS __MSABI_LONG(0x00004001)
+#define MCI_DGV_SETAUDIO_VOLUME __MSABI_LONG(0x00004002)
+#define MCI_DGV_SETAUDIO_STREAM __MSABI_LONG(0x00004003)
+#define MCI_DGV_SETAUDIO_SOURCE __MSABI_LONG(0x00004004)
+#define MCI_DGV_SETAUDIO_SAMPLESPERSEC __MSABI_LONG(0x00004005)
+#define MCI_DGV_SETAUDIO_AVGBYTESPERSEC __MSABI_LONG(0x00004006)
+#define MCI_DGV_SETAUDIO_BLOCKALIGN __MSABI_LONG(0x00004007)
+#define MCI_DGV_SETAUDIO_BITSPERSAMPLE __MSABI_LONG(0x00004008)
 
-#define MCI_DGV_SETAUDIO_SOURCE_STEREO 0x00000000L
-#define MCI_DGV_SETAUDIO_SOURCE_LEFT 0x00000001L
-#define MCI_DGV_SETAUDIO_SOURCE_RIGHT 0x00000002L
-#define MCI_DGV_SETAUDIO_SOURCE_AVERAGE 0x00004000L
+#define MCI_DGV_SETAUDIO_SOURCE_STEREO __MSABI_LONG(0x00000000)
+#define MCI_DGV_SETAUDIO_SOURCE_LEFT __MSABI_LONG(0x00000001)
+#define MCI_DGV_SETAUDIO_SOURCE_RIGHT __MSABI_LONG(0x00000002)
+#define MCI_DGV_SETAUDIO_SOURCE_AVERAGE __MSABI_LONG(0x00004000)
 
-#define MCI_DGV_SETVIDEO_QUALITY 0x00010000L
-#define MCI_DGV_SETVIDEO_ALG 0x00020000L
-#define MCI_DGV_SETVIDEO_CLOCKTIME 0x00040000L
-#define MCI_DGV_SETVIDEO_SRC_NUMBER 0x00080000L
-#define MCI_DGV_SETVIDEO_ITEM 0x00100000L
-#define MCI_DGV_SETVIDEO_OVER 0x00200000L
-#define MCI_DGV_SETVIDEO_RECORD 0x00400000L
-#define MCI_DGV_SETVIDEO_STILL 0x00800000L
-#define MCI_DGV_SETVIDEO_VALUE 0x01000000L
-#define MCI_DGV_SETVIDEO_INPUT 0x02000000L
-#define MCI_DGV_SETVIDEO_OUTPUT 0x04000000L
+#define MCI_DGV_SETVIDEO_QUALITY __MSABI_LONG(0x00010000)
+#define MCI_DGV_SETVIDEO_ALG __MSABI_LONG(0x00020000)
+#define MCI_DGV_SETVIDEO_CLOCKTIME __MSABI_LONG(0x00040000)
+#define MCI_DGV_SETVIDEO_SRC_NUMBER __MSABI_LONG(0x00080000)
+#define MCI_DGV_SETVIDEO_ITEM __MSABI_LONG(0x00100000)
+#define MCI_DGV_SETVIDEO_OVER __MSABI_LONG(0x00200000)
+#define MCI_DGV_SETVIDEO_RECORD __MSABI_LONG(0x00400000)
+#define MCI_DGV_SETVIDEO_STILL __MSABI_LONG(0x00800000)
+#define MCI_DGV_SETVIDEO_VALUE __MSABI_LONG(0x01000000)
+#define MCI_DGV_SETVIDEO_INPUT __MSABI_LONG(0x02000000)
+#define MCI_DGV_SETVIDEO_OUTPUT __MSABI_LONG(0x04000000)
 
-#define MCI_DGV_SETVIDEO_SRC_NTSC 0x00004000L
-#define MCI_DGV_SETVIDEO_SRC_RGB 0x00004001L
-#define MCI_DGV_SETVIDEO_SRC_SVIDEO 0x00004002L
-#define MCI_DGV_SETVIDEO_SRC_PAL 0x00004003L
-#define MCI_DGV_SETVIDEO_SRC_SECAM 0x00004004L
-#define MCI_DGV_SETVIDEO_SRC_GENERIC 0x00004005L
+#define MCI_DGV_SETVIDEO_SRC_NTSC __MSABI_LONG(0x00004000)
+#define MCI_DGV_SETVIDEO_SRC_RGB __MSABI_LONG(0x00004001)
+#define MCI_DGV_SETVIDEO_SRC_SVIDEO __MSABI_LONG(0x00004002)
+#define MCI_DGV_SETVIDEO_SRC_PAL __MSABI_LONG(0x00004003)
+#define MCI_DGV_SETVIDEO_SRC_SECAM __MSABI_LONG(0x00004004)
+#define MCI_DGV_SETVIDEO_SRC_GENERIC __MSABI_LONG(0x00004005)
 
-#define MCI_DGV_SETVIDEO_BRIGHTNESS 0x00004000L
-#define MCI_DGV_SETVIDEO_COLOR 0x00004001L
-#define MCI_DGV_SETVIDEO_CONTRAST 0x00004002L
-#define MCI_DGV_SETVIDEO_TINT 0x00004003L
-#define MCI_DGV_SETVIDEO_SHARPNESS 0x00004004L
-#define MCI_DGV_SETVIDEO_GAMMA 0x00004005L
-#define MCI_DGV_SETVIDEO_STREAM 0x00004006L
-#define MCI_DGV_SETVIDEO_PALHANDLE 0x00004007L
-#define MCI_DGV_SETVIDEO_FRAME_RATE 0x00004008L
-#define MCI_DGV_SETVIDEO_SOURCE 0x00004009L
-#define MCI_DGV_SETVIDEO_KEY_INDEX 0x0000400aL
-#define MCI_DGV_SETVIDEO_KEY_COLOR 0x0000400bL
-#define MCI_DGV_SETVIDEO_BITSPERPEL 0x0000400cL
+#define MCI_DGV_SETVIDEO_BRIGHTNESS __MSABI_LONG(0x00004000)
+#define MCI_DGV_SETVIDEO_COLOR __MSABI_LONG(0x00004001)
+#define MCI_DGV_SETVIDEO_CONTRAST __MSABI_LONG(0x00004002)
+#define MCI_DGV_SETVIDEO_TINT __MSABI_LONG(0x00004003)
+#define MCI_DGV_SETVIDEO_SHARPNESS __MSABI_LONG(0x00004004)
+#define MCI_DGV_SETVIDEO_GAMMA __MSABI_LONG(0x00004005)
+#define MCI_DGV_SETVIDEO_STREAM __MSABI_LONG(0x00004006)
+#define MCI_DGV_SETVIDEO_PALHANDLE __MSABI_LONG(0x00004007)
+#define MCI_DGV_SETVIDEO_FRAME_RATE __MSABI_LONG(0x00004008)
+#define MCI_DGV_SETVIDEO_SOURCE __MSABI_LONG(0x00004009)
+#define MCI_DGV_SETVIDEO_KEY_INDEX __MSABI_LONG(0x0000400a)
+#define MCI_DGV_SETVIDEO_KEY_COLOR __MSABI_LONG(0x0000400b)
+#define MCI_DGV_SETVIDEO_BITSPERPEL __MSABI_LONG(0x0000400c)
 
-#define MCI_DGV_SIGNAL_AT 0x00010000L
-#define MCI_DGV_SIGNAL_EVERY 0x00020000L
-#define MCI_DGV_SIGNAL_USERVAL 0x00040000L
-#define MCI_DGV_SIGNAL_CANCEL 0x00080000L
-#define MCI_DGV_SIGNAL_POSITION 0x00100000L
+#define MCI_DGV_SIGNAL_AT __MSABI_LONG(0x00010000)
+#define MCI_DGV_SIGNAL_EVERY __MSABI_LONG(0x00020000)
+#define MCI_DGV_SIGNAL_USERVAL __MSABI_LONG(0x00040000)
+#define MCI_DGV_SIGNAL_CANCEL __MSABI_LONG(0x00080000)
+#define MCI_DGV_SIGNAL_POSITION __MSABI_LONG(0x00100000)
 
 #define SEND_DGVSIGNAL(dwFlags,dwCallback,hDriver,wDeviceID,dwUser,dwPos) DriverCallback((dwCallback),DCB_WINDOW,(HANDLE)(wDeviceID),MM_MCISIGNAL,hDriver,((dwFlags) & MCI_DGV_SIGNAL_POSITION) ? (dwPos):(dwUser),((dwFlags) & MCI_DGV_SIGNAL_POSITION) ? (dwUser):(dwPos))
 
-#define MCI_DGV_STATUS_NOMINAL 0x00020000L
-#define MCI_DGV_STATUS_REFERENCE 0x00040000L
-#define MCI_DGV_STATUS_LEFT 0x00080000L
-#define MCI_DGV_STATUS_RIGHT 0x00100000L
-#define MCI_DGV_STATUS_DISKSPACE 0x00200000L
-#define MCI_DGV_STATUS_INPUT 0x00400000L
-#define MCI_DGV_STATUS_OUTPUT 0x00800000L
-#define MCI_DGV_STATUS_RECORD 0x01000000L
+#define MCI_DGV_STATUS_NOMINAL __MSABI_LONG(0x00020000)
+#define MCI_DGV_STATUS_REFERENCE __MSABI_LONG(0x00040000)
+#define MCI_DGV_STATUS_LEFT __MSABI_LONG(0x00080000)
+#define MCI_DGV_STATUS_RIGHT __MSABI_LONG(0x00100000)
+#define MCI_DGV_STATUS_DISKSPACE __MSABI_LONG(0x00200000)
+#define MCI_DGV_STATUS_INPUT __MSABI_LONG(0x00400000)
+#define MCI_DGV_STATUS_OUTPUT __MSABI_LONG(0x00800000)
+#define MCI_DGV_STATUS_RECORD __MSABI_LONG(0x01000000)
 
-#define MCI_DGV_STATUS_AUDIO_INPUT 0x00004000L
-#define MCI_DGV_STATUS_HWND 0x00004001L
-#define MCI_DGV_STATUS_SPEED 0x00004003L
-#define MCI_DGV_STATUS_HPAL 0x00004004L
-#define MCI_DGV_STATUS_BRIGHTNESS 0x00004005L
-#define MCI_DGV_STATUS_COLOR 0x00004006L
-#define MCI_DGV_STATUS_CONTRAST 0x00004007L
-#define MCI_DGV_STATUS_FILEFORMAT 0x00004008L
-#define MCI_DGV_STATUS_AUDIO_SOURCE 0x00004009L
-#define MCI_DGV_STATUS_GAMMA 0x0000400aL
-#define MCI_DGV_STATUS_MONITOR 0x0000400bL
-#define MCI_DGV_STATUS_MONITOR_METHOD 0x0000400cL
-#define MCI_DGV_STATUS_FRAME_RATE 0x0000400eL
-#define MCI_DGV_STATUS_BASS 0x0000400fL
-#define MCI_DGV_STATUS_SIZE 0x00004010L
-#define MCI_DGV_STATUS_SEEK_EXACTLY 0x00004011L
-#define MCI_DGV_STATUS_SHARPNESS 0x00004012L
-#define MCI_DGV_STATUS_SMPTE 0x00004013L
-#define MCI_DGV_STATUS_AUDIO 0x00004014L
-#define MCI_DGV_STATUS_TINT 0x00004015L
-#define MCI_DGV_STATUS_TREBLE 0x00004016L
-#define MCI_DGV_STATUS_UNSAVED 0x00004017L
-#define MCI_DGV_STATUS_VIDEO 0x00004018L
-#define MCI_DGV_STATUS_VOLUME 0x00004019L
-#define MCI_DGV_STATUS_AUDIO_RECORD 0x0000401aL
-#define MCI_DGV_STATUS_VIDEO_SOURCE 0x0000401bL
-#define MCI_DGV_STATUS_VIDEO_RECORD 0x0000401cL
-#define MCI_DGV_STATUS_STILL_FILEFORMAT 0x0000401dL
-#define MCI_DGV_STATUS_VIDEO_SRC_NUM 0x0000401eL
-#define MCI_DGV_STATUS_FILE_MODE 0x0000401fL
-#define MCI_DGV_STATUS_FILE_COMPLETION 0x00004020L
-#define MCI_DGV_STATUS_WINDOW_VISIBLE 0x00004021L
-#define MCI_DGV_STATUS_WINDOW_MINIMIZED 0x00004022L
-#define MCI_DGV_STATUS_WINDOW_MAXIMIZED 0x00004023L
-#define MCI_DGV_STATUS_KEY_INDEX 0x00004024L
-#define MCI_DGV_STATUS_KEY_COLOR 0x00004025L
-#define MCI_DGV_STATUS_PAUSE_MODE 0x00004026L
-#define MCI_DGV_STATUS_SAMPLESPERSEC 0x00004027L
-#define MCI_DGV_STATUS_AVGBYTESPERSEC 0x00004028L
-#define MCI_DGV_STATUS_BLOCKALIGN 0x00004029L
-#define MCI_DGV_STATUS_BITSPERSAMPLE 0x0000402aL
-#define MCI_DGV_STATUS_BITSPERPEL 0x0000402bL
-#define MCI_DGV_STATUS_FORWARD 0x0000402cL
-#define MCI_DGV_STATUS_AUDIO_STREAM 0x0000402dL
-#define MCI_DGV_STATUS_VIDEO_STREAM 0x0000402eL
+#define MCI_DGV_STATUS_AUDIO_INPUT __MSABI_LONG(0x00004000)
+#define MCI_DGV_STATUS_HWND __MSABI_LONG(0x00004001)
+#define MCI_DGV_STATUS_SPEED __MSABI_LONG(0x00004003)
+#define MCI_DGV_STATUS_HPAL __MSABI_LONG(0x00004004)
+#define MCI_DGV_STATUS_BRIGHTNESS __MSABI_LONG(0x00004005)
+#define MCI_DGV_STATUS_COLOR __MSABI_LONG(0x00004006)
+#define MCI_DGV_STATUS_CONTRAST __MSABI_LONG(0x00004007)
+#define MCI_DGV_STATUS_FILEFORMAT __MSABI_LONG(0x00004008)
+#define MCI_DGV_STATUS_AUDIO_SOURCE __MSABI_LONG(0x00004009)
+#define MCI_DGV_STATUS_GAMMA __MSABI_LONG(0x0000400a)
+#define MCI_DGV_STATUS_MONITOR __MSABI_LONG(0x0000400b)
+#define MCI_DGV_STATUS_MONITOR_METHOD __MSABI_LONG(0x0000400c)
+#define MCI_DGV_STATUS_FRAME_RATE __MSABI_LONG(0x0000400e)
+#define MCI_DGV_STATUS_BASS __MSABI_LONG(0x0000400f)
+#define MCI_DGV_STATUS_SIZE __MSABI_LONG(0x00004010)
+#define MCI_DGV_STATUS_SEEK_EXACTLY __MSABI_LONG(0x00004011)
+#define MCI_DGV_STATUS_SHARPNESS __MSABI_LONG(0x00004012)
+#define MCI_DGV_STATUS_SMPTE __MSABI_LONG(0x00004013)
+#define MCI_DGV_STATUS_AUDIO __MSABI_LONG(0x00004014)
+#define MCI_DGV_STATUS_TINT __MSABI_LONG(0x00004015)
+#define MCI_DGV_STATUS_TREBLE __MSABI_LONG(0x00004016)
+#define MCI_DGV_STATUS_UNSAVED __MSABI_LONG(0x00004017)
+#define MCI_DGV_STATUS_VIDEO __MSABI_LONG(0x00004018)
+#define MCI_DGV_STATUS_VOLUME __MSABI_LONG(0x00004019)
+#define MCI_DGV_STATUS_AUDIO_RECORD __MSABI_LONG(0x0000401a)
+#define MCI_DGV_STATUS_VIDEO_SOURCE __MSABI_LONG(0x0000401b)
+#define MCI_DGV_STATUS_VIDEO_RECORD __MSABI_LONG(0x0000401c)
+#define MCI_DGV_STATUS_STILL_FILEFORMAT __MSABI_LONG(0x0000401d)
+#define MCI_DGV_STATUS_VIDEO_SRC_NUM __MSABI_LONG(0x0000401e)
+#define MCI_DGV_STATUS_FILE_MODE __MSABI_LONG(0x0000401f)
+#define MCI_DGV_STATUS_FILE_COMPLETION __MSABI_LONG(0x00004020)
+#define MCI_DGV_STATUS_WINDOW_VISIBLE __MSABI_LONG(0x00004021)
+#define MCI_DGV_STATUS_WINDOW_MINIMIZED __MSABI_LONG(0x00004022)
+#define MCI_DGV_STATUS_WINDOW_MAXIMIZED __MSABI_LONG(0x00004023)
+#define MCI_DGV_STATUS_KEY_INDEX __MSABI_LONG(0x00004024)
+#define MCI_DGV_STATUS_KEY_COLOR __MSABI_LONG(0x00004025)
+#define MCI_DGV_STATUS_PAUSE_MODE __MSABI_LONG(0x00004026)
+#define MCI_DGV_STATUS_SAMPLESPERSEC __MSABI_LONG(0x00004027)
+#define MCI_DGV_STATUS_AVGBYTESPERSEC __MSABI_LONG(0x00004028)
+#define MCI_DGV_STATUS_BLOCKALIGN __MSABI_LONG(0x00004029)
+#define MCI_DGV_STATUS_BITSPERSAMPLE __MSABI_LONG(0x0000402a)
+#define MCI_DGV_STATUS_BITSPERPEL __MSABI_LONG(0x0000402b)
+#define MCI_DGV_STATUS_FORWARD __MSABI_LONG(0x0000402c)
+#define MCI_DGV_STATUS_AUDIO_STREAM __MSABI_LONG(0x0000402d)
+#define MCI_DGV_STATUS_VIDEO_STREAM __MSABI_LONG(0x0000402e)
 
-#define MCI_DGV_STEP_REVERSE 0x00010000L
-#define MCI_DGV_STEP_FRAMES 0x00020000L
+#define MCI_DGV_STEP_REVERSE __MSABI_LONG(0x00010000)
+#define MCI_DGV_STEP_FRAMES __MSABI_LONG(0x00020000)
 
-#define MCI_DGV_STOP_HOLD 0x00010000L
+#define MCI_DGV_STOP_HOLD __MSABI_LONG(0x00010000)
 
-#define MCI_DGV_UPDATE_HDC 0x00020000L
-#define MCI_DGV_UPDATE_PAINT 0x00040000L
+#define MCI_DGV_UPDATE_HDC __MSABI_LONG(0x00020000)
+#define MCI_DGV_UPDATE_PAINT __MSABI_LONG(0x00040000)
 
-#define MCI_DGV_WHERE_SOURCE 0x00020000L
-#define MCI_DGV_WHERE_DESTINATION 0x00040000L
-#define MCI_DGV_WHERE_FRAME 0x00080000L
-#define MCI_DGV_WHERE_VIDEO 0x00100000L
-#define MCI_DGV_WHERE_WINDOW 0x00200000L
-#define MCI_DGV_WHERE_MAX 0x00400000L
+#define MCI_DGV_WHERE_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_DGV_WHERE_DESTINATION __MSABI_LONG(0x00040000)
+#define MCI_DGV_WHERE_FRAME __MSABI_LONG(0x00080000)
+#define MCI_DGV_WHERE_VIDEO __MSABI_LONG(0x00100000)
+#define MCI_DGV_WHERE_WINDOW __MSABI_LONG(0x00200000)
+#define MCI_DGV_WHERE_MAX __MSABI_LONG(0x00400000)
 
-#define MCI_DGV_WINDOW_HWND 0x00010000L
-#define MCI_DGV_WINDOW_STATE 0x00040000L
-#define MCI_DGV_WINDOW_TEXT 0x00080000L
+#define MCI_DGV_WINDOW_HWND __MSABI_LONG(0x00010000)
+#define MCI_DGV_WINDOW_STATE __MSABI_LONG(0x00040000)
+#define MCI_DGV_WINDOW_TEXT __MSABI_LONG(0x00080000)
 
-#define MCI_DGV_WINDOW_DEFAULT 0x00000000L
+#define MCI_DGV_WINDOW_DEFAULT __MSABI_LONG(0x00000000)
 
   typedef struct {
     DWORD_PTR dwCallback;
diff --git a/mingw-w64-headers/include/directx/d3d9caps.h b/mingw-w64-headers/include/directx/d3d9caps.h
index 9858cf2..085d971 100644
--- a/mingw-w64-headers/include/directx/d3d9caps.h
+++ b/mingw-w64-headers/include/directx/d3d9caps.h
@@ -120,7 +120,7 @@
 #define D3DPRESENT_INTERVAL_TWO	0x02
 #define D3DPRESENT_INTERVAL_THREE	0x04
 #define D3DPRESENT_INTERVAL_FOUR	0x08
-#define D3DPRESENT_INTERVAL_IMMEDIATE	0x80000000L
+#define D3DPRESENT_INTERVAL_IMMEDIATE	__MSABI_LONG(0x80000000)
 #define D3DPSHADECAPS_COLORGOURAUDRGB	0x08
 #define D3DPSHADECAPS_SPECULARGOURAUDRGB	0x200
 #define D3DPSHADECAPS_ALPHAGOURAUDBLEND	0x4000
@@ -203,17 +203,17 @@
 #define D3DVTXPCAPS_TEXGEN_SPHEREMAP	0x100
 #define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER	0x200
 #define D3DCAPS_READ_SCANLINE	0x20000
-#define D3DCAPS2_FULLSCREENGAMMA	0x20000L
-#define D3DCAPS2_CANCALIBRATEGAMMA	0x100000L
-#define D3DCAPS2_RESERVED	0x2000000L
-#define D3DCAPS2_CANMANAGERESOURCE	0x10000000L
-#define D3DCAPS2_DYNAMICTEXTURES	0x20000000L
-#define D3DCAPS2_CANAUTOGENMIPMAP	0x40000000L
+#define D3DCAPS2_FULLSCREENGAMMA	__MSABI_LONG(0x20000)
+#define D3DCAPS2_CANCALIBRATEGAMMA	__MSABI_LONG(0x100000)
+#define D3DCAPS2_RESERVED	__MSABI_LONG(0x2000000)
+#define D3DCAPS2_CANMANAGERESOURCE	__MSABI_LONG(0x10000000)
+#define D3DCAPS2_DYNAMICTEXTURES	__MSABI_LONG(0x20000000)
+#define D3DCAPS2_CANAUTOGENMIPMAP	__MSABI_LONG(0x40000000)
 #define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD	0x20
 #define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION	0x80
 #define D3DCAPS3_COPY_TO_VIDMEM	0x100
 #define D3DCAPS3_COPY_TO_SYSTEMMEM	0x200
-#define D3DCAPS3_RESERVED	0x8000001fL
+#define D3DCAPS3_RESERVED	__MSABI_LONG(0x8000001f)
 #define D3DDTCAPS_UBYTE4	0x01
 #define D3DDTCAPS_UBYTE4N	0x02
 #define D3DDTCAPS_SHORT2N	0x04
diff --git a/mingw-w64-headers/include/dispex.h b/mingw-w64-headers/include/dispex.h
index d9a3d7b..9015889 100644
--- a/mingw-w64-headers/include/dispex.h
+++ b/mingw-w64-headers/include/dispex.h
@@ -78,35 +78,35 @@
 #endif
 
 #ifndef _NO_DISPATCHEX_CONSTS
-#define fdexNameCaseSensitive 0x00000001L
-#define fdexNameEnsure 0x00000002L
-#define fdexNameImplicit 0x00000004L
-#define fdexNameCaseInsensitive 0x00000008L
-#define fdexNameInternal 0x00000010L
-#define fdexNameNoDynamicProperties 0x00000020L
+#define fdexNameCaseSensitive __MSABI_LONG(0x00000001)
+#define fdexNameEnsure __MSABI_LONG(0x00000002)
+#define fdexNameImplicit __MSABI_LONG(0x00000004)
+#define fdexNameCaseInsensitive __MSABI_LONG(0x00000008)
+#define fdexNameInternal __MSABI_LONG(0x00000010)
+#define fdexNameNoDynamicProperties __MSABI_LONG(0x00000020)
 
-#define fdexPropCanGet 0x00000001L
-#define fdexPropCannotGet 0x00000002L
-#define fdexPropCanPut 0x00000004L
-#define fdexPropCannotPut 0x00000008L
-#define fdexPropCanPutRef 0x00000010L
-#define fdexPropCannotPutRef 0x00000020L
-#define fdexPropNoSideEffects 0x00000040L
-#define fdexPropDynamicType 0x00000080L
-#define fdexPropCanCall 0x00000100L
-#define fdexPropCannotCall 0x00000200L
-#define fdexPropCanConstruct 0x00000400L
-#define fdexPropCannotConstruct 0x00000800L
-#define fdexPropCanSourceEvents 0x00001000L
-#define fdexPropCannotSourceEvents 0x00002000L
+#define fdexPropCanGet __MSABI_LONG(0x00000001)
+#define fdexPropCannotGet __MSABI_LONG(0x00000002)
+#define fdexPropCanPut __MSABI_LONG(0x00000004)
+#define fdexPropCannotPut __MSABI_LONG(0x00000008)
+#define fdexPropCanPutRef __MSABI_LONG(0x00000010)
+#define fdexPropCannotPutRef __MSABI_LONG(0x00000020)
+#define fdexPropNoSideEffects __MSABI_LONG(0x00000040)
+#define fdexPropDynamicType __MSABI_LONG(0x00000080)
+#define fdexPropCanCall __MSABI_LONG(0x00000100)
+#define fdexPropCannotCall __MSABI_LONG(0x00000200)
+#define fdexPropCanConstruct __MSABI_LONG(0x00000400)
+#define fdexPropCannotConstruct __MSABI_LONG(0x00000800)
+#define fdexPropCanSourceEvents __MSABI_LONG(0x00001000)
+#define fdexPropCannotSourceEvents __MSABI_LONG(0x00002000)
 
 #define grfdexPropCanAll (fdexPropCanGet | fdexPropCanPut | fdexPropCanPutRef | fdexPropCanCall | fdexPropCanConstruct | fdexPropCanSourceEvents)
 #define grfdexPropCannotAll (fdexPropCannotGet | fdexPropCannotPut | fdexPropCannotPutRef | fdexPropCannotCall | fdexPropCannotConstruct | fdexPropCannotSourceEvents)
 #define grfdexPropExtraAll (fdexPropNoSideEffects | fdexPropDynamicType)
 #define grfdexPropAll (grfdexPropCanAll | grfdexPropCannotAll | grfdexPropExtraAll)
 
-#define fdexEnumDefault 0x00000001L
-#define fdexEnumAll 0x00000002L
+#define fdexEnumDefault __MSABI_LONG(0x00000001)
+#define fdexEnumAll __MSABI_LONG(0x00000002)
 
 #define DISPATCH_CONSTRUCT 0x4000
 
diff --git a/mingw-w64-headers/include/dtchelp.h b/mingw-w64-headers/include/dtchelp.h
index ca7b2d3..1897614 100644
--- a/mingw-w64-headers/include/dtchelp.h
+++ b/mingw-w64-headers/include/dtchelp.h
@@ -29,8 +29,8 @@
 #define StartDTC __MINGW_NAME_AW(StartDTC)
 #define StopDTC __MINGW_NAME_AW(StopDTC)
 
-#define DTCINSTALL_E_CLIENT_ALREADY_INSTALLED 0x0000180L
-#define DTCINSTALL_E_SERVER_ALREADY_INSTALLED 0x0000181L
+#define DTCINSTALL_E_CLIENT_ALREADY_INSTALLED __MSABI_LONG(0x0000180)
+#define DTCINSTALL_E_SERVER_ALREADY_INSTALLED __MSABI_LONG(0x0000181)
 
 const DWORD DTC_INSTALL_OVERWRITE_CLIENT = 0x00000001;
 const DWORD DTC_INSTALL_OVERWRITE_SERVER = 0x00000002;
diff --git a/mingw-w64-headers/include/eaphosterror.h b/mingw-w64-headers/include/eaphosterror.h
index e6b35e0..8e71ceb 100644
--- a/mingw-w64-headers/include/eaphosterror.h
+++ b/mingw-w64-headers/include/eaphosterror.h
@@ -19,10 +19,10 @@
 #define _EAP_GENERAL_FIRST 0x10
 #define _EAP_GENERAL_LAST 0x3f
 
-#define EAP_E_EAPHOST_FIRST 0x80420000L
-#define EAP_E_EAPHOST_LAST  0x804200FFL
-#define EAP_I_EAPHOST_FIRST 0x80420000L
-#define EAP_I_EAPHOST_FIRST 0x804200FFL
+#define EAP_E_EAPHOST_FIRST __MSABI_LONG(0x80420000)
+#define EAP_E_EAPHOST_LAST  __MSABI_LONG(0x804200FF)
+#define EAP_I_EAPHOST_FIRST __MSABI_LONG(0x80420000)
+#define EAP_I_EAPHOST_FIRST __MSABI_LONG(0x804200FF)
 
 #define EAP_E_CERT_STORE_INACCESSIBLE 0x80420011
 #define EAP_E_EAPHOST_METHOD_NOT_INSTALLED 0x80420011
@@ -41,10 +41,10 @@
 
 #define EAP_E_EAPHOST_METHOD_OPERATION_NOT_SUPPORTED 0x80420020
 
-#define EAP_E_USER_FIRST 0x80420100L
-#define EAP_E_USER_LAST  0x804201FFL
-#define EAP_I_USER_FIRST 0x40420100L
-#define EAP_I_USER_LAST  0x804201FFL
+#define EAP_E_USER_FIRST __MSABI_LONG(0x80420100)
+#define EAP_E_USER_LAST  __MSABI_LONG(0x804201FF)
+#define EAP_I_USER_FIRST __MSABI_LONG(0x40420100)
+#define EAP_I_USER_LAST  __MSABI_LONG(0x804201FF)
 
 #define EAP_E_USER_CERT_NOT_FOUND 0x80420100
 #define EAP_E_USER_CERT_INVALID 0x80420101
@@ -60,8 +60,8 @@
 #define EAP_E_NO_SMART_CARD_READER 0x80420113
 #endif /*(_WIN32_WINNT >= 0x0601)*/
 
-#define EAP_E_SERVER_FIRST 0x80420200L
-#define EAP_E_SERVER_LAST 0x804202FFL
+#define EAP_E_SERVER_FIRST __MSABI_LONG(0x80420200)
+#define EAP_E_SERVER_LAST __MSABI_LONG(0x804202FF)
 
 #define EAP_E_SERVER_CERT_NOT_FOUND 0x80420200
 #define EAP_E_SERVER_CERT_INVALID 0x80420201
@@ -69,14 +69,14 @@
 #define EAP_E_SERVER_CERT_REVOKED 0x80420203
 #define EAP_E_SERVER_CERT_OTHER_ERROR 0x80420204
 
-#define EAP_E_USER_ROOT_CERT_FIRST 0x80420300L
-#define EAP_E_USER_ROOT_CERT_LAST 0x804203FFL
+#define EAP_E_USER_ROOT_CERT_FIRST __MSABI_LONG(0x80420300)
+#define EAP_E_USER_ROOT_CERT_LAST __MSABI_LONG(0x804203FF)
 #define EAP_E_USER_ROOT_CERT_NOT_FOUND 0x80420300
 #define EAP_E_USER_ROOT_CERT_INVALID 0x80420301
 #define EAP_E_USER_ROOT_CERT_EXPIRED 0x80420302
 
-#define EAP_E_SERVER_ROOT_CERT_FIRST 0x80420400L
-#define EAP_E_SERVER_ROOT_CERT_LAST 0x804204FFL
+#define EAP_E_SERVER_ROOT_CERT_FIRST __MSABI_LONG(0x80420400)
+#define EAP_E_SERVER_ROOT_CERT_LAST __MSABI_LONG(0x804204FF)
 
 #define EAP_E_SERVER_ROOT_CERT_NOT_FOUND 0x80420400
 #define EAP_E_SERVER_ROOT_CERT_INVALID 0x80420401
diff --git a/mingw-w64-headers/include/fci.h b/mingw-w64-headers/include/fci.h
index 13ddd2f..eb9ae13 100644
--- a/mingw-w64-headers/include/fci.h
+++ b/mingw-w64-headers/include/fci.h
@@ -69,7 +69,7 @@
 #define STATIC static
 
 #define CB_MAX_CHUNK 32768U
-#define CB_MAX_DISK 0x7fffffffL
+#define CB_MAX_DISK __MSABI_LONG(0x7fffffff)
 #define CB_MAX_FILENAME 256
 #define CB_MAX_CABINET_NAME 256
 #define CB_MAX_CAB_PATH 256
diff --git a/mingw-w64-headers/include/fdi.h b/mingw-w64-headers/include/fdi.h
index f896cef..23ca13b 100644
--- a/mingw-w64-headers/include/fdi.h
+++ b/mingw-w64-headers/include/fdi.h
@@ -71,7 +71,7 @@
 #define STATIC static
 
 #define CB_MAX_CHUNK 32768U
-#define CB_MAX_DISK 0x7fffffffL
+#define CB_MAX_DISK __MSABI_LONG(0x7fffffff)
 #define CB_MAX_FILENAME 256
 #define CB_MAX_CABINET_NAME 256
 #define CB_MAX_CAB_PATH 256
diff --git a/mingw-w64-headers/include/icm.h b/mingw-w64-headers/include/icm.h
index 06e9ea6..47f7c9c 100644
--- a/mingw-w64-headers/include/icm.h
+++ b/mingw-w64-headers/include/icm.h
@@ -305,9 +305,9 @@
 #define CMS_DISABLEINTENT 0x400
 #define CMS_DISABLERENDERINTENT 0x800
 
-#define CMS_MONITOROVERFLOW 0x80000000L
-#define CMS_PRINTEROVERFLOW 0x40000000L
-#define CMS_TARGETOVERFLOW 0x20000000L
+#define CMS_MONITOROVERFLOW __MSABI_LONG(0x80000000)
+#define CMS_PRINTEROVERFLOW __MSABI_LONG(0x40000000)
+#define CMS_TARGETOVERFLOW __MSABI_LONG(0x20000000)
 
   struct _tagCOLORMATCHSETUPW;
   struct _tagCOLORMATCHSETUPA;
diff --git a/mingw-w64-headers/include/ksmedia.h b/mingw-w64-headers/include/ksmedia.h
index 49745ed..125c352 100644
--- a/mingw-w64-headers/include/ksmedia.h
+++ b/mingw-w64-headers/include/ksmedia.h
@@ -2415,10 +2415,10 @@
 DEFINE_GUIDSTRUCT("f72a76e3-eb0a-11d0-ace4-0000c0cc16ba",KSDATAFORMAT_SUBTYPE_TELETEXT);
 #define KSDATAFORMAT_SUBTYPE_TELETEXT DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_TELETEXT)
 
-#define KS_BI_RGB		0L
-#define KS_BI_RLE8		1L
-#define KS_BI_RLE4		2L
-#define KS_BI_BITFIELDS		3L
+#define KS_BI_RGB		__MSABI_LONG(0)
+#define KS_BI_RLE8		__MSABI_LONG(1)
+#define KS_BI_RLE4		__MSABI_LONG(2)
+#define KS_BI_BITFIELDS		__MSABI_LONG(3)
 
 typedef struct tagKS_RGBQUAD {
   BYTE rgbBlue;
@@ -2510,8 +2510,8 @@
   ULONG BufferSize;
 } KS_VBIINFOHEADER,*PKS_VBIINFOHEADER;
 
-#define KS_VBIDATARATE_NABTS		(5727272L)
-#define KS_VBIDATARATE_CC		(503493L)
+#define KS_VBIDATARATE_NABTS		(__MSABI_LONG(5727272))
+#define KS_VBIDATARATE_CC		(__MSABI_LONG(503493))
 #define KS_VBISAMPLINGRATE_4X_NABTS	((long)(4*KS_VBIDATARATE_NABTS))
 #define KS_VBISAMPLINGRATE_47X_NABTS	((long)(27000000))
 #define KS_VBISAMPLINGRATE_5X_NABTS	((long)(5*KS_VBIDATARATE_NABTS))
@@ -2526,8 +2526,8 @@
   REFERENCE_TIME AvgTimePerFrame;
 } KS_ANALOGVIDEOINFO,*PKS_ANALOGVIDEOINFO;
 
-#define KS_TVTUNER_CHANGE_BEGIN_TUNE	0x0001L
-#define KS_TVTUNER_CHANGE_END_TUNE	0x0002L
+#define KS_TVTUNER_CHANGE_BEGIN_TUNE	__MSABI_LONG(0x0001)
+#define KS_TVTUNER_CHANGE_END_TUNE	__MSABI_LONG(0x0002)
 
 typedef struct tagKS_TVTUNER_CHANGE_INFO {
   DWORD dwFlags;
@@ -2761,9 +2761,9 @@
   ULONG Status;
 } VBICAP_PROPERTIES_PROTECTION_S,*PVBICAP_PROPERTIES_PROTECTION_S;
 
-#define KS_VBICAP_PROTECTION_MV_PRESENT				0x0001L
-#define KS_VBICAP_PROTECTION_MV_HARDWARE			0x0002L
-#define KS_VBICAP_PROTECTION_MV_DETECTED			0x0004L
+#define KS_VBICAP_PROTECTION_MV_PRESENT				__MSABI_LONG(0x0001)
+#define KS_VBICAP_PROTECTION_MV_HARDWARE			__MSABI_LONG(0x0002)
+#define KS_VBICAP_PROTECTION_MV_DETECTED			__MSABI_LONG(0x0004)
 
 #define KS_NABTS_GROUPID_ORIGINAL_CONTENT_BASE			0x800
 #define KS_NABTS_GROUPID_ORIGINAL_CONTENT_ADVERTISER_BASE	0x810
@@ -2832,21 +2832,21 @@
   DWORD SubstreamMask;
 } VBICODECFILTERING_CC_SUBSTREAMS,*PVBICODECFILTERING_CC_SUBSTREAMS;
 
-#define KS_CC_SUBSTREAM_ODD		0x0001L
-#define KS_CC_SUBSTREAM_EVEN		0x0002L
+#define KS_CC_SUBSTREAM_ODD		__MSABI_LONG(0x0001)
+#define KS_CC_SUBSTREAM_EVEN		__MSABI_LONG(0x0002)
 
-#define KS_CC_SUBSTREAM_FIELD1_MASK	0x00F0L
-#define KS_CC_SUBSTREAM_SERVICE_CC1	0x0010L
-#define KS_CC_SUBSTREAM_SERVICE_CC2	0x0020L
-#define KS_CC_SUBSTREAM_SERVICE_T1	0x0040L
-#define KS_CC_SUBSTREAM_SERVICE_T2	0x0080L
+#define KS_CC_SUBSTREAM_FIELD1_MASK	__MSABI_LONG(0x00F0)
+#define KS_CC_SUBSTREAM_SERVICE_CC1	__MSABI_LONG(0x0010)
+#define KS_CC_SUBSTREAM_SERVICE_CC2	__MSABI_LONG(0x0020)
+#define KS_CC_SUBSTREAM_SERVICE_T1	__MSABI_LONG(0x0040)
+#define KS_CC_SUBSTREAM_SERVICE_T2	__MSABI_LONG(0x0080)
 
-#define KS_CC_SUBSTREAM_FIELD2_MASK	0x1F00L
-#define KS_CC_SUBSTREAM_SERVICE_CC3	0x0100L
-#define KS_CC_SUBSTREAM_SERVICE_CC4	0x0200L
-#define KS_CC_SUBSTREAM_SERVICE_T3	0x0400L
-#define KS_CC_SUBSTREAM_SERVICE_T4	0x0800L
-#define KS_CC_SUBSTREAM_SERVICE_XDS	0x1000L
+#define KS_CC_SUBSTREAM_FIELD2_MASK	__MSABI_LONG(0x1F00)
+#define KS_CC_SUBSTREAM_SERVICE_CC3	__MSABI_LONG(0x0100)
+#define KS_CC_SUBSTREAM_SERVICE_CC4	__MSABI_LONG(0x0200)
+#define KS_CC_SUBSTREAM_SERVICE_T3	__MSABI_LONG(0x0400)
+#define KS_CC_SUBSTREAM_SERVICE_T4	__MSABI_LONG(0x0800)
+#define KS_CC_SUBSTREAM_SERVICE_XDS	__MSABI_LONG(0x1000)
 
 #define CC_MAX_HW_DECODE_LINES		12
 typedef struct _CC_BYTE_PAIR {
@@ -2879,8 +2879,8 @@
 #include <poppack.h>
 #endif
 
-#define WST_TVTUNER_CHANGE_BEGIN_TUNE	0x1000L
-#define WST_TVTUNER_CHANGE_END_TUNE	0x2000L
+#define WST_TVTUNER_CHANGE_BEGIN_TUNE	__MSABI_LONG(0x1000)
+#define WST_TVTUNER_CHANGE_END_TUNE	__MSABI_LONG(0x2000)
 
 #define MAX_WST_VBI_LINES_PER_FIELD	17
 #define WST_BYTES_PER_LINE		42
@@ -3142,13 +3142,13 @@
 } VRAM_SURFACE_INFO_PROPERTY_S,*PVRAM_SURFACE_INFO_PROPERTY_S;
 
 
-#define KS_VIDEO_FLAG_FRAME		0x0000L
-#define KS_VIDEO_FLAG_FIELD1		0x0001L
-#define KS_VIDEO_FLAG_FIELD2		0x0002L
+#define KS_VIDEO_FLAG_FRAME		__MSABI_LONG(0x0000)
+#define KS_VIDEO_FLAG_FIELD1		__MSABI_LONG(0x0001)
+#define KS_VIDEO_FLAG_FIELD2		__MSABI_LONG(0x0002)
 
-#define KS_VIDEO_FLAG_I_FRAME		0x0000L
-#define KS_VIDEO_FLAG_P_FRAME		0x0010L
-#define KS_VIDEO_FLAG_B_FRAME		0x0020L
+#define KS_VIDEO_FLAG_I_FRAME		__MSABI_LONG(0x0000)
+#define KS_VIDEO_FLAG_P_FRAME		__MSABI_LONG(0x0010)
+#define KS_VIDEO_FLAG_B_FRAME		__MSABI_LONG(0x0020)
 
 typedef struct tagKS_FRAME_INFO {
   ULONG ExtendedHeaderSize;
@@ -3165,15 +3165,15 @@
   DWORD Reserved4;
 } KS_FRAME_INFO,*PKS_FRAME_INFO;
 
-#define KS_VBI_FLAG_FIELD1		0x0001L
-#define KS_VBI_FLAG_FIELD2		0x0002L
+#define KS_VBI_FLAG_FIELD1		__MSABI_LONG(0x0001)
+#define KS_VBI_FLAG_FIELD2		__MSABI_LONG(0x0002)
 
-#define KS_VBI_FLAG_MV_PRESENT		0x0100L
-#define KS_VBI_FLAG_MV_HARDWARE		0x0200L
-#define KS_VBI_FLAG_MV_DETECTED		0x0400L
+#define KS_VBI_FLAG_MV_PRESENT		__MSABI_LONG(0x0100)
+#define KS_VBI_FLAG_MV_HARDWARE		__MSABI_LONG(0x0200)
+#define KS_VBI_FLAG_MV_DETECTED		__MSABI_LONG(0x0400)
 
-#define KS_VBI_FLAG_TVTUNER_CHANGE	0x0010L
-#define KS_VBI_FLAG_VBIINFOHEADER_CHANGE 0x0020L
+#define KS_VBI_FLAG_TVTUNER_CHANGE	__MSABI_LONG(0x0010)
+#define KS_VBI_FLAG_VBIINFOHEADER_CHANGE __MSABI_LONG(0x0020)
 
 typedef struct tagKS_VBI_FRAME_INFO {
   ULONG ExtendedHeaderSize;
@@ -4226,7 +4226,7 @@
 #else /* __IVPType__ */
 
 #ifndef __DDRAW_INCLUDED__
-#define DDPF_FOURCC 0x00000004l
+#define DDPF_FOURCC __MSABI_LONG(0x00000004)
 
 typedef struct _DDPIXELFORMAT
 {
diff --git a/mingw-w64-headers/include/lmremutl.h b/mingw-w64-headers/include/lmremutl.h
index 8161a1d..dee89ad 100644
--- a/mingw-w64-headers/include/lmremutl.h
+++ b/mingw-w64-headers/include/lmremutl.h
@@ -37,12 +37,12 @@
     DWORD tod_weekday;
   } TIME_OF_DAY_INFO,*PTIME_OF_DAY_INFO,*LPTIME_OF_DAY_INFO;
 
-#define SUPPORTS_REMOTE_ADMIN_PROTOCOL 0x00000002L
-#define SUPPORTS_RPC 0x00000004L
-#define SUPPORTS_SAM_PROTOCOL 0x00000008L
-#define SUPPORTS_UNICODE 0x00000010L
-#define SUPPORTS_LOCAL 0x00000020L
-#define SUPPORTS_ANY 0xFFFFFFFFL
+#define SUPPORTS_REMOTE_ADMIN_PROTOCOL __MSABI_LONG(0x00000002)
+#define SUPPORTS_RPC __MSABI_LONG(0x00000004)
+#define SUPPORTS_SAM_PROTOCOL __MSABI_LONG(0x00000008)
+#define SUPPORTS_UNICODE __MSABI_LONG(0x00000010)
+#define SUPPORTS_LOCAL __MSABI_LONG(0x00000020)
+#define SUPPORTS_ANY __MSABI_LONG(0xFFFFFFFF)
 
 #define NO_PERMISSION_REQUIRED 0x00000001
 #define ALLOCATE_RESPONSE 0x00000002
diff --git a/mingw-w64-headers/include/lmserver.h b/mingw-w64-headers/include/lmserver.h
index 1f6e738..8ed95bf 100644
--- a/mingw-w64-headers/include/lmserver.h
+++ b/mingw-w64-headers/include/lmserver.h
@@ -753,7 +753,7 @@
 #define SV_TYPE_DOMAIN_ENUM 0x80000000
 #define SV_TYPE_ALL 0xFFFFFFFF
 
-#define SV_NODISC (-1L)
+#define SV_NODISC (__MSABI_LONG(-1))
 
 #define SV_USERSECURITY 1
 #define SV_SHARESECURITY 0
diff --git a/mingw-w64-headers/include/mapicode.h b/mingw-w64-headers/include/mapicode.h
index 0b53197..3dd3668 100644
--- a/mingw-w64-headers/include/mapicode.h
+++ b/mingw-w64-headers/include/mapicode.h
@@ -16,7 +16,7 @@
 #ifdef SUCCESS_SUCCESS
 #undef SUCCESS_SUCCESS
 #endif
-#define SUCCESS_SUCCESS 0L
+#define SUCCESS_SUCCESS __MSABI_LONG(0)
 
 #define MAPI_E_CALL_FAILED E_FAIL
 #define MAPI_E_NOT_ENOUGH_MEMORY E_OUTOFMEMORY
diff --git a/mingw-w64-headers/include/mapidefs.h b/mingw-w64-headers/include/mapidefs.h
index 8186aee..6d6b2ad 100644
--- a/mingw-w64-headers/include/mapidefs.h
+++ b/mingw-w64-headers/include/mapidefs.h
@@ -589,7 +589,7 @@
       MAPI_IMAPIPROGRESS_METHODS(PURE)
   };
 
-#define MAPI_ERROR_VERSION 0x00000000L
+#define MAPI_ERROR_VERSION __MSABI_LONG(0x00000000)
 
 #define KEEP_OPEN_READONLY ((ULONG) 0x00000001)
 #define KEEP_OPEN_READWRITE ((ULONG) 0x00000002)
diff --git a/mingw-w64-headers/include/mapispi.h b/mingw-w64-headers/include/mapispi.h
index 9c55659..e2aae49 100644
--- a/mingw-w64-headers/include/mapispi.h
+++ b/mingw-w64-headers/include/mapispi.h
@@ -19,10 +19,10 @@
 extern "C" {
 #endif
 
-#define CURRENT_SPI_VERSION 0x00010010L
-#define PDK1_SPI_VERSION 0x00010000L
-#define PDK2_SPI_VERSION 0x00010008L
-#define PDK3_SPI_VERSION 0x00010010L
+#define CURRENT_SPI_VERSION __MSABI_LONG(0x00010010)
+#define PDK1_SPI_VERSION __MSABI_LONG(0x00010000)
+#define PDK2_SPI_VERSION __MSABI_LONG(0x00010008)
+#define PDK3_SPI_VERSION __MSABI_LONG(0x00010010)
 
   DECLARE_MAPI_INTERFACE_PTR(IMAPISupport,LPMAPISUP);
 
diff --git a/mingw-w64-headers/include/mciavi.h b/mingw-w64-headers/include/mciavi.h
index 984368f..a76ed1e 100644
--- a/mingw-w64-headers/include/mciavi.h
+++ b/mingw-w64-headers/include/mciavi.h
@@ -3,17 +3,17 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define MCI_MCIAVI_PLAY_WINDOW 0x01000000L
-#define MCI_MCIAVI_PLAY_FULLSCREEN 0x02000000L
-#define MCI_MCIAVI_PLAY_FULLBY2 0x04000000L
+#define MCI_MCIAVI_PLAY_WINDOW __MSABI_LONG(0x01000000)
+#define MCI_MCIAVI_PLAY_FULLSCREEN __MSABI_LONG(0x02000000)
+#define MCI_MCIAVI_PLAY_FULLBY2 __MSABI_LONG(0x04000000)
 
-#define MCI_AVI_STATUS_FRAMES_SKIPPED 0x8001L
-#define MCI_AVI_STATUS_LAST_PLAY_SPEED 0x8002L
-#define MCI_AVI_STATUS_AUDIO_BREAKS 0x8003L
+#define MCI_AVI_STATUS_FRAMES_SKIPPED __MSABI_LONG(0x8001)
+#define MCI_AVI_STATUS_LAST_PLAY_SPEED __MSABI_LONG(0x8002)
+#define MCI_AVI_STATUS_AUDIO_BREAKS __MSABI_LONG(0x8003)
 
-#define MCI_AVI_SETVIDEO_DRAW_PROCEDURE 0x8000L
-#define MCI_AVI_SETVIDEO_PALETTE_COLOR 0x8100L
-#define MCI_AVI_SETVIDEO_PALETTE_HALFTONE 0x0000FFFFL
+#define MCI_AVI_SETVIDEO_DRAW_PROCEDURE __MSABI_LONG(0x8000)
+#define MCI_AVI_SETVIDEO_PALETTE_COLOR __MSABI_LONG(0x8100)
+#define MCI_AVI_SETVIDEO_PALETTE_HALFTONE __MSABI_LONG(0x0000FFFF)
 
 #define MCIERR_AVI_OLDAVIFORMAT (MCIERR_CUSTOM_DRIVER_BASE + 100)
 #define MCIERR_AVI_NOTINTERLEAVED (MCIERR_CUSTOM_DRIVER_BASE + 101)
diff --git a/mingw-w64-headers/include/mdmsg.h b/mingw-w64-headers/include/mdmsg.h
index 0f0b24c..2e841ea 100644
--- a/mingw-w64-headers/include/mdmsg.h
+++ b/mingw-w64-headers/include/mdmsg.h
@@ -6,24 +6,24 @@
 #ifndef _MDMSG_H_
 #define _MDMSG_H_
 
-#define MD_ERROR_NOT_INITIALIZED 0x800CC800L
-#define MD_ERROR_DATA_NOT_FOUND 0x800CC801L
-#define MD_ERROR_INVALID_VERSION 0x800CC802L
+#define MD_ERROR_NOT_INITIALIZED __MSABI_LONG(0x800CC800)
+#define MD_ERROR_DATA_NOT_FOUND __MSABI_LONG(0x800CC801)
+#define MD_ERROR_INVALID_VERSION __MSABI_LONG(0x800CC802)
 
-#define MD_WARNING_PATH_NOT_FOUND 0x000CC803L
-#define MD_WARNING_DUP_NAME 0x000CC804L
-#define MD_WARNING_INVALID_DATA 0x000CC805L
+#define MD_WARNING_PATH_NOT_FOUND __MSABI_LONG(0x000CC803)
+#define MD_WARNING_DUP_NAME __MSABI_LONG(0x000CC804)
+#define MD_WARNING_INVALID_DATA __MSABI_LONG(0x000CC805)
 
-#define MD_ERROR_SECURE_CHANNEL_FAILURE 0x800CC806L
+#define MD_ERROR_SECURE_CHANNEL_FAILURE __MSABI_LONG(0x800CC806)
 
-#define MD_WARNING_PATH_NOT_INSERTED 0x000CC807L
+#define MD_WARNING_PATH_NOT_INSERTED __MSABI_LONG(0x000CC807)
 
-#define MD_ERROR_CANNOT_REMOVE_SECURE_ATTRIBUTE 0x800CC808L
+#define MD_ERROR_CANNOT_REMOVE_SECURE_ATTRIBUTE __MSABI_LONG(0x800CC808)
 
-#define MD_WARNING_SAVE_FAILED 0x000CC809L
+#define MD_WARNING_SAVE_FAILED __MSABI_LONG(0x000CC809)
 
-#define MD_ERROR_IISAO_INVALID_SCHEMA 0x800CC810L
-#define MD_ERROR_READ_METABASE_FILE 0x800CC819L
-#define MD_ERROR_NO_SESSION_KEY 0x800CC81DL
+#define MD_ERROR_IISAO_INVALID_SCHEMA __MSABI_LONG(0x800CC810)
+#define MD_ERROR_READ_METABASE_FILE __MSABI_LONG(0x800CC819)
+#define MD_ERROR_NO_SESSION_KEY __MSABI_LONG(0x800CC81D)
 
 #endif
diff --git a/mingw-w64-headers/include/mlang.h b/mingw-w64-headers/include/mlang.h
index 2391641..39cf576 100644
--- a/mingw-w64-headers/include/mlang.h
+++ b/mingw-w64-headers/include/mlang.h
@@ -150,8 +150,8 @@
     MLSTR_READ = 1,MLSTR_WRITE = 2
   } MLSTR_FLAGS;
 
-#define CPIOD_PEEK 0x40000000L
-#define CPIOD_FORCE_PROMPT 0x80000000L
+#define CPIOD_PEEK __MSABI_LONG(0x40000000)
+#define CPIOD_FORCE_PROMPT __MSABI_LONG(0x80000000)
 
   EXTERN_C const IID LIBID_MultiLanguage;
 #ifndef __IMLangStringBufW_INTERFACE_DEFINED__
diff --git a/mingw-w64-headers/include/mmreg.h b/mingw-w64-headers/include/mmreg.h
index 253a6bb..f960d6e 100644
--- a/mingw-w64-headers/include/mmreg.h
+++ b/mingw-w64-headers/include/mmreg.h
@@ -2517,7 +2517,7 @@
 
 #define JPEG_PROCESS_BASELINE 0
 
-#define AVIIF_CONTROLFRAME 0x00000200L
+#define AVIIF_CONTROLFRAME __MSABI_LONG(0x00000200)
 
 #define JIFMK_SOF0 0xFFC0
 #define JIFMK_SOF1 0xFFC1
diff --git a/mingw-w64-headers/include/mmsystem.h b/mingw-w64-headers/include/mmsystem.h
index d81cdea..c021d54 100644
--- a/mingw-w64-headers/include/mmsystem.h
+++ b/mingw-w64-headers/include/mmsystem.h
@@ -216,13 +216,13 @@
 #define DRV_MCI_LAST (DRV_RESERVED + 0xFFF)
 #endif
 
-#define CALLBACK_TYPEMASK 0x00070000l
-#define CALLBACK_NULL 0x00000000l
-#define CALLBACK_WINDOW 0x00010000l
-#define CALLBACK_TASK 0x00020000l
-#define CALLBACK_FUNCTION 0x00030000l
+#define CALLBACK_TYPEMASK __MSABI_LONG(0x00070000)
+#define CALLBACK_NULL __MSABI_LONG(0x00000000)
+#define CALLBACK_WINDOW __MSABI_LONG(0x00010000)
+#define CALLBACK_TASK __MSABI_LONG(0x00020000)
+#define CALLBACK_FUNCTION __MSABI_LONG(0x00030000)
 #define CALLBACK_THREAD (CALLBACK_TASK)
-#define CALLBACK_EVENT 0x00050000l
+#define CALLBACK_EVENT __MSABI_LONG(0x00050000)
   typedef void (CALLBACK DRVCALLBACK)(HDRVR hdrvr,UINT uMsg,DWORD_PTR dwUser,DWORD_PTR dw1,DWORD_PTR dw2);
 
   typedef DRVCALLBACK *LPDRVCALLBACK;
@@ -245,11 +245,11 @@
 #define SND_MEMORY 0x0004
 #define SND_LOOP 0x0008
 #define SND_NOSTOP 0x0010
-#define SND_NOWAIT 0x00002000L
-#define SND_ALIAS 0x00010000L
-#define SND_ALIAS_ID 0x00110000L
-#define SND_FILENAME 0x00020000L
-#define SND_RESOURCE 0x00040004L
+#define SND_NOWAIT __MSABI_LONG(0x00002000)
+#define SND_ALIAS __MSABI_LONG(0x00010000)
+#define SND_ALIAS_ID __MSABI_LONG(0x00110000)
+#define SND_FILENAME __MSABI_LONG(0x00020000)
+#define SND_RESOURCE __MSABI_LONG(0x00040004)
 #define SND_PURGE 0x0040
 #define SND_APPLICATION 0x0080
 
@@ -599,7 +599,7 @@
 #define MIDIMAPPER ((UINT)-1)
 #define MIDI_MAPPER ((UINT)-1)
 
-#define MIDI_IO_STATUS 0x00000020L
+#define MIDI_IO_STATUS __MSABI_LONG(0x00000020)
 
 #define MIDI_CACHE_ALL 1
 #define MIDI_CACHE_BESTFIT 2
@@ -761,9 +761,9 @@
 #define MHDR_INQUEUE 0x00000004
 #define MHDR_ISSTRM 0x00000008
 
-#define MEVT_F_SHORT 0x00000000L
-#define MEVT_F_LONG 0x80000000L
-#define MEVT_F_CALLBACK 0x40000000L
+#define MEVT_F_SHORT __MSABI_LONG(0x00000000)
+#define MEVT_F_LONG __MSABI_LONG(0x80000000)
+#define MEVT_F_CALLBACK __MSABI_LONG(0x40000000)
 
 #define MEVT_EVENTTYPE(x) ((BYTE)(((x)>>24)&0xFF))
 #define MEVT_EVENTPARM(x) ((DWORD)((x)&0x00FFFFFF))
@@ -778,11 +778,11 @@
 
 #define MIDISTRM_ERROR (-2)
 
-#define MIDIPROP_SET 0x80000000L
-#define MIDIPROP_GET 0x40000000L
+#define MIDIPROP_SET __MSABI_LONG(0x80000000)
+#define MIDIPROP_GET __MSABI_LONG(0x40000000)
 
-#define MIDIPROP_TIMEDIV 0x00000001L
-#define MIDIPROP_TEMPO 0x00000002L
+#define MIDIPROP_TIMEDIV __MSABI_LONG(0x00000001)
+#define MIDIPROP_TEMPO __MSABI_LONG(0x00000002)
 
   typedef struct midiproptimediv_tag {
     DWORD cbStruct;
@@ -944,18 +944,18 @@
 #define MIXERR_INVALVALUE (MIXERR_BASE + 2)
 #define MIXERR_LASTERROR (MIXERR_BASE + 2)
 
-#define MIXER_OBJECTF_HANDLE 0x80000000L
-#define MIXER_OBJECTF_MIXER 0x00000000L
+#define MIXER_OBJECTF_HANDLE __MSABI_LONG(0x80000000)
+#define MIXER_OBJECTF_MIXER __MSABI_LONG(0x00000000)
 #define MIXER_OBJECTF_HMIXER (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER)
-#define MIXER_OBJECTF_WAVEOUT 0x10000000L
+#define MIXER_OBJECTF_WAVEOUT __MSABI_LONG(0x10000000)
 #define MIXER_OBJECTF_HWAVEOUT (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEOUT)
-#define MIXER_OBJECTF_WAVEIN 0x20000000L
+#define MIXER_OBJECTF_WAVEIN __MSABI_LONG(0x20000000)
 #define MIXER_OBJECTF_HWAVEIN (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEIN)
-#define MIXER_OBJECTF_MIDIOUT 0x30000000L
+#define MIXER_OBJECTF_MIDIOUT __MSABI_LONG(0x30000000)
 #define MIXER_OBJECTF_HMIDIOUT (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIOUT)
-#define MIXER_OBJECTF_MIDIIN 0x40000000L
+#define MIXER_OBJECTF_MIDIIN __MSABI_LONG(0x40000000)
 #define MIXER_OBJECTF_HMIDIIN (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIIN)
-#define MIXER_OBJECTF_AUX 0x50000000L
+#define MIXER_OBJECTF_AUX __MSABI_LONG(0x50000000)
 
   WINMMAPI UINT WINAPI mixerGetNumDevs(void);
 
@@ -1068,11 +1068,11 @@
   __MINGW_TYPEDEF_AW(PMIXERLINE)
   __MINGW_TYPEDEF_AW(LPMIXERLINE)
 
-#define MIXERLINE_LINEF_ACTIVE 0x00000001L
-#define MIXERLINE_LINEF_DISCONNECTED 0x00008000L
-#define MIXERLINE_LINEF_SOURCE 0x80000000L
+#define MIXERLINE_LINEF_ACTIVE __MSABI_LONG(0x00000001)
+#define MIXERLINE_LINEF_DISCONNECTED __MSABI_LONG(0x00008000)
+#define MIXERLINE_LINEF_SOURCE __MSABI_LONG(0x80000000)
 
-#define MIXERLINE_COMPONENTTYPE_DST_FIRST 0x0L
+#define MIXERLINE_COMPONENTTYPE_DST_FIRST __MSABI_LONG(0x0)
 #define MIXERLINE_COMPONENTTYPE_DST_UNDEFINED (MIXERLINE_COMPONENTTYPE_DST_FIRST + 0)
 #define MIXERLINE_COMPONENTTYPE_DST_DIGITAL (MIXERLINE_COMPONENTTYPE_DST_FIRST + 1)
 #define MIXERLINE_COMPONENTTYPE_DST_LINE (MIXERLINE_COMPONENTTYPE_DST_FIRST + 2)
@@ -1083,7 +1083,7 @@
 #define MIXERLINE_COMPONENTTYPE_DST_WAVEIN (MIXERLINE_COMPONENTTYPE_DST_FIRST + 7)
 #define MIXERLINE_COMPONENTTYPE_DST_VOICEIN (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8)
 #define MIXERLINE_COMPONENTTYPE_DST_LAST (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8)
-#define MIXERLINE_COMPONENTTYPE_SRC_FIRST 0x00001000L
+#define MIXERLINE_COMPONENTTYPE_SRC_FIRST __MSABI_LONG(0x00001000)
 #define MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 0)
 #define MIXERLINE_COMPONENTTYPE_SRC_DIGITAL (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 1)
 #define MIXERLINE_COMPONENTTYPE_SRC_LINE (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 2)
@@ -1109,13 +1109,13 @@
 
 #define mixerGetLineInfo __MINGW_NAME_AW(mixerGetLineInfo)
 
-#define MIXER_GETLINEINFOF_DESTINATION 0x00000000L
-#define MIXER_GETLINEINFOF_SOURCE 0x00000001L
-#define MIXER_GETLINEINFOF_LINEID 0x00000002L
-#define MIXER_GETLINEINFOF_COMPONENTTYPE 0x00000003L
-#define MIXER_GETLINEINFOF_TARGETTYPE 0x00000004L
+#define MIXER_GETLINEINFOF_DESTINATION __MSABI_LONG(0x00000000)
+#define MIXER_GETLINEINFOF_SOURCE __MSABI_LONG(0x00000001)
+#define MIXER_GETLINEINFOF_LINEID __MSABI_LONG(0x00000002)
+#define MIXER_GETLINEINFOF_COMPONENTTYPE __MSABI_LONG(0x00000003)
+#define MIXER_GETLINEINFOF_TARGETTYPE __MSABI_LONG(0x00000004)
 
-#define MIXER_GETLINEINFOF_QUERYMASK 0x0000000FL
+#define MIXER_GETLINEINFOF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   WINMMAPI MMRESULT WINAPI mixerGetID(HMIXEROBJ hmxobj,UINT *puMxId,DWORD fdwId);
 
@@ -1175,40 +1175,40 @@
   __MINGW_TYPEDEF_AW(PMIXERCONTROL)
   __MINGW_TYPEDEF_AW(LPMIXERCONTROL)
 
-#define MIXERCONTROL_CONTROLF_UNIFORM 0x00000001L
-#define MIXERCONTROL_CONTROLF_MULTIPLE 0x00000002L
-#define MIXERCONTROL_CONTROLF_DISABLED 0x80000000L
+#define MIXERCONTROL_CONTROLF_UNIFORM __MSABI_LONG(0x00000001)
+#define MIXERCONTROL_CONTROLF_MULTIPLE __MSABI_LONG(0x00000002)
+#define MIXERCONTROL_CONTROLF_DISABLED __MSABI_LONG(0x80000000)
 
-#define MIXERCONTROL_CT_CLASS_MASK 0xF0000000L
-#define MIXERCONTROL_CT_CLASS_CUSTOM 0x00000000L
-#define MIXERCONTROL_CT_CLASS_METER 0x10000000L
-#define MIXERCONTROL_CT_CLASS_SWITCH 0x20000000L
-#define MIXERCONTROL_CT_CLASS_NUMBER 0x30000000L
-#define MIXERCONTROL_CT_CLASS_SLIDER 0x40000000L
-#define MIXERCONTROL_CT_CLASS_FADER 0x50000000L
-#define MIXERCONTROL_CT_CLASS_TIME 0x60000000L
-#define MIXERCONTROL_CT_CLASS_LIST 0x70000000L
+#define MIXERCONTROL_CT_CLASS_MASK __MSABI_LONG(0xF0000000)
+#define MIXERCONTROL_CT_CLASS_CUSTOM __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_CLASS_METER __MSABI_LONG(0x10000000)
+#define MIXERCONTROL_CT_CLASS_SWITCH __MSABI_LONG(0x20000000)
+#define MIXERCONTROL_CT_CLASS_NUMBER __MSABI_LONG(0x30000000)
+#define MIXERCONTROL_CT_CLASS_SLIDER __MSABI_LONG(0x40000000)
+#define MIXERCONTROL_CT_CLASS_FADER __MSABI_LONG(0x50000000)
+#define MIXERCONTROL_CT_CLASS_TIME __MSABI_LONG(0x60000000)
+#define MIXERCONTROL_CT_CLASS_LIST __MSABI_LONG(0x70000000)
 
-#define MIXERCONTROL_CT_SUBCLASS_MASK 0x0F000000L
+#define MIXERCONTROL_CT_SUBCLASS_MASK __MSABI_LONG(0x0F000000)
 
-#define MIXERCONTROL_CT_SC_SWITCH_BOOLEAN 0x00000000L
-#define MIXERCONTROL_CT_SC_SWITCH_BUTTON 0x01000000L
+#define MIXERCONTROL_CT_SC_SWITCH_BOOLEAN __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_SWITCH_BUTTON __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_SC_METER_POLLED 0x00000000L
+#define MIXERCONTROL_CT_SC_METER_POLLED __MSABI_LONG(0x00000000)
 
-#define MIXERCONTROL_CT_SC_TIME_MICROSECS 0x00000000L
-#define MIXERCONTROL_CT_SC_TIME_MILLISECS 0x01000000L
+#define MIXERCONTROL_CT_SC_TIME_MICROSECS __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_TIME_MILLISECS __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_SC_LIST_SINGLE 0x00000000L
-#define MIXERCONTROL_CT_SC_LIST_MULTIPLE 0x01000000L
+#define MIXERCONTROL_CT_SC_LIST_SINGLE __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_SC_LIST_MULTIPLE __MSABI_LONG(0x01000000)
 
-#define MIXERCONTROL_CT_UNITS_MASK 0x00FF0000L
-#define MIXERCONTROL_CT_UNITS_CUSTOM 0x00000000L
-#define MIXERCONTROL_CT_UNITS_BOOLEAN 0x00010000L
-#define MIXERCONTROL_CT_UNITS_SIGNED 0x00020000L
-#define MIXERCONTROL_CT_UNITS_UNSIGNED 0x00030000L
-#define MIXERCONTROL_CT_UNITS_DECIBELS 0x00040000L
-#define MIXERCONTROL_CT_UNITS_PERCENT 0x00050000L
+#define MIXERCONTROL_CT_UNITS_MASK __MSABI_LONG(0x00FF0000)
+#define MIXERCONTROL_CT_UNITS_CUSTOM __MSABI_LONG(0x00000000)
+#define MIXERCONTROL_CT_UNITS_BOOLEAN __MSABI_LONG(0x00010000)
+#define MIXERCONTROL_CT_UNITS_SIGNED __MSABI_LONG(0x00020000)
+#define MIXERCONTROL_CT_UNITS_UNSIGNED __MSABI_LONG(0x00030000)
+#define MIXERCONTROL_CT_UNITS_DECIBELS __MSABI_LONG(0x00040000)
+#define MIXERCONTROL_CT_UNITS_PERCENT __MSABI_LONG(0x00050000)
 
 #define MIXERCONTROL_CONTROLTYPE_CUSTOM (MIXERCONTROL_CT_CLASS_CUSTOM | MIXERCONTROL_CT_UNITS_CUSTOM)
 #define MIXERCONTROL_CONTROLTYPE_BOOLEANMETER (MIXERCONTROL_CT_CLASS_METER | MIXERCONTROL_CT_SC_METER_POLLED | MIXERCONTROL_CT_UNITS_BOOLEAN)
@@ -1275,11 +1275,11 @@
 
 #define mixerGetLineControls __MINGW_NAME_AW(mixerGetLineControls)
 
-#define MIXER_GETLINECONTROLSF_ALL 0x00000000L
-#define MIXER_GETLINECONTROLSF_ONEBYID 0x00000001L
-#define MIXER_GETLINECONTROLSF_ONEBYTYPE 0x00000002L
+#define MIXER_GETLINECONTROLSF_ALL __MSABI_LONG(0x00000000)
+#define MIXER_GETLINECONTROLSF_ONEBYID __MSABI_LONG(0x00000001)
+#define MIXER_GETLINECONTROLSF_ONEBYTYPE __MSABI_LONG(0x00000002)
 
-#define MIXER_GETLINECONTROLSF_QUERYMASK 0x0000000FL
+#define MIXER_GETLINECONTROLSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   typedef struct tMIXERCONTROLDETAILS {
     DWORD cbStruct;
@@ -1325,17 +1325,17 @@
 
 #define mixerGetControlDetails __MINGW_NAME_AW(mixerGetControlDetails)
 
-#define MIXER_GETCONTROLDETAILSF_VALUE 0x00000000L
-#define MIXER_GETCONTROLDETAILSF_LISTTEXT 0x00000001L
+#define MIXER_GETCONTROLDETAILSF_VALUE __MSABI_LONG(0x00000000)
+#define MIXER_GETCONTROLDETAILSF_LISTTEXT __MSABI_LONG(0x00000001)
 
-#define MIXER_GETCONTROLDETAILSF_QUERYMASK 0x0000000FL
+#define MIXER_GETCONTROLDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   WINMMAPI MMRESULT WINAPI mixerSetControlDetails(HMIXEROBJ hmxobj,LPMIXERCONTROLDETAILS pmxcd,DWORD fdwDetails);
 
-#define MIXER_SETCONTROLDETAILSF_VALUE 0x00000000L
-#define MIXER_SETCONTROLDETAILSF_CUSTOM 0x00000001L
+#define MIXER_SETCONTROLDETAILSF_VALUE __MSABI_LONG(0x00000000)
+#define MIXER_SETCONTROLDETAILSF_CUSTOM __MSABI_LONG(0x00000001)
 
-#define MIXER_SETCONTROLDETAILSF_QUERYMASK 0x0000000FL
+#define MIXER_SETCONTROLDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 #endif
 
 #ifndef MMNOTIMER
@@ -1385,34 +1385,34 @@
 #define JOY_BUTTON3CHG 0x0400
 #define JOY_BUTTON4CHG 0x0800
 
-#define JOY_BUTTON5 0x00000010l
-#define JOY_BUTTON6 0x00000020l
-#define JOY_BUTTON7 0x00000040l
-#define JOY_BUTTON8 0x00000080l
-#define JOY_BUTTON9 0x00000100l
-#define JOY_BUTTON10 0x00000200l
-#define JOY_BUTTON11 0x00000400l
-#define JOY_BUTTON12 0x00000800l
-#define JOY_BUTTON13 0x00001000l
-#define JOY_BUTTON14 0x00002000l
-#define JOY_BUTTON15 0x00004000l
-#define JOY_BUTTON16 0x00008000l
-#define JOY_BUTTON17 0x00010000l
-#define JOY_BUTTON18 0x00020000l
-#define JOY_BUTTON19 0x00040000l
-#define JOY_BUTTON20 0x00080000l
-#define JOY_BUTTON21 0x00100000l
-#define JOY_BUTTON22 0x00200000l
-#define JOY_BUTTON23 0x00400000l
-#define JOY_BUTTON24 0x00800000l
-#define JOY_BUTTON25 0x01000000l
-#define JOY_BUTTON26 0x02000000l
-#define JOY_BUTTON27 0x04000000l
-#define JOY_BUTTON28 0x08000000l
-#define JOY_BUTTON29 0x10000000l
-#define JOY_BUTTON30 0x20000000l
-#define JOY_BUTTON31 0x40000000l
-#define JOY_BUTTON32 0x80000000l
+#define JOY_BUTTON5 __MSABI_LONG(0x00000010)
+#define JOY_BUTTON6 __MSABI_LONG(0x00000020)
+#define JOY_BUTTON7 __MSABI_LONG(0x00000040)
+#define JOY_BUTTON8 __MSABI_LONG(0x00000080)
+#define JOY_BUTTON9 __MSABI_LONG(0x00000100)
+#define JOY_BUTTON10 __MSABI_LONG(0x00000200)
+#define JOY_BUTTON11 __MSABI_LONG(0x00000400)
+#define JOY_BUTTON12 __MSABI_LONG(0x00000800)
+#define JOY_BUTTON13 __MSABI_LONG(0x00001000)
+#define JOY_BUTTON14 __MSABI_LONG(0x00002000)
+#define JOY_BUTTON15 __MSABI_LONG(0x00004000)
+#define JOY_BUTTON16 __MSABI_LONG(0x00008000)
+#define JOY_BUTTON17 __MSABI_LONG(0x00010000)
+#define JOY_BUTTON18 __MSABI_LONG(0x00020000)
+#define JOY_BUTTON19 __MSABI_LONG(0x00040000)
+#define JOY_BUTTON20 __MSABI_LONG(0x00080000)
+#define JOY_BUTTON21 __MSABI_LONG(0x00100000)
+#define JOY_BUTTON22 __MSABI_LONG(0x00200000)
+#define JOY_BUTTON23 __MSABI_LONG(0x00400000)
+#define JOY_BUTTON24 __MSABI_LONG(0x00800000)
+#define JOY_BUTTON25 __MSABI_LONG(0x01000000)
+#define JOY_BUTTON26 __MSABI_LONG(0x02000000)
+#define JOY_BUTTON27 __MSABI_LONG(0x04000000)
+#define JOY_BUTTON28 __MSABI_LONG(0x08000000)
+#define JOY_BUTTON29 __MSABI_LONG(0x10000000)
+#define JOY_BUTTON30 __MSABI_LONG(0x20000000)
+#define JOY_BUTTON31 __MSABI_LONG(0x40000000)
+#define JOY_BUTTON32 __MSABI_LONG(0x80000000)
 
 #define JOY_POVCENTERED (WORD) -1
 #define JOY_POVFORWARD 0
@@ -1420,31 +1420,31 @@
 #define JOY_POVBACKWARD 18000
 #define JOY_POVLEFT 27000
 
-#define JOY_RETURNX 0x00000001l
-#define JOY_RETURNY 0x00000002l
-#define JOY_RETURNZ 0x00000004l
-#define JOY_RETURNR 0x00000008l
-#define JOY_RETURNU 0x00000010l
-#define JOY_RETURNV 0x00000020l
-#define JOY_RETURNPOV 0x00000040l
-#define JOY_RETURNBUTTONS 0x00000080l
-#define JOY_RETURNRAWDATA 0x00000100l
-#define JOY_RETURNPOVCTS 0x00000200l
-#define JOY_RETURNCENTERED 0x00000400l
-#define JOY_USEDEADZONE 0x00000800l
+#define JOY_RETURNX __MSABI_LONG(0x00000001)
+#define JOY_RETURNY __MSABI_LONG(0x00000002)
+#define JOY_RETURNZ __MSABI_LONG(0x00000004)
+#define JOY_RETURNR __MSABI_LONG(0x00000008)
+#define JOY_RETURNU __MSABI_LONG(0x00000010)
+#define JOY_RETURNV __MSABI_LONG(0x00000020)
+#define JOY_RETURNPOV __MSABI_LONG(0x00000040)
+#define JOY_RETURNBUTTONS __MSABI_LONG(0x00000080)
+#define JOY_RETURNRAWDATA __MSABI_LONG(0x00000100)
+#define JOY_RETURNPOVCTS __MSABI_LONG(0x00000200)
+#define JOY_RETURNCENTERED __MSABI_LONG(0x00000400)
+#define JOY_USEDEADZONE __MSABI_LONG(0x00000800)
 #define JOY_RETURNALL (JOY_RETURNX | JOY_RETURNY | JOY_RETURNZ | JOY_RETURNR | JOY_RETURNU | JOY_RETURNV | JOY_RETURNPOV | JOY_RETURNBUTTONS)
-#define JOY_CAL_READALWAYS 0x00010000l
-#define JOY_CAL_READXYONLY 0x00020000l
-#define JOY_CAL_READ3 0x00040000l
-#define JOY_CAL_READ4 0x00080000l
-#define JOY_CAL_READXONLY 0x00100000l
-#define JOY_CAL_READYONLY 0x00200000l
-#define JOY_CAL_READ5 0x00400000l
-#define JOY_CAL_READ6 0x00800000l
-#define JOY_CAL_READZONLY 0x01000000l
-#define JOY_CAL_READRONLY 0x02000000l
-#define JOY_CAL_READUONLY 0x04000000l
-#define JOY_CAL_READVONLY 0x08000000l
+#define JOY_CAL_READALWAYS __MSABI_LONG(0x00010000)
+#define JOY_CAL_READXYONLY __MSABI_LONG(0x00020000)
+#define JOY_CAL_READ3 __MSABI_LONG(0x00040000)
+#define JOY_CAL_READ4 __MSABI_LONG(0x00080000)
+#define JOY_CAL_READXONLY __MSABI_LONG(0x00100000)
+#define JOY_CAL_READYONLY __MSABI_LONG(0x00200000)
+#define JOY_CAL_READ5 __MSABI_LONG(0x00400000)
+#define JOY_CAL_READ6 __MSABI_LONG(0x00800000)
+#define JOY_CAL_READZONLY __MSABI_LONG(0x01000000)
+#define JOY_CAL_READRONLY __MSABI_LONG(0x02000000)
+#define JOY_CAL_READUONLY __MSABI_LONG(0x04000000)
+#define JOY_CAL_READVONLY __MSABI_LONG(0x08000000)
 
 #define JOYSTICKID1 0
 #define JOYSTICKID2 1
@@ -1994,80 +1994,80 @@
 #define MCI_NOTIFY_ABORTED 0x0004
 #define MCI_NOTIFY_FAILURE 0x0008
 
-#define MCI_NOTIFY 0x00000001L
-#define MCI_WAIT 0x00000002L
-#define MCI_FROM 0x00000004L
-#define MCI_TO 0x00000008L
-#define MCI_TRACK 0x00000010L
+#define MCI_NOTIFY __MSABI_LONG(0x00000001)
+#define MCI_WAIT __MSABI_LONG(0x00000002)
+#define MCI_FROM __MSABI_LONG(0x00000004)
+#define MCI_TO __MSABI_LONG(0x00000008)
+#define MCI_TRACK __MSABI_LONG(0x00000010)
 
-#define MCI_OPEN_SHAREABLE 0x00000100L
-#define MCI_OPEN_ELEMENT 0x00000200L
-#define MCI_OPEN_ALIAS 0x00000400L
-#define MCI_OPEN_ELEMENT_ID 0x00000800L
-#define MCI_OPEN_TYPE_ID 0x00001000L
-#define MCI_OPEN_TYPE 0x00002000L
+#define MCI_OPEN_SHAREABLE __MSABI_LONG(0x00000100)
+#define MCI_OPEN_ELEMENT __MSABI_LONG(0x00000200)
+#define MCI_OPEN_ALIAS __MSABI_LONG(0x00000400)
+#define MCI_OPEN_ELEMENT_ID __MSABI_LONG(0x00000800)
+#define MCI_OPEN_TYPE_ID __MSABI_LONG(0x00001000)
+#define MCI_OPEN_TYPE __MSABI_LONG(0x00002000)
 
-#define MCI_SEEK_TO_START 0x00000100L
-#define MCI_SEEK_TO_END 0x00000200L
+#define MCI_SEEK_TO_START __MSABI_LONG(0x00000100)
+#define MCI_SEEK_TO_END __MSABI_LONG(0x00000200)
 
-#define MCI_STATUS_ITEM 0x00000100L
-#define MCI_STATUS_START 0x00000200L
+#define MCI_STATUS_ITEM __MSABI_LONG(0x00000100)
+#define MCI_STATUS_START __MSABI_LONG(0x00000200)
 
-#define MCI_STATUS_LENGTH 0x00000001L
-#define MCI_STATUS_POSITION 0x00000002L
-#define MCI_STATUS_NUMBER_OF_TRACKS 0x00000003L
-#define MCI_STATUS_MODE 0x00000004L
-#define MCI_STATUS_MEDIA_PRESENT 0x00000005L
-#define MCI_STATUS_TIME_FORMAT 0x00000006L
-#define MCI_STATUS_READY 0x00000007L
-#define MCI_STATUS_CURRENT_TRACK 0x00000008L
+#define MCI_STATUS_LENGTH __MSABI_LONG(0x00000001)
+#define MCI_STATUS_POSITION __MSABI_LONG(0x00000002)
+#define MCI_STATUS_NUMBER_OF_TRACKS __MSABI_LONG(0x00000003)
+#define MCI_STATUS_MODE __MSABI_LONG(0x00000004)
+#define MCI_STATUS_MEDIA_PRESENT __MSABI_LONG(0x00000005)
+#define MCI_STATUS_TIME_FORMAT __MSABI_LONG(0x00000006)
+#define MCI_STATUS_READY __MSABI_LONG(0x00000007)
+#define MCI_STATUS_CURRENT_TRACK __MSABI_LONG(0x00000008)
 
-#define MCI_INFO_PRODUCT 0x00000100L
-#define MCI_INFO_FILE 0x00000200L
-#define MCI_INFO_MEDIA_UPC 0x00000400L
-#define MCI_INFO_MEDIA_IDENTITY 0x00000800L
-#define MCI_INFO_NAME 0x00001000L
-#define MCI_INFO_COPYRIGHT 0x00002000L
+#define MCI_INFO_PRODUCT __MSABI_LONG(0x00000100)
+#define MCI_INFO_FILE __MSABI_LONG(0x00000200)
+#define MCI_INFO_MEDIA_UPC __MSABI_LONG(0x00000400)
+#define MCI_INFO_MEDIA_IDENTITY __MSABI_LONG(0x00000800)
+#define MCI_INFO_NAME __MSABI_LONG(0x00001000)
+#define MCI_INFO_COPYRIGHT __MSABI_LONG(0x00002000)
 
-#define MCI_GETDEVCAPS_ITEM 0x00000100L
+#define MCI_GETDEVCAPS_ITEM __MSABI_LONG(0x00000100)
 
-#define MCI_GETDEVCAPS_CAN_RECORD 0x00000001L
-#define MCI_GETDEVCAPS_HAS_AUDIO 0x00000002L
-#define MCI_GETDEVCAPS_HAS_VIDEO 0x00000003L
-#define MCI_GETDEVCAPS_DEVICE_TYPE 0x00000004L
-#define MCI_GETDEVCAPS_USES_FILES 0x00000005L
-#define MCI_GETDEVCAPS_COMPOUND_DEVICE 0x00000006L
-#define MCI_GETDEVCAPS_CAN_EJECT 0x00000007L
-#define MCI_GETDEVCAPS_CAN_PLAY 0x00000008L
-#define MCI_GETDEVCAPS_CAN_SAVE 0x00000009L
+#define MCI_GETDEVCAPS_CAN_RECORD __MSABI_LONG(0x00000001)
+#define MCI_GETDEVCAPS_HAS_AUDIO __MSABI_LONG(0x00000002)
+#define MCI_GETDEVCAPS_HAS_VIDEO __MSABI_LONG(0x00000003)
+#define MCI_GETDEVCAPS_DEVICE_TYPE __MSABI_LONG(0x00000004)
+#define MCI_GETDEVCAPS_USES_FILES __MSABI_LONG(0x00000005)
+#define MCI_GETDEVCAPS_COMPOUND_DEVICE __MSABI_LONG(0x00000006)
+#define MCI_GETDEVCAPS_CAN_EJECT __MSABI_LONG(0x00000007)
+#define MCI_GETDEVCAPS_CAN_PLAY __MSABI_LONG(0x00000008)
+#define MCI_GETDEVCAPS_CAN_SAVE __MSABI_LONG(0x00000009)
 
-#define MCI_SYSINFO_QUANTITY 0x00000100L
-#define MCI_SYSINFO_OPEN 0x00000200L
-#define MCI_SYSINFO_NAME 0x00000400L
-#define MCI_SYSINFO_INSTALLNAME 0x00000800L
+#define MCI_SYSINFO_QUANTITY __MSABI_LONG(0x00000100)
+#define MCI_SYSINFO_OPEN __MSABI_LONG(0x00000200)
+#define MCI_SYSINFO_NAME __MSABI_LONG(0x00000400)
+#define MCI_SYSINFO_INSTALLNAME __MSABI_LONG(0x00000800)
 
-#define MCI_SET_DOOR_OPEN 0x00000100L
-#define MCI_SET_DOOR_CLOSED 0x00000200L
-#define MCI_SET_TIME_FORMAT 0x00000400L
-#define MCI_SET_AUDIO 0x00000800L
-#define MCI_SET_VIDEO 0x00001000L
-#define MCI_SET_ON 0x00002000L
-#define MCI_SET_OFF 0x00004000L
+#define MCI_SET_DOOR_OPEN __MSABI_LONG(0x00000100)
+#define MCI_SET_DOOR_CLOSED __MSABI_LONG(0x00000200)
+#define MCI_SET_TIME_FORMAT __MSABI_LONG(0x00000400)
+#define MCI_SET_AUDIO __MSABI_LONG(0x00000800)
+#define MCI_SET_VIDEO __MSABI_LONG(0x00001000)
+#define MCI_SET_ON __MSABI_LONG(0x00002000)
+#define MCI_SET_OFF __MSABI_LONG(0x00004000)
 
-#define MCI_SET_AUDIO_ALL 0x00000000L
-#define MCI_SET_AUDIO_LEFT 0x00000001L
-#define MCI_SET_AUDIO_RIGHT 0x00000002L
+#define MCI_SET_AUDIO_ALL __MSABI_LONG(0x00000000)
+#define MCI_SET_AUDIO_LEFT __MSABI_LONG(0x00000001)
+#define MCI_SET_AUDIO_RIGHT __MSABI_LONG(0x00000002)
 
-#define MCI_BREAK_KEY 0x00000100L
-#define MCI_BREAK_HWND 0x00000200L
-#define MCI_BREAK_OFF 0x00000400L
+#define MCI_BREAK_KEY __MSABI_LONG(0x00000100)
+#define MCI_BREAK_HWND __MSABI_LONG(0x00000200)
+#define MCI_BREAK_OFF __MSABI_LONG(0x00000400)
 
-#define MCI_RECORD_INSERT 0x00000100L
-#define MCI_RECORD_OVERWRITE 0x00000200L
+#define MCI_RECORD_INSERT __MSABI_LONG(0x00000100)
+#define MCI_RECORD_OVERWRITE __MSABI_LONG(0x00000200)
 
-#define MCI_SAVE_FILE 0x00000100L
+#define MCI_SAVE_FILE __MSABI_LONG(0x00000100)
 
-#define MCI_LOAD_FILE 0x00000100L
+#define MCI_LOAD_FILE __MSABI_LONG(0x00000100)
 
   typedef struct tagMCI_GENERIC_PARMS {
     DWORD_PTR dwCallback;
@@ -2205,35 +2205,35 @@
 
 #define MCI_VD_FORMAT_TRACK 0x4001
 
-#define MCI_VD_PLAY_REVERSE 0x00010000L
-#define MCI_VD_PLAY_FAST 0x00020000L
-#define MCI_VD_PLAY_SPEED 0x00040000L
-#define MCI_VD_PLAY_SCAN 0x00080000L
-#define MCI_VD_PLAY_SLOW 0x00100000L
+#define MCI_VD_PLAY_REVERSE __MSABI_LONG(0x00010000)
+#define MCI_VD_PLAY_FAST __MSABI_LONG(0x00020000)
+#define MCI_VD_PLAY_SPEED __MSABI_LONG(0x00040000)
+#define MCI_VD_PLAY_SCAN __MSABI_LONG(0x00080000)
+#define MCI_VD_PLAY_SLOW __MSABI_LONG(0x00100000)
 
-#define MCI_VD_SEEK_REVERSE 0x00010000L
+#define MCI_VD_SEEK_REVERSE __MSABI_LONG(0x00010000)
 
-#define MCI_VD_STATUS_SPEED 0x00004002L
-#define MCI_VD_STATUS_FORWARD 0x00004003L
-#define MCI_VD_STATUS_MEDIA_TYPE 0x00004004L
-#define MCI_VD_STATUS_SIDE 0x00004005L
-#define MCI_VD_STATUS_DISC_SIZE 0x00004006L
+#define MCI_VD_STATUS_SPEED __MSABI_LONG(0x00004002)
+#define MCI_VD_STATUS_FORWARD __MSABI_LONG(0x00004003)
+#define MCI_VD_STATUS_MEDIA_TYPE __MSABI_LONG(0x00004004)
+#define MCI_VD_STATUS_SIDE __MSABI_LONG(0x00004005)
+#define MCI_VD_STATUS_DISC_SIZE __MSABI_LONG(0x00004006)
 
-#define MCI_VD_GETDEVCAPS_CLV 0x00010000L
-#define MCI_VD_GETDEVCAPS_CAV 0x00020000L
+#define MCI_VD_GETDEVCAPS_CLV __MSABI_LONG(0x00010000)
+#define MCI_VD_GETDEVCAPS_CAV __MSABI_LONG(0x00020000)
 
-#define MCI_VD_SPIN_UP 0x00010000L
-#define MCI_VD_SPIN_DOWN 0x00020000L
+#define MCI_VD_SPIN_UP __MSABI_LONG(0x00010000)
+#define MCI_VD_SPIN_DOWN __MSABI_LONG(0x00020000)
 
-#define MCI_VD_GETDEVCAPS_CAN_REVERSE 0x00004002L
-#define MCI_VD_GETDEVCAPS_FAST_RATE 0x00004003L
-#define MCI_VD_GETDEVCAPS_SLOW_RATE 0x00004004L
-#define MCI_VD_GETDEVCAPS_NORMAL_RATE 0x00004005L
+#define MCI_VD_GETDEVCAPS_CAN_REVERSE __MSABI_LONG(0x00004002)
+#define MCI_VD_GETDEVCAPS_FAST_RATE __MSABI_LONG(0x00004003)
+#define MCI_VD_GETDEVCAPS_SLOW_RATE __MSABI_LONG(0x00004004)
+#define MCI_VD_GETDEVCAPS_NORMAL_RATE __MSABI_LONG(0x00004005)
 
-#define MCI_VD_STEP_FRAMES 0x00010000L
-#define MCI_VD_STEP_REVERSE 0x00020000L
+#define MCI_VD_STEP_FRAMES __MSABI_LONG(0x00010000)
+#define MCI_VD_STEP_REVERSE __MSABI_LONG(0x00020000)
 
-#define MCI_VD_ESCAPE_STRING 0x00000100L
+#define MCI_VD_ESCAPE_STRING __MSABI_LONG(0x00000100)
 
   typedef struct tagMCI_VD_PLAY_PARMS {
     DWORD_PTR dwCallback;
@@ -2261,38 +2261,38 @@
   __MINGW_TYPEDEF_AW(PMCI_VD_ESCAPE_PARMS)
   __MINGW_TYPEDEF_AW(LPMCI_VD_ESCAPE_PARMS)
 
-#define MCI_CDA_STATUS_TYPE_TRACK 0x00004001L
+#define MCI_CDA_STATUS_TYPE_TRACK __MSABI_LONG(0x00004001)
 #define MCI_CDA_TRACK_AUDIO (MCI_CD_OFFSET + 0)
 #define MCI_CDA_TRACK_OTHER (MCI_CD_OFFSET + 1)
 
 #define MCI_WAVE_PCM (MCI_WAVE_OFFSET + 0)
 #define MCI_WAVE_MAPPER (MCI_WAVE_OFFSET + 1)
 
-#define MCI_WAVE_OPEN_BUFFER 0x00010000L
+#define MCI_WAVE_OPEN_BUFFER __MSABI_LONG(0x00010000)
 
-#define MCI_WAVE_SET_FORMATTAG 0x00010000L
-#define MCI_WAVE_SET_CHANNELS 0x00020000L
-#define MCI_WAVE_SET_SAMPLESPERSEC 0x00040000L
-#define MCI_WAVE_SET_AVGBYTESPERSEC 0x00080000L
-#define MCI_WAVE_SET_BLOCKALIGN 0x00100000L
-#define MCI_WAVE_SET_BITSPERSAMPLE 0x00200000L
+#define MCI_WAVE_SET_FORMATTAG __MSABI_LONG(0x00010000)
+#define MCI_WAVE_SET_CHANNELS __MSABI_LONG(0x00020000)
+#define MCI_WAVE_SET_SAMPLESPERSEC __MSABI_LONG(0x00040000)
+#define MCI_WAVE_SET_AVGBYTESPERSEC __MSABI_LONG(0x00080000)
+#define MCI_WAVE_SET_BLOCKALIGN __MSABI_LONG(0x00100000)
+#define MCI_WAVE_SET_BITSPERSAMPLE __MSABI_LONG(0x00200000)
 
-#define MCI_WAVE_INPUT 0x00400000L
-#define MCI_WAVE_OUTPUT 0x00800000L
+#define MCI_WAVE_INPUT __MSABI_LONG(0x00400000)
+#define MCI_WAVE_OUTPUT __MSABI_LONG(0x00800000)
 
-#define MCI_WAVE_STATUS_FORMATTAG 0x00004001L
-#define MCI_WAVE_STATUS_CHANNELS 0x00004002L
-#define MCI_WAVE_STATUS_SAMPLESPERSEC 0x00004003L
-#define MCI_WAVE_STATUS_AVGBYTESPERSEC 0x00004004L
-#define MCI_WAVE_STATUS_BLOCKALIGN 0x00004005L
-#define MCI_WAVE_STATUS_BITSPERSAMPLE 0x00004006L
-#define MCI_WAVE_STATUS_LEVEL 0x00004007L
+#define MCI_WAVE_STATUS_FORMATTAG __MSABI_LONG(0x00004001)
+#define MCI_WAVE_STATUS_CHANNELS __MSABI_LONG(0x00004002)
+#define MCI_WAVE_STATUS_SAMPLESPERSEC __MSABI_LONG(0x00004003)
+#define MCI_WAVE_STATUS_AVGBYTESPERSEC __MSABI_LONG(0x00004004)
+#define MCI_WAVE_STATUS_BLOCKALIGN __MSABI_LONG(0x00004005)
+#define MCI_WAVE_STATUS_BITSPERSAMPLE __MSABI_LONG(0x00004006)
+#define MCI_WAVE_STATUS_LEVEL __MSABI_LONG(0x00004007)
 
-#define MCI_WAVE_SET_ANYINPUT 0x04000000L
-#define MCI_WAVE_SET_ANYOUTPUT 0x08000000L
+#define MCI_WAVE_SET_ANYINPUT __MSABI_LONG(0x04000000)
+#define MCI_WAVE_SET_ANYOUTPUT __MSABI_LONG(0x08000000)
 
-#define MCI_WAVE_GETDEVCAPS_INPUTS 0x00004001L
-#define MCI_WAVE_GETDEVCAPS_OUTPUTS 0x00004002L
+#define MCI_WAVE_GETDEVCAPS_INPUTS __MSABI_LONG(0x00004001)
+#define MCI_WAVE_GETDEVCAPS_OUTPUTS __MSABI_LONG(0x00004002)
 
   typedef struct tagMCI_WAVE_OPEN_PARMSA {
     DWORD_PTR dwCallback;
@@ -2353,20 +2353,20 @@
 #define MCI_SEQ_NONE 65533
 #define MCI_SEQ_MAPPER 65535
 
-#define MCI_SEQ_STATUS_TEMPO 0x00004002L
-#define MCI_SEQ_STATUS_PORT 0x00004003L
-#define MCI_SEQ_STATUS_SLAVE 0x00004007L
-#define MCI_SEQ_STATUS_MASTER 0x00004008L
-#define MCI_SEQ_STATUS_OFFSET 0x00004009L
-#define MCI_SEQ_STATUS_DIVTYPE 0x0000400AL
-#define MCI_SEQ_STATUS_NAME 0x0000400BL
-#define MCI_SEQ_STATUS_COPYRIGHT 0x0000400CL
+#define MCI_SEQ_STATUS_TEMPO __MSABI_LONG(0x00004002)
+#define MCI_SEQ_STATUS_PORT __MSABI_LONG(0x00004003)
+#define MCI_SEQ_STATUS_SLAVE __MSABI_LONG(0x00004007)
+#define MCI_SEQ_STATUS_MASTER __MSABI_LONG(0x00004008)
+#define MCI_SEQ_STATUS_OFFSET __MSABI_LONG(0x00004009)
+#define MCI_SEQ_STATUS_DIVTYPE __MSABI_LONG(0x0000400A)
+#define MCI_SEQ_STATUS_NAME __MSABI_LONG(0x0000400B)
+#define MCI_SEQ_STATUS_COPYRIGHT __MSABI_LONG(0x0000400C)
 
-#define MCI_SEQ_SET_TEMPO 0x00010000L
-#define MCI_SEQ_SET_PORT 0x00020000L
-#define MCI_SEQ_SET_SLAVE 0x00040000L
-#define MCI_SEQ_SET_MASTER 0x00080000L
-#define MCI_SEQ_SET_OFFSET 0x01000000L
+#define MCI_SEQ_SET_TEMPO __MSABI_LONG(0x00010000)
+#define MCI_SEQ_SET_PORT __MSABI_LONG(0x00020000)
+#define MCI_SEQ_SET_SLAVE __MSABI_LONG(0x00040000)
+#define MCI_SEQ_SET_MASTER __MSABI_LONG(0x00080000)
+#define MCI_SEQ_SET_OFFSET __MSABI_LONG(0x01000000)
 
   typedef struct tagMCI_SEQ_SET_PARMS {
     DWORD_PTR dwCallback;
@@ -2379,54 +2379,54 @@
     DWORD dwOffset;
   } MCI_SEQ_SET_PARMS,*PMCI_SEQ_SET_PARMS,*LPMCI_SEQ_SET_PARMS;
 
-#define MCI_ANIM_OPEN_WS 0x00010000L
-#define MCI_ANIM_OPEN_PARENT 0x00020000L
-#define MCI_ANIM_OPEN_NOSTATIC 0x00040000L
+#define MCI_ANIM_OPEN_WS __MSABI_LONG(0x00010000)
+#define MCI_ANIM_OPEN_PARENT __MSABI_LONG(0x00020000)
+#define MCI_ANIM_OPEN_NOSTATIC __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_PLAY_SPEED 0x00010000L
-#define MCI_ANIM_PLAY_REVERSE 0x00020000L
-#define MCI_ANIM_PLAY_FAST 0x00040000L
-#define MCI_ANIM_PLAY_SLOW 0x00080000L
-#define MCI_ANIM_PLAY_SCAN 0x00100000L
+#define MCI_ANIM_PLAY_SPEED __MSABI_LONG(0x00010000)
+#define MCI_ANIM_PLAY_REVERSE __MSABI_LONG(0x00020000)
+#define MCI_ANIM_PLAY_FAST __MSABI_LONG(0x00040000)
+#define MCI_ANIM_PLAY_SLOW __MSABI_LONG(0x00080000)
+#define MCI_ANIM_PLAY_SCAN __MSABI_LONG(0x00100000)
 
-#define MCI_ANIM_STEP_REVERSE 0x00010000L
-#define MCI_ANIM_STEP_FRAMES 0x00020000L
+#define MCI_ANIM_STEP_REVERSE __MSABI_LONG(0x00010000)
+#define MCI_ANIM_STEP_FRAMES __MSABI_LONG(0x00020000)
 
-#define MCI_ANIM_STATUS_SPEED 0x00004001L
-#define MCI_ANIM_STATUS_FORWARD 0x00004002L
-#define MCI_ANIM_STATUS_HWND 0x00004003L
-#define MCI_ANIM_STATUS_HPAL 0x00004004L
-#define MCI_ANIM_STATUS_STRETCH 0x00004005L
+#define MCI_ANIM_STATUS_SPEED __MSABI_LONG(0x00004001)
+#define MCI_ANIM_STATUS_FORWARD __MSABI_LONG(0x00004002)
+#define MCI_ANIM_STATUS_HWND __MSABI_LONG(0x00004003)
+#define MCI_ANIM_STATUS_HPAL __MSABI_LONG(0x00004004)
+#define MCI_ANIM_STATUS_STRETCH __MSABI_LONG(0x00004005)
 
-#define MCI_ANIM_INFO_TEXT 0x00010000L
+#define MCI_ANIM_INFO_TEXT __MSABI_LONG(0x00010000)
 
-#define MCI_ANIM_GETDEVCAPS_CAN_REVERSE 0x00004001L
-#define MCI_ANIM_GETDEVCAPS_FAST_RATE 0x00004002L
-#define MCI_ANIM_GETDEVCAPS_SLOW_RATE 0x00004003L
-#define MCI_ANIM_GETDEVCAPS_NORMAL_RATE 0x00004004L
-#define MCI_ANIM_GETDEVCAPS_PALETTES 0x00004006L
-#define MCI_ANIM_GETDEVCAPS_CAN_STRETCH 0x00004007L
-#define MCI_ANIM_GETDEVCAPS_MAX_WINDOWS 0x00004008L
+#define MCI_ANIM_GETDEVCAPS_CAN_REVERSE __MSABI_LONG(0x00004001)
+#define MCI_ANIM_GETDEVCAPS_FAST_RATE __MSABI_LONG(0x00004002)
+#define MCI_ANIM_GETDEVCAPS_SLOW_RATE __MSABI_LONG(0x00004003)
+#define MCI_ANIM_GETDEVCAPS_NORMAL_RATE __MSABI_LONG(0x00004004)
+#define MCI_ANIM_GETDEVCAPS_PALETTES __MSABI_LONG(0x00004006)
+#define MCI_ANIM_GETDEVCAPS_CAN_STRETCH __MSABI_LONG(0x00004007)
+#define MCI_ANIM_GETDEVCAPS_MAX_WINDOWS __MSABI_LONG(0x00004008)
 
-#define MCI_ANIM_REALIZE_NORM 0x00010000L
-#define MCI_ANIM_REALIZE_BKGD 0x00020000L
+#define MCI_ANIM_REALIZE_NORM __MSABI_LONG(0x00010000)
+#define MCI_ANIM_REALIZE_BKGD __MSABI_LONG(0x00020000)
 
-#define MCI_ANIM_WINDOW_HWND 0x00010000L
-#define MCI_ANIM_WINDOW_STATE 0x00040000L
-#define MCI_ANIM_WINDOW_TEXT 0x00080000L
-#define MCI_ANIM_WINDOW_ENABLE_STRETCH 0x00100000L
-#define MCI_ANIM_WINDOW_DISABLE_STRETCH 0x00200000L
+#define MCI_ANIM_WINDOW_HWND __MSABI_LONG(0x00010000)
+#define MCI_ANIM_WINDOW_STATE __MSABI_LONG(0x00040000)
+#define MCI_ANIM_WINDOW_TEXT __MSABI_LONG(0x00080000)
+#define MCI_ANIM_WINDOW_ENABLE_STRETCH __MSABI_LONG(0x00100000)
+#define MCI_ANIM_WINDOW_DISABLE_STRETCH __MSABI_LONG(0x00200000)
 
-#define MCI_ANIM_WINDOW_DEFAULT 0x00000000L
+#define MCI_ANIM_WINDOW_DEFAULT __MSABI_LONG(0x00000000)
 
-#define MCI_ANIM_RECT 0x00010000L
-#define MCI_ANIM_PUT_SOURCE 0x00020000L
-#define MCI_ANIM_PUT_DESTINATION 0x00040000L
+#define MCI_ANIM_RECT __MSABI_LONG(0x00010000)
+#define MCI_ANIM_PUT_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_ANIM_PUT_DESTINATION __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_WHERE_SOURCE 0x00020000L
-#define MCI_ANIM_WHERE_DESTINATION 0x00040000L
+#define MCI_ANIM_WHERE_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_ANIM_WHERE_DESTINATION __MSABI_LONG(0x00040000)
 
-#define MCI_ANIM_UPDATE_HDC 0x00020000L
+#define MCI_ANIM_UPDATE_HDC __MSABI_LONG(0x00020000)
 
   typedef struct tagMCI_ANIM_OPEN_PARMSA {
     DWORD_PTR dwCallback;
@@ -2501,36 +2501,36 @@
     HDC hDC;
   } MCI_ANIM_UPDATE_PARMS,*PMCI_ANIM_UPDATE_PARMS,*LPMCI_ANIM_UPDATE_PARMS;
 
-#define MCI_OVLY_OPEN_WS 0x00010000L
-#define MCI_OVLY_OPEN_PARENT 0x00020000L
+#define MCI_OVLY_OPEN_WS __MSABI_LONG(0x00010000)
+#define MCI_OVLY_OPEN_PARENT __MSABI_LONG(0x00020000)
 
-#define MCI_OVLY_STATUS_HWND 0x00004001L
-#define MCI_OVLY_STATUS_STRETCH 0x00004002L
+#define MCI_OVLY_STATUS_HWND __MSABI_LONG(0x00004001)
+#define MCI_OVLY_STATUS_STRETCH __MSABI_LONG(0x00004002)
 
-#define MCI_OVLY_INFO_TEXT 0x00010000L
+#define MCI_OVLY_INFO_TEXT __MSABI_LONG(0x00010000)
 
-#define MCI_OVLY_GETDEVCAPS_CAN_STRETCH 0x00004001L
-#define MCI_OVLY_GETDEVCAPS_CAN_FREEZE 0x00004002L
-#define MCI_OVLY_GETDEVCAPS_MAX_WINDOWS 0x00004003L
+#define MCI_OVLY_GETDEVCAPS_CAN_STRETCH __MSABI_LONG(0x00004001)
+#define MCI_OVLY_GETDEVCAPS_CAN_FREEZE __MSABI_LONG(0x00004002)
+#define MCI_OVLY_GETDEVCAPS_MAX_WINDOWS __MSABI_LONG(0x00004003)
 
-#define MCI_OVLY_WINDOW_HWND 0x00010000L
-#define MCI_OVLY_WINDOW_STATE 0x00040000L
-#define MCI_OVLY_WINDOW_TEXT 0x00080000L
-#define MCI_OVLY_WINDOW_ENABLE_STRETCH 0x00100000L
-#define MCI_OVLY_WINDOW_DISABLE_STRETCH 0x00200000L
+#define MCI_OVLY_WINDOW_HWND __MSABI_LONG(0x00010000)
+#define MCI_OVLY_WINDOW_STATE __MSABI_LONG(0x00040000)
+#define MCI_OVLY_WINDOW_TEXT __MSABI_LONG(0x00080000)
+#define MCI_OVLY_WINDOW_ENABLE_STRETCH __MSABI_LONG(0x00100000)
+#define MCI_OVLY_WINDOW_DISABLE_STRETCH __MSABI_LONG(0x00200000)
 
-#define MCI_OVLY_WINDOW_DEFAULT 0x00000000L
+#define MCI_OVLY_WINDOW_DEFAULT __MSABI_LONG(0x00000000)
 
-#define MCI_OVLY_RECT 0x00010000L
-#define MCI_OVLY_PUT_SOURCE 0x00020000L
-#define MCI_OVLY_PUT_DESTINATION 0x00040000L
-#define MCI_OVLY_PUT_FRAME 0x00080000L
-#define MCI_OVLY_PUT_VIDEO 0x00100000L
+#define MCI_OVLY_RECT __MSABI_LONG(0x00010000)
+#define MCI_OVLY_PUT_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_OVLY_PUT_DESTINATION __MSABI_LONG(0x00040000)
+#define MCI_OVLY_PUT_FRAME __MSABI_LONG(0x00080000)
+#define MCI_OVLY_PUT_VIDEO __MSABI_LONG(0x00100000)
 
-#define MCI_OVLY_WHERE_SOURCE 0x00020000L
-#define MCI_OVLY_WHERE_DESTINATION 0x00040000L
-#define MCI_OVLY_WHERE_FRAME 0x00080000L
-#define MCI_OVLY_WHERE_VIDEO 0x00100000L
+#define MCI_OVLY_WHERE_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_OVLY_WHERE_DESTINATION __MSABI_LONG(0x00040000)
+#define MCI_OVLY_WHERE_FRAME __MSABI_LONG(0x00080000)
+#define MCI_OVLY_WHERE_VIDEO __MSABI_LONG(0x00100000)
 
   typedef struct tagMCI_OVLY_OPEN_PARMSA {
     DWORD_PTR dwCallback;
diff --git a/mingw-w64-headers/include/msacm.h b/mingw-w64-headers/include/msacm.h
index 3ebbb78..14bbc6c 100644
--- a/mingw-w64-headers/include/msacm.h
+++ b/mingw-w64-headers/include/msacm.h
@@ -114,8 +114,8 @@
 
   MMRESULT ACMAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback,DWORD_PTR dwInstance,DWORD fdwEnum);
 
-#define ACM_DRIVERENUMF_NOLOCAL 0x40000000L
-#define ACM_DRIVERENUMF_DISABLED 0x80000000L
+#define ACM_DRIVERENUMF_NOLOCAL __MSABI_LONG(0x40000000)
+#define ACM_DRIVERENUMF_DISABLED __MSABI_LONG(0x80000000)
 
   MMRESULT ACMAPI acmDriverID(HACMOBJ hao,LPHACMDRIVERID phadid,DWORD fdwDriverID);
   MMRESULT ACMAPI acmDriverAddA(LPHACMDRIVERID phadid,HINSTANCE hinstModule,LPARAM lParam,DWORD dwPriority,DWORD fdwAdd);
@@ -126,12 +126,12 @@
 #define acmDriverAdd acmDriverAddA
 #endif
 
-#define ACM_DRIVERADDF_NAME 0x00000001L
-#define ACM_DRIVERADDF_FUNCTION 0x00000003L
-#define ACM_DRIVERADDF_NOTIFYHWND 0x00000004L
-#define ACM_DRIVERADDF_TYPEMASK 0x00000007L
-#define ACM_DRIVERADDF_LOCAL 0x00000000L
-#define ACM_DRIVERADDF_GLOBAL 0x00000008L
+#define ACM_DRIVERADDF_NAME __MSABI_LONG(0x00000001)
+#define ACM_DRIVERADDF_FUNCTION __MSABI_LONG(0x00000003)
+#define ACM_DRIVERADDF_NOTIFYHWND __MSABI_LONG(0x00000004)
+#define ACM_DRIVERADDF_TYPEMASK __MSABI_LONG(0x00000007)
+#define ACM_DRIVERADDF_LOCAL __MSABI_LONG(0x00000000)
+#define ACM_DRIVERADDF_GLOBAL __MSABI_LONG(0x00000008)
 
   typedef LRESULT (CALLBACK *ACMDRIVERPROC)(DWORD_PTR,HACMDRIVERID,UINT,LPARAM,LPARAM);
   typedef ACMDRIVERPROC *LPACMDRIVERPROC;
@@ -151,12 +151,12 @@
 
   MMRESULT ACMAPI acmDriverPriority(HACMDRIVERID hadid,DWORD dwPriority,DWORD fdwPriority);
 
-#define ACM_DRIVERPRIORITYF_ENABLE 0x00000001L
-#define ACM_DRIVERPRIORITYF_DISABLE 0x00000002L
-#define ACM_DRIVERPRIORITYF_ABLEMASK 0x00000003L
-#define ACM_DRIVERPRIORITYF_BEGIN 0x00010000L
-#define ACM_DRIVERPRIORITYF_END 0x00020000L
-#define ACM_DRIVERPRIORITYF_DEFERMASK 0x00030000L
+#define ACM_DRIVERPRIORITYF_ENABLE __MSABI_LONG(0x00000001)
+#define ACM_DRIVERPRIORITYF_DISABLE __MSABI_LONG(0x00000002)
+#define ACM_DRIVERPRIORITYF_ABLEMASK __MSABI_LONG(0x00000003)
+#define ACM_DRIVERPRIORITYF_BEGIN __MSABI_LONG(0x00010000)
+#define ACM_DRIVERPRIORITYF_END __MSABI_LONG(0x00020000)
+#define ACM_DRIVERPRIORITYF_DEFERMASK __MSABI_LONG(0x00030000)
 
 #define ACMDRIVERDETAILS_SHORTNAME_CHARS 32
 #define ACMDRIVERDETAILS_LONGNAME_CHARS 128
@@ -214,13 +214,13 @@
 #define ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC mmioFOURCC('a','u','d','c')
 #define ACMDRIVERDETAILS_FCCCOMP_UNDEFINED mmioFOURCC('\0','\0','\0','\0')
 
-#define ACMDRIVERDETAILS_SUPPORTF_CODEC 0x00000001L
-#define ACMDRIVERDETAILS_SUPPORTF_CONVERTER 0x00000002L
-#define ACMDRIVERDETAILS_SUPPORTF_FILTER 0x00000004L
-#define ACMDRIVERDETAILS_SUPPORTF_HARDWARE 0x00000008L
-#define ACMDRIVERDETAILS_SUPPORTF_ASYNC 0x00000010L
-#define ACMDRIVERDETAILS_SUPPORTF_LOCAL 0x40000000L
-#define ACMDRIVERDETAILS_SUPPORTF_DISABLED 0x80000000L
+#define ACMDRIVERDETAILS_SUPPORTF_CODEC __MSABI_LONG(0x00000001)
+#define ACMDRIVERDETAILS_SUPPORTF_CONVERTER __MSABI_LONG(0x00000002)
+#define ACMDRIVERDETAILS_SUPPORTF_FILTER __MSABI_LONG(0x00000004)
+#define ACMDRIVERDETAILS_SUPPORTF_HARDWARE __MSABI_LONG(0x00000008)
+#define ACMDRIVERDETAILS_SUPPORTF_ASYNC __MSABI_LONG(0x00000010)
+#define ACMDRIVERDETAILS_SUPPORTF_LOCAL __MSABI_LONG(0x40000000)
+#define ACMDRIVERDETAILS_SUPPORTF_DISABLED __MSABI_LONG(0x80000000)
 
   MMRESULT ACMAPI acmDriverDetailsA(HACMDRIVERID hadid,LPACMDRIVERDETAILSA padd,DWORD fdwDetails);
   MMRESULT ACMAPI acmDriverDetailsW(HACMDRIVERID hadid,LPACMDRIVERDETAILSW padd,DWORD fdwDetails);
@@ -269,10 +269,10 @@
 #define acmFormatTagDetails acmFormatTagDetailsA
 #endif
 
-#define ACM_FORMATTAGDETAILSF_INDEX 0x00000000L
-#define ACM_FORMATTAGDETAILSF_FORMATTAG 0x00000001L
-#define ACM_FORMATTAGDETAILSF_LARGESTSIZE 0x00000002L
-#define ACM_FORMATTAGDETAILSF_QUERYMASK 0x0000000FL
+#define ACM_FORMATTAGDETAILSF_INDEX __MSABI_LONG(0x00000000)
+#define ACM_FORMATTAGDETAILSF_FORMATTAG __MSABI_LONG(0x00000001)
+#define ACM_FORMATTAGDETAILSF_LARGESTSIZE __MSABI_LONG(0x00000002)
+#define ACM_FORMATTAGDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   typedef WINBOOL (CALLBACK *ACMFORMATTAGENUMCBA)(HACMDRIVERID hadid,LPACMFORMATTAGDETAILSA paftd,DWORD_PTR dwInstance,DWORD fdwSupport);
   typedef WINBOOL (CALLBACK *ACMFORMATTAGENUMCBW)(HACMDRIVERID hadid,LPACMFORMATTAGDETAILSW paftd,DWORD_PTR dwInstance,DWORD fdwSupport);
@@ -326,9 +326,9 @@
 #define acmFormatDetails acmFormatDetailsA
 #endif
 
-#define ACM_FORMATDETAILSF_INDEX 0x00000000L
-#define ACM_FORMATDETAILSF_FORMAT 0x00000001L
-#define ACM_FORMATDETAILSF_QUERYMASK 0x0000000FL
+#define ACM_FORMATDETAILSF_INDEX __MSABI_LONG(0x00000000)
+#define ACM_FORMATDETAILSF_FORMAT __MSABI_LONG(0x00000001)
+#define ACM_FORMATDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   typedef WINBOOL (CALLBACK *ACMFORMATENUMCBA)(HACMDRIVERID hadid,LPACMFORMATDETAILSA pafd,DWORD_PTR dwInstance,DWORD fdwSupport);
   typedef WINBOOL (CALLBACK *ACMFORMATENUMCBW)(HACMDRIVERID hadid,LPACMFORMATDETAILSW pafd,DWORD_PTR dwInstance,DWORD fdwSupport);
@@ -343,25 +343,25 @@
 #define acmFormatEnum acmFormatEnumA
 #endif
 
-#define ACM_FORMATENUMF_WFORMATTAG 0x00010000L
-#define ACM_FORMATENUMF_NCHANNELS 0x00020000L
-#define ACM_FORMATENUMF_NSAMPLESPERSEC 0x00040000L
-#define ACM_FORMATENUMF_WBITSPERSAMPLE 0x00080000L
-#define ACM_FORMATENUMF_CONVERT 0x00100000L
-#define ACM_FORMATENUMF_SUGGEST 0x00200000L
-#define ACM_FORMATENUMF_HARDWARE 0x00400000L
-#define ACM_FORMATENUMF_INPUT 0x00800000L
-#define ACM_FORMATENUMF_OUTPUT 0x01000000L
+#define ACM_FORMATENUMF_WFORMATTAG __MSABI_LONG(0x00010000)
+#define ACM_FORMATENUMF_NCHANNELS __MSABI_LONG(0x00020000)
+#define ACM_FORMATENUMF_NSAMPLESPERSEC __MSABI_LONG(0x00040000)
+#define ACM_FORMATENUMF_WBITSPERSAMPLE __MSABI_LONG(0x00080000)
+#define ACM_FORMATENUMF_CONVERT __MSABI_LONG(0x00100000)
+#define ACM_FORMATENUMF_SUGGEST __MSABI_LONG(0x00200000)
+#define ACM_FORMATENUMF_HARDWARE __MSABI_LONG(0x00400000)
+#define ACM_FORMATENUMF_INPUT __MSABI_LONG(0x00800000)
+#define ACM_FORMATENUMF_OUTPUT __MSABI_LONG(0x01000000)
 
   MMRESULT ACMAPI acmFormatSuggest
     (HACMDRIVER had,LPWAVEFORMATEX pwfxSrc,LPWAVEFORMATEX pwfxDst,DWORD cbwfxDst,DWORD fdwSuggest);
 
-#define ACM_FORMATSUGGESTF_WFORMATTAG 0x00010000L
-#define ACM_FORMATSUGGESTF_NCHANNELS 0x00020000L
-#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC 0x00040000L
-#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE 0x00080000L
+#define ACM_FORMATSUGGESTF_WFORMATTAG __MSABI_LONG(0x00010000)
+#define ACM_FORMATSUGGESTF_NCHANNELS __MSABI_LONG(0x00020000)
+#define ACM_FORMATSUGGESTF_NSAMPLESPERSEC __MSABI_LONG(0x00040000)
+#define ACM_FORMATSUGGESTF_WBITSPERSAMPLE __MSABI_LONG(0x00080000)
 
-#define ACM_FORMATSUGGESTF_TYPEMASK 0x00FF0000L
+#define ACM_FORMATSUGGESTF_TYPEMASK __MSABI_LONG(0x00FF0000)
 
 #define ACMHELPMSGSTRINGA "acmchoose_help"
 #define ACMHELPMSGSTRINGW L"acmchoose_help"
@@ -441,12 +441,12 @@
 #define LPACMFORMATCHOOSE LPACMFORMATCHOOSEA
 #endif
 
-#define ACMFORMATCHOOSE_STYLEF_SHOWHELP 0x00000004L
-#define ACMFORMATCHOOSE_STYLEF_ENABLEHOOK 0x00000008L
-#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L
-#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L
-#define ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT 0x00000040L
-#define ACMFORMATCHOOSE_STYLEF_CONTEXTHELP 0x00000080L
+#define ACMFORMATCHOOSE_STYLEF_SHOWHELP __MSABI_LONG(0x00000004)
+#define ACMFORMATCHOOSE_STYLEF_ENABLEHOOK __MSABI_LONG(0x00000008)
+#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE __MSABI_LONG(0x00000010)
+#define ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x00000020)
+#define ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT __MSABI_LONG(0x00000040)
+#define ACMFORMATCHOOSE_STYLEF_CONTEXTHELP __MSABI_LONG(0x00000080)
 
   MMRESULT ACMAPI acmFormatChooseA(LPACMFORMATCHOOSEA pafmtc);
   MMRESULT ACMAPI acmFormatChooseW(LPACMFORMATCHOOSEW pafmtc);
@@ -495,10 +495,10 @@
 #define acmFilterTagDetails acmFilterTagDetailsA
 #endif
 
-#define ACM_FILTERTAGDETAILSF_INDEX 0x00000000L
-#define ACM_FILTERTAGDETAILSF_FILTERTAG 0x00000001L
-#define ACM_FILTERTAGDETAILSF_LARGESTSIZE 0x00000002L
-#define ACM_FILTERTAGDETAILSF_QUERYMASK 0x0000000FL
+#define ACM_FILTERTAGDETAILSF_INDEX __MSABI_LONG(0x00000000)
+#define ACM_FILTERTAGDETAILSF_FILTERTAG __MSABI_LONG(0x00000001)
+#define ACM_FILTERTAGDETAILSF_LARGESTSIZE __MSABI_LONG(0x00000002)
+#define ACM_FILTERTAGDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   typedef WINBOOL (CALLBACK *ACMFILTERTAGENUMCBA)(HACMDRIVERID hadid,LPACMFILTERTAGDETAILSA paftd,DWORD_PTR dwInstance,DWORD fdwSupport);
   typedef WINBOOL (CALLBACK *ACMFILTERTAGENUMCBW)(HACMDRIVERID hadid,LPACMFILTERTAGDETAILSW paftd,DWORD_PTR dwInstance,DWORD fdwSupport);
@@ -552,9 +552,9 @@
 #define acmFilterDetails acmFilterDetailsA
 #endif
 
-#define ACM_FILTERDETAILSF_INDEX 0x00000000L
-#define ACM_FILTERDETAILSF_FILTER 0x00000001L
-#define ACM_FILTERDETAILSF_QUERYMASK 0x0000000FL
+#define ACM_FILTERDETAILSF_INDEX __MSABI_LONG(0x00000000)
+#define ACM_FILTERDETAILSF_FILTER __MSABI_LONG(0x00000001)
+#define ACM_FILTERDETAILSF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   typedef WINBOOL (CALLBACK *ACMFILTERENUMCBA)(HACMDRIVERID hadid,LPACMFILTERDETAILSA pafd,DWORD_PTR dwInstance,DWORD fdwSupport);
   typedef WINBOOL (CALLBACK *ACMFILTERENUMCBW)(HACMDRIVERID hadid,LPACMFILTERDETAILSW pafd,DWORD_PTR dwInstance,DWORD fdwSupport);
@@ -569,7 +569,7 @@
 #define acmFilterEnum acmFilterEnumA
 #endif
 
-#define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L
+#define ACM_FILTERENUMF_DWFILTERTAG __MSABI_LONG(0x00010000)
 
 #define MM_ACM_FILTERCHOOSE (0x8000)
 
@@ -633,12 +633,12 @@
 #define LPACMFILTERCHOOSE LPACMFILTERCHOOSEA
 #endif
 
-#define ACMFILTERCHOOSE_STYLEF_SHOWHELP 0x00000004L
-#define ACMFILTERCHOOSE_STYLEF_ENABLEHOOK 0x00000008L
-#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATE 0x00000010L
-#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATEHANDLE 0x00000020L
-#define ACMFILTERCHOOSE_STYLEF_INITTOFILTERSTRUCT 0x00000040L
-#define ACMFILTERCHOOSE_STYLEF_CONTEXTHELP 0x00000080L
+#define ACMFILTERCHOOSE_STYLEF_SHOWHELP __MSABI_LONG(0x00000004)
+#define ACMFILTERCHOOSE_STYLEF_ENABLEHOOK __MSABI_LONG(0x00000008)
+#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATE __MSABI_LONG(0x00000010)
+#define ACMFILTERCHOOSE_STYLEF_ENABLETEMPLATEHANDLE __MSABI_LONG(0x00000020)
+#define ACMFILTERCHOOSE_STYLEF_INITTOFILTERSTRUCT __MSABI_LONG(0x00000040)
+#define ACMFILTERCHOOSE_STYLEF_CONTEXTHELP __MSABI_LONG(0x00000080)
 
   MMRESULT ACMAPI acmFilterChooseA(LPACMFILTERCHOOSEA pafltrc);
   MMRESULT ACMAPI acmFilterChooseW(LPACMFILTERCHOOSEW pafltrc);
@@ -669,9 +669,9 @@
     DWORD dwReservedDriver[_DRVRESERVED];
   } ACMSTREAMHEADER,*PACMSTREAMHEADER,*LPACMSTREAMHEADER;
 
-#define ACMSTREAMHEADER_STATUSF_DONE 0x00010000L
-#define ACMSTREAMHEADER_STATUSF_PREPARED 0x00020000L
-#define ACMSTREAMHEADER_STATUSF_INQUEUE 0x00100000L
+#define ACMSTREAMHEADER_STATUSF_DONE __MSABI_LONG(0x00010000)
+#define ACMSTREAMHEADER_STATUSF_PREPARED __MSABI_LONG(0x00020000)
+#define ACMSTREAMHEADER_STATUSF_INQUEUE __MSABI_LONG(0x00100000)
 
   MMRESULT ACMAPI acmStreamOpen(LPHACMSTREAM phas,HACMDRIVER had,LPWAVEFORMATEX pwfxSrc,LPWAVEFORMATEX pwfxDst,LPWAVEFILTER pwfltr,DWORD_PTR dwCallback,DWORD_PTR dwInstance,DWORD fdwOpen);
 
@@ -684,9 +684,9 @@
 
   MMRESULT ACMAPI acmStreamSize(HACMSTREAM has,DWORD cbInput,LPDWORD pdwOutputBytes,DWORD fdwSize);
 
-#define ACM_STREAMSIZEF_SOURCE 0x00000000L
-#define ACM_STREAMSIZEF_DESTINATION 0x00000001L
-#define ACM_STREAMSIZEF_QUERYMASK 0x0000000FL
+#define ACM_STREAMSIZEF_SOURCE __MSABI_LONG(0x00000000)
+#define ACM_STREAMSIZEF_DESTINATION __MSABI_LONG(0x00000001)
+#define ACM_STREAMSIZEF_QUERYMASK __MSABI_LONG(0x0000000F)
 
   MMRESULT ACMAPI acmStreamReset(HACMSTREAM has,DWORD fdwReset);
   MMRESULT ACMAPI acmStreamMessage(HACMSTREAM has,UINT uMsg,LPARAM lParam1,LPARAM lParam2);
diff --git a/mingw-w64-headers/include/msdaipp.h b/mingw-w64-headers/include/msdaipp.h
index 9da6c52..3686aa5 100644
--- a/mingw-w64-headers/include/msdaipp.h
+++ b/mingw-w64-headers/include/msdaipp.h
@@ -128,11 +128,11 @@
 #define RESOURCE_ISROOT_MAXLENGTH sizeof(VARIANT_BOOL)
 
   const GUID DBPROPSET_MSDAIPP_INIT = {0x8f1033e3,0xb2cd,0x11d1,{0x9c,0x74,0x0,0x0,0xf8,0x75,0xac,0x61}};
-#define DBPROP_INIT_IGNORECACHEDDATA 2L
-#define DBPROP_INIT_CACHEAGGRESSIVELY 3L
-#define DBPROP_INIT_TREATASOFFLINE 4L
-#define DBPROP_INIT_MARKFOROFFLINE 5L
-#define DBPROP_INIT_PROTOCOLPROVIDER 6L
+#define DBPROP_INIT_IGNORECACHEDDATA __MSABI_LONG(2)
+#define DBPROP_INIT_CACHEAGGRESSIVELY __MSABI_LONG(3)
+#define DBPROP_INIT_TREATASOFFLINE __MSABI_LONG(4)
+#define DBPROP_INIT_MARKFOROFFLINE __MSABI_LONG(5)
+#define DBPROP_INIT_PROTOCOLPROVIDER __MSABI_LONG(6)
 
   enum MFO {
     MFO_DONTCHANGE = 0,MFO_MARK = 1,MFO_UNMARK = 2
diff --git a/mingw-w64-headers/include/msdaipper.h b/mingw-w64-headers/include/msdaipper.h
index bf186c3..8a3812e 100644
--- a/mingw-w64-headers/include/msdaipper.h
+++ b/mingw-w64-headers/include/msdaipper.h
@@ -3,19 +3,19 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define IPP_E_FIRST 0x40048000L
-#define IPP_E_SYNCCONFLICT 0xC0048003L
-#define IPP_E_FILENOTDIRTY 0xC0048004L
-#define IPP_E_MARKFOROFFLINE_FAILED 0xC0048006L
-#define IPP_E_OFFLINE 0xC0048007L
-#define IPP_E_UNSYNCHRONIZED 0xC0048008L
-#define IPP_E_SERVERTYPE_NOT_SUPPORTED 0xC004800AL
-#define IPP_E_MDAC_VERSION 0xC004800DL
-#define IPP_E_COLLECTIONEXISTS 0xC004800EL
-#define IPP_E_CANNOTCREATEOFFLINE 0xC004800FL
-#define IPP_E_STATUS_CANNOTCOMPLETE 0xC0048101L
-#define IPP_E_RESELECTPROVIDER 0xC0048102L
-#define IPP_E_CLIENTMUSTEMULATE 0xC0048103L
-#define IPP_S_WEAKRESERVE 0x00048104L
-#define IPP_S_TRUNCATED 0x00048105L
-#define IPP_E_LAST 0x40048106L
+#define IPP_E_FIRST __MSABI_LONG(0x40048000)
+#define IPP_E_SYNCCONFLICT __MSABI_LONG(0xC0048003)
+#define IPP_E_FILENOTDIRTY __MSABI_LONG(0xC0048004)
+#define IPP_E_MARKFOROFFLINE_FAILED __MSABI_LONG(0xC0048006)
+#define IPP_E_OFFLINE __MSABI_LONG(0xC0048007)
+#define IPP_E_UNSYNCHRONIZED __MSABI_LONG(0xC0048008)
+#define IPP_E_SERVERTYPE_NOT_SUPPORTED __MSABI_LONG(0xC004800A)
+#define IPP_E_MDAC_VERSION __MSABI_LONG(0xC004800D)
+#define IPP_E_COLLECTIONEXISTS __MSABI_LONG(0xC004800E)
+#define IPP_E_CANNOTCREATEOFFLINE __MSABI_LONG(0xC004800F)
+#define IPP_E_STATUS_CANNOTCOMPLETE __MSABI_LONG(0xC0048101)
+#define IPP_E_RESELECTPROVIDER __MSABI_LONG(0xC0048102)
+#define IPP_E_CLIENTMUSTEMULATE __MSABI_LONG(0xC0048103)
+#define IPP_S_WEAKRESERVE __MSABI_LONG(0x00048104)
+#define IPP_S_TRUNCATED __MSABI_LONG(0x00048105)
+#define IPP_E_LAST __MSABI_LONG(0x40048106)
diff --git a/mingw-w64-headers/include/msdasc.h b/mingw-w64-headers/include/msdasc.h
index f0c6387..c69e22d 100644
--- a/mingw-w64-headers/include/msdasc.h
+++ b/mingw-w64-headers/include/msdasc.h
@@ -101,11 +101,11 @@
     BIO_BINDER = 0x1
   } EBindInfoOptions;
 
-#define STGM_COLLECTION 0x00002000L
-#define STGM_OUTPUT 0x00008000L
-#define STGM_OPEN 0x80000000L
-#define STGM_RECURSIVE 0x01000000L
-#define STGM_STRICTOPEN 0x40000000L
+#define STGM_COLLECTION __MSABI_LONG(0x00002000)
+#define STGM_OUTPUT __MSABI_LONG(0x00008000)
+#define STGM_OPEN __MSABI_LONG(0x80000000)
+#define STGM_RECURSIVE __MSABI_LONG(0x01000000)
+#define STGM_STRICTOPEN __MSABI_LONG(0x40000000)
 
   extern RPC_IF_HANDLE __MIDL_itf_msdasc_0000_v0_0_c_ifspec;
   extern RPC_IF_HANDLE __MIDL_itf_msdasc_0000_v0_0_s_ifspec;
diff --git a/mingw-w64-headers/include/msi.h b/mingw-w64-headers/include/msi.h
index 612c365..e8132c6 100644
--- a/mingw-w64-headers/include/msi.h
+++ b/mingw-w64-headers/include/msi.h
@@ -710,123 +710,123 @@
 #endif
 
 #ifndef ERROR_INSTALL_FAILURE
-#define ERROR_INSTALL_USEREXIT 1602L
-#define ERROR_INSTALL_FAILURE 1603L
-#define ERROR_INSTALL_SUSPEND 1604L
+#define ERROR_INSTALL_USEREXIT __MSABI_LONG(1602)
+#define ERROR_INSTALL_FAILURE __MSABI_LONG(1603)
+#define ERROR_INSTALL_SUSPEND __MSABI_LONG(1604)
 
-#define ERROR_UNKNOWN_PRODUCT 1605L
+#define ERROR_UNKNOWN_PRODUCT __MSABI_LONG(1605)
 
-#define ERROR_UNKNOWN_FEATURE 1606L
-#define ERROR_UNKNOWN_COMPONENT 1607L
-#define ERROR_UNKNOWN_PROPERTY 1608L
-#define ERROR_INVALID_HANDLE_STATE 1609L
+#define ERROR_UNKNOWN_FEATURE __MSABI_LONG(1606)
+#define ERROR_UNKNOWN_COMPONENT __MSABI_LONG(1607)
+#define ERROR_UNKNOWN_PROPERTY __MSABI_LONG(1608)
+#define ERROR_INVALID_HANDLE_STATE __MSABI_LONG(1609)
 
-#define ERROR_BAD_CONFIGURATION 1610L
+#define ERROR_BAD_CONFIGURATION __MSABI_LONG(1610)
 
-#define ERROR_INDEX_ABSENT 1611L
+#define ERROR_INDEX_ABSENT __MSABI_LONG(1611)
 
-#define ERROR_INSTALL_SOURCE_ABSENT 1612L
+#define ERROR_INSTALL_SOURCE_ABSENT __MSABI_LONG(1612)
 
-#define ERROR_PRODUCT_UNINSTALLED 1614L
-#define ERROR_BAD_QUERY_SYNTAX 1615L
-#define ERROR_INVALID_FIELD 1616L
+#define ERROR_PRODUCT_UNINSTALLED __MSABI_LONG(1614)
+#define ERROR_BAD_QUERY_SYNTAX __MSABI_LONG(1615)
+#define ERROR_INVALID_FIELD __MSABI_LONG(1616)
 #endif
 
 #ifndef ERROR_INSTALL_SERVICE_FAILURE
-#define ERROR_INSTALL_SERVICE_FAILURE 1601L
-#define ERROR_INSTALL_PACKAGE_VERSION 1613L
-#define ERROR_INSTALL_ALREADY_RUNNING 1618L
-#define ERROR_INSTALL_PACKAGE_OPEN_FAILED 1619L
-#define ERROR_INSTALL_PACKAGE_INVALID 1620L
-#define ERROR_INSTALL_UI_FAILURE 1621L
-#define ERROR_INSTALL_LOG_FAILURE 1622L
-#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED 1623L
-#define ERROR_INSTALL_PACKAGE_REJECTED 1625L
+#define ERROR_INSTALL_SERVICE_FAILURE __MSABI_LONG(1601)
+#define ERROR_INSTALL_PACKAGE_VERSION __MSABI_LONG(1613)
+#define ERROR_INSTALL_ALREADY_RUNNING __MSABI_LONG(1618)
+#define ERROR_INSTALL_PACKAGE_OPEN_FAILED __MSABI_LONG(1619)
+#define ERROR_INSTALL_PACKAGE_INVALID __MSABI_LONG(1620)
+#define ERROR_INSTALL_UI_FAILURE __MSABI_LONG(1621)
+#define ERROR_INSTALL_LOG_FAILURE __MSABI_LONG(1622)
+#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED __MSABI_LONG(1623)
+#define ERROR_INSTALL_PACKAGE_REJECTED __MSABI_LONG(1625)
 
-#define ERROR_FUNCTION_NOT_CALLED 1626L
-#define ERROR_FUNCTION_FAILED 1627L
-#define ERROR_INVALID_TABLE 1628L
-#define ERROR_DATATYPE_MISMATCH 1629L
-#define ERROR_UNSUPPORTED_TYPE 1630L
+#define ERROR_FUNCTION_NOT_CALLED __MSABI_LONG(1626)
+#define ERROR_FUNCTION_FAILED __MSABI_LONG(1627)
+#define ERROR_INVALID_TABLE __MSABI_LONG(1628)
+#define ERROR_DATATYPE_MISMATCH __MSABI_LONG(1629)
+#define ERROR_UNSUPPORTED_TYPE __MSABI_LONG(1630)
 
-#define ERROR_CREATE_FAILED 1631L
+#define ERROR_CREATE_FAILED __MSABI_LONG(1631)
 #endif
 
 #ifndef ERROR_INSTALL_TEMP_UNWRITABLE
-#define ERROR_INSTALL_TEMP_UNWRITABLE 1632L
+#define ERROR_INSTALL_TEMP_UNWRITABLE __MSABI_LONG(1632)
 #endif
 
 #ifndef ERROR_INSTALL_PLATFORM_UNSUPPORTED
-#define ERROR_INSTALL_PLATFORM_UNSUPPORTED 1633L
+#define ERROR_INSTALL_PLATFORM_UNSUPPORTED __MSABI_LONG(1633)
 #endif
 
 #ifndef ERROR_INSTALL_NOTUSED
-#define ERROR_INSTALL_NOTUSED 1634L
+#define ERROR_INSTALL_NOTUSED __MSABI_LONG(1634)
 #endif
 
 #ifndef ERROR_INSTALL_TRANSFORM_FAILURE
-#define ERROR_INSTALL_TRANSFORM_FAILURE 1624L
+#define ERROR_INSTALL_TRANSFORM_FAILURE __MSABI_LONG(1624)
 #endif
 
 #ifndef ERROR_PATCH_PACKAGE_OPEN_FAILED
-#define ERROR_PATCH_PACKAGE_OPEN_FAILED 1635L
-#define ERROR_PATCH_PACKAGE_INVALID 1636L
-#define ERROR_PATCH_PACKAGE_UNSUPPORTED 1637L
+#define ERROR_PATCH_PACKAGE_OPEN_FAILED __MSABI_LONG(1635)
+#define ERROR_PATCH_PACKAGE_INVALID __MSABI_LONG(1636)
+#define ERROR_PATCH_PACKAGE_UNSUPPORTED __MSABI_LONG(1637)
 #endif
 
 #ifndef ERROR_PRODUCT_VERSION
-#define ERROR_PRODUCT_VERSION 1638L
+#define ERROR_PRODUCT_VERSION __MSABI_LONG(1638)
 #endif
 
 #ifndef ERROR_INVALID_COMMAND_LINE
-#define ERROR_INVALID_COMMAND_LINE 1639L
+#define ERROR_INVALID_COMMAND_LINE __MSABI_LONG(1639)
 #endif
 
 #ifndef ERROR_INSTALL_REMOTE_DISALLOWED
-#define ERROR_INSTALL_REMOTE_DISALLOWED 1640L
+#define ERROR_INSTALL_REMOTE_DISALLOWED __MSABI_LONG(1640)
 #endif
 
 #ifndef ERROR_SUCCESS_REBOOT_INITIATED
-#define ERROR_SUCCESS_REBOOT_INITIATED 1641L
+#define ERROR_SUCCESS_REBOOT_INITIATED __MSABI_LONG(1641)
 #endif
 
 #ifndef ERROR_PATCH_TARGET_NOT_FOUND
-#define ERROR_PATCH_TARGET_NOT_FOUND 1642L
+#define ERROR_PATCH_TARGET_NOT_FOUND __MSABI_LONG(1642)
 #endif
 
 #ifndef ERROR_PATCH_PACKAGE_REJECTED
-#define ERROR_PATCH_PACKAGE_REJECTED 1643L
+#define ERROR_PATCH_PACKAGE_REJECTED __MSABI_LONG(1643)
 #endif
 
 #ifndef ERROR_INSTALL_TRANSFORM_REJECTED
-#define ERROR_INSTALL_TRANSFORM_REJECTED 1644L
+#define ERROR_INSTALL_TRANSFORM_REJECTED __MSABI_LONG(1644)
 #endif
 
 #ifndef ERROR_INSTALL_REMOTE_PROHIBITED
-#define ERROR_INSTALL_REMOTE_PROHIBITED 1645L
+#define ERROR_INSTALL_REMOTE_PROHIBITED __MSABI_LONG(1645)
 #endif
 
 #ifndef ERROR_PATCH_REMOVAL_UNSUPPORTED
-#define ERROR_PATCH_REMOVAL_UNSUPPORTED 1646L
+#define ERROR_PATCH_REMOVAL_UNSUPPORTED __MSABI_LONG(1646)
 #endif
 
 #ifndef ERROR_UNKNOWN_PATCH
-#define ERROR_UNKNOWN_PATCH 1647L
+#define ERROR_UNKNOWN_PATCH __MSABI_LONG(1647)
 #endif
 
 #ifndef ERROR_PATCH_NO_SEQUENCE
-#define ERROR_PATCH_NO_SEQUENCE 1648L
+#define ERROR_PATCH_NO_SEQUENCE __MSABI_LONG(1648)
 #endif
 
 #ifndef ERROR_PATCH_REMOVAL_DISALLOWED
-#define ERROR_PATCH_REMOVAL_DISALLOWED 1649L
+#define ERROR_PATCH_REMOVAL_DISALLOWED __MSABI_LONG(1649)
 #endif
 
 #ifndef ERROR_INVALID_PATCH_XML
-#define ERROR_INVALID_PATCH_XML 1650L
+#define ERROR_INVALID_PATCH_XML __MSABI_LONG(1650)
 #endif
 
 #ifndef ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT
-#define ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT 1651L
+#define ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT __MSABI_LONG(1651)
 #endif
 #endif
diff --git a/mingw-w64-headers/include/msiquery.h b/mingw-w64-headers/include/msiquery.h
index 3bbbe7b..991a8a3 100644
--- a/mingw-w64-headers/include/msiquery.h
+++ b/mingw-w64-headers/include/msiquery.h
@@ -57,7 +57,7 @@
   MSIRUNMODE_RESERVED15 = 15,MSIRUNMODE_SCHEDULED = 16,MSIRUNMODE_ROLLBACK = 17,MSIRUNMODE_COMMIT = 18
 } MSIRUNMODE;
 
-#define INSTALLMESSAGE_TYPEMASK 0xFF000000L
+#define INSTALLMESSAGE_TYPEMASK __MSABI_LONG(0xFF000000)
 
 typedef enum tagMSITRANSFORM_ERROR {
   MSITRANSFORM_ERROR_ADDEXISTINGROW = 0x00000001,MSITRANSFORM_ERROR_DELMISSINGROW = 0x00000002,MSITRANSFORM_ERROR_ADDEXISTINGTABLE = 0x00000004,
diff --git a/mingw-w64-headers/include/msxml2.h b/mingw-w64-headers/include/msxml2.h
index 84ea1c6..de7eaa2 100644
--- a/mingw-w64-headers/include/msxml2.h
+++ b/mingw-w64-headers/include/msxml2.h
@@ -7791,10 +7791,10 @@
 #endif
 #endif
 
-#define E_XML_NOTWF 0xC00CE223L
-#define E_XML_NODTD 0xC00CE224L
-#define E_XML_INVALID 0xC00CE225L
-#define E_XML_BUFFERTOOSMALL 0xC00CE226L
+#define E_XML_NOTWF __MSABI_LONG(0xC00CE223)
+#define E_XML_NODTD __MSABI_LONG(0xC00CE224)
+#define E_XML_INVALID __MSABI_LONG(0xC00CE225)
+#define E_XML_BUFFERTOOSMALL __MSABI_LONG(0xC00CE226)
 #ifdef __USE_MSXML2_NAMESPACE__
   }
 #endif
diff --git a/mingw-w64-headers/include/netevent.h b/mingw-w64-headers/include/netevent.h
index 1991b64..eed7534 100644
--- a/mingw-w64-headers/include/netevent.h
+++ b/mingw-w64-headers/include/netevent.h
@@ -27,620 +27,620 @@
 extern "C" {
 #endif
 
-#define COULD_NOT_VERIFY_VOLUMES                                 0xC00037E8L
+#define COULD_NOT_VERIFY_VOLUMES                                 __MSABI_LONG(0xC00037E8)
 
-#define DFS_CONNECTION_FAILURE                                   0x40003842L
-#define DFS_ERROR_ACTIVEDIRECTORY_OFFLINE                        0xC00038BBL
-#define DFS_ERROR_CLUSTERINFO_FAILED                             0xC00038B5L
-#define DFS_ERROR_COMPUTERINFO_FAILED                            0xC00038B4L
-#define DFS_ERROR_CREATEEVENT_FAILED                             0xC00038B3L
-#define DFS_ERROR_CREATE_REPARSEPOINT_FAILURE                    0xC00038A7L
-#define DFS_ERROR_CREATE_REPARSEPOINT_SUCCESS                    0x400038D2L
-#define DFS_ERROR_CROSS_FOREST_TRUST_INFO_FAILED                 0xC00038D6L
-#define DFS_ERROR_DCINFO_FAILED                                  0xC00038B6L
-#define DFS_ERROR_DSCONNECT_FAILED                               0x800038BEL
-#define DFS_ERROR_DUPLICATE_LINK                                 0xC00038D3L
-#define DFS_ERROR_HANDLENAMESPACE_FAILED                         0xC00038B8L
-#define DFS_ERROR_LINKS_OVERLAP                                  0xC00038D0L
-#define DFS_ERROR_LINK_OVERLAP                                   0xC00038D1L
-#define DFS_ERROR_MUTLIPLE_ROOTS_NOT_SUPPORTED                   0xC00038C7L
-#define DFS_ERROR_NO_DFS_DATA                                    0xC00038C2L
-#define DFS_ERROR_ON_ROOT                                        0x800038C6L
-#define DFS_ERROR_OVERLAPPING_DIRECTORIES                        0xC00038A9L
-#define DFS_ERROR_PREFIXTABLE_FAILED                             0xC00038B7L
-#define DFS_ERROR_REFLECTIONENGINE_FAILED                        0xC00038BAL
-#define DFS_ERROR_REGISTERSTORE_FAILED                           0xC00038B9L
-#define DFS_ERROR_REMOVE_LINK_FAILED                             0xC00038CCL
-#define DFS_ERROR_RESYNCHRONIZE_FAILED                           0xC00038CBL
-#define DFS_ERROR_ROOTSYNCINIT_FAILED                            0xC00038B2L
-#define DFS_ERROR_SECURITYINIT_FAILED                            0xC00038AFL
-#define DFS_ERROR_SITECACHEINIT_FAILED                           0xC00038B1L
-#define DFS_ERROR_SITESUPPOR_FAILED                              0xC00038BCL
-#define DFS_ERROR_TARGET_LIST_INCORRECT                          0xC00038CFL
-#define DFS_ERROR_THREADINIT_FAILED                              0xC00038B0L
-#define DFS_ERROR_TOO_MANY_ERRORS                                0xC00038ADL
-#define DFS_ERROR_TRUSTED_DOMAIN_INFO_FAILED                     0xC00038D4L
-#define DFS_ERROR_UNSUPPORTED_FILESYSTEM                         0xC00038A8L
-#define DFS_ERROR_WINSOCKINIT_FAILED                             0xC00038AEL
-#define DFS_INFO_ACTIVEDIRECTORY_ONLINE                          0x400038ACL
-#define DFS_INFO_CROSS_FOREST_TRUST_INFO_SUCCESS                 0x400038D7L
-#define DFS_INFO_DOMAIN_REFERRAL_MIN_OVERFLOW                    0x400038C9L
-#define DFS_INFO_DS_RECONNECTED                                  0x400038C1L
-#define DFS_INFO_FINISH_BUILDING_NAMESPACE                       0x400038C5L
-#define DFS_INFO_FINISH_INIT                                     0x400038C3L
-#define DFS_INFO_RECONNECT_DATA                                  0x400038C4L
-#define DFS_INFO_TRUSTED_DOMAIN_INFO_SUCCESS                     0x400038D5L
-#define DFS_MAX_DNR_ATTEMPTS                                     0x40003845L
-#define DFS_OPEN_FAILURE                                         0x40003847L
-#define DFS_REFERRAL_FAILURE                                     0x40003843L
-#define DFS_REFERRAL_REQUEST                                     0x400037EEL
-#define DFS_REFERRAL_SUCCESS                                     0x40003844L
-#define DFS_SPECIAL_REFERRAL_FAILURE                             0x40003846L
-#define DFS_WARN_DOMAIN_REFERRAL_OVERFLOW                        0x800038C8L
-#define DFS_WARN_INCOMPLETE_MOVE                                 0x800038CAL
-#define DFS_WARN_METADATA_LINK_INFO_INVALID                      0x800038CEL
-#define DFS_WARN_METADATA_LINK_TYPE_INCORRECT                    0x800038CDL
+#define DFS_CONNECTION_FAILURE                                   __MSABI_LONG(0x40003842)
+#define DFS_ERROR_ACTIVEDIRECTORY_OFFLINE                        __MSABI_LONG(0xC00038BB)
+#define DFS_ERROR_CLUSTERINFO_FAILED                             __MSABI_LONG(0xC00038B5)
+#define DFS_ERROR_COMPUTERINFO_FAILED                            __MSABI_LONG(0xC00038B4)
+#define DFS_ERROR_CREATEEVENT_FAILED                             __MSABI_LONG(0xC00038B3)
+#define DFS_ERROR_CREATE_REPARSEPOINT_FAILURE                    __MSABI_LONG(0xC00038A7)
+#define DFS_ERROR_CREATE_REPARSEPOINT_SUCCESS                    __MSABI_LONG(0x400038D2)
+#define DFS_ERROR_CROSS_FOREST_TRUST_INFO_FAILED                 __MSABI_LONG(0xC00038D6)
+#define DFS_ERROR_DCINFO_FAILED                                  __MSABI_LONG(0xC00038B6)
+#define DFS_ERROR_DSCONNECT_FAILED                               __MSABI_LONG(0x800038BE)
+#define DFS_ERROR_DUPLICATE_LINK                                 __MSABI_LONG(0xC00038D3)
+#define DFS_ERROR_HANDLENAMESPACE_FAILED                         __MSABI_LONG(0xC00038B8)
+#define DFS_ERROR_LINKS_OVERLAP                                  __MSABI_LONG(0xC00038D0)
+#define DFS_ERROR_LINK_OVERLAP                                   __MSABI_LONG(0xC00038D1)
+#define DFS_ERROR_MUTLIPLE_ROOTS_NOT_SUPPORTED                   __MSABI_LONG(0xC00038C7)
+#define DFS_ERROR_NO_DFS_DATA                                    __MSABI_LONG(0xC00038C2)
+#define DFS_ERROR_ON_ROOT                                        __MSABI_LONG(0x800038C6)
+#define DFS_ERROR_OVERLAPPING_DIRECTORIES                        __MSABI_LONG(0xC00038A9)
+#define DFS_ERROR_PREFIXTABLE_FAILED                             __MSABI_LONG(0xC00038B7)
+#define DFS_ERROR_REFLECTIONENGINE_FAILED                        __MSABI_LONG(0xC00038BA)
+#define DFS_ERROR_REGISTERSTORE_FAILED                           __MSABI_LONG(0xC00038B9)
+#define DFS_ERROR_REMOVE_LINK_FAILED                             __MSABI_LONG(0xC00038CC)
+#define DFS_ERROR_RESYNCHRONIZE_FAILED                           __MSABI_LONG(0xC00038CB)
+#define DFS_ERROR_ROOTSYNCINIT_FAILED                            __MSABI_LONG(0xC00038B2)
+#define DFS_ERROR_SECURITYINIT_FAILED                            __MSABI_LONG(0xC00038AF)
+#define DFS_ERROR_SITECACHEINIT_FAILED                           __MSABI_LONG(0xC00038B1)
+#define DFS_ERROR_SITESUPPOR_FAILED                              __MSABI_LONG(0xC00038BC)
+#define DFS_ERROR_TARGET_LIST_INCORRECT                          __MSABI_LONG(0xC00038CF)
+#define DFS_ERROR_THREADINIT_FAILED                              __MSABI_LONG(0xC00038B0)
+#define DFS_ERROR_TOO_MANY_ERRORS                                __MSABI_LONG(0xC00038AD)
+#define DFS_ERROR_TRUSTED_DOMAIN_INFO_FAILED                     __MSABI_LONG(0xC00038D4)
+#define DFS_ERROR_UNSUPPORTED_FILESYSTEM                         __MSABI_LONG(0xC00038A8)
+#define DFS_ERROR_WINSOCKINIT_FAILED                             __MSABI_LONG(0xC00038AE)
+#define DFS_INFO_ACTIVEDIRECTORY_ONLINE                          __MSABI_LONG(0x400038AC)
+#define DFS_INFO_CROSS_FOREST_TRUST_INFO_SUCCESS                 __MSABI_LONG(0x400038D7)
+#define DFS_INFO_DOMAIN_REFERRAL_MIN_OVERFLOW                    __MSABI_LONG(0x400038C9)
+#define DFS_INFO_DS_RECONNECTED                                  __MSABI_LONG(0x400038C1)
+#define DFS_INFO_FINISH_BUILDING_NAMESPACE                       __MSABI_LONG(0x400038C5)
+#define DFS_INFO_FINISH_INIT                                     __MSABI_LONG(0x400038C3)
+#define DFS_INFO_RECONNECT_DATA                                  __MSABI_LONG(0x400038C4)
+#define DFS_INFO_TRUSTED_DOMAIN_INFO_SUCCESS                     __MSABI_LONG(0x400038D5)
+#define DFS_MAX_DNR_ATTEMPTS                                     __MSABI_LONG(0x40003845)
+#define DFS_OPEN_FAILURE                                         __MSABI_LONG(0x40003847)
+#define DFS_REFERRAL_FAILURE                                     __MSABI_LONG(0x40003843)
+#define DFS_REFERRAL_REQUEST                                     __MSABI_LONG(0x400037EE)
+#define DFS_REFERRAL_SUCCESS                                     __MSABI_LONG(0x40003844)
+#define DFS_SPECIAL_REFERRAL_FAILURE                             __MSABI_LONG(0x40003846)
+#define DFS_WARN_DOMAIN_REFERRAL_OVERFLOW                        __MSABI_LONG(0x800038C8)
+#define DFS_WARN_INCOMPLETE_MOVE                                 __MSABI_LONG(0x800038CA)
+#define DFS_WARN_METADATA_LINK_INFO_INVALID                      __MSABI_LONG(0x800038CE)
+#define DFS_WARN_METADATA_LINK_TYPE_INCORRECT                    __MSABI_LONG(0x800038CD)
 
-#define EVENT_BAD_ACCOUNT_NAME                                   0xC0001B60L
-#define EVENT_BAD_SERVICE_STATE                                  0xC0001B68L
-#define EVENT_BOOT_SYSTEM_DRIVERS_FAILED                         0xC0001B72L
-#define EVENT_BOWSER_CANT_READ_REGISTRY                          0x40001F5DL
-#define EVENT_BOWSER_ELECTION_RECEIVED                           0x00001F4CL
-#define EVENT_BOWSER_ELECTION_SENT_FIND_MASTER_FAILED            0x40001F4EL
-#define EVENT_BOWSER_ELECTION_SENT_GETBLIST_FAILED               0x40001F4DL
-#define EVENT_BOWSER_GETBROWSERLIST_THRESHOLD_EXCEEDED           0x40001F5FL
-#define EVENT_BOWSER_ILLEGAL_DATAGRAM                            0x80001F46L
-#define EVENT_BOWSER_ILLEGAL_DATAGRAM_THRESHOLD                  0xC0001F50L
-#define EVENT_BOWSER_MAILSLOT_DATAGRAM_THRESHOLD_EXCEEDED        0x40001F5EL
-#define EVENT_BOWSER_NAME_CONVERSION_FAILED                      0xC0001F4AL
-#define EVENT_BOWSER_NON_MASTER_MASTER_ANNOUNCE                  0x80001F45L
-#define EVENT_BOWSER_NON_PDC_WON_ELECTION                        0x40001F5CL
-#define EVENT_BOWSER_OLD_BACKUP_FOUND                            0x40001F58L
-#define EVENT_BOWSER_OTHER_MASTER_ON_NET                         0xC0001F43L
-#define EVENT_BOWSER_PDC_LOST_ELECTION                           0x40001F5BL
-#define EVENT_BOWSER_PROMOTED_WHILE_ALREADY_MASTER               0x80001F44L
-#define EVENT_BRIDGE_ADAPTER_BIND_FAILED                         0xC0003970L
-#define EVENT_BRIDGE_ADAPTER_FILTER_FAILED                       0xC000396EL
-#define EVENT_BRIDGE_ADAPTER_LINK_SPEED_QUERY_FAILED             0xC000396CL
-#define EVENT_BRIDGE_ADAPTER_MAC_ADDR_QUERY_FAILED               0xC000396DL
-#define EVENT_BRIDGE_ADAPTER_NAME_QUERY_FAILED                   0xC000396FL
-#define EVENT_BRIDGE_BUFFER_POOL_CREATION_FAILED                 0xC0003912L
-#define EVENT_BRIDGE_DEVICE_CREATION_FAILED                      0xC000390BL
-#define EVENT_BRIDGE_ETHERNET_NOT_OFFERED                        0xC000390EL
-#define EVENT_BRIDGE_INIT_MALLOC_FAILED                          0xC0003913L
-#define EVENT_BRIDGE_MINIPORT_INIT_FAILED                        0xC000390DL
-#define EVENT_BRIDGE_MINIPORT_REGISTER_FAILED                    0xC000390AL
-#define EVENT_BRIDGE_MINIPROT_DEVNAME_MISSING                    0xC0003909L
-#define EVENT_BRIDGE_NO_BRIDGE_MAC_ADDR                          0xC000390CL
-#define EVENT_BRIDGE_PACKET_POOL_CREATION_FAILED                 0xC0003911L
-#define EVENT_BRIDGE_PROTOCOL_REGISTER_FAILED                    0xC0003908L
-#define EVENT_BRIDGE_THREAD_CREATION_FAILED                      0xC000390FL
-#define EVENT_BRIDGE_THREAD_REF_FAILED                           0xC0003910L
-#define EVENT_BROWSER_BACKUP_STOPPED                             0xC0001F60L
-#define EVENT_BROWSER_DEPENDANT_SERVICE_FAILED                   0xC0001F51L
-#define EVENT_BROWSER_DOMAIN_LIST_FAILED                         0x80001F56L
-#define EVENT_BROWSER_DOMAIN_LIST_RETRIEVED                      0x00001F5AL
-#define EVENT_BROWSER_ELECTION_SENT_LANMAN_NT_STARTED            0x40001F4FL
-#define EVENT_BROWSER_ELECTION_SENT_LANMAN_NT_STOPPED            0x40001F61L
-#define EVENT_BROWSER_ELECTION_SENT_ROLE_CHANGED                 0x40001F63L
-#define EVENT_BROWSER_GETBLIST_RECEIVED_NOT_MASTER               0xC0001F62L
-#define EVENT_BROWSER_ILLEGAL_CONFIG                             0x80001F57L
-#define EVENT_BROWSER_MASTER_PROMOTION_FAILED                    0xC0001F49L
-#define EVENT_BROWSER_MASTER_PROMOTION_FAILED_NO_MASTER          0xC0001F54L
-#define EVENT_BROWSER_MASTER_PROMOTION_FAILED_STOPPING           0xC0001F53L
-#define EVENT_BROWSER_NOT_STARTED_IPX_CONFIG_MISMATCH            0xC0001F64L
-#define EVENT_BROWSER_OTHERDOMAIN_ADD_FAILED                     0xC0001F4BL
-#define EVENT_BROWSER_ROLE_CHANGE_FAILED                         0xC0001F48L
-#define EVENT_BROWSER_SERVER_LIST_FAILED                         0x80001F55L
-#define EVENT_BROWSER_SERVER_LIST_RETRIEVED                      0x00001F59L
-#define EVENT_BROWSER_STATUS_BITS_UPDATE_FAILED                  0xC0001F47L
-#define EVENT_CALL_TO_FUNCTION_FAILED                            0xC0001B5DL
-#define EVENT_CALL_TO_FUNCTION_FAILED_II                         0xC0001B5EL
-#define EVENT_CIRCULAR_DEPENDENCY_AUTO                           0xC0001B6AL
-#define EVENT_CIRCULAR_DEPENDENCY_DEMAND                         0xC0001B69L
-#define EVENT_COMMAND_NOT_INTERACTIVE                            0xC0001EDCL
-#define EVENT_COMMAND_START_FAILED                               0xC0001EDDL
-#define EVENT_CONNECTION_TIMEOUT                                 0xC0001B61L
-#define EVENT_ComputerNameChange                                 0x8000177BL
-#define EVENT_DAV_REDIR_DELAYED_WRITE_FAILED                     0x800039D0L
-#define EVENT_DCOM_ASSERTION_FAILURE                             0xC000271CL
-#define EVENT_DCOM_COMPLUS_DISABLED                              0xC000271EL
-#define EVENT_DCOM_INVALID_ENDPOINT_DATA                         0xC000271DL
-#define EVENT_DEPEND_ON_LATER_GROUP                              0xC0001B6CL
-#define EVENT_DEPEND_ON_LATER_SERVICE                            0xC0001B6BL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_NOTSUPP               0x80002BAEL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_NOTSUPP_PRIMARY_DN    0x80002BBAL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_OTHER                 0x80002BB1L
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_OTHER_PRIMARY_DN      0x80002BBDL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_REFUSED               0x80002BAFL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_REFUSED_PRIMARY_DN    0x80002BBBL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SECURITY              0x80002BB0L
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SECURITY_PRIMARY_DN   0x80002BBCL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SERVERFAIL            0x80002BADL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SERVERFAIL_PRIMARY_DN 0x80002BB9L
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_TIMEOUT               0x80002BACL
-#define EVENT_DNSAPI_DEREGISTRATION_FAILED_TIMEOUT_PRIMARY_DN    0x80002BB8L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_NOTSUPP           0x80002BB4L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_OTHER             0x80002BB7L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_REFUSED           0x80002BB5L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_SECURITY          0x80002BB6L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_SERVERFAIL        0x80002BB3L
-#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_TIMEOUT           0x80002BB2L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_NOTSUPP             0x80002B96L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_OTHER               0x80002B99L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_REFUSED             0x80002B97L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_SECURITY            0x80002B98L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_SERVERFAIL          0x80002B95L
-#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_TIMEOUT             0x80002B94L
-#define EVENT_DNSAPI_REGISTERED_ADAPTER                          0x40002BC0L
-#define EVENT_DNSAPI_REGISTERED_ADAPTER_PRIMARY_DN               0x40002BC2L
-#define EVENT_DNSAPI_REGISTERED_PTR                              0x40002BC1L
-#define EVENT_DNSAPI_REGISTRATION_FAILED_NOTSUPP                 0x80002B90L
-#define EVENT_DNSAPI_REGISTRATION_FAILED_NOTSUPP_PRIMARY_DN      0x80002B9CL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_OTHER                   0x80002B93L
-#define EVENT_DNSAPI_REGISTRATION_FAILED_OTHER_PRIMARY_DN        0x80002B9FL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_REFUSED                 0x80002B91L
-#define EVENT_DNSAPI_REGISTRATION_FAILED_REFUSED_PRIMARY_DN      0x80002B9DL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_SECURITY                0x80002B92L
-#define EVENT_DNSAPI_REGISTRATION_FAILED_SECURITY_PRIMARY_DN     0x80002B9EL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_SERVERFAIL              0x80002B8FL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_SERVERFAIL_PRIMARY_DN   0x80002B9BL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_TIMEOUT                 0x80002B8EL
-#define EVENT_DNSAPI_REGISTRATION_FAILED_TIMEOUT_PRIMARY_DN      0x80002B9AL
-#define EVENT_DNSDomainNameChange                                0x8000177CL
-#define EVENT_DNS_CACHE_NETWORK_PERF_WARNING                     0x80002B2AL
-#define EVENT_DNS_CACHE_START_FAILURE_LOW_MEMORY                 0xC0002AFFL
-#define EVENT_DNS_CACHE_START_FAILURE_NO_CONTROL                 0xC0002AFAL
-#define EVENT_DNS_CACHE_START_FAILURE_NO_DLL                     0xC0002AF8L
-#define EVENT_DNS_CACHE_START_FAILURE_NO_DONE_EVENT              0xC0002AFBL
-#define EVENT_DNS_CACHE_START_FAILURE_NO_ENTRY                   0xC0002AF9L
-#define EVENT_DNS_CACHE_START_FAILURE_NO_RPC                     0xC0002AFCL
-#define EVENT_DNS_CACHE_START_FAILURE_NO_SHUTDOWN_NOTIFY         0xC0002AFDL
-#define EVENT_DNS_CACHE_START_FAILURE_NO_UPDATE                  0xC0002AFEL
-#define EVENT_DNS_CACHE_UNABLE_TO_REACH_SERVER_WARNING           0x80002B2BL
-#define EVENT_EQOS_ERROR_MACHINE_POLICY_KEYNAME_SIZE_ZERO        0xC0004142L
-#define EVENT_EQOS_ERROR_MACHINE_POLICY_KEYNAME_TOO_LONG         0xC0004140L
-#define EVENT_EQOS_ERROR_MACHINE_POLICY_REFERESH                 0xC000413CL
-#define EVENT_EQOS_ERROR_OPENING_MACHINE_POLICY_ROOT_KEY         0xC000413EL
-#define EVENT_EQOS_ERROR_OPENING_MACHINE_POLICY_SUBKEY           0xC0004144L
-#define EVENT_EQOS_ERROR_OPENING_USER_POLICY_ROOT_KEY            0xC000413FL
-#define EVENT_EQOS_ERROR_OPENING_USER_POLICY_SUBKEY              0xC0004145L
-#define EVENT_EQOS_ERROR_PROCESSING_MACHINE_POLICY_FIELD         0xC0004146L
-#define EVENT_EQOS_ERROR_PROCESSING_USER_POLICY_FIELD            0xC0004147L
-#define EVENT_EQOS_ERROR_SETTING_APP_MARKING                     0xC0004149L
-#define EVENT_EQOS_ERROR_SETTING_TCP_AUTOTUNING                  0xC0004148L
-#define EVENT_EQOS_ERROR_USER_POLICY_KEYNAME_SIZE_ZERO           0xC0004143L
-#define EVENT_EQOS_ERROR_USER_POLICY_KEYNAME_TOO_LONG            0xC0004141L
-#define EVENT_EQOS_ERROR_USER_POLICY_REFERESH                    0xC000413DL
-#define EVENT_EQOS_INFO_APP_MARKING_ALLOWED                      0x4000407FL
-#define EVENT_EQOS_INFO_APP_MARKING_IGNORED                      0x4000407EL
-#define EVENT_EQOS_INFO_APP_MARKING_NOT_CONFIGURED               0x4000407DL
-#define EVENT_EQOS_INFO_LOCAL_SETTING_DONT_USE_NLA               0x40004080L
-#define EVENT_EQOS_INFO_MACHINE_POLICY_REFRESH_NO_CHANGE         0x40004074L
-#define EVENT_EQOS_INFO_MACHINE_POLICY_REFRESH_WITH_CHANGE       0x40004075L
-#define EVENT_EQOS_INFO_TCP_AUTOTUNING_HIGHLY_RESTRICTED         0x4000407AL
-#define EVENT_EQOS_INFO_TCP_AUTOTUNING_NORMAL                    0x4000407CL
-#define EVENT_EQOS_INFO_TCP_AUTOTUNING_NOT_CONFIGURED            0x40004078L
-#define EVENT_EQOS_INFO_TCP_AUTOTUNING_OFF                       0x40004079L
-#define EVENT_EQOS_INFO_TCP_AUTOTUNING_RESTRICTED                0x4000407BL
-#define EVENT_EQOS_INFO_USER_POLICY_REFRESH_NO_CHANGE            0x40004076L
-#define EVENT_EQOS_INFO_USER_POLICY_REFRESH_WITH_CHANGE          0x40004077L
-#define EVENT_EQOS_URL_QOS_APPLICATION_CONFLICT                  0x40004081L
-#define EVENT_EQOS_WARNING_MACHINE_POLICY_CONFLICT               0x800040E0L
-#define EVENT_EQOS_WARNING_MACHINE_POLICY_NO_FULLPATH_APPNAME    0x800040E2L
-#define EVENT_EQOS_WARNING_MACHINE_POLICY_PROFILE_NOT_SPECIFIED  0x800040DCL
-#define EVENT_EQOS_WARNING_MACHINE_POLICY_QUOTA_EXCEEDED         0x800040DEL
-#define EVENT_EQOS_WARNING_MACHINE_POLICY_VERSION                0x800040DAL
-#define EVENT_EQOS_WARNING_TEST_1                                0x800040D8L
-#define EVENT_EQOS_WARNING_TEST_2                                0x800040D9L
-#define EVENT_EQOS_WARNING_USER_POLICY_CONFLICT                  0x800040E1L
-#define EVENT_EQOS_WARNING_USER_POLICY_NO_FULLPATH_APPNAME       0x800040E3L
-#define EVENT_EQOS_WARNING_USER_POLICY_PROFILE_NOT_SPECIFIED     0x800040DDL
-#define EVENT_EQOS_WARNING_USER_POLICY_QUOTA_EXCEEDED            0x800040DFL
-#define EVENT_EQOS_WARNING_USER_POLICY_VERSION                   0x800040DBL
-#define EVENT_EventLogProductInfo                                0x80001779L
-#define EVENT_EventlogAbnormalShutdown                           0x80001778L
-#define EVENT_EventlogStarted                                    0x80001775L
-#define EVENT_EventlogStopped                                    0x80001776L
-#define EVENT_EventlogUptime                                     0x8000177DL
-#define EVENT_FIRST_LOGON_FAILED                                 0xC0001B65L
-#define EVENT_FIRST_LOGON_FAILED_II                              0xC0001B7EL
-#define EVENT_FRS_ACCESS_CHECKS_DISABLED                         0x800034CDL
-#define EVENT_FRS_ACCESS_CHECKS_FAILED_UNKNOWN                   0xC00034CFL
-#define EVENT_FRS_ACCESS_CHECKS_FAILED_USER                      0x800034CEL
-#define EVENT_FRS_ASSERT                                         0xC00034C2L
-#define EVENT_FRS_BAD_REG_DATA                                   0x800034EBL
-#define EVENT_FRS_CANNOT_COMMUNICATE                             0xC00034C6L
-#define EVENT_FRS_CANNOT_CREATE_UUID                             0xC00034D4L
-#define EVENT_FRS_CANNOT_START_BACKUP_RESTORE_IN_PROGRESS        0xC00034D1L
-#define EVENT_FRS_CANT_OPEN_PREINSTALL                           0xC00034EFL
-#define EVENT_FRS_CANT_OPEN_STAGE                                0xC00034EEL
-#define EVENT_FRS_DATABASE_SPACE                                 0xC00034C7L
-#define EVENT_FRS_DISK_WRITE_CACHE_ENABLED                       0x800034C8L
-#define EVENT_FRS_DS_POLL_ERROR_SUMMARY                          0x800034FAL
-#define EVENT_FRS_DUPLICATE_IN_CXTION                            0xC00034F6L
-#define EVENT_FRS_DUPLICATE_IN_CXTION_SYSVOL                     0xC00034F5L
-#define EVENT_FRS_ERROR                                          0xC00034BCL
-#define EVENT_FRS_ERROR_REPLICA_SET_DELETED                      0x800034F8L
-#define EVENT_FRS_HUGE_FILE                                      0x800034D3L
-#define EVENT_FRS_IN_ERROR_STATE                                 0xC00034F3L
-#define EVENT_FRS_JET_1414                                       0xC00034C9L
-#define EVENT_FRS_JOIN_FAIL_TIME_SKEW                            0xC00034ECL
-#define EVENT_FRS_LONG_JOIN                                      0x800034C4L
-#define EVENT_FRS_LONG_JOIN_DONE                                 0x800034C5L
-#define EVENT_FRS_MOVED_PREEXISTING                              0x800034D0L
-#define EVENT_FRS_NO_DNS_ATTRIBUTE                               0x800034D5L
-#define EVENT_FRS_NO_SID                                         0xC00034D6L
-#define EVENT_FRS_OVERLAPS_LOGGING                               0xC00034E5L
-#define EVENT_FRS_OVERLAPS_OTHER_STAGE                           0xC00034E9L
-#define EVENT_FRS_OVERLAPS_ROOT                                  0xC00034E8L
-#define EVENT_FRS_OVERLAPS_STAGE                                 0xC00034E7L
-#define EVENT_FRS_OVERLAPS_WORKING                               0xC00034E6L
-#define EVENT_FRS_PREPARE_ROOT_FAILED                            0xC00034EAL
-#define EVENT_FRS_REPLICA_IN_JRNL_WRAP_ERROR                     0xC00034F9L
-#define EVENT_FRS_REPLICA_NO_ROOT_CHANGE                         0xC00034F4L
-#define EVENT_FRS_REPLICA_SET_CREATE_FAIL                        0xC00034F0L
-#define EVENT_FRS_REPLICA_SET_CREATE_OK                          0x400034F1L
-#define EVENT_FRS_REPLICA_SET_CXTIONS                            0x400034F2L
-#define EVENT_FRS_RMTCO_TIME_SKEW                                0xC00034EDL
-#define EVENT_FRS_ROOT_HAS_MOVED                                 0xC00034F7L
-#define EVENT_FRS_ROOT_NOT_VALID                                 0xC00034E3L
-#define EVENT_FRS_STAGE_NOT_VALID                                0xC00034E4L
-#define EVENT_FRS_STAGING_AREA_FULL                              0x800034D2L
-#define EVENT_FRS_STARTING                                       0x400034BDL
-#define EVENT_FRS_STOPPED                                        0x400034BFL
-#define EVENT_FRS_STOPPED_ASSERT                                 0xC00034C1L
-#define EVENT_FRS_STOPPED_FORCE                                  0xC00034C0L
-#define EVENT_FRS_STOPPING                                       0x400034BEL
-#define EVENT_FRS_SYSVOL_NOT_READY                               0x800034CAL
-#define EVENT_FRS_SYSVOL_NOT_READY_PRIMARY                       0x800034CBL
-#define EVENT_FRS_SYSVOL_READY                                   0x400034CCL
-#define EVENT_FRS_VOLUME_NOT_SUPPORTED                           0xC00034C3L
-#define EVENT_INVALID_DRIVER_DEPENDENCY                          0xC0001B67L
-#define EVENT_IPX_CREATE_DEVICE                                  0xC0002522L
-#define EVENT_IPX_ILLEGAL_CONFIG                                 0x8000251FL
-#define EVENT_IPX_INTERNAL_NET_INVALID                           0xC0002520L
-#define EVENT_IPX_NEW_DEFAULT_TYPE                               0x4000251DL
-#define EVENT_IPX_NO_ADAPTERS                                    0xC0002523L
-#define EVENT_IPX_NO_FRAME_TYPES                                 0xC0002521L
-#define EVENT_IPX_SAP_ANNOUNCE                                   0x8000251EL
-#define EVENT_NBT_BAD_BACKUP_WINS_ADDR                           0x800010D0L
-#define EVENT_NBT_BAD_PRIMARY_WINS_ADDR                          0x800010D1L
-#define EVENT_NBT_CREATE_ADDRESS                                 0xC00010D3L
-#define EVENT_NBT_CREATE_CONNECTION                              0xC00010D4L
-#define EVENT_NBT_CREATE_DEVICE                                  0xC00010D7L
-#define EVENT_NBT_CREATE_DRIVER                                  0xC00010CCL
-#define EVENT_NBT_DUPLICATE_NAME                                 0xC00010DFL
-#define EVENT_NBT_DUPLICATE_NAME_ERROR                           0xC00010E1L
-#define EVENT_NBT_NAME_RELEASE                                   0xC00010E0L
-#define EVENT_NBT_NAME_SERVER_ADDRS                              0xC00010D2L
-#define EVENT_NBT_NON_OS_INIT                                    0xC00010D5L
-#define EVENT_NBT_NO_BACKUP_WINS                                 0x800010CEL
-#define EVENT_NBT_NO_DEVICES                                     0x800010D8L
-#define EVENT_NBT_NO_RESOURCES                                   0xC00010E2L
-#define EVENT_NBT_NO_WINS                                        0x800010CFL
-#define EVENT_NBT_OPEN_REG_LINKAGE                               0xC00010D9L
-#define EVENT_NBT_OPEN_REG_NAMESERVER                            0x800010DCL
-#define EVENT_NBT_OPEN_REG_PARAMS                                0xC00010CDL
-#define EVENT_NBT_READ_BIND                                      0xC00010DAL
-#define EVENT_NBT_READ_EXPORT                                    0xC00010DBL
-#define EVENT_NBT_TIMERS                                         0xC00010D6L
-#define EVENT_NDIS_ADAPTER_CHECK_ERROR                           0xC00013A7L
-#define EVENT_NDIS_ADAPTER_DISABLED                              0x80001396L
-#define EVENT_NDIS_ADAPTER_NOT_FOUND                             0xC000138BL
-#define EVENT_NDIS_BAD_IO_BASE_ADDRESS                           0xC0001394L
-#define EVENT_NDIS_BAD_VERSION                                   0xC000138EL
-#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR                      0x800013A9L
-#define EVENT_NDIS_DMA_CONFLICT                                  0x8000139BL
-#define EVENT_NDIS_DRIVER_FAILURE                                0xC000138DL
-#define EVENT_NDIS_HARDWARE_FAILURE                              0xC000138AL
-#define EVENT_NDIS_INTERRUPT_CONFLICT                            0x8000139AL
-#define EVENT_NDIS_INTERRUPT_CONNECT                             0xC000138CL
-#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR                   0xC000139CL
-#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER                    0xC0001392L
-#define EVENT_NDIS_IO_PORT_CONFLICT                              0x80001397L
-#define EVENT_NDIS_LOBE_FAILUE_ERROR                             0x800013A3L
-#define EVENT_NDIS_MAXFRAMESIZE_ERROR                            0x8000139FL
-#define EVENT_NDIS_MAXINTERNALBUFS_ERROR                         0x800013A0L
-#define EVENT_NDIS_MAXMULTICAST_ERROR                            0x800013A1L
-#define EVENT_NDIS_MAXRECEIVES_ERROR                             0x8000139DL
-#define EVENT_NDIS_MAXTRANSMITS_ERROR                            0x8000139EL
-#define EVENT_NDIS_MEMORY_CONFLICT                               0x80001399L
-#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER               0xC0001393L
-#define EVENT_NDIS_NETWORK_ADDRESS                               0xC0001390L
-#define EVENT_NDIS_OUT_OF_RESOURCE                               0xC0001389L
-#define EVENT_NDIS_PORT_OR_DMA_CONFLICT                          0x80001398L
-#define EVENT_NDIS_PRODUCTID_ERROR                               0x800013A2L
-#define EVENT_NDIS_RECEIVE_SPACE_SMALL                           0x40001395L
-#define EVENT_NDIS_REMOVE_RECEIVED_ERROR                         0x800013A5L
-#define EVENT_NDIS_RESET_FAILURE_CORRECTION                      0x800013AAL
-#define EVENT_NDIS_RESET_FAILURE_ERROR                           0x800013A8L
-#define EVENT_NDIS_RESOURCE_CONFLICT                             0xC0001388L
-#define EVENT_NDIS_SIGNAL_LOSS_ERROR                             0x800013A4L
-#define EVENT_NDIS_TIMEOUT                                       0x8000138FL
-#define EVENT_NDIS_TOKEN_RING_CORRECTION                         0x400013A6L
-#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION                     0xC0001391L
-#define EVENT_PS_ADMISSIONCONTROL_OVERFLOW                       0x8000371FL
-#define EVENT_PS_BAD_BESTEFFORT_LIMIT                            0x80003714L
-#define EVENT_PS_BINDING_FAILED                                  0xC0003718L
-#define EVENT_PS_GPC_REGISTER_FAILED                             0xC00036B0L
-#define EVENT_PS_INIT_DEVICE_FAILED                              0xC000371BL
-#define EVENT_PS_MISSING_ADAPTER_REGISTRY_DATA                   0xC0003719L
-#define EVENT_PS_NETWORK_ADDRESS_FAIL                            0xC0003720L
-#define EVENT_PS_NO_RESOURCES_FOR_INIT                           0xC00036B1L
-#define EVENT_PS_QUERY_OID_GEN_LINK_SPEED                        0xC0003717L
-#define EVENT_PS_QUERY_OID_GEN_MAXIMUM_FRAME_SIZE                0xC0003715L
-#define EVENT_PS_QUERY_OID_GEN_MAXIMUM_TOTAL_SIZE                0xC0003716L
-#define EVENT_PS_REGISTER_ADDRESS_FAMILY_FAILED                  0xC000371AL
-#define EVENT_PS_REGISTER_MINIPORT_FAILED                        0xC00036B3L
-#define EVENT_PS_REGISTER_PROTOCOL_FAILED                        0xC00036B2L
-#define EVENT_PS_RESOURCE_POOL                                   0xC000371EL
-#define EVENT_PS_WAN_LIMITED_BESTEFFORT                          0x8000371DL
-#define EVENT_PS_WMI_INSTANCE_NAME_FAILED                        0xC000371CL
-#define EVENT_RDR_AT_THREAD_MAX                                  0x80000BD2L
-#define EVENT_RDR_CANT_BIND_TRANSPORT                            0x80000BD8L
-#define EVENT_RDR_CANT_BUILD_SMB_HEADER                          0x80000BDBL
-#define EVENT_RDR_CANT_CREATE_DEVICE                             0x80000BBAL
-#define EVENT_RDR_CANT_CREATE_THREAD                             0x80000BBBL
-#define EVENT_RDR_CANT_GET_SECURITY_CONTEXT                      0x80000BDAL
-#define EVENT_RDR_CANT_READ_REGISTRY                             0x80000BD3L
-#define EVENT_RDR_CANT_REGISTER_ADDRESS                          0x80000BD9L
-#define EVENT_RDR_CANT_SET_THREAD                                0x80000BBCL
-#define EVENT_RDR_CLOSE_BEHIND                                   0x80000BC3L
-#define EVENT_RDR_CONNECTION                                     0x80000BCBL
-#define EVENT_RDR_CONNECTION_REFERENCE                           0x80000BC7L
-#define EVENT_RDR_CONTEXTS                                       0x80000BD0L
-#define EVENT_RDR_DELAYED_SET_ATTRIBUTES_FAILED                  0x80000BD6L
-#define EVENT_RDR_DELETEONCLOSE_FAILED                           0x80000BD7L
-#define EVENT_RDR_DISPOSITION                                    0x80000BCFL
-#define EVENT_RDR_ENCRYPT                                        0x80000BCAL
-#define EVENT_RDR_FAILED_UNLOCK                                  0x80000BC1L
-#define EVENT_RDR_INVALID_LOCK_REPLY                             0x80000BBFL
-#define EVENT_RDR_INVALID_OPLOCK                                 0x80000BC6L
-#define EVENT_RDR_INVALID_REPLY                                  0x80000BBDL
-#define EVENT_RDR_INVALID_SMB                                    0x80000BBEL
-#define EVENT_RDR_MAXCMDS                                        0x80000BCDL
-#define EVENT_RDR_OPLOCK_SMB                                     0x80000BCEL
-#define EVENT_RDR_PRIMARY_TRANSPORT_CONNECT_FAILED               0x80000BD5L
-#define EVENT_RDR_RESOURCE_SHORTAGE                              0x80000BB9L
-#define EVENT_RDR_SECURITY_SIGNATURE_MISMATCH                    0x80000BDCL
-#define EVENT_RDR_SERVER_REFERENCE                               0x80000BC8L
-#define EVENT_RDR_SMB_REFERENCE                                  0x80000BC9L
-#define EVENT_RDR_TIMEOUT                                        0x80000BC5L
-#define EVENT_RDR_TIMEZONE_BIAS_TOO_LARGE                        0x80000BD4L
-#define EVENT_RDR_UNEXPECTED_ERROR                               0x80000BC4L
-#define EVENT_RDR_WRITE_BEHIND_FLUSH_FAILED                      0x80000BD1L
-#define EVENT_READFILE_TIMEOUT                                   0xC0001B62L
-#define EVENT_REVERTED_TO_LASTKNOWNGOOD                          0xC0001B5FL
-#define EVENT_RPCSS_ACTIVATION_ERROR                             0xC0002717L
-#define EVENT_RPCSS_CREATEPROCESS_FAILURE                        0xC0002710L
-#define EVENT_RPCSS_DEFAULT_LAUNCH_ACCESS_DENIED                 0xC0002713L
-#define EVENT_RPCSS_LAUNCH_ACCESS_DENIED                         0xC0002712L
-#define EVENT_RPCSS_REMOTE_SIDE_ERROR                            0xC0002716L
-#define EVENT_RPCSS_REMOTE_SIDE_ERROR_WITH_FILE                  0xC0002718L
-#define EVENT_RPCSS_REMOTE_SIDE_UNAVAILABLE                      0xC0002719L
-#define EVENT_RPCSS_RUNAS_CANT_LOGIN                             0xC0002714L
-#define EVENT_RPCSS_RUNAS_CREATEPROCESS_FAILURE                  0xC0002711L
-#define EVENT_RPCSS_SERVER_NOT_RESPONDING                        0xC000271BL
-#define EVENT_RPCSS_SERVER_START_TIMEOUT                         0xC000271AL
-#define EVENT_RPCSS_START_SERVICE_FAILURE                        0xC0002715L
-#define EVENT_RUNNING_LASTKNOWNGOOD                              0xC0001B73L
-#define EVENT_SCOPE_LABEL_TOO_LONG                               0x800010DDL
-#define EVENT_SCOPE_TOO_LONG                                     0x800010DEL
-#define EVENT_SECOND_LOGON_FAILED                                0xC0001B66L
-#define EVENT_SERVICE_CONFIG_BACKOUT_FAILED                      0xC0001B7DL
-#define EVENT_SERVICE_CONTROL_SUCCESS                            0x40001B7BL
-#define EVENT_SERVICE_CRASH                                      0xC0001B77L
-#define EVENT_SERVICE_CRASH_NO_ACTION                            0xC0001B7AL
-#define EVENT_SERVICE_DIFFERENT_PID_CONNECTED                    0x80001B7FL
-#define EVENT_SERVICE_EXIT_FAILED                                0xC0001B6FL
-#define EVENT_SERVICE_EXIT_FAILED_SPECIFIC                       0xC0001B70L
-#define EVENT_SERVICE_LOGON_TYPE_NOT_GRANTED                     0xC0001B81L
-#define EVENT_SERVICE_NOT_INTERACTIVE                            0xC0001B76L
-#define EVENT_SERVICE_RECOVERY_FAILED                            0xC0001B78L
-#define EVENT_SERVICE_SCESRV_FAILED                              0xC0001B79L
-#define EVENT_SERVICE_SHUTDOWN_FAILED                            0xC0001B83L
-#define EVENT_SERVICE_START_AT_BOOT_FAILED                       0xC0001B71L
-#define EVENT_SERVICE_START_FAILED                               0xC0001B58L
-#define EVENT_SERVICE_START_FAILED_GROUP                         0xC0001B5AL
-#define EVENT_SERVICE_START_FAILED_II                            0xC0001B59L
-#define EVENT_SERVICE_START_FAILED_NONE                          0xC0001B5BL
-#define EVENT_SERVICE_START_HUNG                                 0xC0001B6EL
-#define EVENT_SERVICE_START_TYPE_CHANGED                         0x40001B80L
-#define EVENT_SERVICE_STATUS_SUCCESS                             0x40001B7CL
-#define EVENT_SERVICE_STOP_SUCCESS_WITH_REASON                   0x40001B82L
-#define EVENT_SEVERE_SERVICE_FAILED                              0xC0001B6DL
-#define EVENT_SRV_CANT_BIND_DUP_NAME                             0xC00009C9L
-#define EVENT_SRV_CANT_BIND_TO_TRANSPORT                         0x800009C8L
-#define EVENT_SRV_CANT_CHANGE_DOMAIN_NAME                        0x800009D0L
-#define EVENT_SRV_CANT_CREATE_DEVICE                             0xC00007D2L
-#define EVENT_SRV_CANT_CREATE_PROCESS                            0xC00007D3L
-#define EVENT_SRV_CANT_CREATE_THREAD                             0xC00007D4L
-#define EVENT_SRV_CANT_GROW_TABLE                                0x800007D9L
-#define EVENT_SRV_CANT_LOAD_DRIVER                               0x800009CCL
-#define EVENT_SRV_CANT_MAP_ERROR                                 0x800009CEL
-#define EVENT_SRV_CANT_OPEN_NPFS                                 0xC00007D7L
-#define EVENT_SRV_CANT_RECREATE_SHARE                            0x800009CFL
-#define EVENT_SRV_CANT_START_SCAVENGER                           0xC00007DAL
-#define EVENT_SRV_CANT_UNLOAD_DRIVER                             0x800009CDL
-#define EVENT_SRV_DISK_FULL                                      0x800007DDL
-#define EVENT_SRV_DOS_ATTACK_DETECTED                            0x800007E9L
-#define EVENT_SRV_INVALID_REGISTRY_VALUE                         0x800009CAL
-#define EVENT_SRV_INVALID_REQUEST                                0xC00007D6L
-#define EVENT_SRV_INVALID_SD                                     0x800009CBL
-#define EVENT_SRV_IRP_STACK_SIZE                                 0xC00007DBL
-#define EVENT_SRV_KEY_NOT_CREATED                                0xC00009C6L
-#define EVENT_SRV_KEY_NOT_FOUND                                  0xC00009C5L
-#define EVENT_SRV_NETWORK_ERROR                                  0x800007DCL
-#define EVENT_SRV_NONPAGED_POOL_LIMIT                            0xC00007E1L
-#define EVENT_SRV_NO_BLOCKING_IO                                 0x800007E8L
-#define EVENT_SRV_NO_FREE_CONNECTIONS                            0x800007E6L
-#define EVENT_SRV_NO_FREE_RAW_WORK_ITEM                          0x800007E7L
-#define EVENT_SRV_NO_NONPAGED_POOL                               0xC00007E3L
-#define EVENT_SRV_NO_PAGED_POOL                                  0xC00007E4L
-#define EVENT_SRV_NO_TRANSPORTS_BOUND                            0xC00009C7L
-#define EVENT_SRV_NO_VIRTUAL_MEMORY                              0xC00007E0L
-#define EVENT_SRV_NO_WORK_ITEM                                   0x800007E5L
-#define EVENT_SRV_OUT_OF_WORK_ITEM_DOS                           0x800007EBL
-#define EVENT_SRV_PAGED_POOL_LIMIT                               0xC00007E2L
-#define EVENT_SRV_RESOURCE_SHORTAGE                              0xC00007D1L
-#define EVENT_SRV_SERVICE_FAILED                                 0xC00007D0L
-#define EVENT_SRV_TOO_MANY_DOS                                   0x800007EAL
-#define EVENT_SRV_TXF_INIT_FAILED                                0x800009D1L
-#define EVENT_SRV_UNEXPECTED_DISC                                0xC00007D5L
-#define EVENT_STREAMS_ALLOCB_FAILURE                             0x80000FA1L
-#define EVENT_STREAMS_ALLOCB_FAILURE_CNT                         0x80000FA2L
-#define EVENT_STREAMS_ESBALLOC_FAILURE                           0x80000FA3L
-#define EVENT_STREAMS_ESBALLOC_FAILURE_CNT                       0x80000FA4L
-#define EVENT_STREAMS_STRLOG                                     0xC0000FA0L
-#define EVENT_TAKE_OWNERSHIP                                     0xC0001B74L
-#define EVENT_TCPIP6_STARTED                                     0x40000C1CL
-#define EVENT_TCPIP_ADAPTER_REG_FAILURE                          0xC000105FL
-#define EVENT_TCPIP_ADDRESS_CONFLICT1                            0xC0001066L
-#define EVENT_TCPIP_ADDRESS_CONFLICT2                            0xC0001067L
-#define EVENT_TCPIP_CREATE_DEVICE_FAILED                         0xC0001004L
-#define EVENT_TCPIP_DHCP_INIT_FAILED                             0x8000105EL
-#define EVENT_TCPIP_INVALID_ADDRESS                              0xC000105BL
-#define EVENT_TCPIP_INVALID_DEFAULT_GATEWAY                      0x80001060L
-#define EVENT_TCPIP_INVALID_MASK                                 0xC000105CL
-#define EVENT_TCPIP_IPV4_UNINSTALLED                             0x4000106BL
-#define EVENT_TCPIP_IP_INIT_FAILED                               0xC0001064L
-#define EVENT_TCPIP_MEDIA_CONNECT                                0x40001069L
-#define EVENT_TCPIP_MEDIA_DISCONNECT                             0x4000106AL
-#define EVENT_TCPIP_NO_ADAPTER_RESOURCES                         0xC000105DL
-#define EVENT_TCPIP_NO_ADDRESS_LIST                              0xC0001061L
-#define EVENT_TCPIP_NO_BINDINGS                                  0xC0001063L
-#define EVENT_TCPIP_NO_MASK                                      0xC000105AL
-#define EVENT_TCPIP_NO_MASK_LIST                                 0xC0001062L
-#define EVENT_TCPIP_NO_RESOURCES_FOR_INIT                        0xC0001005L
-#define EVENT_TCPIP_NTE_CONTEXT_LIST_FAILURE                     0xC0001068L
-#define EVENT_TCPIP_TCP_CONNECT_LIMIT_REACHED                    0x80001082L
-#define EVENT_TCPIP_TCP_INIT_FAILED                              0xC0001081L
-#define EVENT_TCPIP_TCP_MPP_ATTACKS_DETECTED                     0x80001085L
-#define EVENT_TCPIP_TCP_TIME_WAIT_COLLISION                      0x80001083L
-#define EVENT_TCPIP_TCP_WSD_WS_RESTRICTED                        0x80001084L
-#define EVENT_TCPIP_TOO_MANY_GATEWAYS                            0x80001065L
-#define EVENT_TCPIP_TOO_MANY_NETS                                0xC0001059L
-#define EVENT_TCPIP_UDP_LIMIT_REACHED                            0x800010A9L
-#define EVENT_TRANSACT_INVALID                                   0xC0001B64L
-#define EVENT_TRANSACT_TIMEOUT                                   0xC0001B63L
-#define EVENT_TRANSPORT_ADAPTER_NOT_FOUND                        0xC000232EL
-#define EVENT_TRANSPORT_BAD_PROTOCOL                             0x40002333L
-#define EVENT_TRANSPORT_BINDING_FAILED                           0xC000232DL
-#define EVENT_TRANSPORT_QUERY_OID_FAILED                         0xC0002330L
-#define EVENT_TRANSPORT_REGISTER_FAILED                          0xC000232CL
-#define EVENT_TRANSPORT_RESOURCE_LIMIT                           0x8000232AL
-#define EVENT_TRANSPORT_RESOURCE_POOL                            0x80002329L
-#define EVENT_TRANSPORT_RESOURCE_SPECIFIC                        0x8000232BL
-#define EVENT_TRANSPORT_SET_OID_FAILED                           0xC000232FL
-#define EVENT_TRANSPORT_TOO_MANY_LINKS                           0x40002332L
-#define EVENT_TRANSPORT_TRANSFER_DATA                            0x40002331L
-#define EVENT_TRK_INTERNAL_ERROR                                 0xC00030D4L
-#define EVENT_TRK_SERVICE_CORRUPT_LOG                            0xC00030D7L
-#define EVENT_TRK_SERVICE_DUPLICATE_VOLIDS                       0x400030DBL
-#define EVENT_TRK_SERVICE_MOVE_QUOTA_EXCEEDED                    0x800030DCL
-#define EVENT_TRK_SERVICE_START_FAILURE                          0xC00030D6L
-#define EVENT_TRK_SERVICE_START_SUCCESS                          0x400030D5L
-#define EVENT_TRK_SERVICE_VOLUME_CLAIM                           0x400030DAL
-#define EVENT_TRK_SERVICE_VOLUME_CREATE                          0x400030D9L
-#define EVENT_TRK_SERVICE_VOL_QUOTA_EXCEEDED                     0x800030D8L
-#define EVENT_UP_DRIVER_ON_MP                                    0xC00017D4L
-#define EVENT_WEBCLIENT_CLOSE_DELETE_FAILED                      0x80003A36L
-#define EVENT_WEBCLIENT_CLOSE_PROPPATCH_FAILED                   0x80003A37L
-#define EVENT_WEBCLIENT_CLOSE_PUT_FAILED                         0x80003A35L
-#define EVENT_WEBCLIENT_SETINFO_PROPPATCH_FAILED                 0x80003A38L
-#define EVENT_WMI_CANT_GET_EVENT_DATA                            0x80002F49L
-#define EVENT_WMI_CANT_OPEN_DEVICE                               0xC0002EE0L
-#define EVENT_WMI_CANT_RESOLVE_INSTANCE                          0x80002F48L
-#define EVENT_WMI_INVALID_MOF                                    0x80002F44L
-#define EVENT_WMI_INVALID_REGINFO                                0x80002F46L
-#define EVENT_WMI_INVALID_REGPATH                                0x80002F47L
-#define EVENT_WMI_MOF_LOAD_FAILURE                               0x80002F45L
-#define EVENT_WSK_OWNINGTHREAD_PARAMETER_IGNORED                 0xC0003E80L
+#define EVENT_BAD_ACCOUNT_NAME                                   __MSABI_LONG(0xC0001B60)
+#define EVENT_BAD_SERVICE_STATE                                  __MSABI_LONG(0xC0001B68)
+#define EVENT_BOOT_SYSTEM_DRIVERS_FAILED                         __MSABI_LONG(0xC0001B72)
+#define EVENT_BOWSER_CANT_READ_REGISTRY                          __MSABI_LONG(0x40001F5D)
+#define EVENT_BOWSER_ELECTION_RECEIVED                           __MSABI_LONG(0x00001F4C)
+#define EVENT_BOWSER_ELECTION_SENT_FIND_MASTER_FAILED            __MSABI_LONG(0x40001F4E)
+#define EVENT_BOWSER_ELECTION_SENT_GETBLIST_FAILED               __MSABI_LONG(0x40001F4D)
+#define EVENT_BOWSER_GETBROWSERLIST_THRESHOLD_EXCEEDED           __MSABI_LONG(0x40001F5F)
+#define EVENT_BOWSER_ILLEGAL_DATAGRAM                            __MSABI_LONG(0x80001F46)
+#define EVENT_BOWSER_ILLEGAL_DATAGRAM_THRESHOLD                  __MSABI_LONG(0xC0001F50)
+#define EVENT_BOWSER_MAILSLOT_DATAGRAM_THRESHOLD_EXCEEDED        __MSABI_LONG(0x40001F5E)
+#define EVENT_BOWSER_NAME_CONVERSION_FAILED                      __MSABI_LONG(0xC0001F4A)
+#define EVENT_BOWSER_NON_MASTER_MASTER_ANNOUNCE                  __MSABI_LONG(0x80001F45)
+#define EVENT_BOWSER_NON_PDC_WON_ELECTION                        __MSABI_LONG(0x40001F5C)
+#define EVENT_BOWSER_OLD_BACKUP_FOUND                            __MSABI_LONG(0x40001F58)
+#define EVENT_BOWSER_OTHER_MASTER_ON_NET                         __MSABI_LONG(0xC0001F43)
+#define EVENT_BOWSER_PDC_LOST_ELECTION                           __MSABI_LONG(0x40001F5B)
+#define EVENT_BOWSER_PROMOTED_WHILE_ALREADY_MASTER               __MSABI_LONG(0x80001F44)
+#define EVENT_BRIDGE_ADAPTER_BIND_FAILED                         __MSABI_LONG(0xC0003970)
+#define EVENT_BRIDGE_ADAPTER_FILTER_FAILED                       __MSABI_LONG(0xC000396E)
+#define EVENT_BRIDGE_ADAPTER_LINK_SPEED_QUERY_FAILED             __MSABI_LONG(0xC000396C)
+#define EVENT_BRIDGE_ADAPTER_MAC_ADDR_QUERY_FAILED               __MSABI_LONG(0xC000396D)
+#define EVENT_BRIDGE_ADAPTER_NAME_QUERY_FAILED                   __MSABI_LONG(0xC000396F)
+#define EVENT_BRIDGE_BUFFER_POOL_CREATION_FAILED                 __MSABI_LONG(0xC0003912)
+#define EVENT_BRIDGE_DEVICE_CREATION_FAILED                      __MSABI_LONG(0xC000390B)
+#define EVENT_BRIDGE_ETHERNET_NOT_OFFERED                        __MSABI_LONG(0xC000390E)
+#define EVENT_BRIDGE_INIT_MALLOC_FAILED                          __MSABI_LONG(0xC0003913)
+#define EVENT_BRIDGE_MINIPORT_INIT_FAILED                        __MSABI_LONG(0xC000390D)
+#define EVENT_BRIDGE_MINIPORT_REGISTER_FAILED                    __MSABI_LONG(0xC000390A)
+#define EVENT_BRIDGE_MINIPROT_DEVNAME_MISSING                    __MSABI_LONG(0xC0003909)
+#define EVENT_BRIDGE_NO_BRIDGE_MAC_ADDR                          __MSABI_LONG(0xC000390C)
+#define EVENT_BRIDGE_PACKET_POOL_CREATION_FAILED                 __MSABI_LONG(0xC0003911)
+#define EVENT_BRIDGE_PROTOCOL_REGISTER_FAILED                    __MSABI_LONG(0xC0003908)
+#define EVENT_BRIDGE_THREAD_CREATION_FAILED                      __MSABI_LONG(0xC000390F)
+#define EVENT_BRIDGE_THREAD_REF_FAILED                           __MSABI_LONG(0xC0003910)
+#define EVENT_BROWSER_BACKUP_STOPPED                             __MSABI_LONG(0xC0001F60)
+#define EVENT_BROWSER_DEPENDANT_SERVICE_FAILED                   __MSABI_LONG(0xC0001F51)
+#define EVENT_BROWSER_DOMAIN_LIST_FAILED                         __MSABI_LONG(0x80001F56)
+#define EVENT_BROWSER_DOMAIN_LIST_RETRIEVED                      __MSABI_LONG(0x00001F5A)
+#define EVENT_BROWSER_ELECTION_SENT_LANMAN_NT_STARTED            __MSABI_LONG(0x40001F4F)
+#define EVENT_BROWSER_ELECTION_SENT_LANMAN_NT_STOPPED            __MSABI_LONG(0x40001F61)
+#define EVENT_BROWSER_ELECTION_SENT_ROLE_CHANGED                 __MSABI_LONG(0x40001F63)
+#define EVENT_BROWSER_GETBLIST_RECEIVED_NOT_MASTER               __MSABI_LONG(0xC0001F62)
+#define EVENT_BROWSER_ILLEGAL_CONFIG                             __MSABI_LONG(0x80001F57)
+#define EVENT_BROWSER_MASTER_PROMOTION_FAILED                    __MSABI_LONG(0xC0001F49)
+#define EVENT_BROWSER_MASTER_PROMOTION_FAILED_NO_MASTER          __MSABI_LONG(0xC0001F54)
+#define EVENT_BROWSER_MASTER_PROMOTION_FAILED_STOPPING           __MSABI_LONG(0xC0001F53)
+#define EVENT_BROWSER_NOT_STARTED_IPX_CONFIG_MISMATCH            __MSABI_LONG(0xC0001F64)
+#define EVENT_BROWSER_OTHERDOMAIN_ADD_FAILED                     __MSABI_LONG(0xC0001F4B)
+#define EVENT_BROWSER_ROLE_CHANGE_FAILED                         __MSABI_LONG(0xC0001F48)
+#define EVENT_BROWSER_SERVER_LIST_FAILED                         __MSABI_LONG(0x80001F55)
+#define EVENT_BROWSER_SERVER_LIST_RETRIEVED                      __MSABI_LONG(0x00001F59)
+#define EVENT_BROWSER_STATUS_BITS_UPDATE_FAILED                  __MSABI_LONG(0xC0001F47)
+#define EVENT_CALL_TO_FUNCTION_FAILED                            __MSABI_LONG(0xC0001B5D)
+#define EVENT_CALL_TO_FUNCTION_FAILED_II                         __MSABI_LONG(0xC0001B5E)
+#define EVENT_CIRCULAR_DEPENDENCY_AUTO                           __MSABI_LONG(0xC0001B6A)
+#define EVENT_CIRCULAR_DEPENDENCY_DEMAND                         __MSABI_LONG(0xC0001B69)
+#define EVENT_COMMAND_NOT_INTERACTIVE                            __MSABI_LONG(0xC0001EDC)
+#define EVENT_COMMAND_START_FAILED                               __MSABI_LONG(0xC0001EDD)
+#define EVENT_CONNECTION_TIMEOUT                                 __MSABI_LONG(0xC0001B61)
+#define EVENT_ComputerNameChange                                 __MSABI_LONG(0x8000177B)
+#define EVENT_DAV_REDIR_DELAYED_WRITE_FAILED                     __MSABI_LONG(0x800039D0)
+#define EVENT_DCOM_ASSERTION_FAILURE                             __MSABI_LONG(0xC000271C)
+#define EVENT_DCOM_COMPLUS_DISABLED                              __MSABI_LONG(0xC000271E)
+#define EVENT_DCOM_INVALID_ENDPOINT_DATA                         __MSABI_LONG(0xC000271D)
+#define EVENT_DEPEND_ON_LATER_GROUP                              __MSABI_LONG(0xC0001B6C)
+#define EVENT_DEPEND_ON_LATER_SERVICE                            __MSABI_LONG(0xC0001B6B)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_NOTSUPP               __MSABI_LONG(0x80002BAE)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_NOTSUPP_PRIMARY_DN    __MSABI_LONG(0x80002BBA)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_OTHER                 __MSABI_LONG(0x80002BB1)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_OTHER_PRIMARY_DN      __MSABI_LONG(0x80002BBD)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_REFUSED               __MSABI_LONG(0x80002BAF)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_REFUSED_PRIMARY_DN    __MSABI_LONG(0x80002BBB)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SECURITY              __MSABI_LONG(0x80002BB0)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SECURITY_PRIMARY_DN   __MSABI_LONG(0x80002BBC)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SERVERFAIL            __MSABI_LONG(0x80002BAD)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_SERVERFAIL_PRIMARY_DN __MSABI_LONG(0x80002BB9)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_TIMEOUT               __MSABI_LONG(0x80002BAC)
+#define EVENT_DNSAPI_DEREGISTRATION_FAILED_TIMEOUT_PRIMARY_DN    __MSABI_LONG(0x80002BB8)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_NOTSUPP           __MSABI_LONG(0x80002BB4)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_OTHER             __MSABI_LONG(0x80002BB7)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_REFUSED           __MSABI_LONG(0x80002BB5)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_SECURITY          __MSABI_LONG(0x80002BB6)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_SERVERFAIL        __MSABI_LONG(0x80002BB3)
+#define EVENT_DNSAPI_PTR_DEREGISTRATION_FAILED_TIMEOUT           __MSABI_LONG(0x80002BB2)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_NOTSUPP             __MSABI_LONG(0x80002B96)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_OTHER               __MSABI_LONG(0x80002B99)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_REFUSED             __MSABI_LONG(0x80002B97)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_SECURITY            __MSABI_LONG(0x80002B98)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_SERVERFAIL          __MSABI_LONG(0x80002B95)
+#define EVENT_DNSAPI_PTR_REGISTRATION_FAILED_TIMEOUT             __MSABI_LONG(0x80002B94)
+#define EVENT_DNSAPI_REGISTERED_ADAPTER                          __MSABI_LONG(0x40002BC0)
+#define EVENT_DNSAPI_REGISTERED_ADAPTER_PRIMARY_DN               __MSABI_LONG(0x40002BC2)
+#define EVENT_DNSAPI_REGISTERED_PTR                              __MSABI_LONG(0x40002BC1)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_NOTSUPP                 __MSABI_LONG(0x80002B90)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_NOTSUPP_PRIMARY_DN      __MSABI_LONG(0x80002B9C)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_OTHER                   __MSABI_LONG(0x80002B93)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_OTHER_PRIMARY_DN        __MSABI_LONG(0x80002B9F)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_REFUSED                 __MSABI_LONG(0x80002B91)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_REFUSED_PRIMARY_DN      __MSABI_LONG(0x80002B9D)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_SECURITY                __MSABI_LONG(0x80002B92)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_SECURITY_PRIMARY_DN     __MSABI_LONG(0x80002B9E)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_SERVERFAIL              __MSABI_LONG(0x80002B8F)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_SERVERFAIL_PRIMARY_DN   __MSABI_LONG(0x80002B9B)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_TIMEOUT                 __MSABI_LONG(0x80002B8E)
+#define EVENT_DNSAPI_REGISTRATION_FAILED_TIMEOUT_PRIMARY_DN      __MSABI_LONG(0x80002B9A)
+#define EVENT_DNSDomainNameChange                                __MSABI_LONG(0x8000177C)
+#define EVENT_DNS_CACHE_NETWORK_PERF_WARNING                     __MSABI_LONG(0x80002B2A)
+#define EVENT_DNS_CACHE_START_FAILURE_LOW_MEMORY                 __MSABI_LONG(0xC0002AFF)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_CONTROL                 __MSABI_LONG(0xC0002AFA)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_DLL                     __MSABI_LONG(0xC0002AF8)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_DONE_EVENT              __MSABI_LONG(0xC0002AFB)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_ENTRY                   __MSABI_LONG(0xC0002AF9)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_RPC                     __MSABI_LONG(0xC0002AFC)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_SHUTDOWN_NOTIFY         __MSABI_LONG(0xC0002AFD)
+#define EVENT_DNS_CACHE_START_FAILURE_NO_UPDATE                  __MSABI_LONG(0xC0002AFE)
+#define EVENT_DNS_CACHE_UNABLE_TO_REACH_SERVER_WARNING           __MSABI_LONG(0x80002B2B)
+#define EVENT_EQOS_ERROR_MACHINE_POLICY_KEYNAME_SIZE_ZERO        __MSABI_LONG(0xC0004142)
+#define EVENT_EQOS_ERROR_MACHINE_POLICY_KEYNAME_TOO_LONG         __MSABI_LONG(0xC0004140)
+#define EVENT_EQOS_ERROR_MACHINE_POLICY_REFERESH                 __MSABI_LONG(0xC000413C)
+#define EVENT_EQOS_ERROR_OPENING_MACHINE_POLICY_ROOT_KEY         __MSABI_LONG(0xC000413E)
+#define EVENT_EQOS_ERROR_OPENING_MACHINE_POLICY_SUBKEY           __MSABI_LONG(0xC0004144)
+#define EVENT_EQOS_ERROR_OPENING_USER_POLICY_ROOT_KEY            __MSABI_LONG(0xC000413F)
+#define EVENT_EQOS_ERROR_OPENING_USER_POLICY_SUBKEY              __MSABI_LONG(0xC0004145)
+#define EVENT_EQOS_ERROR_PROCESSING_MACHINE_POLICY_FIELD         __MSABI_LONG(0xC0004146)
+#define EVENT_EQOS_ERROR_PROCESSING_USER_POLICY_FIELD            __MSABI_LONG(0xC0004147)
+#define EVENT_EQOS_ERROR_SETTING_APP_MARKING                     __MSABI_LONG(0xC0004149)
+#define EVENT_EQOS_ERROR_SETTING_TCP_AUTOTUNING                  __MSABI_LONG(0xC0004148)
+#define EVENT_EQOS_ERROR_USER_POLICY_KEYNAME_SIZE_ZERO           __MSABI_LONG(0xC0004143)
+#define EVENT_EQOS_ERROR_USER_POLICY_KEYNAME_TOO_LONG            __MSABI_LONG(0xC0004141)
+#define EVENT_EQOS_ERROR_USER_POLICY_REFERESH                    __MSABI_LONG(0xC000413D)
+#define EVENT_EQOS_INFO_APP_MARKING_ALLOWED                      __MSABI_LONG(0x4000407F)
+#define EVENT_EQOS_INFO_APP_MARKING_IGNORED                      __MSABI_LONG(0x4000407E)
+#define EVENT_EQOS_INFO_APP_MARKING_NOT_CONFIGURED               __MSABI_LONG(0x4000407D)
+#define EVENT_EQOS_INFO_LOCAL_SETTING_DONT_USE_NLA               __MSABI_LONG(0x40004080)
+#define EVENT_EQOS_INFO_MACHINE_POLICY_REFRESH_NO_CHANGE         __MSABI_LONG(0x40004074)
+#define EVENT_EQOS_INFO_MACHINE_POLICY_REFRESH_WITH_CHANGE       __MSABI_LONG(0x40004075)
+#define EVENT_EQOS_INFO_TCP_AUTOTUNING_HIGHLY_RESTRICTED         __MSABI_LONG(0x4000407A)
+#define EVENT_EQOS_INFO_TCP_AUTOTUNING_NORMAL                    __MSABI_LONG(0x4000407C)
+#define EVENT_EQOS_INFO_TCP_AUTOTUNING_NOT_CONFIGURED            __MSABI_LONG(0x40004078)
+#define EVENT_EQOS_INFO_TCP_AUTOTUNING_OFF                       __MSABI_LONG(0x40004079)
+#define EVENT_EQOS_INFO_TCP_AUTOTUNING_RESTRICTED                __MSABI_LONG(0x4000407B)
+#define EVENT_EQOS_INFO_USER_POLICY_REFRESH_NO_CHANGE            __MSABI_LONG(0x40004076)
+#define EVENT_EQOS_INFO_USER_POLICY_REFRESH_WITH_CHANGE          __MSABI_LONG(0x40004077)
+#define EVENT_EQOS_URL_QOS_APPLICATION_CONFLICT                  __MSABI_LONG(0x40004081)
+#define EVENT_EQOS_WARNING_MACHINE_POLICY_CONFLICT               __MSABI_LONG(0x800040E0)
+#define EVENT_EQOS_WARNING_MACHINE_POLICY_NO_FULLPATH_APPNAME    __MSABI_LONG(0x800040E2)
+#define EVENT_EQOS_WARNING_MACHINE_POLICY_PROFILE_NOT_SPECIFIED  __MSABI_LONG(0x800040DC)
+#define EVENT_EQOS_WARNING_MACHINE_POLICY_QUOTA_EXCEEDED         __MSABI_LONG(0x800040DE)
+#define EVENT_EQOS_WARNING_MACHINE_POLICY_VERSION                __MSABI_LONG(0x800040DA)
+#define EVENT_EQOS_WARNING_TEST_1                                __MSABI_LONG(0x800040D8)
+#define EVENT_EQOS_WARNING_TEST_2                                __MSABI_LONG(0x800040D9)
+#define EVENT_EQOS_WARNING_USER_POLICY_CONFLICT                  __MSABI_LONG(0x800040E1)
+#define EVENT_EQOS_WARNING_USER_POLICY_NO_FULLPATH_APPNAME       __MSABI_LONG(0x800040E3)
+#define EVENT_EQOS_WARNING_USER_POLICY_PROFILE_NOT_SPECIFIED     __MSABI_LONG(0x800040DD)
+#define EVENT_EQOS_WARNING_USER_POLICY_QUOTA_EXCEEDED            __MSABI_LONG(0x800040DF)
+#define EVENT_EQOS_WARNING_USER_POLICY_VERSION                   __MSABI_LONG(0x800040DB)
+#define EVENT_EventLogProductInfo                                __MSABI_LONG(0x80001779)
+#define EVENT_EventlogAbnormalShutdown                           __MSABI_LONG(0x80001778)
+#define EVENT_EventlogStarted                                    __MSABI_LONG(0x80001775)
+#define EVENT_EventlogStopped                                    __MSABI_LONG(0x80001776)
+#define EVENT_EventlogUptime                                     __MSABI_LONG(0x8000177D)
+#define EVENT_FIRST_LOGON_FAILED                                 __MSABI_LONG(0xC0001B65)
+#define EVENT_FIRST_LOGON_FAILED_II                              __MSABI_LONG(0xC0001B7E)
+#define EVENT_FRS_ACCESS_CHECKS_DISABLED                         __MSABI_LONG(0x800034CD)
+#define EVENT_FRS_ACCESS_CHECKS_FAILED_UNKNOWN                   __MSABI_LONG(0xC00034CF)
+#define EVENT_FRS_ACCESS_CHECKS_FAILED_USER                      __MSABI_LONG(0x800034CE)
+#define EVENT_FRS_ASSERT                                         __MSABI_LONG(0xC00034C2)
+#define EVENT_FRS_BAD_REG_DATA                                   __MSABI_LONG(0x800034EB)
+#define EVENT_FRS_CANNOT_COMMUNICATE                             __MSABI_LONG(0xC00034C6)
+#define EVENT_FRS_CANNOT_CREATE_UUID                             __MSABI_LONG(0xC00034D4)
+#define EVENT_FRS_CANNOT_START_BACKUP_RESTORE_IN_PROGRESS        __MSABI_LONG(0xC00034D1)
+#define EVENT_FRS_CANT_OPEN_PREINSTALL                           __MSABI_LONG(0xC00034EF)
+#define EVENT_FRS_CANT_OPEN_STAGE                                __MSABI_LONG(0xC00034EE)
+#define EVENT_FRS_DATABASE_SPACE                                 __MSABI_LONG(0xC00034C7)
+#define EVENT_FRS_DISK_WRITE_CACHE_ENABLED                       __MSABI_LONG(0x800034C8)
+#define EVENT_FRS_DS_POLL_ERROR_SUMMARY                          __MSABI_LONG(0x800034FA)
+#define EVENT_FRS_DUPLICATE_IN_CXTION                            __MSABI_LONG(0xC00034F6)
+#define EVENT_FRS_DUPLICATE_IN_CXTION_SYSVOL                     __MSABI_LONG(0xC00034F5)
+#define EVENT_FRS_ERROR                                          __MSABI_LONG(0xC00034BC)
+#define EVENT_FRS_ERROR_REPLICA_SET_DELETED                      __MSABI_LONG(0x800034F8)
+#define EVENT_FRS_HUGE_FILE                                      __MSABI_LONG(0x800034D3)
+#define EVENT_FRS_IN_ERROR_STATE                                 __MSABI_LONG(0xC00034F3)
+#define EVENT_FRS_JET_1414                                       __MSABI_LONG(0xC00034C9)
+#define EVENT_FRS_JOIN_FAIL_TIME_SKEW                            __MSABI_LONG(0xC00034EC)
+#define EVENT_FRS_LONG_JOIN                                      __MSABI_LONG(0x800034C4)
+#define EVENT_FRS_LONG_JOIN_DONE                                 __MSABI_LONG(0x800034C5)
+#define EVENT_FRS_MOVED_PREEXISTING                              __MSABI_LONG(0x800034D0)
+#define EVENT_FRS_NO_DNS_ATTRIBUTE                               __MSABI_LONG(0x800034D5)
+#define EVENT_FRS_NO_SID                                         __MSABI_LONG(0xC00034D6)
+#define EVENT_FRS_OVERLAPS_LOGGING                               __MSABI_LONG(0xC00034E5)
+#define EVENT_FRS_OVERLAPS_OTHER_STAGE                           __MSABI_LONG(0xC00034E9)
+#define EVENT_FRS_OVERLAPS_ROOT                                  __MSABI_LONG(0xC00034E8)
+#define EVENT_FRS_OVERLAPS_STAGE                                 __MSABI_LONG(0xC00034E7)
+#define EVENT_FRS_OVERLAPS_WORKING                               __MSABI_LONG(0xC00034E6)
+#define EVENT_FRS_PREPARE_ROOT_FAILED                            __MSABI_LONG(0xC00034EA)
+#define EVENT_FRS_REPLICA_IN_JRNL_WRAP_ERROR                     __MSABI_LONG(0xC00034F9)
+#define EVENT_FRS_REPLICA_NO_ROOT_CHANGE                         __MSABI_LONG(0xC00034F4)
+#define EVENT_FRS_REPLICA_SET_CREATE_FAIL                        __MSABI_LONG(0xC00034F0)
+#define EVENT_FRS_REPLICA_SET_CREATE_OK                          __MSABI_LONG(0x400034F1)
+#define EVENT_FRS_REPLICA_SET_CXTIONS                            __MSABI_LONG(0x400034F2)
+#define EVENT_FRS_RMTCO_TIME_SKEW                                __MSABI_LONG(0xC00034ED)
+#define EVENT_FRS_ROOT_HAS_MOVED                                 __MSABI_LONG(0xC00034F7)
+#define EVENT_FRS_ROOT_NOT_VALID                                 __MSABI_LONG(0xC00034E3)
+#define EVENT_FRS_STAGE_NOT_VALID                                __MSABI_LONG(0xC00034E4)
+#define EVENT_FRS_STAGING_AREA_FULL                              __MSABI_LONG(0x800034D2)
+#define EVENT_FRS_STARTING                                       __MSABI_LONG(0x400034BD)
+#define EVENT_FRS_STOPPED                                        __MSABI_LONG(0x400034BF)
+#define EVENT_FRS_STOPPED_ASSERT                                 __MSABI_LONG(0xC00034C1)
+#define EVENT_FRS_STOPPED_FORCE                                  __MSABI_LONG(0xC00034C0)
+#define EVENT_FRS_STOPPING                                       __MSABI_LONG(0x400034BE)
+#define EVENT_FRS_SYSVOL_NOT_READY                               __MSABI_LONG(0x800034CA)
+#define EVENT_FRS_SYSVOL_NOT_READY_PRIMARY                       __MSABI_LONG(0x800034CB)
+#define EVENT_FRS_SYSVOL_READY                                   __MSABI_LONG(0x400034CC)
+#define EVENT_FRS_VOLUME_NOT_SUPPORTED                           __MSABI_LONG(0xC00034C3)
+#define EVENT_INVALID_DRIVER_DEPENDENCY                          __MSABI_LONG(0xC0001B67)
+#define EVENT_IPX_CREATE_DEVICE                                  __MSABI_LONG(0xC0002522)
+#define EVENT_IPX_ILLEGAL_CONFIG                                 __MSABI_LONG(0x8000251F)
+#define EVENT_IPX_INTERNAL_NET_INVALID                           __MSABI_LONG(0xC0002520)
+#define EVENT_IPX_NEW_DEFAULT_TYPE                               __MSABI_LONG(0x4000251D)
+#define EVENT_IPX_NO_ADAPTERS                                    __MSABI_LONG(0xC0002523)
+#define EVENT_IPX_NO_FRAME_TYPES                                 __MSABI_LONG(0xC0002521)
+#define EVENT_IPX_SAP_ANNOUNCE                                   __MSABI_LONG(0x8000251E)
+#define EVENT_NBT_BAD_BACKUP_WINS_ADDR                           __MSABI_LONG(0x800010D0)
+#define EVENT_NBT_BAD_PRIMARY_WINS_ADDR                          __MSABI_LONG(0x800010D1)
+#define EVENT_NBT_CREATE_ADDRESS                                 __MSABI_LONG(0xC00010D3)
+#define EVENT_NBT_CREATE_CONNECTION                              __MSABI_LONG(0xC00010D4)
+#define EVENT_NBT_CREATE_DEVICE                                  __MSABI_LONG(0xC00010D7)
+#define EVENT_NBT_CREATE_DRIVER                                  __MSABI_LONG(0xC00010CC)
+#define EVENT_NBT_DUPLICATE_NAME                                 __MSABI_LONG(0xC00010DF)
+#define EVENT_NBT_DUPLICATE_NAME_ERROR                           __MSABI_LONG(0xC00010E1)
+#define EVENT_NBT_NAME_RELEASE                                   __MSABI_LONG(0xC00010E0)
+#define EVENT_NBT_NAME_SERVER_ADDRS                              __MSABI_LONG(0xC00010D2)
+#define EVENT_NBT_NON_OS_INIT                                    __MSABI_LONG(0xC00010D5)
+#define EVENT_NBT_NO_BACKUP_WINS                                 __MSABI_LONG(0x800010CE)
+#define EVENT_NBT_NO_DEVICES                                     __MSABI_LONG(0x800010D8)
+#define EVENT_NBT_NO_RESOURCES                                   __MSABI_LONG(0xC00010E2)
+#define EVENT_NBT_NO_WINS                                        __MSABI_LONG(0x800010CF)
+#define EVENT_NBT_OPEN_REG_LINKAGE                               __MSABI_LONG(0xC00010D9)
+#define EVENT_NBT_OPEN_REG_NAMESERVER                            __MSABI_LONG(0x800010DC)
+#define EVENT_NBT_OPEN_REG_PARAMS                                __MSABI_LONG(0xC00010CD)
+#define EVENT_NBT_READ_BIND                                      __MSABI_LONG(0xC00010DA)
+#define EVENT_NBT_READ_EXPORT                                    __MSABI_LONG(0xC00010DB)
+#define EVENT_NBT_TIMERS                                         __MSABI_LONG(0xC00010D6)
+#define EVENT_NDIS_ADAPTER_CHECK_ERROR                           __MSABI_LONG(0xC00013A7)
+#define EVENT_NDIS_ADAPTER_DISABLED                              __MSABI_LONG(0x80001396)
+#define EVENT_NDIS_ADAPTER_NOT_FOUND                             __MSABI_LONG(0xC000138B)
+#define EVENT_NDIS_BAD_IO_BASE_ADDRESS                           __MSABI_LONG(0xC0001394)
+#define EVENT_NDIS_BAD_VERSION                                   __MSABI_LONG(0xC000138E)
+#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR                      __MSABI_LONG(0x800013A9)
+#define EVENT_NDIS_DMA_CONFLICT                                  __MSABI_LONG(0x8000139B)
+#define EVENT_NDIS_DRIVER_FAILURE                                __MSABI_LONG(0xC000138D)
+#define EVENT_NDIS_HARDWARE_FAILURE                              __MSABI_LONG(0xC000138A)
+#define EVENT_NDIS_INTERRUPT_CONFLICT                            __MSABI_LONG(0x8000139A)
+#define EVENT_NDIS_INTERRUPT_CONNECT                             __MSABI_LONG(0xC000138C)
+#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR                   __MSABI_LONG(0xC000139C)
+#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER                    __MSABI_LONG(0xC0001392)
+#define EVENT_NDIS_IO_PORT_CONFLICT                              __MSABI_LONG(0x80001397)
+#define EVENT_NDIS_LOBE_FAILUE_ERROR                             __MSABI_LONG(0x800013A3)
+#define EVENT_NDIS_MAXFRAMESIZE_ERROR                            __MSABI_LONG(0x8000139F)
+#define EVENT_NDIS_MAXINTERNALBUFS_ERROR                         __MSABI_LONG(0x800013A0)
+#define EVENT_NDIS_MAXMULTICAST_ERROR                            __MSABI_LONG(0x800013A1)
+#define EVENT_NDIS_MAXRECEIVES_ERROR                             __MSABI_LONG(0x8000139D)
+#define EVENT_NDIS_MAXTRANSMITS_ERROR                            __MSABI_LONG(0x8000139E)
+#define EVENT_NDIS_MEMORY_CONFLICT                               __MSABI_LONG(0x80001399)
+#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER               __MSABI_LONG(0xC0001393)
+#define EVENT_NDIS_NETWORK_ADDRESS                               __MSABI_LONG(0xC0001390)
+#define EVENT_NDIS_OUT_OF_RESOURCE                               __MSABI_LONG(0xC0001389)
+#define EVENT_NDIS_PORT_OR_DMA_CONFLICT                          __MSABI_LONG(0x80001398)
+#define EVENT_NDIS_PRODUCTID_ERROR                               __MSABI_LONG(0x800013A2)
+#define EVENT_NDIS_RECEIVE_SPACE_SMALL                           __MSABI_LONG(0x40001395)
+#define EVENT_NDIS_REMOVE_RECEIVED_ERROR                         __MSABI_LONG(0x800013A5)
+#define EVENT_NDIS_RESET_FAILURE_CORRECTION                      __MSABI_LONG(0x800013AA)
+#define EVENT_NDIS_RESET_FAILURE_ERROR                           __MSABI_LONG(0x800013A8)
+#define EVENT_NDIS_RESOURCE_CONFLICT                             __MSABI_LONG(0xC0001388)
+#define EVENT_NDIS_SIGNAL_LOSS_ERROR                             __MSABI_LONG(0x800013A4)
+#define EVENT_NDIS_TIMEOUT                                       __MSABI_LONG(0x8000138F)
+#define EVENT_NDIS_TOKEN_RING_CORRECTION                         __MSABI_LONG(0x400013A6)
+#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION                     __MSABI_LONG(0xC0001391)
+#define EVENT_PS_ADMISSIONCONTROL_OVERFLOW                       __MSABI_LONG(0x8000371F)
+#define EVENT_PS_BAD_BESTEFFORT_LIMIT                            __MSABI_LONG(0x80003714)
+#define EVENT_PS_BINDING_FAILED                                  __MSABI_LONG(0xC0003718)
+#define EVENT_PS_GPC_REGISTER_FAILED                             __MSABI_LONG(0xC00036B0)
+#define EVENT_PS_INIT_DEVICE_FAILED                              __MSABI_LONG(0xC000371B)
+#define EVENT_PS_MISSING_ADAPTER_REGISTRY_DATA                   __MSABI_LONG(0xC0003719)
+#define EVENT_PS_NETWORK_ADDRESS_FAIL                            __MSABI_LONG(0xC0003720)
+#define EVENT_PS_NO_RESOURCES_FOR_INIT                           __MSABI_LONG(0xC00036B1)
+#define EVENT_PS_QUERY_OID_GEN_LINK_SPEED                        __MSABI_LONG(0xC0003717)
+#define EVENT_PS_QUERY_OID_GEN_MAXIMUM_FRAME_SIZE                __MSABI_LONG(0xC0003715)
+#define EVENT_PS_QUERY_OID_GEN_MAXIMUM_TOTAL_SIZE                __MSABI_LONG(0xC0003716)
+#define EVENT_PS_REGISTER_ADDRESS_FAMILY_FAILED                  __MSABI_LONG(0xC000371A)
+#define EVENT_PS_REGISTER_MINIPORT_FAILED                        __MSABI_LONG(0xC00036B3)
+#define EVENT_PS_REGISTER_PROTOCOL_FAILED                        __MSABI_LONG(0xC00036B2)
+#define EVENT_PS_RESOURCE_POOL                                   __MSABI_LONG(0xC000371E)
+#define EVENT_PS_WAN_LIMITED_BESTEFFORT                          __MSABI_LONG(0x8000371D)
+#define EVENT_PS_WMI_INSTANCE_NAME_FAILED                        __MSABI_LONG(0xC000371C)
+#define EVENT_RDR_AT_THREAD_MAX                                  __MSABI_LONG(0x80000BD2)
+#define EVENT_RDR_CANT_BIND_TRANSPORT                            __MSABI_LONG(0x80000BD8)
+#define EVENT_RDR_CANT_BUILD_SMB_HEADER                          __MSABI_LONG(0x80000BDB)
+#define EVENT_RDR_CANT_CREATE_DEVICE                             __MSABI_LONG(0x80000BBA)
+#define EVENT_RDR_CANT_CREATE_THREAD                             __MSABI_LONG(0x80000BBB)
+#define EVENT_RDR_CANT_GET_SECURITY_CONTEXT                      __MSABI_LONG(0x80000BDA)
+#define EVENT_RDR_CANT_READ_REGISTRY                             __MSABI_LONG(0x80000BD3)
+#define EVENT_RDR_CANT_REGISTER_ADDRESS                          __MSABI_LONG(0x80000BD9)
+#define EVENT_RDR_CANT_SET_THREAD                                __MSABI_LONG(0x80000BBC)
+#define EVENT_RDR_CLOSE_BEHIND                                   __MSABI_LONG(0x80000BC3)
+#define EVENT_RDR_CONNECTION                                     __MSABI_LONG(0x80000BCB)
+#define EVENT_RDR_CONNECTION_REFERENCE                           __MSABI_LONG(0x80000BC7)
+#define EVENT_RDR_CONTEXTS                                       __MSABI_LONG(0x80000BD0)
+#define EVENT_RDR_DELAYED_SET_ATTRIBUTES_FAILED                  __MSABI_LONG(0x80000BD6)
+#define EVENT_RDR_DELETEONCLOSE_FAILED                           __MSABI_LONG(0x80000BD7)
+#define EVENT_RDR_DISPOSITION                                    __MSABI_LONG(0x80000BCF)
+#define EVENT_RDR_ENCRYPT                                        __MSABI_LONG(0x80000BCA)
+#define EVENT_RDR_FAILED_UNLOCK                                  __MSABI_LONG(0x80000BC1)
+#define EVENT_RDR_INVALID_LOCK_REPLY                             __MSABI_LONG(0x80000BBF)
+#define EVENT_RDR_INVALID_OPLOCK                                 __MSABI_LONG(0x80000BC6)
+#define EVENT_RDR_INVALID_REPLY                                  __MSABI_LONG(0x80000BBD)
+#define EVENT_RDR_INVALID_SMB                                    __MSABI_LONG(0x80000BBE)
+#define EVENT_RDR_MAXCMDS                                        __MSABI_LONG(0x80000BCD)
+#define EVENT_RDR_OPLOCK_SMB                                     __MSABI_LONG(0x80000BCE)
+#define EVENT_RDR_PRIMARY_TRANSPORT_CONNECT_FAILED               __MSABI_LONG(0x80000BD5)
+#define EVENT_RDR_RESOURCE_SHORTAGE                              __MSABI_LONG(0x80000BB9)
+#define EVENT_RDR_SECURITY_SIGNATURE_MISMATCH                    __MSABI_LONG(0x80000BDC)
+#define EVENT_RDR_SERVER_REFERENCE                               __MSABI_LONG(0x80000BC8)
+#define EVENT_RDR_SMB_REFERENCE                                  __MSABI_LONG(0x80000BC9)
+#define EVENT_RDR_TIMEOUT                                        __MSABI_LONG(0x80000BC5)
+#define EVENT_RDR_TIMEZONE_BIAS_TOO_LARGE                        __MSABI_LONG(0x80000BD4)
+#define EVENT_RDR_UNEXPECTED_ERROR                               __MSABI_LONG(0x80000BC4)
+#define EVENT_RDR_WRITE_BEHIND_FLUSH_FAILED                      __MSABI_LONG(0x80000BD1)
+#define EVENT_READFILE_TIMEOUT                                   __MSABI_LONG(0xC0001B62)
+#define EVENT_REVERTED_TO_LASTKNOWNGOOD                          __MSABI_LONG(0xC0001B5F)
+#define EVENT_RPCSS_ACTIVATION_ERROR                             __MSABI_LONG(0xC0002717)
+#define EVENT_RPCSS_CREATEPROCESS_FAILURE                        __MSABI_LONG(0xC0002710)
+#define EVENT_RPCSS_DEFAULT_LAUNCH_ACCESS_DENIED                 __MSABI_LONG(0xC0002713)
+#define EVENT_RPCSS_LAUNCH_ACCESS_DENIED                         __MSABI_LONG(0xC0002712)
+#define EVENT_RPCSS_REMOTE_SIDE_ERROR                            __MSABI_LONG(0xC0002716)
+#define EVENT_RPCSS_REMOTE_SIDE_ERROR_WITH_FILE                  __MSABI_LONG(0xC0002718)
+#define EVENT_RPCSS_REMOTE_SIDE_UNAVAILABLE                      __MSABI_LONG(0xC0002719)
+#define EVENT_RPCSS_RUNAS_CANT_LOGIN                             __MSABI_LONG(0xC0002714)
+#define EVENT_RPCSS_RUNAS_CREATEPROCESS_FAILURE                  __MSABI_LONG(0xC0002711)
+#define EVENT_RPCSS_SERVER_NOT_RESPONDING                        __MSABI_LONG(0xC000271B)
+#define EVENT_RPCSS_SERVER_START_TIMEOUT                         __MSABI_LONG(0xC000271A)
+#define EVENT_RPCSS_START_SERVICE_FAILURE                        __MSABI_LONG(0xC0002715)
+#define EVENT_RUNNING_LASTKNOWNGOOD                              __MSABI_LONG(0xC0001B73)
+#define EVENT_SCOPE_LABEL_TOO_LONG                               __MSABI_LONG(0x800010DD)
+#define EVENT_SCOPE_TOO_LONG                                     __MSABI_LONG(0x800010DE)
+#define EVENT_SECOND_LOGON_FAILED                                __MSABI_LONG(0xC0001B66)
+#define EVENT_SERVICE_CONFIG_BACKOUT_FAILED                      __MSABI_LONG(0xC0001B7D)
+#define EVENT_SERVICE_CONTROL_SUCCESS                            __MSABI_LONG(0x40001B7B)
+#define EVENT_SERVICE_CRASH                                      __MSABI_LONG(0xC0001B77)
+#define EVENT_SERVICE_CRASH_NO_ACTION                            __MSABI_LONG(0xC0001B7A)
+#define EVENT_SERVICE_DIFFERENT_PID_CONNECTED                    __MSABI_LONG(0x80001B7F)
+#define EVENT_SERVICE_EXIT_FAILED                                __MSABI_LONG(0xC0001B6F)
+#define EVENT_SERVICE_EXIT_FAILED_SPECIFIC                       __MSABI_LONG(0xC0001B70)
+#define EVENT_SERVICE_LOGON_TYPE_NOT_GRANTED                     __MSABI_LONG(0xC0001B81)
+#define EVENT_SERVICE_NOT_INTERACTIVE                            __MSABI_LONG(0xC0001B76)
+#define EVENT_SERVICE_RECOVERY_FAILED                            __MSABI_LONG(0xC0001B78)
+#define EVENT_SERVICE_SCESRV_FAILED                              __MSABI_LONG(0xC0001B79)
+#define EVENT_SERVICE_SHUTDOWN_FAILED                            __MSABI_LONG(0xC0001B83)
+#define EVENT_SERVICE_START_AT_BOOT_FAILED                       __MSABI_LONG(0xC0001B71)
+#define EVENT_SERVICE_START_FAILED                               __MSABI_LONG(0xC0001B58)
+#define EVENT_SERVICE_START_FAILED_GROUP                         __MSABI_LONG(0xC0001B5A)
+#define EVENT_SERVICE_START_FAILED_II                            __MSABI_LONG(0xC0001B59)
+#define EVENT_SERVICE_START_FAILED_NONE                          __MSABI_LONG(0xC0001B5B)
+#define EVENT_SERVICE_START_HUNG                                 __MSABI_LONG(0xC0001B6E)
+#define EVENT_SERVICE_START_TYPE_CHANGED                         __MSABI_LONG(0x40001B80)
+#define EVENT_SERVICE_STATUS_SUCCESS                             __MSABI_LONG(0x40001B7C)
+#define EVENT_SERVICE_STOP_SUCCESS_WITH_REASON                   __MSABI_LONG(0x40001B82)
+#define EVENT_SEVERE_SERVICE_FAILED                              __MSABI_LONG(0xC0001B6D)
+#define EVENT_SRV_CANT_BIND_DUP_NAME                             __MSABI_LONG(0xC00009C9)
+#define EVENT_SRV_CANT_BIND_TO_TRANSPORT                         __MSABI_LONG(0x800009C8)
+#define EVENT_SRV_CANT_CHANGE_DOMAIN_NAME                        __MSABI_LONG(0x800009D0)
+#define EVENT_SRV_CANT_CREATE_DEVICE                             __MSABI_LONG(0xC00007D2)
+#define EVENT_SRV_CANT_CREATE_PROCESS                            __MSABI_LONG(0xC00007D3)
+#define EVENT_SRV_CANT_CREATE_THREAD                             __MSABI_LONG(0xC00007D4)
+#define EVENT_SRV_CANT_GROW_TABLE                                __MSABI_LONG(0x800007D9)
+#define EVENT_SRV_CANT_LOAD_DRIVER                               __MSABI_LONG(0x800009CC)
+#define EVENT_SRV_CANT_MAP_ERROR                                 __MSABI_LONG(0x800009CE)
+#define EVENT_SRV_CANT_OPEN_NPFS                                 __MSABI_LONG(0xC00007D7)
+#define EVENT_SRV_CANT_RECREATE_SHARE                            __MSABI_LONG(0x800009CF)
+#define EVENT_SRV_CANT_START_SCAVENGER                           __MSABI_LONG(0xC00007DA)
+#define EVENT_SRV_CANT_UNLOAD_DRIVER                             __MSABI_LONG(0x800009CD)
+#define EVENT_SRV_DISK_FULL                                      __MSABI_LONG(0x800007DD)
+#define EVENT_SRV_DOS_ATTACK_DETECTED                            __MSABI_LONG(0x800007E9)
+#define EVENT_SRV_INVALID_REGISTRY_VALUE                         __MSABI_LONG(0x800009CA)
+#define EVENT_SRV_INVALID_REQUEST                                __MSABI_LONG(0xC00007D6)
+#define EVENT_SRV_INVALID_SD                                     __MSABI_LONG(0x800009CB)
+#define EVENT_SRV_IRP_STACK_SIZE                                 __MSABI_LONG(0xC00007DB)
+#define EVENT_SRV_KEY_NOT_CREATED                                __MSABI_LONG(0xC00009C6)
+#define EVENT_SRV_KEY_NOT_FOUND                                  __MSABI_LONG(0xC00009C5)
+#define EVENT_SRV_NETWORK_ERROR                                  __MSABI_LONG(0x800007DC)
+#define EVENT_SRV_NONPAGED_POOL_LIMIT                            __MSABI_LONG(0xC00007E1)
+#define EVENT_SRV_NO_BLOCKING_IO                                 __MSABI_LONG(0x800007E8)
+#define EVENT_SRV_NO_FREE_CONNECTIONS                            __MSABI_LONG(0x800007E6)
+#define EVENT_SRV_NO_FREE_RAW_WORK_ITEM                          __MSABI_LONG(0x800007E7)
+#define EVENT_SRV_NO_NONPAGED_POOL                               __MSABI_LONG(0xC00007E3)
+#define EVENT_SRV_NO_PAGED_POOL                                  __MSABI_LONG(0xC00007E4)
+#define EVENT_SRV_NO_TRANSPORTS_BOUND                            __MSABI_LONG(0xC00009C7)
+#define EVENT_SRV_NO_VIRTUAL_MEMORY                              __MSABI_LONG(0xC00007E0)
+#define EVENT_SRV_NO_WORK_ITEM                                   __MSABI_LONG(0x800007E5)
+#define EVENT_SRV_OUT_OF_WORK_ITEM_DOS                           __MSABI_LONG(0x800007EB)
+#define EVENT_SRV_PAGED_POOL_LIMIT                               __MSABI_LONG(0xC00007E2)
+#define EVENT_SRV_RESOURCE_SHORTAGE                              __MSABI_LONG(0xC00007D1)
+#define EVENT_SRV_SERVICE_FAILED                                 __MSABI_LONG(0xC00007D0)
+#define EVENT_SRV_TOO_MANY_DOS                                   __MSABI_LONG(0x800007EA)
+#define EVENT_SRV_TXF_INIT_FAILED                                __MSABI_LONG(0x800009D1)
+#define EVENT_SRV_UNEXPECTED_DISC                                __MSABI_LONG(0xC00007D5)
+#define EVENT_STREAMS_ALLOCB_FAILURE                             __MSABI_LONG(0x80000FA1)
+#define EVENT_STREAMS_ALLOCB_FAILURE_CNT                         __MSABI_LONG(0x80000FA2)
+#define EVENT_STREAMS_ESBALLOC_FAILURE                           __MSABI_LONG(0x80000FA3)
+#define EVENT_STREAMS_ESBALLOC_FAILURE_CNT                       __MSABI_LONG(0x80000FA4)
+#define EVENT_STREAMS_STRLOG                                     __MSABI_LONG(0xC0000FA0)
+#define EVENT_TAKE_OWNERSHIP                                     __MSABI_LONG(0xC0001B74)
+#define EVENT_TCPIP6_STARTED                                     __MSABI_LONG(0x40000C1C)
+#define EVENT_TCPIP_ADAPTER_REG_FAILURE                          __MSABI_LONG(0xC000105F)
+#define EVENT_TCPIP_ADDRESS_CONFLICT1                            __MSABI_LONG(0xC0001066)
+#define EVENT_TCPIP_ADDRESS_CONFLICT2                            __MSABI_LONG(0xC0001067)
+#define EVENT_TCPIP_CREATE_DEVICE_FAILED                         __MSABI_LONG(0xC0001004)
+#define EVENT_TCPIP_DHCP_INIT_FAILED                             __MSABI_LONG(0x8000105E)
+#define EVENT_TCPIP_INVALID_ADDRESS                              __MSABI_LONG(0xC000105B)
+#define EVENT_TCPIP_INVALID_DEFAULT_GATEWAY                      __MSABI_LONG(0x80001060)
+#define EVENT_TCPIP_INVALID_MASK                                 __MSABI_LONG(0xC000105C)
+#define EVENT_TCPIP_IPV4_UNINSTALLED                             __MSABI_LONG(0x4000106B)
+#define EVENT_TCPIP_IP_INIT_FAILED                               __MSABI_LONG(0xC0001064)
+#define EVENT_TCPIP_MEDIA_CONNECT                                __MSABI_LONG(0x40001069)
+#define EVENT_TCPIP_MEDIA_DISCONNECT                             __MSABI_LONG(0x4000106A)
+#define EVENT_TCPIP_NO_ADAPTER_RESOURCES                         __MSABI_LONG(0xC000105D)
+#define EVENT_TCPIP_NO_ADDRESS_LIST                              __MSABI_LONG(0xC0001061)
+#define EVENT_TCPIP_NO_BINDINGS                                  __MSABI_LONG(0xC0001063)
+#define EVENT_TCPIP_NO_MASK                                      __MSABI_LONG(0xC000105A)
+#define EVENT_TCPIP_NO_MASK_LIST                                 __MSABI_LONG(0xC0001062)
+#define EVENT_TCPIP_NO_RESOURCES_FOR_INIT                        __MSABI_LONG(0xC0001005)
+#define EVENT_TCPIP_NTE_CONTEXT_LIST_FAILURE                     __MSABI_LONG(0xC0001068)
+#define EVENT_TCPIP_TCP_CONNECT_LIMIT_REACHED                    __MSABI_LONG(0x80001082)
+#define EVENT_TCPIP_TCP_INIT_FAILED                              __MSABI_LONG(0xC0001081)
+#define EVENT_TCPIP_TCP_MPP_ATTACKS_DETECTED                     __MSABI_LONG(0x80001085)
+#define EVENT_TCPIP_TCP_TIME_WAIT_COLLISION                      __MSABI_LONG(0x80001083)
+#define EVENT_TCPIP_TCP_WSD_WS_RESTRICTED                        __MSABI_LONG(0x80001084)
+#define EVENT_TCPIP_TOO_MANY_GATEWAYS                            __MSABI_LONG(0x80001065)
+#define EVENT_TCPIP_TOO_MANY_NETS                                __MSABI_LONG(0xC0001059)
+#define EVENT_TCPIP_UDP_LIMIT_REACHED                            __MSABI_LONG(0x800010A9)
+#define EVENT_TRANSACT_INVALID                                   __MSABI_LONG(0xC0001B64)
+#define EVENT_TRANSACT_TIMEOUT                                   __MSABI_LONG(0xC0001B63)
+#define EVENT_TRANSPORT_ADAPTER_NOT_FOUND                        __MSABI_LONG(0xC000232E)
+#define EVENT_TRANSPORT_BAD_PROTOCOL                             __MSABI_LONG(0x40002333)
+#define EVENT_TRANSPORT_BINDING_FAILED                           __MSABI_LONG(0xC000232D)
+#define EVENT_TRANSPORT_QUERY_OID_FAILED                         __MSABI_LONG(0xC0002330)
+#define EVENT_TRANSPORT_REGISTER_FAILED                          __MSABI_LONG(0xC000232C)
+#define EVENT_TRANSPORT_RESOURCE_LIMIT                           __MSABI_LONG(0x8000232A)
+#define EVENT_TRANSPORT_RESOURCE_POOL                            __MSABI_LONG(0x80002329)
+#define EVENT_TRANSPORT_RESOURCE_SPECIFIC                        __MSABI_LONG(0x8000232B)
+#define EVENT_TRANSPORT_SET_OID_FAILED                           __MSABI_LONG(0xC000232F)
+#define EVENT_TRANSPORT_TOO_MANY_LINKS                           __MSABI_LONG(0x40002332)
+#define EVENT_TRANSPORT_TRANSFER_DATA                            __MSABI_LONG(0x40002331)
+#define EVENT_TRK_INTERNAL_ERROR                                 __MSABI_LONG(0xC00030D4)
+#define EVENT_TRK_SERVICE_CORRUPT_LOG                            __MSABI_LONG(0xC00030D7)
+#define EVENT_TRK_SERVICE_DUPLICATE_VOLIDS                       __MSABI_LONG(0x400030DB)
+#define EVENT_TRK_SERVICE_MOVE_QUOTA_EXCEEDED                    __MSABI_LONG(0x800030DC)
+#define EVENT_TRK_SERVICE_START_FAILURE                          __MSABI_LONG(0xC00030D6)
+#define EVENT_TRK_SERVICE_START_SUCCESS                          __MSABI_LONG(0x400030D5)
+#define EVENT_TRK_SERVICE_VOLUME_CLAIM                           __MSABI_LONG(0x400030DA)
+#define EVENT_TRK_SERVICE_VOLUME_CREATE                          __MSABI_LONG(0x400030D9)
+#define EVENT_TRK_SERVICE_VOL_QUOTA_EXCEEDED                     __MSABI_LONG(0x800030D8)
+#define EVENT_UP_DRIVER_ON_MP                                    __MSABI_LONG(0xC00017D4)
+#define EVENT_WEBCLIENT_CLOSE_DELETE_FAILED                      __MSABI_LONG(0x80003A36)
+#define EVENT_WEBCLIENT_CLOSE_PROPPATCH_FAILED                   __MSABI_LONG(0x80003A37)
+#define EVENT_WEBCLIENT_CLOSE_PUT_FAILED                         __MSABI_LONG(0x80003A35)
+#define EVENT_WEBCLIENT_SETINFO_PROPPATCH_FAILED                 __MSABI_LONG(0x80003A38)
+#define EVENT_WMI_CANT_GET_EVENT_DATA                            __MSABI_LONG(0x80002F49)
+#define EVENT_WMI_CANT_OPEN_DEVICE                               __MSABI_LONG(0xC0002EE0)
+#define EVENT_WMI_CANT_RESOLVE_INSTANCE                          __MSABI_LONG(0x80002F48)
+#define EVENT_WMI_INVALID_MOF                                    __MSABI_LONG(0x80002F44)
+#define EVENT_WMI_INVALID_REGINFO                                __MSABI_LONG(0x80002F46)
+#define EVENT_WMI_INVALID_REGPATH                                __MSABI_LONG(0x80002F47)
+#define EVENT_WMI_MOF_LOAD_FAILURE                               __MSABI_LONG(0x80002F45)
+#define EVENT_WSK_OWNINGTHREAD_PARAMETER_IGNORED                 __MSABI_LONG(0xC0003E80)
 
-#define EXTRA_EXIT_POINT                                         0xC00037DCL
-#define EXTRA_EXIT_POINT_DELETED                                 0xC00037E0L
-#define EXTRA_EXIT_POINT_NOT_DELETED                             0xC00037E1L
-#define EXTRA_VOLUME                                             0xC00037DFL
-#define EXTRA_VOLUME_DELETED                                     0xC00037E6L
-#define EXTRA_VOLUME_NOT_DELETED                                 0xC00037E7L
+#define EXTRA_EXIT_POINT                                         __MSABI_LONG(0xC00037DC)
+#define EXTRA_EXIT_POINT_DELETED                                 __MSABI_LONG(0xC00037E0)
+#define EXTRA_EXIT_POINT_NOT_DELETED                             __MSABI_LONG(0xC00037E1)
+#define EXTRA_VOLUME                                             __MSABI_LONG(0xC00037DF)
+#define EXTRA_VOLUME_DELETED                                     __MSABI_LONG(0xC00037E6)
+#define EXTRA_VOLUME_NOT_DELETED                                 __MSABI_LONG(0xC00037E7)
 
-#define KNOWLEDGE_INCONSISTENCY_DETECTED                         0xC00037E9L
+#define KNOWLEDGE_INCONSISTENCY_DETECTED                         __MSABI_LONG(0xC00037E9)
 
-#define LM_REDIR_FAILURE                                         0x40003841L
+#define LM_REDIR_FAILURE                                         __MSABI_LONG(0x40003841)
 
-#define MACHINE_UNJOINED                                         0xC00037EDL
+#define MACHINE_UNJOINED                                         __MSABI_LONG(0xC00037ED)
 
-#define MISSING_EXIT_POINT                                       0xC00037DDL
-#define MISSING_EXIT_POINT_CREATED                               0xC00037E2L
-#define MISSING_EXIT_POINT_NOT_CREATED                           0xC00037E3L
-#define MISSING_VOLUME                                           0xC00037DEL
-#define MISSING_VOLUME_CREATED                                   0xC00037E4L
-#define MISSING_VOLUME_NOT_CREATED                               0xC00037E5L
+#define MISSING_EXIT_POINT                                       __MSABI_LONG(0xC00037DD)
+#define MISSING_EXIT_POINT_CREATED                               __MSABI_LONG(0xC00037E2)
+#define MISSING_EXIT_POINT_NOT_CREATED                           __MSABI_LONG(0xC00037E3)
+#define MISSING_VOLUME                                           __MSABI_LONG(0xC00037DE)
+#define MISSING_VOLUME_CREATED                                   __MSABI_LONG(0xC00037E4)
+#define MISSING_VOLUME_NOT_CREATED                               __MSABI_LONG(0xC00037E5)
 
-#define NET_DFS_ENUM                                             0x400038A4L
-#define NET_DFS_ENUMEX                                           0x400038A5L
+#define NET_DFS_ENUM                                             __MSABI_LONG(0x400038A4)
+#define NET_DFS_ENUMEX                                           __MSABI_LONG(0x400038A5)
 
-#define NOT_A_DFS_PATH                                           0x40003840L
+#define NOT_A_DFS_PATH                                           __MSABI_LONG(0x40003840)
 
-#define NTFRSPRF_COLLECT_RPC_BINDING_ERROR_CONN                  0xC00034DCL
-#define NTFRSPRF_COLLECT_RPC_BINDING_ERROR_SET                   0xC00034DBL
-#define NTFRSPRF_COLLECT_RPC_CALL_ERROR_CONN                     0xC00034DEL
-#define NTFRSPRF_COLLECT_RPC_CALL_ERROR_SET                      0xC00034DDL
-#define NTFRSPRF_OPEN_RPC_BINDING_ERROR_CONN                     0xC00034D8L
-#define NTFRSPRF_OPEN_RPC_BINDING_ERROR_SET                      0xC00034D7L
-#define NTFRSPRF_OPEN_RPC_CALL_ERROR_CONN                        0xC00034DAL
-#define NTFRSPRF_OPEN_RPC_CALL_ERROR_SET                         0xC00034D9L
-#define NTFRSPRF_REGISTRY_ERROR_CONN                             0xC00034E2L
-#define NTFRSPRF_REGISTRY_ERROR_SET                              0xC00034E1L
-#define NTFRSPRF_VIRTUALALLOC_ERROR_CONN                         0xC00034E0L
-#define NTFRSPRF_VIRTUALALLOC_ERROR_SET                          0xC00034DFL
+#define NTFRSPRF_COLLECT_RPC_BINDING_ERROR_CONN                  __MSABI_LONG(0xC00034DC)
+#define NTFRSPRF_COLLECT_RPC_BINDING_ERROR_SET                   __MSABI_LONG(0xC00034DB)
+#define NTFRSPRF_COLLECT_RPC_CALL_ERROR_CONN                     __MSABI_LONG(0xC00034DE)
+#define NTFRSPRF_COLLECT_RPC_CALL_ERROR_SET                      __MSABI_LONG(0xC00034DD)
+#define NTFRSPRF_OPEN_RPC_BINDING_ERROR_CONN                     __MSABI_LONG(0xC00034D8)
+#define NTFRSPRF_OPEN_RPC_BINDING_ERROR_SET                      __MSABI_LONG(0xC00034D7)
+#define NTFRSPRF_OPEN_RPC_CALL_ERROR_CONN                        __MSABI_LONG(0xC00034DA)
+#define NTFRSPRF_OPEN_RPC_CALL_ERROR_SET                         __MSABI_LONG(0xC00034D9)
+#define NTFRSPRF_REGISTRY_ERROR_CONN                             __MSABI_LONG(0xC00034E2)
+#define NTFRSPRF_REGISTRY_ERROR_SET                              __MSABI_LONG(0xC00034E1)
+#define NTFRSPRF_VIRTUALALLOC_ERROR_CONN                         __MSABI_LONG(0xC00034E0)
+#define NTFRSPRF_VIRTUALALLOC_ERROR_SET                          __MSABI_LONG(0xC00034DF)
 
-#define NWSAP_EVENT_BADWANFILTER_VALUE                           0xC000214AL
-#define NWSAP_EVENT_BIND_FAILED                                  0xC0002138L
-#define NWSAP_EVENT_CARDLISTEVENT_FAIL                           0xC000214BL
-#define NWSAP_EVENT_CARDMALLOC_FAILED                            0xC000213CL
-#define NWSAP_EVENT_CREATELPCEVENT_ERROR                         0xC0002147L
-#define NWSAP_EVENT_CREATELPCPORT_ERROR                          0xC0002146L
-#define NWSAP_EVENT_GETSOCKNAME_FAILED                           0xC0002139L
-#define NWSAP_EVENT_HASHTABLE_MALLOC_FAILED                      0xC0002144L
-#define NWSAP_EVENT_INVALID_FILTERNAME                           0x8000214DL
-#define NWSAP_EVENT_KEY_NOT_FOUND                                0xC0002134L
-#define NWSAP_EVENT_LPCHANDLEMEMORY_ERROR                        0xC0002149L
-#define NWSAP_EVENT_LPCLISTENMEMORY_ERROR                        0xC0002148L
-#define NWSAP_EVENT_NOCARDS                                      0xC000213DL
-#define NWSAP_EVENT_OPTBCASTINADDR_FAILED                        0xC000213BL
-#define NWSAP_EVENT_OPTEXTENDEDADDR_FAILED                       0xC000213AL
-#define NWSAP_EVENT_OPTMAXADAPTERNUM_ERROR                       0xC0002153L
-#define NWSAP_EVENT_RECVSEM_FAIL                                 0xC000213FL
-#define NWSAP_EVENT_SDMDEVENT_FAIL                               0xC000214CL
-#define NWSAP_EVENT_SENDEVENT_FAIL                               0xC0002140L
-#define NWSAP_EVENT_SETOPTBCAST_FAILED                           0xC0002137L
-#define NWSAP_EVENT_SOCKET_FAILED                                0xC0002136L
-#define NWSAP_EVENT_STARTLPCWORKER_ERROR                         0xC0002145L
-#define NWSAP_EVENT_STARTRECEIVE_ERROR                           0xC0002141L
-#define NWSAP_EVENT_STARTWANCHECK_ERROR                          0xC0002152L
-#define NWSAP_EVENT_STARTWANWORKER_ERROR                         0xC0002151L
-#define NWSAP_EVENT_STARTWORKER_ERROR                            0xC0002142L
-#define NWSAP_EVENT_TABLE_MALLOC_FAILED                          0xC0002143L
-#define NWSAP_EVENT_THREADEVENT_FAIL                             0xC000213EL
-#define NWSAP_EVENT_WANBIND_FAILED                               0xC0002150L
-#define NWSAP_EVENT_WANEVENT_ERROR                               0xC0002155L
-#define NWSAP_EVENT_WANHANDLEMEMORY_ERROR                        0xC0002154L
-#define NWSAP_EVENT_WANSEM_FAIL                                  0xC000214EL
-#define NWSAP_EVENT_WANSOCKET_FAILED                             0xC000214FL
-#define NWSAP_EVENT_WSASTARTUP_FAILED                            0xC0002135L
+#define NWSAP_EVENT_BADWANFILTER_VALUE                           __MSABI_LONG(0xC000214A)
+#define NWSAP_EVENT_BIND_FAILED                                  __MSABI_LONG(0xC0002138)
+#define NWSAP_EVENT_CARDLISTEVENT_FAIL                           __MSABI_LONG(0xC000214B)
+#define NWSAP_EVENT_CARDMALLOC_FAILED                            __MSABI_LONG(0xC000213C)
+#define NWSAP_EVENT_CREATELPCEVENT_ERROR                         __MSABI_LONG(0xC0002147)
+#define NWSAP_EVENT_CREATELPCPORT_ERROR                          __MSABI_LONG(0xC0002146)
+#define NWSAP_EVENT_GETSOCKNAME_FAILED                           __MSABI_LONG(0xC0002139)
+#define NWSAP_EVENT_HASHTABLE_MALLOC_FAILED                      __MSABI_LONG(0xC0002144)
+#define NWSAP_EVENT_INVALID_FILTERNAME                           __MSABI_LONG(0x8000214D)
+#define NWSAP_EVENT_KEY_NOT_FOUND                                __MSABI_LONG(0xC0002134)
+#define NWSAP_EVENT_LPCHANDLEMEMORY_ERROR                        __MSABI_LONG(0xC0002149)
+#define NWSAP_EVENT_LPCLISTENMEMORY_ERROR                        __MSABI_LONG(0xC0002148)
+#define NWSAP_EVENT_NOCARDS                                      __MSABI_LONG(0xC000213D)
+#define NWSAP_EVENT_OPTBCASTINADDR_FAILED                        __MSABI_LONG(0xC000213B)
+#define NWSAP_EVENT_OPTEXTENDEDADDR_FAILED                       __MSABI_LONG(0xC000213A)
+#define NWSAP_EVENT_OPTMAXADAPTERNUM_ERROR                       __MSABI_LONG(0xC0002153)
+#define NWSAP_EVENT_RECVSEM_FAIL                                 __MSABI_LONG(0xC000213F)
+#define NWSAP_EVENT_SDMDEVENT_FAIL                               __MSABI_LONG(0xC000214C)
+#define NWSAP_EVENT_SENDEVENT_FAIL                               __MSABI_LONG(0xC0002140)
+#define NWSAP_EVENT_SETOPTBCAST_FAILED                           __MSABI_LONG(0xC0002137)
+#define NWSAP_EVENT_SOCKET_FAILED                                __MSABI_LONG(0xC0002136)
+#define NWSAP_EVENT_STARTLPCWORKER_ERROR                         __MSABI_LONG(0xC0002145)
+#define NWSAP_EVENT_STARTRECEIVE_ERROR                           __MSABI_LONG(0xC0002141)
+#define NWSAP_EVENT_STARTWANCHECK_ERROR                          __MSABI_LONG(0xC0002152)
+#define NWSAP_EVENT_STARTWANWORKER_ERROR                         __MSABI_LONG(0xC0002151)
+#define NWSAP_EVENT_STARTWORKER_ERROR                            __MSABI_LONG(0xC0002142)
+#define NWSAP_EVENT_TABLE_MALLOC_FAILED                          __MSABI_LONG(0xC0002143)
+#define NWSAP_EVENT_THREADEVENT_FAIL                             __MSABI_LONG(0xC000213E)
+#define NWSAP_EVENT_WANBIND_FAILED                               __MSABI_LONG(0xC0002150)
+#define NWSAP_EVENT_WANEVENT_ERROR                               __MSABI_LONG(0xC0002155)
+#define NWSAP_EVENT_WANHANDLEMEMORY_ERROR                        __MSABI_LONG(0xC0002154)
+#define NWSAP_EVENT_WANSEM_FAIL                                  __MSABI_LONG(0xC000214E)
+#define NWSAP_EVENT_WANSOCKET_FAILED                             __MSABI_LONG(0xC000214F)
+#define NWSAP_EVENT_WSASTARTUP_FAILED                            __MSABI_LONG(0xC0002135)
 
-#define PREFIX_MISMATCH                                          0xC00037EAL
-#define PREFIX_MISMATCH_FIXED                                    0xC00037EBL
-#define PREFIX_MISMATCH_NOT_FIXED                                0xC00037ECL
+#define PREFIX_MISMATCH                                          __MSABI_LONG(0xC00037EA)
+#define PREFIX_MISMATCH_FIXED                                    __MSABI_LONG(0xC00037EB)
+#define PREFIX_MISMATCH_NOT_FIXED                                __MSABI_LONG(0xC00037EC)
 
 #define STATUS_SEVERITY_ERROR                                    0x3
 #define STATUS_SEVERITY_INFORMATIONAL                            0x1
 #define STATUS_SEVERITY_SUCCESS                                  0x0
 #define STATUS_SEVERITY_WARNING                                  0x2
 
-#define TITLE_SC_MESSAGE_BOX                                     0xC0001B75L
+#define TITLE_SC_MESSAGE_BOX                                     __MSABI_LONG(0xC0001B75)
 
 #ifdef __cplusplus
 }
diff --git a/mingw-w64-headers/include/ntddstor.h b/mingw-w64-headers/include/ntddstor.h
index 2f3f298..520742b 100644
--- a/mingw-w64-headers/include/ntddstor.h
+++ b/mingw-w64-headers/include/ntddstor.h
@@ -189,9 +189,9 @@
 #define WRITE_COMPRESSION_INFO_VALID   0x00000010
 #define READ_COMPRESSION_INFO_VALID    0x00000020
 
-#define TAPE_RETURN_STATISTICS         0L
-#define TAPE_RETURN_ENV_INFO           1L
-#define TAPE_RESET_STATISTICS          2L
+#define TAPE_RETURN_STATISTICS         __MSABI_LONG(0)
+#define TAPE_RETURN_ENV_INFO           __MSABI_LONG(1)
+#define TAPE_RESET_STATISTICS          __MSABI_LONG(2)
 
 /* DEVICE_MEDIA_INFO.DeviceSpecific.DiskInfo.MediaCharacteristics constants */
 #define MEDIA_ERASEABLE                   0x00000001
diff --git a/mingw-w64-headers/include/ntsecapi.h b/mingw-w64-headers/include/ntsecapi.h
index 5a67da1..20f1d5e 100644
--- a/mingw-w64-headers/include/ntsecapi.h
+++ b/mingw-w64-headers/include/ntsecapi.h
@@ -19,10 +19,10 @@
   typedef ULONG LSA_OPERATIONAL_MODE,*PLSA_OPERATIONAL_MODE;
 #endif
 
-#define LSA_MODE_PASSWORD_PROTECTED (0x00000001L)
-#define LSA_MODE_INDIVIDUAL_ACCOUNTS (0x00000002L)
-#define LSA_MODE_MANDATORY_ACCESS (0x00000004L)
-#define LSA_MODE_LOG_FULL (0x00000008L)
+#define LSA_MODE_PASSWORD_PROTECTED (__MSABI_LONG(0x00000001))
+#define LSA_MODE_INDIVIDUAL_ACCOUNTS (__MSABI_LONG(0x00000002))
+#define LSA_MODE_MANDATORY_ACCESS (__MSABI_LONG(0x00000004))
+#define LSA_MODE_LOG_FULL (__MSABI_LONG(0x00000008))
 
 #ifndef _NTLSA_IFS_
   typedef enum _SECURITY_LOGON_TYPE {
@@ -83,10 +83,10 @@
     AuditCategoryPolicyChange,AuditCategoryAccountManagement,AuditCategoryDirectoryServiceAccess,AuditCategoryAccountLogon
   } POLICY_AUDIT_EVENT_TYPE,*PPOLICY_AUDIT_EVENT_TYPE;
 
-#define POLICY_AUDIT_EVENT_UNCHANGED (0x00000000L)
-#define POLICY_AUDIT_EVENT_SUCCESS (0x00000001L)
-#define POLICY_AUDIT_EVENT_FAILURE (0x00000002L)
-#define POLICY_AUDIT_EVENT_NONE (0x00000004L)
+#define POLICY_AUDIT_EVENT_UNCHANGED (__MSABI_LONG(0x00000000))
+#define POLICY_AUDIT_EVENT_SUCCESS (__MSABI_LONG(0x00000001))
+#define POLICY_AUDIT_EVENT_FAILURE (__MSABI_LONG(0x00000002))
+#define POLICY_AUDIT_EVENT_NONE (__MSABI_LONG(0x00000004))
 #define POLICY_AUDIT_EVENT_MASK (POLICY_AUDIT_EVENT_SUCCESS | POLICY_AUDIT_EVENT_FAILURE | POLICY_AUDIT_EVENT_UNCHANGED | POLICY_AUDIT_EVENT_NONE)
 
 #ifdef _NTDEF_
@@ -141,19 +141,19 @@
   NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE LsaHandle);
 #endif
 
-#define POLICY_VIEW_LOCAL_INFORMATION 0x00000001L
-#define POLICY_VIEW_AUDIT_INFORMATION 0x00000002L
-#define POLICY_GET_PRIVATE_INFORMATION 0x00000004L
-#define POLICY_TRUST_ADMIN 0x00000008L
-#define POLICY_CREATE_ACCOUNT 0x00000010L
-#define POLICY_CREATE_SECRET 0x00000020L
-#define POLICY_CREATE_PRIVILEGE 0x00000040L
-#define POLICY_SET_DEFAULT_QUOTA_LIMITS 0x00000080L
-#define POLICY_SET_AUDIT_REQUIREMENTS 0x00000100L
-#define POLICY_AUDIT_LOG_ADMIN 0x00000200L
-#define POLICY_SERVER_ADMIN 0x00000400L
-#define POLICY_LOOKUP_NAMES 0x00000800L
-#define POLICY_NOTIFICATION 0x00001000L
+#define POLICY_VIEW_LOCAL_INFORMATION __MSABI_LONG(0x00000001)
+#define POLICY_VIEW_AUDIT_INFORMATION __MSABI_LONG(0x00000002)
+#define POLICY_GET_PRIVATE_INFORMATION __MSABI_LONG(0x00000004)
+#define POLICY_TRUST_ADMIN __MSABI_LONG(0x00000008)
+#define POLICY_CREATE_ACCOUNT __MSABI_LONG(0x00000010)
+#define POLICY_CREATE_SECRET __MSABI_LONG(0x00000020)
+#define POLICY_CREATE_PRIVILEGE __MSABI_LONG(0x00000040)
+#define POLICY_SET_DEFAULT_QUOTA_LIMITS __MSABI_LONG(0x00000080)
+#define POLICY_SET_AUDIT_REQUIREMENTS __MSABI_LONG(0x00000100)
+#define POLICY_AUDIT_LOG_ADMIN __MSABI_LONG(0x00000200)
+#define POLICY_SERVER_ADMIN __MSABI_LONG(0x00000400)
+#define POLICY_LOOKUP_NAMES __MSABI_LONG(0x00000800)
+#define POLICY_NOTIFICATION __MSABI_LONG(0x00001000)
 
 #define POLICY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | POLICY_VIEW_LOCAL_INFORMATION | POLICY_VIEW_AUDIT_INFORMATION | POLICY_GET_PRIVATE_INFORMATION | POLICY_TRUST_ADMIN | POLICY_CREATE_ACCOUNT | POLICY_CREATE_SECRET | POLICY_CREATE_PRIVILEGE | POLICY_SET_DEFAULT_QUOTA_LIMITS | POLICY_SET_AUDIT_REQUIREMENTS | POLICY_AUDIT_LOG_ADMIN | POLICY_SERVER_ADMIN | POLICY_LOOKUP_NAMES)
 #define POLICY_READ (STANDARD_RIGHTS_READ | POLICY_VIEW_AUDIT_INFORMATION | POLICY_GET_PRIVATE_INFORMATION)
@@ -398,16 +398,16 @@
     ForestTrustTopLevelName,ForestTrustTopLevelNameEx,ForestTrustDomainInfo,ForestTrustRecordTypeLast = ForestTrustDomainInfo
   } LSA_FOREST_TRUST_RECORD_TYPE;
 
-#define LSA_FTRECORD_DISABLED_REASONS (0x0000FFFFL)
+#define LSA_FTRECORD_DISABLED_REASONS (__MSABI_LONG(0x0000FFFF))
 
-#define LSA_TLN_DISABLED_NEW (0x00000001L)
-#define LSA_TLN_DISABLED_ADMIN (0x00000002L)
-#define LSA_TLN_DISABLED_CONFLICT (0x00000004L)
+#define LSA_TLN_DISABLED_NEW (__MSABI_LONG(0x00000001))
+#define LSA_TLN_DISABLED_ADMIN (__MSABI_LONG(0x00000002))
+#define LSA_TLN_DISABLED_CONFLICT (__MSABI_LONG(0x00000004))
 
-#define LSA_SID_DISABLED_ADMIN (0x00000001L)
-#define LSA_SID_DISABLED_CONFLICT (0x00000002L)
-#define LSA_NB_DISABLED_ADMIN (0x00000004L)
-#define LSA_NB_DISABLED_CONFLICT (0x00000008L)
+#define LSA_SID_DISABLED_ADMIN (__MSABI_LONG(0x00000001))
+#define LSA_SID_DISABLED_CONFLICT (__MSABI_LONG(0x00000002))
+#define LSA_NB_DISABLED_ADMIN (__MSABI_LONG(0x00000004))
+#define LSA_NB_DISABLED_CONFLICT (__MSABI_LONG(0x00000008))
 
   typedef struct _LSA_FOREST_TRUST_DOMAIN_INFO {
     PSID Sid;
@@ -585,12 +585,12 @@
   } DOMAIN_PASSWORD_INFORMATION,*PDOMAIN_PASSWORD_INFORMATION;
 #endif
 
-#define DOMAIN_PASSWORD_COMPLEX 0x00000001L
-#define DOMAIN_PASSWORD_NO_ANON_CHANGE 0x00000002L
-#define DOMAIN_PASSWORD_NO_CLEAR_CHANGE 0x00000004L
-#define DOMAIN_LOCKOUT_ADMINS 0x00000008L
-#define DOMAIN_PASSWORD_STORE_CLEARTEXT 0x00000010L
-#define DOMAIN_REFUSE_PASSWORD_CHANGE 0x00000020L
+#define DOMAIN_PASSWORD_COMPLEX __MSABI_LONG(0x00000001)
+#define DOMAIN_PASSWORD_NO_ANON_CHANGE __MSABI_LONG(0x00000002)
+#define DOMAIN_PASSWORD_NO_CLEAR_CHANGE __MSABI_LONG(0x00000004)
+#define DOMAIN_LOCKOUT_ADMINS __MSABI_LONG(0x00000008)
+#define DOMAIN_PASSWORD_STORE_CLEARTEXT __MSABI_LONG(0x00000010)
+#define DOMAIN_REFUSE_PASSWORD_CHANGE __MSABI_LONG(0x00000020)
 
 #ifndef _PASSWORD_NOTIFICATION_DEFINED
 #define _PASSWORD_NOTIFICATION_DEFINED
diff --git a/mingw-w64-headers/include/objbase.h b/mingw-w64-headers/include/objbase.h
index 011933f..6749fe2 100644
--- a/mingw-w64-headers/include/objbase.h
+++ b/mingw-w64-headers/include/objbase.h
@@ -106,36 +106,36 @@
 
 #define CWCSTORAGENAME 32
 
-#define STGM_DIRECT 0x00000000L
-#define STGM_TRANSACTED 0x00010000L
-#define STGM_SIMPLE 0x08000000L
+#define STGM_DIRECT __MSABI_LONG(0x00000000)
+#define STGM_TRANSACTED __MSABI_LONG(0x00010000)
+#define STGM_SIMPLE __MSABI_LONG(0x08000000)
 
-#define STGM_READ 0x00000000L
-#define STGM_WRITE 0x00000001L
-#define STGM_READWRITE 0x00000002L
+#define STGM_READ __MSABI_LONG(0x00000000)
+#define STGM_WRITE __MSABI_LONG(0x00000001)
+#define STGM_READWRITE __MSABI_LONG(0x00000002)
 
-#define STGM_SHARE_DENY_NONE 0x00000040L
-#define STGM_SHARE_DENY_READ 0x00000030L
-#define STGM_SHARE_DENY_WRITE 0x00000020L
-#define STGM_SHARE_EXCLUSIVE 0x00000010L
+#define STGM_SHARE_DENY_NONE __MSABI_LONG(0x00000040)
+#define STGM_SHARE_DENY_READ __MSABI_LONG(0x00000030)
+#define STGM_SHARE_DENY_WRITE __MSABI_LONG(0x00000020)
+#define STGM_SHARE_EXCLUSIVE __MSABI_LONG(0x00000010)
 
-#define STGM_PRIORITY 0x00040000L
-#define STGM_DELETEONRELEASE 0x04000000L
-#define STGM_NOSCRATCH 0x00100000L
-#define STGM_CREATE 0x00001000L
-#define STGM_CONVERT 0x00020000L
-#define STGM_FAILIFTHERE 0x00000000L
-#define STGM_NOSNAPSHOT 0x00200000L
-#define STGM_DIRECT_SWMR 0x00400000L
+#define STGM_PRIORITY __MSABI_LONG(0x00040000)
+#define STGM_DELETEONRELEASE __MSABI_LONG(0x04000000)
+#define STGM_NOSCRATCH __MSABI_LONG(0x00100000)
+#define STGM_CREATE __MSABI_LONG(0x00001000)
+#define STGM_CONVERT __MSABI_LONG(0x00020000)
+#define STGM_FAILIFTHERE __MSABI_LONG(0x00000000)
+#define STGM_NOSNAPSHOT __MSABI_LONG(0x00200000)
+#define STGM_DIRECT_SWMR __MSABI_LONG(0x00400000)
 
-#define ASYNC_MODE_COMPATIBILITY 0x00000001L
-#define ASYNC_MODE_DEFAULT 0x00000000L
+#define ASYNC_MODE_COMPATIBILITY __MSABI_LONG(0x00000001)
+#define ASYNC_MODE_DEFAULT __MSABI_LONG(0x00000000)
 
-#define STGTY_REPEAT 0x00000100L
-#define STG_TOEND 0xFFFFFFFFL
+#define STGTY_REPEAT __MSABI_LONG(0x00000100)
+#define STG_TOEND __MSABI_LONG(0xFFFFFFFF)
 
-#define STG_LAYOUT_SEQUENTIAL 0x00000000L
-#define STG_LAYOUT_INTERLEAVED 0x00000001L
+#define STG_LAYOUT_SEQUENTIAL __MSABI_LONG(0x00000000)
+#define STG_LAYOUT_INTERLEAVED __MSABI_LONG(0x00000001)
 
 #define STGFMT_STORAGE 0
 #define STGFMT_NATIVE 1
diff --git a/mingw-w64-headers/include/ocmm.h b/mingw-w64-headers/include/ocmm.h
index 2a36441..53bf9eb 100644
--- a/mingw-w64-headers/include/ocmm.h
+++ b/mingw-w64-headers/include/ocmm.h
@@ -69,13 +69,13 @@
 #define SURFACE_LOCK_ALLOW_DISCARD 0x02
 #define SURFACE_LOCK_WAIT 0x04
 
-#define E_SURFACE_NOSURFACE 0x8000C000L
-#define E_SURFACE_UNKNOWN_FORMAT 0x8000C001L
-#define E_SURFACE_NOTMYPOINTER 0x8000C002L
-#define E_SURFACE_DISCARDED 0x8000C003L
-#define E_SURFACE_NODC 0x8000C004L
-#define E_SURFACE_NOTMYDC 0x8000C005L
-#define S_SURFACE_DISCARDED 0x0000C003L
+#define E_SURFACE_NOSURFACE __MSABI_LONG(0x8000C000)
+#define E_SURFACE_UNKNOWN_FORMAT __MSABI_LONG(0x8000C001)
+#define E_SURFACE_NOTMYPOINTER __MSABI_LONG(0x8000C002)
+#define E_SURFACE_DISCARDED __MSABI_LONG(0x8000C003)
+#define E_SURFACE_NODC __MSABI_LONG(0x8000C004)
+#define E_SURFACE_NOTMYDC __MSABI_LONG(0x8000C005)
+#define S_SURFACE_DISCARDED __MSABI_LONG(0x0000C003)
 
   typedef GUID BFID;
 
diff --git a/mingw-w64-headers/include/odbcss.h b/mingw-w64-headers/include/odbcss.h
index 4744701..6bdf697 100644
--- a/mingw-w64-headers/include/odbcss.h
+++ b/mingw-w64-headers/include/odbcss.h
@@ -65,87 +65,87 @@
 
 #define SQL_COPT_SS_EX_MAX_USED SQL_COPT_SS_RESET_CONNECTION
 
-#define SQL_UP_OFF 0L
-#define SQL_UP_ON 1L
-#define SQL_UP_ON_DROP 2L
+#define SQL_UP_OFF __MSABI_LONG(0)
+#define SQL_UP_ON __MSABI_LONG(1)
+#define SQL_UP_ON_DROP __MSABI_LONG(2)
 #define SQL_UP_DEFAULT SQL_UP_ON
 
-#define SQL_IS_OFF 0L
-#define SQL_IS_ON 1L
+#define SQL_IS_OFF __MSABI_LONG(0)
+#define SQL_IS_ON __MSABI_LONG(1)
 #define SQL_IS_DEFAULT SQL_IS_OFF
 
-#define SQL_PC_OFF 0L
-#define SQL_PC_ON 1L
+#define SQL_PC_OFF __MSABI_LONG(0)
+#define SQL_PC_ON __MSABI_LONG(1)
 #define SQL_PC_DEFAULT SQL_PC_OFF
 
 #define SQL_UD_NOTSET NULL
 
-#define SQL_XL_OFF 0L
-#define SQL_XL_ON 1L
+#define SQL_XL_OFF __MSABI_LONG(0)
+#define SQL_XL_ON __MSABI_LONG(1)
 #define SQL_XL_DEFAULT SQL_XL_ON
 
-#define SQL_FB_OFF 0L
-#define SQL_FB_ON 1L
+#define SQL_FB_OFF __MSABI_LONG(0)
+#define SQL_FB_ON __MSABI_LONG(1)
 #define SQL_FB_DEFAULT SQL_FB_OFF
 
-#define SQL_BCP_OFF 0L
-#define SQL_BCP_ON 1L
+#define SQL_BCP_OFF __MSABI_LONG(0)
+#define SQL_BCP_ON __MSABI_LONG(1)
 #define SQL_BCP_DEFAULT SQL_BCP_OFF
 
-#define SQL_QI_OFF 0L
-#define SQL_QI_ON 1L
+#define SQL_QI_OFF __MSABI_LONG(0)
+#define SQL_QI_ON __MSABI_LONG(1)
 #define SQL_QI_DEFAULT SQL_QI_ON
 
-#define SQL_AD_OFF 0L
-#define SQL_AD_ON 1L
+#define SQL_AD_OFF __MSABI_LONG(0)
+#define SQL_AD_ON __MSABI_LONG(1)
 #define SQL_AD_DEFAULT SQL_AD_ON
 
-#define SQL_CN_OFF 0L
-#define SQL_CN_ON 1L
+#define SQL_CN_OFF __MSABI_LONG(0)
+#define SQL_CN_ON __MSABI_LONG(1)
 #define SQL_CN_DEFAULT SQL_CN_ON
 
-#define SQL_TL_OFF 0L
-#define SQL_TL_ON 1L
+#define SQL_TL_OFF __MSABI_LONG(0)
+#define SQL_TL_ON __MSABI_LONG(1)
 #define SQL_TL_DEFAULT SQL_TL_ON
 
-#define SQL_HC_OFF 0L
-#define SQL_HC_ON 1L
+#define SQL_HC_OFF __MSABI_LONG(0)
+#define SQL_HC_ON __MSABI_LONG(1)
 #define SQL_HC_DEFAULT SQL_HC_OFF
 
-#define SQL_NB_OFF 0L
-#define SQL_NB_ON 1L
+#define SQL_NB_OFF __MSABI_LONG(0)
+#define SQL_NB_ON __MSABI_LONG(1)
 #define SQL_NB_DEFAULT SQL_NB_OFF
 
-#define SQL_RE_OFF 0L
-#define SQL_RE_ON 1L
+#define SQL_RE_OFF __MSABI_LONG(0)
+#define SQL_RE_ON __MSABI_LONG(1)
 #define SQL_RE_DEFAULT SQL_RE_OFF
 
-#define SQL_CO_OFF 0L
-#define SQL_CO_FFO 1L
-#define SQL_CO_AF 2L
+#define SQL_CO_OFF __MSABI_LONG(0)
+#define SQL_CO_FFO __MSABI_LONG(1)
+#define SQL_CO_AF __MSABI_LONG(2)
 #define SQL_CO_FFO_AF (SQL_CO_FFO|SQL_CO_AF)
-#define SQL_CO_FIREHOSE_AF 4L
+#define SQL_CO_FIREHOSE_AF __MSABI_LONG(4)
 #define SQL_CO_DEFAULT SQL_CO_OFF
 
-#define SQL_NC_OFF 0L
-#define SQL_NC_ON 1L
+#define SQL_NC_OFF __MSABI_LONG(0)
+#define SQL_NC_ON __MSABI_LONG(1)
 
-#define SQL_DP_OFF 0L
-#define SQL_DP_ON 1L
+#define SQL_DP_OFF __MSABI_LONG(0)
+#define SQL_DP_ON __MSABI_LONG(1)
 
-#define SQL_EN_OFF 0L
-#define SQL_EN_ON 1L
+#define SQL_EN_OFF __MSABI_LONG(0)
+#define SQL_EN_ON __MSABI_LONG(1)
 
-#define SQL_MORE_INFO_NO 0L
-#define SQL_MORE_INFO_YES 1L
+#define SQL_MORE_INFO_NO __MSABI_LONG(0)
+#define SQL_MORE_INFO_YES __MSABI_LONG(1)
 
-#define SQL_CACHE_DATA_NO 0L
-#define SQL_CACHE_DATA_YES 1L
+#define SQL_CACHE_DATA_NO __MSABI_LONG(0)
+#define SQL_CACHE_DATA_YES __MSABI_LONG(1)
 
-#define SQL_RESET_YES 1L
+#define SQL_RESET_YES __MSABI_LONG(1)
 
-#define SQL_WARN_NO 0L
-#define SQL_WARN_YES 1L
+#define SQL_WARN_NO __MSABI_LONG(0)
+#define SQL_WARN_YES __MSABI_LONG(1)
 
 #define SQL_CURSOR_FAST_FORWARD_ONLY 8
 
@@ -543,12 +543,12 @@
 
 #define SQL_FAST_CONNECT (SQL_COPT_SS_BASE+0)
 
-#define SQL_FC_OFF 0L
-#define SQL_FC_ON 1L
+#define SQL_FC_OFF __MSABI_LONG(0)
+#define SQL_FC_ON __MSABI_LONG(1)
 #define SQL_FC_DEFAULT SQL_FC_OFF
 #define SQL_COPT_SS_ANSI_OEM (SQL_COPT_SS_BASE+6)
-#define SQL_AO_OFF 0L
-#define SQL_AO_ON 1L
+#define SQL_AO_OFF __MSABI_LONG(0)
+#define SQL_AO_ON __MSABI_LONG(1)
 #define SQL_AO_DEFAULT SQL_AO_OFF
 
 #define SQL_REMOTE_PWD SQL_COPT_SS_REMOTE_PWD
diff --git a/mingw-w64-headers/include/ole.h b/mingw-w64-headers/include/ole.h
index 31419db..40df17d 100644
--- a/mingw-w64-headers/include/ole.h
+++ b/mingw-w64-headers/include/ole.h
@@ -28,9 +28,9 @@
 #define LRESULT LONG_PTR
 #define HGLOBAL HANDLE
 
-#define OT_LINK 1L
-#define OT_EMBEDDED 2L
-#define OT_STATIC 3L
+#define OT_LINK __MSABI_LONG(1)
+#define OT_EMBEDDED __MSABI_LONG(2)
+#define OT_STATIC __MSABI_LONG(3)
 
 #define OLEVERB_PRIMARY 0
 
diff --git a/mingw-w64-headers/include/ole2.h b/mingw-w64-headers/include/ole2.h
index 739bf78..3672fcd 100644
--- a/mingw-w64-headers/include/ole2.h
+++ b/mingw-w64-headers/include/ole2.h
@@ -20,18 +20,18 @@
 
 #define DATA_E_FORMATETC DV_E_FORMATETC
 
-#define OLEIVERB_PRIMARY (0L)
-#define OLEIVERB_SHOW (-1L)
-#define OLEIVERB_OPEN (-2L)
-#define OLEIVERB_HIDE (-3L)
-#define OLEIVERB_UIACTIVATE (-4L)
-#define OLEIVERB_INPLACEACTIVATE (-5L)
-#define OLEIVERB_DISCARDUNDOSTATE (-6L)
+#define OLEIVERB_PRIMARY (__MSABI_LONG(0))
+#define OLEIVERB_SHOW (__MSABI_LONG(-1))
+#define OLEIVERB_OPEN (__MSABI_LONG(-2))
+#define OLEIVERB_HIDE (__MSABI_LONG(-3))
+#define OLEIVERB_UIACTIVATE (__MSABI_LONG(-4))
+#define OLEIVERB_INPLACEACTIVATE (__MSABI_LONG(-5))
+#define OLEIVERB_DISCARDUNDOSTATE (__MSABI_LONG(-6))
 
-#define EMBDHLP_INPROC_HANDLER 0x0000L
-#define EMBDHLP_INPROC_SERVER 0x0001L
-#define EMBDHLP_CREATENOW 0x00000000L
-#define EMBDHLP_DELAYCREATE 0x00010000L
+#define EMBDHLP_INPROC_HANDLER __MSABI_LONG(0x0000)
+#define EMBDHLP_INPROC_SERVER __MSABI_LONG(0x0001)
+#define EMBDHLP_CREATENOW __MSABI_LONG(0x00000000)
+#define EMBDHLP_DELAYCREATE __MSABI_LONG(0x00010000)
 
 #define OLECREATE_LEAVERUNNING 0x00000001
 
diff --git a/mingw-w64-headers/include/oleacc.h b/mingw-w64-headers/include/oleacc.h
index 6fb2118..2e80319 100644
--- a/mingw-w64-headers/include/oleacc.h
+++ b/mingw-w64-headers/include/oleacc.h
@@ -132,7 +132,7 @@
   STDAPI CreateStdAccessibleProxyA(HWND hwnd,LPCSTR pClassName,LONG idObject,REFIID riid,void **ppvObject);
   STDAPI CreateStdAccessibleProxyW(HWND hwnd,LPCWSTR pClassName,LONG idObject,REFIID riid,void **ppvObject);
 
-#define MSAA_MENU_SIG 0xAA0DF00DL
+#define MSAA_MENU_SIG __MSABI_LONG(0xAA0DF00D)
 
   typedef struct tagMSAAMENUINFO {
     DWORD dwMSAASignature;
diff --git a/mingw-w64-headers/include/olectl.h b/mingw-w64-headers/include/olectl.h
index 87cda95..df2f887 100644
--- a/mingw-w64-headers/include/olectl.h
+++ b/mingw-w64-headers/include/olectl.h
@@ -207,18 +207,18 @@
 
 #define PERPROP_E_NOPAGEAVAILABLE (PERPROP_E_FIRST+0)
 
-#define OLEMISC_INVISIBLEATRUNTIME 0x00000400L
-#define OLEMISC_ALWAYSRUN 0x00000800L
-#define OLEMISC_ACTSLIKEBUTTON 0x00001000L
-#define OLEMISC_ACTSLIKELABEL 0x00002000L
-#define OLEMISC_NOUIACTIVATE 0x00004000L
-#define OLEMISC_ALIGNABLE 0x00008000L
-#define OLEMISC_SIMPLEFRAME 0x00010000L
-#define OLEMISC_SETCLIENTSITEFIRST 0x00020000L
-#define OLEMISC_IMEMODE 0x00040000L
+#define OLEMISC_INVISIBLEATRUNTIME __MSABI_LONG(0x00000400)
+#define OLEMISC_ALWAYSRUN __MSABI_LONG(0x00000800)
+#define OLEMISC_ACTSLIKEBUTTON __MSABI_LONG(0x00001000)
+#define OLEMISC_ACTSLIKELABEL __MSABI_LONG(0x00002000)
+#define OLEMISC_NOUIACTIVATE __MSABI_LONG(0x00004000)
+#define OLEMISC_ALIGNABLE __MSABI_LONG(0x00008000)
+#define OLEMISC_SIMPLEFRAME __MSABI_LONG(0x00010000)
+#define OLEMISC_SETCLIENTSITEFIRST __MSABI_LONG(0x00020000)
+#define OLEMISC_IMEMODE __MSABI_LONG(0x00040000)
 
 #ifndef OLEIVERB_PROPERTIES
-#define OLEIVERB_PROPERTIES (-7L)
+#define OLEIVERB_PROPERTIES (__MSABI_LONG(-7))
 #endif
 
 #define VT_STREAMED_PROPSET 73
diff --git a/mingw-w64-headers/include/oledb.h b/mingw-w64-headers/include/oledb.h
index 6218afe..4665387 100644
--- a/mingw-w64-headers/include/oledb.h
+++ b/mingw-w64-headers/include/oledb.h
@@ -1313,261 +1313,261 @@
   }
 #endif
 
-#define DBPROPVAL_BMK_NUMERIC 0x00000001L
-#define DBPROPVAL_BMK_KEY 0x00000002L
-#define DBPROPVAL_CL_START 0x00000001L
-#define DBPROPVAL_CL_END 0x00000002L
-#define DBPROPVAL_CU_DML_STATEMENTS 0x00000001L
-#define DBPROPVAL_CU_TABLE_DEFINITION 0x00000002L
-#define DBPROPVAL_CU_INDEX_DEFINITION 0x00000004L
-#define DBPROPVAL_CU_PRIVILEGE_DEFINITION 0x00000008L
-#define DBPROPVAL_CD_NOTNULL 0x00000001L
-#define DBPROPVAL_CB_NULL 0x00000001L
-#define DBPROPVAL_CB_NON_NULL 0x00000002L
-#define DBPROPVAL_FU_NOT_SUPPORTED 0x00000001L
-#define DBPROPVAL_FU_COLUMN 0x00000002L
-#define DBPROPVAL_FU_TABLE 0x00000004L
-#define DBPROPVAL_FU_CATALOG 0x00000008L
-#define DBPROPVAL_GB_NOT_SUPPORTED 0x00000001L
-#define DBPROPVAL_GB_EQUALS_SELECT 0x00000002L
-#define DBPROPVAL_GB_CONTAINS_SELECT 0x00000004L
-#define DBPROPVAL_GB_NO_RELATION 0x00000008L
-#define DBPROPVAL_HT_DIFFERENT_CATALOGS 0x00000001L
-#define DBPROPVAL_HT_DIFFERENT_PROVIDERS 0x00000002L
-#define DBPROPVAL_IC_UPPER 0x00000001L
-#define DBPROPVAL_IC_LOWER 0x00000002L
-#define DBPROPVAL_IC_SENSITIVE 0x00000004L
-#define DBPROPVAL_IC_MIXED 0x00000008L
+#define DBPROPVAL_BMK_NUMERIC __MSABI_LONG(0x00000001)
+#define DBPROPVAL_BMK_KEY __MSABI_LONG(0x00000002)
+#define DBPROPVAL_CL_START __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CL_END __MSABI_LONG(0x00000002)
+#define DBPROPVAL_CU_DML_STATEMENTS __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CU_TABLE_DEFINITION __MSABI_LONG(0x00000002)
+#define DBPROPVAL_CU_INDEX_DEFINITION __MSABI_LONG(0x00000004)
+#define DBPROPVAL_CU_PRIVILEGE_DEFINITION __MSABI_LONG(0x00000008)
+#define DBPROPVAL_CD_NOTNULL __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CB_NULL __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CB_NON_NULL __MSABI_LONG(0x00000002)
+#define DBPROPVAL_FU_NOT_SUPPORTED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_FU_COLUMN __MSABI_LONG(0x00000002)
+#define DBPROPVAL_FU_TABLE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_FU_CATALOG __MSABI_LONG(0x00000008)
+#define DBPROPVAL_GB_NOT_SUPPORTED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_GB_EQUALS_SELECT __MSABI_LONG(0x00000002)
+#define DBPROPVAL_GB_CONTAINS_SELECT __MSABI_LONG(0x00000004)
+#define DBPROPVAL_GB_NO_RELATION __MSABI_LONG(0x00000008)
+#define DBPROPVAL_HT_DIFFERENT_CATALOGS __MSABI_LONG(0x00000001)
+#define DBPROPVAL_HT_DIFFERENT_PROVIDERS __MSABI_LONG(0x00000002)
+#define DBPROPVAL_IC_UPPER __MSABI_LONG(0x00000001)
+#define DBPROPVAL_IC_LOWER __MSABI_LONG(0x00000002)
+#define DBPROPVAL_IC_SENSITIVE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_IC_MIXED __MSABI_LONG(0x00000008)
 
 #ifdef deprecated
-#define DBPROPVAL_LM_NONE 0x00000001L
-#define DBPROPVAL_LM_READ 0x00000002L
-#define DBPROPVAL_LM_INTENT 0x00000004L
-#define DBPROPVAL_LM_RITE 0x00000008L
+#define DBPROPVAL_LM_NONE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_LM_READ __MSABI_LONG(0x00000002)
+#define DBPROPVAL_LM_INTENT __MSABI_LONG(0x00000004)
+#define DBPROPVAL_LM_RITE __MSABI_LONG(0x00000008)
 #endif
 
-#define DBPROPVAL_NP_OKTODO 0x00000001L
-#define DBPROPVAL_NP_ABOUTTODO 0x00000002L
-#define DBPROPVAL_NP_SYNCHAFTER 0x00000004L
-#define DBPROPVAL_NP_FAILEDTODO 0x00000008L
-#define DBPROPVAL_NP_DIDEVENT 0x00000010L
-#define DBPROPVAL_NC_END 0x00000001L
-#define DBPROPVAL_NC_HIGH 0x00000002L
-#define DBPROPVAL_NC_LOW 0x00000004L
-#define DBPROPVAL_NC_START 0x00000008L
-#define DBPROPVAL_OO_BLOB 0x00000001L
-#define DBPROPVAL_OO_IPERSIST 0x00000002L
-#define DBPROPVAL_CB_DELETE 0x00000001L
-#define DBPROPVAL_CB_PRESERVE 0x00000002L
-#define DBPROPVAL_SU_DML_STATEMENTS 0x00000001L
-#define DBPROPVAL_SU_TABLE_DEFINITION 0x00000002L
-#define DBPROPVAL_SU_INDEX_DEFINITION 0x00000004L
-#define DBPROPVAL_SU_PRIVILEGE_DEFINITION 0x00000008L
-#define DBPROPVAL_SQ_CORRELATEDSUBQUERIES 0x00000001L
-#define DBPROPVAL_SQ_COMPARISON 0x00000002L
-#define DBPROPVAL_SQ_EXISTS 0x00000004L
-#define DBPROPVAL_SQ_IN 0x00000008L
-#define DBPROPVAL_SQ_QUANTIFIED 0x00000010L
-#define DBPROPVAL_SQ_TABLE 0x00000020L
-#define DBPROPVAL_SS_ISEQUENTIALSTREAM 0x00000001L
-#define DBPROPVAL_SS_ISTREAM 0x00000002L
-#define DBPROPVAL_SS_ISTORAGE 0x00000004L
-#define DBPROPVAL_SS_ILOCKBYTES 0x00000008L
-#define DBPROPVAL_TI_CHAOS 0x00000010L
-#define DBPROPVAL_TI_READUNCOMMITTED 0x00000100L
-#define DBPROPVAL_TI_BROWSE 0x00000100L
-#define DBPROPVAL_TI_CURSORSTABILITY 0x00001000L
-#define DBPROPVAL_TI_READCOMMITTED 0x00001000L
-#define DBPROPVAL_TI_REPEATABLEREAD 0x00010000L
-#define DBPROPVAL_TI_SERIALIZABLE 0x00100000L
-#define DBPROPVAL_TI_ISOLATED 0x00100000L
-#define DBPROPVAL_TR_COMMIT_DC 0x00000001L
-#define DBPROPVAL_TR_COMMIT 0x00000002L
-#define DBPROPVAL_TR_COMMIT_NO 0x00000004L
-#define DBPROPVAL_TR_ABORT_DC 0x00000008L
-#define DBPROPVAL_TR_ABORT 0x00000010L
-#define DBPROPVAL_TR_ABORT_NO 0x00000020L
-#define DBPROPVAL_TR_DONTCARE 0x00000040L
-#define DBPROPVAL_TR_BOTH 0x00000080L
-#define DBPROPVAL_TR_NONE 0x00000100L
-#define DBPROPVAL_TR_OPTIMISTIC 0x00000200L
-#define DBPROPVAL_RT_FREETHREAD 0x00000001L
-#define DBPROPVAL_RT_APTMTTHREAD 0x00000002L
-#define DBPROPVAL_RT_SINGLETHREAD 0x00000004L
-#define DBPROPVAL_UP_CHANGE 0x00000001L
-#define DBPROPVAL_UP_DELETE 0x00000002L
-#define DBPROPVAL_UP_INSERT 0x00000004L
-#define DBPROPVAL_SQL_NONE 0x00000000L
-#define DBPROPVAL_SQL_ODBC_MINIMUM 0x00000001L
-#define DBPROPVAL_SQL_ODBC_CORE 0x00000002L
-#define DBPROPVAL_SQL_ODBC_EXTENDED 0x00000004L
-#define DBPROPVAL_SQL_ANSI89_IEF 0x00000008L
-#define DBPROPVAL_SQL_ANSI92_ENTRY 0x00000010L
-#define DBPROPVAL_SQL_FIPS_TRANSITIONAL 0x00000020L
-#define DBPROPVAL_SQL_ANSI92_INTERMEDIATE 0x00000040L
-#define DBPROPVAL_SQL_ANSI92_FULL 0x00000080L
-#define DBPROPVAL_SQL_ESCAPECLAUSES 0x00000100L
-#define DBPROPVAL_IT_BTREE 0x00000001L
-#define DBPROPVAL_IT_HASH 0x00000002L
-#define DBPROPVAL_IT_CONTENT 0x00000003L
-#define DBPROPVAL_IT_OTHER 0x00000004L
-#define DBPROPVAL_IN_DISALLOWNULL 0x00000001L
-#define DBPROPVAL_IN_IGNORENULL 0x00000002L
-#define DBPROPVAL_IN_IGNOREANYNULL 0x00000004L
-#define DBPROPVAL_TC_NONE 0x00000000L
-#define DBPROPVAL_TC_DML 0x00000001L
-#define DBPROPVAL_TC_DDL_COMMIT 0x00000002L
-#define DBPROPVAL_TC_DDL_IGNORE 0x00000004L
-#define DBPROPVAL_TC_ALL 0x00000008L
-#define DBPROPVAL_NP_OKTODO 0x00000001L
-#define DBPROPVAL_NP_ABOUTTODO 0x00000002L
-#define DBPROPVAL_NP_SYNCHAFTER 0x00000004L
-#define DBPROPVAL_OA_NOTSUPPORTED 0x00000001L
-#define DBPROPVAL_OA_ATEXECUTE 0x00000002L
-#define DBPROPVAL_OA_ATROWRELEASE 0x00000004L
-#define DBPROPVAL_MR_NOTSUPPORTED 0x00000000L
-#define DBPROPVAL_MR_SUPPORTED 0x00000001L
-#define DBPROPVAL_MR_CONCURRENT 0x00000002L
-#define DBPROPVAL_PT_GUID_NAME 0x00000001L
-#define DBPROPVAL_PT_GUID_PROPID 0x00000002L
-#define DBPROPVAL_PT_NAME 0x00000004L
-#define DBPROPVAL_PT_GUID 0x00000008L
-#define DBPROPVAL_PT_PROPID 0x00000010L
-#define DBPROPVAL_PT_PGUID_NAME 0x00000020L
-#define DBPROPVAL_PT_PGUID_PROPID 0x00000040L
-#define DBPROPVAL_NT_SINGLEROW 0x00000001L
-#define DBPROPVAL_NT_MULTIPLEROWS 0x00000002L
+#define DBPROPVAL_NP_OKTODO __MSABI_LONG(0x00000001)
+#define DBPROPVAL_NP_ABOUTTODO __MSABI_LONG(0x00000002)
+#define DBPROPVAL_NP_SYNCHAFTER __MSABI_LONG(0x00000004)
+#define DBPROPVAL_NP_FAILEDTODO __MSABI_LONG(0x00000008)
+#define DBPROPVAL_NP_DIDEVENT __MSABI_LONG(0x00000010)
+#define DBPROPVAL_NC_END __MSABI_LONG(0x00000001)
+#define DBPROPVAL_NC_HIGH __MSABI_LONG(0x00000002)
+#define DBPROPVAL_NC_LOW __MSABI_LONG(0x00000004)
+#define DBPROPVAL_NC_START __MSABI_LONG(0x00000008)
+#define DBPROPVAL_OO_BLOB __MSABI_LONG(0x00000001)
+#define DBPROPVAL_OO_IPERSIST __MSABI_LONG(0x00000002)
+#define DBPROPVAL_CB_DELETE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CB_PRESERVE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SU_DML_STATEMENTS __MSABI_LONG(0x00000001)
+#define DBPROPVAL_SU_TABLE_DEFINITION __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SU_INDEX_DEFINITION __MSABI_LONG(0x00000004)
+#define DBPROPVAL_SU_PRIVILEGE_DEFINITION __MSABI_LONG(0x00000008)
+#define DBPROPVAL_SQ_CORRELATEDSUBQUERIES __MSABI_LONG(0x00000001)
+#define DBPROPVAL_SQ_COMPARISON __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SQ_EXISTS __MSABI_LONG(0x00000004)
+#define DBPROPVAL_SQ_IN __MSABI_LONG(0x00000008)
+#define DBPROPVAL_SQ_QUANTIFIED __MSABI_LONG(0x00000010)
+#define DBPROPVAL_SQ_TABLE __MSABI_LONG(0x00000020)
+#define DBPROPVAL_SS_ISEQUENTIALSTREAM __MSABI_LONG(0x00000001)
+#define DBPROPVAL_SS_ISTREAM __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SS_ISTORAGE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_SS_ILOCKBYTES __MSABI_LONG(0x00000008)
+#define DBPROPVAL_TI_CHAOS __MSABI_LONG(0x00000010)
+#define DBPROPVAL_TI_READUNCOMMITTED __MSABI_LONG(0x00000100)
+#define DBPROPVAL_TI_BROWSE __MSABI_LONG(0x00000100)
+#define DBPROPVAL_TI_CURSORSTABILITY __MSABI_LONG(0x00001000)
+#define DBPROPVAL_TI_READCOMMITTED __MSABI_LONG(0x00001000)
+#define DBPROPVAL_TI_REPEATABLEREAD __MSABI_LONG(0x00010000)
+#define DBPROPVAL_TI_SERIALIZABLE __MSABI_LONG(0x00100000)
+#define DBPROPVAL_TI_ISOLATED __MSABI_LONG(0x00100000)
+#define DBPROPVAL_TR_COMMIT_DC __MSABI_LONG(0x00000001)
+#define DBPROPVAL_TR_COMMIT __MSABI_LONG(0x00000002)
+#define DBPROPVAL_TR_COMMIT_NO __MSABI_LONG(0x00000004)
+#define DBPROPVAL_TR_ABORT_DC __MSABI_LONG(0x00000008)
+#define DBPROPVAL_TR_ABORT __MSABI_LONG(0x00000010)
+#define DBPROPVAL_TR_ABORT_NO __MSABI_LONG(0x00000020)
+#define DBPROPVAL_TR_DONTCARE __MSABI_LONG(0x00000040)
+#define DBPROPVAL_TR_BOTH __MSABI_LONG(0x00000080)
+#define DBPROPVAL_TR_NONE __MSABI_LONG(0x00000100)
+#define DBPROPVAL_TR_OPTIMISTIC __MSABI_LONG(0x00000200)
+#define DBPROPVAL_RT_FREETHREAD __MSABI_LONG(0x00000001)
+#define DBPROPVAL_RT_APTMTTHREAD __MSABI_LONG(0x00000002)
+#define DBPROPVAL_RT_SINGLETHREAD __MSABI_LONG(0x00000004)
+#define DBPROPVAL_UP_CHANGE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_UP_DELETE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_UP_INSERT __MSABI_LONG(0x00000004)
+#define DBPROPVAL_SQL_NONE __MSABI_LONG(0x00000000)
+#define DBPROPVAL_SQL_ODBC_MINIMUM __MSABI_LONG(0x00000001)
+#define DBPROPVAL_SQL_ODBC_CORE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SQL_ODBC_EXTENDED __MSABI_LONG(0x00000004)
+#define DBPROPVAL_SQL_ANSI89_IEF __MSABI_LONG(0x00000008)
+#define DBPROPVAL_SQL_ANSI92_ENTRY __MSABI_LONG(0x00000010)
+#define DBPROPVAL_SQL_FIPS_TRANSITIONAL __MSABI_LONG(0x00000020)
+#define DBPROPVAL_SQL_ANSI92_INTERMEDIATE __MSABI_LONG(0x00000040)
+#define DBPROPVAL_SQL_ANSI92_FULL __MSABI_LONG(0x00000080)
+#define DBPROPVAL_SQL_ESCAPECLAUSES __MSABI_LONG(0x00000100)
+#define DBPROPVAL_IT_BTREE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_IT_HASH __MSABI_LONG(0x00000002)
+#define DBPROPVAL_IT_CONTENT __MSABI_LONG(0x00000003)
+#define DBPROPVAL_IT_OTHER __MSABI_LONG(0x00000004)
+#define DBPROPVAL_IN_DISALLOWNULL __MSABI_LONG(0x00000001)
+#define DBPROPVAL_IN_IGNORENULL __MSABI_LONG(0x00000002)
+#define DBPROPVAL_IN_IGNOREANYNULL __MSABI_LONG(0x00000004)
+#define DBPROPVAL_TC_NONE __MSABI_LONG(0x00000000)
+#define DBPROPVAL_TC_DML __MSABI_LONG(0x00000001)
+#define DBPROPVAL_TC_DDL_COMMIT __MSABI_LONG(0x00000002)
+#define DBPROPVAL_TC_DDL_IGNORE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_TC_ALL __MSABI_LONG(0x00000008)
+#define DBPROPVAL_NP_OKTODO __MSABI_LONG(0x00000001)
+#define DBPROPVAL_NP_ABOUTTODO __MSABI_LONG(0x00000002)
+#define DBPROPVAL_NP_SYNCHAFTER __MSABI_LONG(0x00000004)
+#define DBPROPVAL_OA_NOTSUPPORTED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_OA_ATEXECUTE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_OA_ATROWRELEASE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_MR_NOTSUPPORTED __MSABI_LONG(0x00000000)
+#define DBPROPVAL_MR_SUPPORTED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_MR_CONCURRENT __MSABI_LONG(0x00000002)
+#define DBPROPVAL_PT_GUID_NAME __MSABI_LONG(0x00000001)
+#define DBPROPVAL_PT_GUID_PROPID __MSABI_LONG(0x00000002)
+#define DBPROPVAL_PT_NAME __MSABI_LONG(0x00000004)
+#define DBPROPVAL_PT_GUID __MSABI_LONG(0x00000008)
+#define DBPROPVAL_PT_PROPID __MSABI_LONG(0x00000010)
+#define DBPROPVAL_PT_PGUID_NAME __MSABI_LONG(0x00000020)
+#define DBPROPVAL_PT_PGUID_PROPID __MSABI_LONG(0x00000040)
+#define DBPROPVAL_NT_SINGLEROW __MSABI_LONG(0x00000001)
+#define DBPROPVAL_NT_MULTIPLEROWS __MSABI_LONG(0x00000002)
 
 #if (OLEDBVER >= 0x0150)
-#define DBPROPVAL_ASYNCH_INITIALIZE 0x00000001L
-#define DBPROPVAL_ASYNCH_SEQUENTIALPOPULATION 0x00000002L
-#define DBPROPVAL_ASYNCH_RANDOMPOPULATION 0x00000004L
-#define DBPROPVAL_OP_EQUAL 0x00000001L
-#define DBPROPVAL_OP_RELATIVE 0x00000002L
-#define DBPROPVAL_OP_STRING 0x00000004L
-#define DBPROPVAL_CO_EQUALITY 0x00000001L
-#define DBPROPVAL_CO_STRING 0x00000002L
-#define DBPROPVAL_CO_CASESENSITIVE 0x00000004L
-#define DBPROPVAL_CO_CASEINSENSITIVE 0x00000008L
+#define DBPROPVAL_ASYNCH_INITIALIZE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_ASYNCH_SEQUENTIALPOPULATION __MSABI_LONG(0x00000002)
+#define DBPROPVAL_ASYNCH_RANDOMPOPULATION __MSABI_LONG(0x00000004)
+#define DBPROPVAL_OP_EQUAL __MSABI_LONG(0x00000001)
+#define DBPROPVAL_OP_RELATIVE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_OP_STRING __MSABI_LONG(0x00000004)
+#define DBPROPVAL_CO_EQUALITY __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CO_STRING __MSABI_LONG(0x00000002)
+#define DBPROPVAL_CO_CASESENSITIVE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_CO_CASEINSENSITIVE __MSABI_LONG(0x00000008)
 #endif
 
 #if (OLEDBVER >= 0x0200)
-#define DBPROPVAL_CO_CONTAINS 0x00000010L
-#define DBPROPVAL_CO_BEGINSWITH 0x00000020L
-#define DBPROPVAL_ASYNCH_BACKGROUNDPOPULATION 0x00000008L
-#define DBPROPVAL_ASYNCH_PREPOPULATE 0x00000010L
-#define DBPROPVAL_ASYNCH_POPULATEONDEMAND 0x00000020L
-#define DBPROPVAL_LM_NONE 0x00000001L
-#define DBPROPVAL_LM_SINGLEROW 0x00000002L
-#define DBPROPVAL_SQL_SUBMINIMUM 0x00000200L
-#define DBPROPVAL_DST_TDP 0x00000001L
-#define DBPROPVAL_DST_MDP 0x00000002L
-#define DBPROPVAL_DST_TDPANDMDP 0x00000003L
-#define MDPROPVAL_AU_UNSUPPORTED 0x00000000L
-#define MDPROPVAL_AU_UNCHANGED 0x00000001L
-#define MDPROPVAL_AU_UNKNOWN 0x00000002L
-#define MDPROPVAL_MF_WITH_CALCMEMBERS 0x00000001L
-#define MDPROPVAL_MF_WITH_NAMEDSETS 0x00000002L
-#define MDPROPVAL_MF_CREATE_CALCMEMBERS 0x00000004L
-#define MDPROPVAL_MF_CREATE_NAMEDSETS 0x00000008L
-#define MDPROPVAL_MF_SCOPE_SESSION 0x00000010L
-#define MDPROPVAL_MF_SCOPE_GLOBAL 0x00000020L
-#define MDPROPVAL_MMF_COUSIN 0x00000001L
-#define MDPROPVAL_MMF_PARALLELPERIOD 0x00000002L
-#define MDPROPVAL_MMF_OPENINGPERIOD 0x00000004L
-#define MDPROPVAL_MMF_CLOSINGPERIOD 0x00000008L
-#define MDPROPVAL_MNF_MEDIAN 0x00000001L
-#define MDPROPVAL_MNF_VAR 0x00000002L
-#define MDPROPVAL_MNF_STDDEV 0x00000004L
-#define MDPROPVAL_MNF_RANK 0x00000008L
-#define MDPROPVAL_MNF_AGGREGATE 0x00000010L
-#define MDPROPVAL_MNF_COVARIANCE 0x00000020L
-#define MDPROPVAL_MNF_CORRELATION 0x00000040L
-#define MDPROPVAL_MNF_LINREGSLOPE 0x00000080L
-#define MDPROPVAL_MNF_LINREGVARIANCE 0x00000100L
-#define MDPROPVAL_MNF_LINREG2 0x00000200L
-#define MDPROPVAL_MNF_LINREGPOINT 0x00000400L
-#define MDPROPVAL_MNF_DRILLDOWNLEVEL 0x00000800L
-#define MDPROPVAL_MNF_DRILLDOWNMEMBERTOP 0x00001000L
-#define MDPROPVAL_MNF_DRILLDOWNMEMBERBOTTOM 0x00002000L
-#define MDPROPVAL_MNF_DRILLDOWNLEVELTOP 0x00004000L
-#define MDPROPVAL_MNF_DRILLDOWNLEVELBOTTOM 0x00008000L
-#define MDPROPVAL_MNF_DRILLUPMEMBER 0x00010000L
-#define MDPROPVAL_MNF_DRILLUPLEVEL 0x00020000L
-#define MDPROPVAL_MMF_COUSIN 0x00000001L
-#define MDPROPVAL_MMF_PARALLELPERIOD 0x00000002L
-#define MDPROPVAL_MMF_OPENINGPERIOD 0x00000004L
-#define MDPROPVAL_MMF_CLOSINGPERIOD 0x00000008L
-#define MDPROPVAL_MSF_TOPPERCENT 0x00000001L
-#define MDPROPVAL_MSF_BOTTOMPERCENT 0x00000002L
-#define MDPROPVAL_MSF_TOPSUM 0x00000004L
-#define MDPROPVAL_MSF_BOTTOMSUM 0x00000008L
-#define MDPROPVAL_MSF_PERIODSTODATE 0x00000010L
-#define MDPROPVAL_MSF_LASTPERIODS 0x00000020L
-#define MDPROPVAL_MSF_YTD 0x00000040L
-#define MDPROPVAL_MSF_QTD 0x00000080L
-#define MDPROPVAL_MSF_MTD 0x00000100L
-#define MDPROPVAL_MSF_WTD 0x00000200L
-#define MDPROPVAL_MSF_DRILLDOWNMEMBBER 0x00000400L
-#define MDPROPVAL_MSF_DRILLDOWNLEVEL 0x00000800L
-#define MDPROPVAL_MSF_DRILLDOWNMEMBERTOP 0x00001000L
-#define MDPROPVAL_MSF_DRILLDOWNMEMBERBOTTOM 0x00002000L
-#define MDPROPVAL_MSF_DRILLDOWNLEVELTOP 0x00004000L
-#define MDPROPVAL_MSF_DRILLDOWNLEVELBOTTOM 0x00008000L
-#define MDPROPVAL_MSF_DRILLUPMEMBER 0x00010000L
-#define MDPROPVAL_MSF_DRILLUPLEVEL 0x00020000L
-#define MDPROPVAL_MSF_TOGGLEDRILLSTATE 0x00040000L
+#define DBPROPVAL_CO_CONTAINS __MSABI_LONG(0x00000010)
+#define DBPROPVAL_CO_BEGINSWITH __MSABI_LONG(0x00000020)
+#define DBPROPVAL_ASYNCH_BACKGROUNDPOPULATION __MSABI_LONG(0x00000008)
+#define DBPROPVAL_ASYNCH_PREPOPULATE __MSABI_LONG(0x00000010)
+#define DBPROPVAL_ASYNCH_POPULATEONDEMAND __MSABI_LONG(0x00000020)
+#define DBPROPVAL_LM_NONE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_LM_SINGLEROW __MSABI_LONG(0x00000002)
+#define DBPROPVAL_SQL_SUBMINIMUM __MSABI_LONG(0x00000200)
+#define DBPROPVAL_DST_TDP __MSABI_LONG(0x00000001)
+#define DBPROPVAL_DST_MDP __MSABI_LONG(0x00000002)
+#define DBPROPVAL_DST_TDPANDMDP __MSABI_LONG(0x00000003)
+#define MDPROPVAL_AU_UNSUPPORTED __MSABI_LONG(0x00000000)
+#define MDPROPVAL_AU_UNCHANGED __MSABI_LONG(0x00000001)
+#define MDPROPVAL_AU_UNKNOWN __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MF_WITH_CALCMEMBERS __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MF_WITH_NAMEDSETS __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MF_CREATE_CALCMEMBERS __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MF_CREATE_NAMEDSETS __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MF_SCOPE_SESSION __MSABI_LONG(0x00000010)
+#define MDPROPVAL_MF_SCOPE_GLOBAL __MSABI_LONG(0x00000020)
+#define MDPROPVAL_MMF_COUSIN __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MMF_PARALLELPERIOD __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MMF_OPENINGPERIOD __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MMF_CLOSINGPERIOD __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MNF_MEDIAN __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MNF_VAR __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MNF_STDDEV __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MNF_RANK __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MNF_AGGREGATE __MSABI_LONG(0x00000010)
+#define MDPROPVAL_MNF_COVARIANCE __MSABI_LONG(0x00000020)
+#define MDPROPVAL_MNF_CORRELATION __MSABI_LONG(0x00000040)
+#define MDPROPVAL_MNF_LINREGSLOPE __MSABI_LONG(0x00000080)
+#define MDPROPVAL_MNF_LINREGVARIANCE __MSABI_LONG(0x00000100)
+#define MDPROPVAL_MNF_LINREG2 __MSABI_LONG(0x00000200)
+#define MDPROPVAL_MNF_LINREGPOINT __MSABI_LONG(0x00000400)
+#define MDPROPVAL_MNF_DRILLDOWNLEVEL __MSABI_LONG(0x00000800)
+#define MDPROPVAL_MNF_DRILLDOWNMEMBERTOP __MSABI_LONG(0x00001000)
+#define MDPROPVAL_MNF_DRILLDOWNMEMBERBOTTOM __MSABI_LONG(0x00002000)
+#define MDPROPVAL_MNF_DRILLDOWNLEVELTOP __MSABI_LONG(0x00004000)
+#define MDPROPVAL_MNF_DRILLDOWNLEVELBOTTOM __MSABI_LONG(0x00008000)
+#define MDPROPVAL_MNF_DRILLUPMEMBER __MSABI_LONG(0x00010000)
+#define MDPROPVAL_MNF_DRILLUPLEVEL __MSABI_LONG(0x00020000)
+#define MDPROPVAL_MMF_COUSIN __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MMF_PARALLELPERIOD __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MMF_OPENINGPERIOD __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MMF_CLOSINGPERIOD __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MSF_TOPPERCENT __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MSF_BOTTOMPERCENT __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MSF_TOPSUM __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MSF_BOTTOMSUM __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MSF_PERIODSTODATE __MSABI_LONG(0x00000010)
+#define MDPROPVAL_MSF_LASTPERIODS __MSABI_LONG(0x00000020)
+#define MDPROPVAL_MSF_YTD __MSABI_LONG(0x00000040)
+#define MDPROPVAL_MSF_QTD __MSABI_LONG(0x00000080)
+#define MDPROPVAL_MSF_MTD __MSABI_LONG(0x00000100)
+#define MDPROPVAL_MSF_WTD __MSABI_LONG(0x00000200)
+#define MDPROPVAL_MSF_DRILLDOWNMEMBBER __MSABI_LONG(0x00000400)
+#define MDPROPVAL_MSF_DRILLDOWNLEVEL __MSABI_LONG(0x00000800)
+#define MDPROPVAL_MSF_DRILLDOWNMEMBERTOP __MSABI_LONG(0x00001000)
+#define MDPROPVAL_MSF_DRILLDOWNMEMBERBOTTOM __MSABI_LONG(0x00002000)
+#define MDPROPVAL_MSF_DRILLDOWNLEVELTOP __MSABI_LONG(0x00004000)
+#define MDPROPVAL_MSF_DRILLDOWNLEVELBOTTOM __MSABI_LONG(0x00008000)
+#define MDPROPVAL_MSF_DRILLUPMEMBER __MSABI_LONG(0x00010000)
+#define MDPROPVAL_MSF_DRILLUPLEVEL __MSABI_LONG(0x00020000)
+#define MDPROPVAL_MSF_TOGGLEDRILLSTATE __MSABI_LONG(0x00040000)
 
-#define MDPROPVAL_MD_SELF 0x00000001L
-#define MDPROPVAL_MD_BEFORE 0x00000002L
-#define MDPROPVAL_MD_AFTER 0x00000004L
+#define MDPROPVAL_MD_SELF __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MD_BEFORE __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MD_AFTER __MSABI_LONG(0x00000004)
 
-#define MDPROPVAL_MSC_LESSTHAN 0x00000001L
-#define MDPROPVAL_MSC_GREATERTHAN 0x00000002L
-#define MDPROPVAL_MSC_LESSTHANEQUAL 0x00000004L
-#define MDPROPVAL_MSC_GREATERTHANEQUAL 0x00000008L
-#define MDPROPVAL_MC_SINGLECASE 0x00000001L
-#define MDPROPVAL_MC_SEARCHEDCASE 0x00000002L
-#define MDPROPVAL_MOQ_OUTERREFERENCE 0x00000001L
-#define MDPROPVAL_MOQ_DATASOURCE_CUBE 0x00000001L
-#define MDPROPVAL_MOQ_CATALOG_CUBE 0x00000002L
-#define MDPROPVAL_MOQ_SCHEMA_CUBE 0x00000004L
-#define MDPROPVAL_MOQ_CUBE_DIM 0x00000008L
-#define MDPROPVAL_MOQ_DIM_HIER 0x00000010L
-#define MDPROPVAL_MOQ_DIMHIER_LEVEL 0x00000020L
-#define MDPROPVAL_MOQ_LEVEL_MEMBER 0x00000040L
-#define MDPROPVAL_MOQ_MEMBER_MEMBER 0x00000080L
-#define MDPROPVAL_MOQ_DIMHIER_MEMBER 0x00000100L
-#define MDPROPVAL_FS_FULL_SUPPORT 0x00000001L
-#define MDPROPVAL_FS_GENERATED_COLUMN 0x00000002L
-#define MDPROPVAL_FS_GENERATED_DIMENSION 0x00000003L
-#define MDPROPVAL_FS_NO_SUPPORT 0x00000004L
-#define MDPROPVAL_NL_NAMEDLEVELS 0x00000001L
-#define MDPROPVAL_NL_NUMBEREDLEVELS 0x00000002L
-#define MDPROPVAL_MJC_SINGLECUBE 0x00000001L
-#define MDPROPVAL_MJC_MULTICUBES 0x00000002L
-#define MDPROPVAL_MJC_IMPLICITCUBE 0x00000004L
-#define MDPROPVAL_RR_NORANGEROWSET 0x00000001L
-#define MDPROPVAL_RR_READONLY 0x00000002L
-#define MDPROPVAL_RR_UPDATE 0x00000004L
-#define MDPROPVAL_MS_MULTIPLETUPLES 0x00000001L
-#define MDPROPVAL_MS_SINGLETUPLE 0x00000002L
-#define MDPROPVAL_NME_ALLDIMENSIONS 0x00000000L
-#define MDPROPVAL_NME_MEASURESONLY 0x00000001L
-#define DBPROPVAL_AO_SEQUENTIAL 0x00000000L
-#define DBPROPVAL_AO_SEQUENTIALSTORAGEOBJECTS 0x00000001L
-#define DBPROPVAL_AO_RANDOM 0x00000002L
-#define DBPROPVAL_BD_ROWSET 0x00000000L
-#define DBPROPVAL_BD_INTRANSACTION 0x00000001L
-#define DBPROPVAL_BD_XTRANSACTION 0x00000002L
-#define DBPROPVAL_BD_REORGANIZATION 0x00000003L
+#define MDPROPVAL_MSC_LESSTHAN __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MSC_GREATERTHAN __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MSC_LESSTHANEQUAL __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MSC_GREATERTHANEQUAL __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MC_SINGLECASE __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MC_SEARCHEDCASE __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MOQ_OUTERREFERENCE __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MOQ_DATASOURCE_CUBE __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MOQ_CATALOG_CUBE __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MOQ_SCHEMA_CUBE __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MOQ_CUBE_DIM __MSABI_LONG(0x00000008)
+#define MDPROPVAL_MOQ_DIM_HIER __MSABI_LONG(0x00000010)
+#define MDPROPVAL_MOQ_DIMHIER_LEVEL __MSABI_LONG(0x00000020)
+#define MDPROPVAL_MOQ_LEVEL_MEMBER __MSABI_LONG(0x00000040)
+#define MDPROPVAL_MOQ_MEMBER_MEMBER __MSABI_LONG(0x00000080)
+#define MDPROPVAL_MOQ_DIMHIER_MEMBER __MSABI_LONG(0x00000100)
+#define MDPROPVAL_FS_FULL_SUPPORT __MSABI_LONG(0x00000001)
+#define MDPROPVAL_FS_GENERATED_COLUMN __MSABI_LONG(0x00000002)
+#define MDPROPVAL_FS_GENERATED_DIMENSION __MSABI_LONG(0x00000003)
+#define MDPROPVAL_FS_NO_SUPPORT __MSABI_LONG(0x00000004)
+#define MDPROPVAL_NL_NAMEDLEVELS __MSABI_LONG(0x00000001)
+#define MDPROPVAL_NL_NUMBEREDLEVELS __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MJC_SINGLECUBE __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MJC_MULTICUBES __MSABI_LONG(0x00000002)
+#define MDPROPVAL_MJC_IMPLICITCUBE __MSABI_LONG(0x00000004)
+#define MDPROPVAL_RR_NORANGEROWSET __MSABI_LONG(0x00000001)
+#define MDPROPVAL_RR_READONLY __MSABI_LONG(0x00000002)
+#define MDPROPVAL_RR_UPDATE __MSABI_LONG(0x00000004)
+#define MDPROPVAL_MS_MULTIPLETUPLES __MSABI_LONG(0x00000001)
+#define MDPROPVAL_MS_SINGLETUPLE __MSABI_LONG(0x00000002)
+#define MDPROPVAL_NME_ALLDIMENSIONS __MSABI_LONG(0x00000000)
+#define MDPROPVAL_NME_MEASURESONLY __MSABI_LONG(0x00000001)
+#define DBPROPVAL_AO_SEQUENTIAL __MSABI_LONG(0x00000000)
+#define DBPROPVAL_AO_SEQUENTIALSTORAGEOBJECTS __MSABI_LONG(0x00000001)
+#define DBPROPVAL_AO_RANDOM __MSABI_LONG(0x00000002)
+#define DBPROPVAL_BD_ROWSET __MSABI_LONG(0x00000000)
+#define DBPROPVAL_BD_INTRANSACTION __MSABI_LONG(0x00000001)
+#define DBPROPVAL_BD_XTRANSACTION __MSABI_LONG(0x00000002)
+#define DBPROPVAL_BD_REORGANIZATION __MSABI_LONG(0x00000003)
 #define BMK_DURABILITY_ROWSET DBPROPVAL_BD_ROWSET
 #define BMK_DURABILITY_INTRANSACTION DBPROPVAL_BD_INTRANSACTION
 #define BMK_DURABILITY_XTRANSACTION DBPROPVAL_BD_XTRANSACTION
 #define BMK_DURABILITY_REORGANIZATION DBPROPVAL_BD_REORGANIZATION
-#define DBPROPVAL_BO_NOLOG 0x00000000L
-#define DBPROPVAL_BO_NOINDEXUPDATE 0x00000001L
-#define DBPROPVAL_BO_REFINTEGRITY 0x00000002L
+#define DBPROPVAL_BO_NOLOG __MSABI_LONG(0x00000000)
+#define DBPROPVAL_BO_NOINDEXUPDATE __MSABI_LONG(0x00000001)
+#define DBPROPVAL_BO_REFINTEGRITY __MSABI_LONG(0x00000002)
 #if !defined(_WINBASE_)
 #define OF_READ 0x00000000
 #define OF_WRITE 0x00000001
@@ -1600,56 +1600,56 @@
 #define DBPROPVAL_STGM_FAILIFTHERE 0x00080000
 #define DBPROPVAL_STGM_PRIORITY 0x00100000
 #define DBPROPVAL_STGM_DELETEONRELEASE 0x00200000
-#define DBPROPVAL_GB_COLLATE 0x00000010L
-#define DBPROPVAL_CS_UNINITIALIZED 0x00000000L
-#define DBPROPVAL_CS_INITIALIZED 0x00000001L
-#define DBPROPVAL_CS_COMMUNICATIONFAILURE 0x00000002L
-#define DBPROPVAL_RD_RESETALL 0xffffffffL
-#define DBPROPVAL_OS_RESOURCEPOOLING 0x00000001L
-#define DBPROPVAL_OS_TXNENLISTMENT 0x00000002L
-#define DBPROPVAL_OS_CLIENTCURSOR 0x00000004L
-#define DBPROPVAL_OS_ENABLEALL 0xffffffffL
-#define DBPROPVAL_BI_CROSSROWSET 0x00000001L
+#define DBPROPVAL_GB_COLLATE __MSABI_LONG(0x00000010)
+#define DBPROPVAL_CS_UNINITIALIZED __MSABI_LONG(0x00000000)
+#define DBPROPVAL_CS_INITIALIZED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_CS_COMMUNICATIONFAILURE __MSABI_LONG(0x00000002)
+#define DBPROPVAL_RD_RESETALL __MSABI_LONG(0xffffffff)
+#define DBPROPVAL_OS_RESOURCEPOOLING __MSABI_LONG(0x00000001)
+#define DBPROPVAL_OS_TXNENLISTMENT __MSABI_LONG(0x00000002)
+#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)
+#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)
+#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)
 #endif
 
 #if (OLEDBVER >= 0x0210)
-#define MDPROPVAL_NL_SCHEMAONLY 0x00000004L
-#define DBPROPVAL_OS_DISABLEALL 0x00000000L
-#define DBPROPVAL_OO_ROWOBJECT 0x00000004L
-#define DBPROPVAL_OO_SCOPED 0x00000008L
-#define DBPROPVAL_OO_DIRECTBIND 0x00000010L
-#define DBPROPVAL_DST_DOCSOURCE 0x00000004L
-#define DBPROPVAL_GU_NOTSUPPORTED 0x00000001L
-#define DBPROPVAL_GU_SUFFIX 0x00000002L
-#define DB_BINDFLAGS_DELAYFETCHCOLUMNS 0x00000001L
-#define DB_BINDFLAGS_DELAYFETCHSTREAM 0x00000002L
-#define DB_BINDFLAGS_RECURSIVE 0x00000004L
-#define DB_BINDFLAGS_OUTPUT 0x00000008L
-#define DB_BINDFLAGS_COLLECTION 0x00000010L
-#define DB_BINDFLAGS_OPENIFEXISTS 0x00000020L
-#define DB_BINDFLAGS_OVERWRITE 0x00000040L
-#define DB_BINDFLAGS_ISSTRUCTUREDDOCUMENT 0x00000080L
-#define DBPROPVAL_ORS_TABLE 0x00000000L
-#define DBPROPVAL_ORS_INDEX 0x00000001L
-#define DBPROPVAL_ORS_INTEGRATEDINDEX 0x00000002L
-#define DBPROPVAL_TC_DDL_LOCK 0x00000010L
-#define DBPROPVAL_ORS_STOREDPROC 0x00000004L
-#define DBPROPVAL_IN_ALLOWNULL 0x00000000L
+#define MDPROPVAL_NL_SCHEMAONLY __MSABI_LONG(0x00000004)
+#define DBPROPVAL_OS_DISABLEALL __MSABI_LONG(0x00000000)
+#define DBPROPVAL_OO_ROWOBJECT __MSABI_LONG(0x00000004)
+#define DBPROPVAL_OO_SCOPED __MSABI_LONG(0x00000008)
+#define DBPROPVAL_OO_DIRECTBIND __MSABI_LONG(0x00000010)
+#define DBPROPVAL_DST_DOCSOURCE __MSABI_LONG(0x00000004)
+#define DBPROPVAL_GU_NOTSUPPORTED __MSABI_LONG(0x00000001)
+#define DBPROPVAL_GU_SUFFIX __MSABI_LONG(0x00000002)
+#define DB_BINDFLAGS_DELAYFETCHCOLUMNS __MSABI_LONG(0x00000001)
+#define DB_BINDFLAGS_DELAYFETCHSTREAM __MSABI_LONG(0x00000002)
+#define DB_BINDFLAGS_RECURSIVE __MSABI_LONG(0x00000004)
+#define DB_BINDFLAGS_OUTPUT __MSABI_LONG(0x00000008)
+#define DB_BINDFLAGS_COLLECTION __MSABI_LONG(0x00000010)
+#define DB_BINDFLAGS_OPENIFEXISTS __MSABI_LONG(0x00000020)
+#define DB_BINDFLAGS_OVERWRITE __MSABI_LONG(0x00000040)
+#define DB_BINDFLAGS_ISSTRUCTUREDDOCUMENT __MSABI_LONG(0x00000080)
+#define DBPROPVAL_ORS_TABLE __MSABI_LONG(0x00000000)
+#define DBPROPVAL_ORS_INDEX __MSABI_LONG(0x00000001)
+#define DBPROPVAL_ORS_INTEGRATEDINDEX __MSABI_LONG(0x00000002)
+#define DBPROPVAL_TC_DDL_LOCK __MSABI_LONG(0x00000010)
+#define DBPROPVAL_ORS_STOREDPROC __MSABI_LONG(0x00000004)
+#define DBPROPVAL_IN_ALLOWNULL __MSABI_LONG(0x00000000)
 #endif
 
 #if (OLEDBVER >= 0x0250)
-#define DBPROPVAL_OO_SINGLETON 0x00000020L
-#define DBPROPVAL_OS_AGR_AFTERSESSION 0x00000008L
-#define DBPROPVAL_CM_TRANSACTIONS 0x00000001L
+#define DBPROPVAL_OO_SINGLETON __MSABI_LONG(0x00000020)
+#define DBPROPVAL_OS_AGR_AFTERSESSION __MSABI_LONG(0x00000008)
+#define DBPROPVAL_CM_TRANSACTIONS __MSABI_LONG(0x00000001)
 #endif
 
 #if (OLEDBVER >= 0x0260)
-#define DBPROPVAL_TS_CARDINALITY 0x00000001L
-#define DBPROPVAL_TS_HISTOGRAM 0x00000002L
-#define DBPROPVAL_ORS_HISTOGRAM 0x00000008L
-#define MDPROPVAL_VISUAL_MODE_DEFAULT 0x00000000L
-#define MDPROPVAL_VISUAL_MODE_VISUAL 0x00000001L
-#define MDPROPVAL_VISUAL_MODE_VISUAL_OFF 0x00000002L
+#define DBPROPVAL_TS_CARDINALITY __MSABI_LONG(0x00000001)
+#define DBPROPVAL_TS_HISTOGRAM __MSABI_LONG(0x00000002)
+#define DBPROPVAL_ORS_HISTOGRAM __MSABI_LONG(0x00000008)
+#define MDPROPVAL_VISUAL_MODE_DEFAULT __MSABI_LONG(0x00000000)
+#define MDPROPVAL_VISUAL_MODE_VISUAL __MSABI_LONG(0x00000001)
+#define MDPROPVAL_VISUAL_MODE_VISUAL_OFF __MSABI_LONG(0x00000002)
 #endif
 
 #define DB_IMP_LEVEL_ANONYMOUS 0x00
diff --git a/mingw-w64-headers/include/oledlg.h b/mingw-w64-headers/include/oledlg.h
index 5e18f1f..110b7fc 100644
--- a/mingw-w64-headers/include/oledlg.h
+++ b/mingw-w64-headers/include/oledlg.h
@@ -293,20 +293,20 @@
 
 #define OleUIInsertObject __MINGW_NAME_AW(OleUIInsertObject)
 
-#define IOF_SHOWHELP 0x00000001L
-#define IOF_SELECTCREATENEW 0x00000002L
-#define IOF_SELECTCREATEFROMFILE 0x00000004L
-#define IOF_CHECKLINK 0x00000008L
-#define IOF_CHECKDISPLAYASICON 0x00000010L
-#define IOF_CREATENEWOBJECT 0x00000020L
-#define IOF_CREATEFILEOBJECT 0x00000040L
-#define IOF_CREATELINKOBJECT 0x00000080L
-#define IOF_DISABLELINK 0x00000100L
-#define IOF_VERIFYSERVERSEXIST 0x00000200L
-#define IOF_DISABLEDISPLAYASICON 0x00000400L
-#define IOF_HIDECHANGEICON 0x00000800L
-#define IOF_SHOWINSERTCONTROL 0x00001000L
-#define IOF_SELECTCREATECONTROL 0x00002000L
+#define IOF_SHOWHELP __MSABI_LONG(0x00000001)
+#define IOF_SELECTCREATENEW __MSABI_LONG(0x00000002)
+#define IOF_SELECTCREATEFROMFILE __MSABI_LONG(0x00000004)
+#define IOF_CHECKLINK __MSABI_LONG(0x00000008)
+#define IOF_CHECKDISPLAYASICON __MSABI_LONG(0x00000010)
+#define IOF_CREATENEWOBJECT __MSABI_LONG(0x00000020)
+#define IOF_CREATEFILEOBJECT __MSABI_LONG(0x00000040)
+#define IOF_CREATELINKOBJECT __MSABI_LONG(0x00000080)
+#define IOF_DISABLELINK __MSABI_LONG(0x00000100)
+#define IOF_VERIFYSERVERSEXIST __MSABI_LONG(0x00000200)
+#define IOF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000400)
+#define IOF_HIDECHANGEICON __MSABI_LONG(0x00000800)
+#define IOF_SHOWINSERTCONTROL __MSABI_LONG(0x00001000)
+#define IOF_SELECTCREATECONTROL __MSABI_LONG(0x00002000)
 
 #define OLEUI_IOERR_LPSZFILEINVALID (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_IOERR_LPSZLABELINVALID (OLEUI_ERR_STANDARDMAX+1)
@@ -406,15 +406,15 @@
 
 #define OleUIPasteSpecial __MINGW_NAME_AW(OleUIPasteSpecial)
 
-#define PSF_SHOWHELP 0x00000001L
-#define PSF_SELECTPASTE 0x00000002L
-#define PSF_SELECTPASTELINK 0x00000004L
+#define PSF_SHOWHELP __MSABI_LONG(0x00000001)
+#define PSF_SELECTPASTE __MSABI_LONG(0x00000002)
+#define PSF_SELECTPASTELINK __MSABI_LONG(0x00000004)
 
-#define PSF_CHECKDISPLAYASICON 0x00000008L
-#define PSF_DISABLEDISPLAYASICON 0x00000010L
-#define PSF_HIDECHANGEICON 0x00000020L
-#define PSF_STAYONCLIPBOARDCHANGE 0x00000040L
-#define PSF_NOREFRESHDATAOBJECT 0x00000080L
+#define PSF_CHECKDISPLAYASICON __MSABI_LONG(0x00000008)
+#define PSF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000010)
+#define PSF_HIDECHANGEICON __MSABI_LONG(0x00000020)
+#define PSF_STAYONCLIPBOARDCHANGE __MSABI_LONG(0x00000040)
+#define PSF_NOREFRESHDATAOBJECT __MSABI_LONG(0x00000080)
 
 #define OLEUI_IOERR_SRCDATAOBJECTINVALID (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_IOERR_ARRPASTEENTRIESINVALID (OLEUI_ERR_STANDARDMAX+1)
@@ -505,11 +505,11 @@
 
 #define OleUIEditLinks __MINGW_NAME_AW(OleUIEditLinks)
 
-#define ELF_SHOWHELP 0x00000001L
-#define ELF_DISABLEUPDATENOW 0x00000002L
-#define ELF_DISABLEOPENSOURCE 0x00000004L
-#define ELF_DISABLECHANGESOURCE 0x00000008L
-#define ELF_DISABLECANCELLINK 0x00000010L
+#define ELF_SHOWHELP __MSABI_LONG(0x00000001)
+#define ELF_DISABLEUPDATENOW __MSABI_LONG(0x00000002)
+#define ELF_DISABLEOPENSOURCE __MSABI_LONG(0x00000004)
+#define ELF_DISABLECHANGESOURCE __MSABI_LONG(0x00000008)
+#define ELF_DISABLECANCELLINK __MSABI_LONG(0x00000010)
 
   typedef struct tagOLEUICHANGEICONW {
     DWORD cbStruct;
@@ -555,11 +555,11 @@
 
 #define OleUIChangeIcon __MINGW_NAME_AW(OleUIChangeIcon)
 
-#define CIF_SHOWHELP 0x00000001L
-#define CIF_SELECTCURRENT 0x00000002L
-#define CIF_SELECTDEFAULT 0x00000004L
-#define CIF_SELECTFROMFILE 0x00000008L
-#define CIF_USEICONEXE 0x00000010L
+#define CIF_SHOWHELP __MSABI_LONG(0x00000001)
+#define CIF_SELECTCURRENT __MSABI_LONG(0x00000002)
+#define CIF_SELECTDEFAULT __MSABI_LONG(0x00000004)
+#define CIF_SELECTFROMFILE __MSABI_LONG(0x00000008)
+#define CIF_USEICONEXE __MSABI_LONG(0x00000010)
 
 #define OLEUI_CIERR_MUSTHAVECLSID (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_CIERR_MUSTHAVECURRENTMETAFILE (OLEUI_ERR_STANDARDMAX+1)
@@ -630,15 +630,15 @@
 
   STDAPI_(WINBOOL) OleUICanConvertOrActivateAs(REFCLSID rClsid,WINBOOL fIsLinkedObject,WORD wFormat);
 
-#define CF_SHOWHELPBUTTON 0x00000001L
-#define CF_SETCONVERTDEFAULT 0x00000002L
-#define CF_SETACTIVATEDEFAULT 0x00000004L
-#define CF_SELECTCONVERTTO 0x00000008L
-#define CF_SELECTACTIVATEAS 0x00000010L
-#define CF_DISABLEDISPLAYASICON 0x00000020L
-#define CF_DISABLEACTIVATEAS 0x00000040L
-#define CF_HIDECHANGEICON 0x00000080L
-#define CF_CONVERTONLY 0x00000100L
+#define CF_SHOWHELPBUTTON __MSABI_LONG(0x00000001)
+#define CF_SETCONVERTDEFAULT __MSABI_LONG(0x00000002)
+#define CF_SETACTIVATEDEFAULT __MSABI_LONG(0x00000004)
+#define CF_SELECTCONVERTTO __MSABI_LONG(0x00000008)
+#define CF_SELECTACTIVATEAS __MSABI_LONG(0x00000010)
+#define CF_DISABLEDISPLAYASICON __MSABI_LONG(0x00000020)
+#define CF_DISABLEACTIVATEAS __MSABI_LONG(0x00000040)
+#define CF_HIDECHANGEICON __MSABI_LONG(0x00000080)
+#define CF_CONVERTONLY __MSABI_LONG(0x00000100)
 
 #define OLEUI_CTERR_CLASSIDINVALID (OLEUI_ERR_STANDARDMAX+1)
 #define OLEUI_CTERR_DVASPECTINVALID (OLEUI_ERR_STANDARDMAX+2)
@@ -685,11 +685,11 @@
 
 #define OleUIBusy __MINGW_NAME_AW(OleUIBusy)
 
-#define BZ_DISABLECANCELBUTTON 0x00000001L
-#define BZ_DISABLESWITCHTOBUTTON 0x00000002L
-#define BZ_DISABLERETRYBUTTON 0x00000004L
+#define BZ_DISABLECANCELBUTTON __MSABI_LONG(0x00000001)
+#define BZ_DISABLESWITCHTOBUTTON __MSABI_LONG(0x00000002)
+#define BZ_DISABLERETRYBUTTON __MSABI_LONG(0x00000004)
 
-#define BZ_NOTRESPONDINGDIALOG 0x00000008L
+#define BZ_NOTRESPONDINGDIALOG __MSABI_LONG(0x00000008)
 
 #define OLEUI_BZERR_HTASKINVALID (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_BZ_SWITCHTOSELECTED (OLEUI_ERR_STANDARDMAX+1)
@@ -747,10 +747,10 @@
 
 #define OleUIChangeSource __MINGW_NAME_AW(OleUIChangeSource)
 
-#define CSF_SHOWHELP 0x00000001L
-#define CSF_VALIDSOURCE 0x00000002L
-#define CSF_ONLYGETSOURCE 0x00000004L
-#define CSF_EXPLORER 0x00000008L
+#define CSF_SHOWHELP __MSABI_LONG(0x00000001)
+#define CSF_VALIDSOURCE __MSABI_LONG(0x00000002)
+#define CSF_ONLYGETSOURCE __MSABI_LONG(0x00000004)
+#define CSF_EXPLORER __MSABI_LONG(0x00000008)
 
 #define OLEUI_CSERR_LINKCNTRNULL (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_CSERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+1)
@@ -902,9 +902,9 @@
 #define POLEUIVIEWPROPS __MINGW_NAME_AW(POLEUIVIEWPROPS)
 #define LPOLEUIVIEWPROPS __MINGW_NAME_AW(LPOLEUIVIEWPROPS)
 
-#define VPF_SELECTRELATIVE 0x00000001L
-#define VPF_DISABLERELATIVE 0x00000002L
-#define VPF_DISABLESCALE 0x00000004L
+#define VPF_SELECTRELATIVE __MSABI_LONG(0x00000001)
+#define VPF_DISABLERELATIVE __MSABI_LONG(0x00000002)
+#define VPF_DISABLESCALE __MSABI_LONG(0x00000004)
 
   typedef struct tagOLEUILINKPROPSW {
     DWORD cbStruct;
@@ -982,10 +982,10 @@
 
 #define OleUIObjectProperties __MINGW_NAME_AW(OleUIObjectProperties)
 
-#define OPF_OBJECTISLINK 0x00000001L
-#define OPF_NOFILLDEFAULT 0x00000002L
-#define OPF_SHOWHELP 0x00000004L
-#define OPF_DISABLECONVERT 0x00000008L
+#define OPF_OBJECTISLINK __MSABI_LONG(0x00000001)
+#define OPF_NOFILLDEFAULT __MSABI_LONG(0x00000002)
+#define OPF_SHOWHELP __MSABI_LONG(0x00000004)
+#define OPF_DISABLECONVERT __MSABI_LONG(0x00000008)
 
 #define OLEUI_OPERR_SUBPROPNULL (OLEUI_ERR_STANDARDMAX+0)
 #define OLEUI_OPERR_SUBPROPINVALID (OLEUI_ERR_STANDARDMAX+1)
diff --git a/mingw-w64-headers/include/pdh.h b/mingw-w64-headers/include/pdh.h
index af3d25e..e46c4c8 100644
--- a/mingw-w64-headers/include/pdh.h
+++ b/mingw-w64-headers/include/pdh.h
@@ -303,8 +303,8 @@
   PDH_FUNCTION PdhGetCounterInfoW(PDH_HCOUNTER hCounter,BOOLEAN bRetrieveExplainText,LPDWORD pdwBufferSize,PPDH_COUNTER_INFO_W lpBuffer);
   PDH_FUNCTION PdhGetCounterInfoA(PDH_HCOUNTER hCounter,BOOLEAN bRetrieveExplainText,LPDWORD pdwBufferSize,PPDH_COUNTER_INFO_A lpBuffer);
 
-#define PDH_MAX_SCALE (7L)
-#define PDH_MIN_SCALE (-7L)
+#define PDH_MAX_SCALE (__MSABI_LONG(7))
+#define PDH_MIN_SCALE (__MSABI_LONG(-7))
 
   PDH_FUNCTION PdhSetCounterScaleFactor(PDH_HCOUNTER hCounter,LONG lFactor);
   PDH_FUNCTION PdhConnectMachineW(LPCWSTR szMachineName);
diff --git a/mingw-w64-headers/include/penwin.h b/mingw-w64-headers/include/penwin.h
index 5be6f7b..47ed644 100644
--- a/mingw-w64-headers/include/penwin.h
+++ b/mingw-w64-headers/include/penwin.h
@@ -46,28 +46,28 @@
 
 #ifndef NOPENALC
 
-#define ALC_DEFAULT 0x00000000L
-#define ALC_LCALPHA 0x00000001L
-#define ALC_UCALPHA 0x00000002L
-#define ALC_NUMERIC 0x00000004L
-#define ALC_PUNC 0x00000008L
-#define ALC_MATH 0x00000010L
-#define ALC_MONETARY 0x00000020L
-#define ALC_OTHER 0x00000040L
-#define ALC_ASCII 0x00000080L
-#define ALC_WHITE 0x00000100L
-#define ALC_NONPRINT 0x00000200L
-#define ALC_DBCS 0x00000400L
-#define ALC_JIS1 0x00000800L
-#define ALC_GESTURE 0x00004000L
-#define ALC_USEBITMAP 0x00008000L
-#define ALC_HIRAGANA 0x00010000L
-#define ALC_KATAKANA 0x00020000L
-#define ALC_KANJI 0x00040000L
-#define ALC_GLOBALPRIORITY 0x10000000L
-#define ALC_OEM 0x0FF80000L
-#define ALC_RESERVED 0xE0003000L
-#define ALC_NOPRIORITY 0x00000000L
+#define ALC_DEFAULT __MSABI_LONG(0x00000000)
+#define ALC_LCALPHA __MSABI_LONG(0x00000001)
+#define ALC_UCALPHA __MSABI_LONG(0x00000002)
+#define ALC_NUMERIC __MSABI_LONG(0x00000004)
+#define ALC_PUNC __MSABI_LONG(0x00000008)
+#define ALC_MATH __MSABI_LONG(0x00000010)
+#define ALC_MONETARY __MSABI_LONG(0x00000020)
+#define ALC_OTHER __MSABI_LONG(0x00000040)
+#define ALC_ASCII __MSABI_LONG(0x00000080)
+#define ALC_WHITE __MSABI_LONG(0x00000100)
+#define ALC_NONPRINT __MSABI_LONG(0x00000200)
+#define ALC_DBCS __MSABI_LONG(0x00000400)
+#define ALC_JIS1 __MSABI_LONG(0x00000800)
+#define ALC_GESTURE __MSABI_LONG(0x00004000)
+#define ALC_USEBITMAP __MSABI_LONG(0x00008000)
+#define ALC_HIRAGANA __MSABI_LONG(0x00010000)
+#define ALC_KATAKANA __MSABI_LONG(0x00020000)
+#define ALC_KANJI __MSABI_LONG(0x00040000)
+#define ALC_GLOBALPRIORITY __MSABI_LONG(0x10000000)
+#define ALC_OEM __MSABI_LONG(0x0FF80000)
+#define ALC_RESERVED __MSABI_LONG(0xE0003000)
+#define ALC_NOPRIORITY __MSABI_LONG(0x00000000)
 
 #define ALC_ALPHA (ALC_LCALPHA | ALC_UCALPHA)
 #define ALC_ALPHANUMERIC (ALC_ALPHA | ALC_NUMERIC)
@@ -123,50 +123,50 @@
 
 #ifndef NOPENHRC
 
-#define SYV_NULL 0x00000000L
-#define SYV_UNKNOWN 0x00000001L
-#define SYV_EMPTY 0x00000003L
-#define SYV_BEGINOR 0x00000010L
-#define SYV_ENDOR 0x00000011L
-#define SYV_OR 0x00000012L
-#define SYV_SOFTNEWLINE 0x00000020L
-#define SYV_SPACENULL 0x00010000L
+#define SYV_NULL __MSABI_LONG(0x00000000)
+#define SYV_UNKNOWN __MSABI_LONG(0x00000001)
+#define SYV_EMPTY __MSABI_LONG(0x00000003)
+#define SYV_BEGINOR __MSABI_LONG(0x00000010)
+#define SYV_ENDOR __MSABI_LONG(0x00000011)
+#define SYV_OR __MSABI_LONG(0x00000012)
+#define SYV_SOFTNEWLINE __MSABI_LONG(0x00000020)
+#define SYV_SPACENULL __MSABI_LONG(0x00010000)
 
-#define SYV_SELECTFIRST 0x0002FFC0L
-#define SYV_LASSO 0x0002FFC1L
-#define SYV_SELECTLEFT 0x0002FFC2L
-#define SYV_SELECTRIGHT 0x0002FFC3L
-#define SYV_SELECTLAST 0x0002FFCFL
+#define SYV_SELECTFIRST __MSABI_LONG(0x0002FFC0)
+#define SYV_LASSO __MSABI_LONG(0x0002FFC1)
+#define SYV_SELECTLEFT __MSABI_LONG(0x0002FFC2)
+#define SYV_SELECTRIGHT __MSABI_LONG(0x0002FFC3)
+#define SYV_SELECTLAST __MSABI_LONG(0x0002FFCF)
 
-#define SYV_CLEARCHAR 0x0002FFD2L
-#define SYV_HELP 0x0002FFD3L
-#define SYV_KKCONVERT 0x0002FFD4L
-#define SYV_CLEAR 0x0002FFD5L
-#define SYV_INSERT 0x0002FFD6L
-#define SYV_CONTEXT 0x0002FFD7L
-#define SYV_EXTENDSELECT 0x0002FFD8L
-#define SYV_UNDO 0x0002FFD9L
-#define SYV_COPY 0x0002FFDAL
-#define SYV_CUT 0x0002FFDBL
-#define SYV_PASTE 0x0002FFDCL
-#define SYV_CLEARWORD 0x0002FFDDL
-#define SYV_USER 0x0002FFDEL
-#define SYV_CORRECT 0x0002FFDFL
+#define SYV_CLEARCHAR __MSABI_LONG(0x0002FFD2)
+#define SYV_HELP __MSABI_LONG(0x0002FFD3)
+#define SYV_KKCONVERT __MSABI_LONG(0x0002FFD4)
+#define SYV_CLEAR __MSABI_LONG(0x0002FFD5)
+#define SYV_INSERT __MSABI_LONG(0x0002FFD6)
+#define SYV_CONTEXT __MSABI_LONG(0x0002FFD7)
+#define SYV_EXTENDSELECT __MSABI_LONG(0x0002FFD8)
+#define SYV_UNDO __MSABI_LONG(0x0002FFD9)
+#define SYV_COPY __MSABI_LONG(0x0002FFDA)
+#define SYV_CUT __MSABI_LONG(0x0002FFDB)
+#define SYV_PASTE __MSABI_LONG(0x0002FFDC)
+#define SYV_CLEARWORD __MSABI_LONG(0x0002FFDD)
+#define SYV_USER __MSABI_LONG(0x0002FFDE)
+#define SYV_CORRECT __MSABI_LONG(0x0002FFDF)
 
-#define SYV_BACKSPACE 0x00020008L
-#define SYV_TAB 0x00020009L
-#define SYV_RETURN 0x0002000DL
-#define SYV_SPACE 0x00020020L
+#define SYV_BACKSPACE __MSABI_LONG(0x00020008)
+#define SYV_TAB __MSABI_LONG(0x00020009)
+#define SYV_RETURN __MSABI_LONG(0x0002000D)
+#define SYV_SPACE __MSABI_LONG(0x00020020)
 
-#define SYV_APPGESTUREMASK 0x00020000L
-#define SYV_CIRCLEUPA 0x000224B6L
-#define SYV_CIRCLEUPZ 0x000224CFL
-#define SYV_CIRCLELOA 0x000224D0L
-#define SYV_CIRCLELOZ 0x000224E9L
+#define SYV_APPGESTUREMASK __MSABI_LONG(0x00020000)
+#define SYV_CIRCLEUPA __MSABI_LONG(0x000224B6)
+#define SYV_CIRCLEUPZ __MSABI_LONG(0x000224CF)
+#define SYV_CIRCLELOA __MSABI_LONG(0x000224D0)
+#define SYV_CIRCLELOZ __MSABI_LONG(0x000224E9)
 
-#define SYV_SHAPELINE 0x00040001L
-#define SYV_SHAPEELLIPSE 0x00040002L
-#define SYV_SHAPERECT 0x00040003L
+#define SYV_SHAPELINE __MSABI_LONG(0x00040001)
+#define SYV_SHAPEELLIPSE __MSABI_LONG(0x00040002)
+#define SYV_SHAPERECT __MSABI_LONG(0x00040003)
 #define SYV_SHAPEMIN SYV_SHAPELINE
 #define SYV_SHAPEMAX SYV_SHAPERECT
 
@@ -428,27 +428,27 @@
 
 #define MAXOEMDATAWORDS 6
 
-#define PCM_PENUP 0x00000001L
-#define PCM_RANGE 0x00000002L
-#define PCM_INVERT 0x00000020L
-#define PCM_RECTEXCLUDE 0x00002000L
-#define PCM_RECTBOUND 0x00004000L
-#define PCM_TIMEOUT 0x00008000L
+#define PCM_PENUP __MSABI_LONG(0x00000001)
+#define PCM_RANGE __MSABI_LONG(0x00000002)
+#define PCM_INVERT __MSABI_LONG(0x00000020)
+#define PCM_RECTEXCLUDE __MSABI_LONG(0x00002000)
+#define PCM_RECTBOUND __MSABI_LONG(0x00004000)
+#define PCM_TIMEOUT __MSABI_LONG(0x00008000)
 
-#define PCM_RGNBOUND 0x00010000L
-#define PCM_RGNEXCLUDE 0x00020000L
-#define PCM_DOPOLLING 0x00040000L
-#define PCM_TAPNHOLD 0x00080000L
+#define PCM_RGNBOUND __MSABI_LONG(0x00010000)
+#define PCM_RGNEXCLUDE __MSABI_LONG(0x00020000)
+#define PCM_DOPOLLING __MSABI_LONG(0x00040000)
+#define PCM_TAPNHOLD __MSABI_LONG(0x00080000)
 #define PCM_ADDDEFAULTS RC_LDEFAULTFLAGS
 
-#define PDC_INTEGRATED 0x00000001L
-#define PDC_PROXIMITY 0x00000002L
-#define PDC_RANGE 0x00000004L
-#define PDC_INVERT 0x00000008L
-#define PDC_RELATIVE 0x00000010L
-#define PDC_BARREL1 0x00000020L
-#define PDC_BARREL2 0x00000040L
-#define PDC_BARREL3 0x00000080L
+#define PDC_INTEGRATED __MSABI_LONG(0x00000001)
+#define PDC_PROXIMITY __MSABI_LONG(0x00000002)
+#define PDC_RANGE __MSABI_LONG(0x00000004)
+#define PDC_INVERT __MSABI_LONG(0x00000008)
+#define PDC_RELATIVE __MSABI_LONG(0x00000010)
+#define PDC_BARREL1 __MSABI_LONG(0x00000020)
+#define PDC_BARREL2 __MSABI_LONG(0x00000040)
+#define PDC_BARREL3 __MSABI_LONG(0x00000080)
 
 #define PDK_NULL 0x0000
 #define PDK_UP 0x0000
@@ -524,26 +524,26 @@
 #define GRH_NONGESTURE 2
 
 #ifdef JAPAN
-#define GST_SEL 0x00000001L
-#define GST_CLIP 0x00000002L
-#define GST_WHITE 0x00000004L
-#define GST_KKCONVERT 0x00000008L
-#define GST_EDIT 0x00000010L
-#define GST_SYS 0x0000001FL
-#define GST_CIRCLELO 0x00000100L
-#define GST_CIRCLEUP 0x00000200L
-#define GST_CIRCLE 0x00000300L
-#define GST_ALL 0x0000031FL
+#define GST_SEL __MSABI_LONG(0x00000001)
+#define GST_CLIP __MSABI_LONG(0x00000002)
+#define GST_WHITE __MSABI_LONG(0x00000004)
+#define GST_KKCONVERT __MSABI_LONG(0x00000008)
+#define GST_EDIT __MSABI_LONG(0x00000010)
+#define GST_SYS __MSABI_LONG(0x0000001F)
+#define GST_CIRCLELO __MSABI_LONG(0x00000100)
+#define GST_CIRCLEUP __MSABI_LONG(0x00000200)
+#define GST_CIRCLE __MSABI_LONG(0x00000300)
+#define GST_ALL __MSABI_LONG(0x0000031F)
 #else
-#define GST_SEL 0x00000001L
-#define GST_CLIP 0x00000002L
-#define GST_WHITE 0x00000004L
-#define GST_EDIT 0x00000010L
-#define GST_SYS 0x00000017L
-#define GST_CIRCLELO 0x00000100L
-#define GST_CIRCLEUP 0x00000200L
-#define GST_CIRCLE 0x00000300L
-#define GST_ALL 0x00000317L
+#define GST_SEL __MSABI_LONG(0x00000001)
+#define GST_CLIP __MSABI_LONG(0x00000002)
+#define GST_WHITE __MSABI_LONG(0x00000004)
+#define GST_EDIT __MSABI_LONG(0x00000010)
+#define GST_SYS __MSABI_LONG(0x00000017)
+#define GST_CIRCLELO __MSABI_LONG(0x00000100)
+#define GST_CIRCLEUP __MSABI_LONG(0x00000200)
+#define GST_CIRCLE __MSABI_LONG(0x00000300)
+#define GST_ALL __MSABI_LONG(0x00000317)
 #endif
 
 #define HRCR_NORESULTS 4
@@ -571,9 +571,9 @@
 
 #define MAXHOTSPOT 8
 
-#define PH_MAX 0xFFFFFFFFL
-#define PH_DEFAULT 0xFFFFFFFEL
-#define PH_MIN 0xFFFFFFFDL
+#define PH_MAX __MSABI_LONG(0xFFFFFFFF)
+#define PH_DEFAULT __MSABI_LONG(0xFFFFFFFE)
+#define PH_MIN __MSABI_LONG(0xFFFFFFFD)
 
 #define RHH_STD 0
 #define RHH_BOX 1
@@ -748,11 +748,11 @@
 
 #ifndef NOPENINKPUT
 
-#define LRET_DONE 1L
-#define LRET_ABORT (-1L)
-#define LRET_HRC (-2L)
-#define LRET_HPENDATA (-3L)
-#define LRET_PRIVATE (-4L)
+#define LRET_DONE __MSABI_LONG(1)
+#define LRET_ABORT (__MSABI_LONG(-1))
+#define LRET_HRC (__MSABI_LONG(-2))
+#define LRET_HPENDATA (__MSABI_LONG(-3))
+#define LRET_PRIVATE (__MSABI_LONG(-4))
 
 #define PCMR_OK 0
 #define PCMR_ALREADYCOLLECTING (-1)
@@ -809,9 +809,9 @@
 #define cbRcUserMax 32
 #define cbRcrgbfAlcMax 32
 #define RC_WDEFAULT 0xffff
-#define RC_LDEFAULT 0xffffffffL
+#define RC_LDEFAULT __MSABI_LONG(0xffffffff)
 #define RC_WDEFAULTFLAGS 0x8000
-#define RC_LDEFAULTFLAGS 0x80000000L
+#define RC_LDEFAULTFLAGS __MSABI_LONG(0x80000000)
 
 #define CWR_REPLACECR 0x0001
 #define CWR_STRIPCR CWR_REPLACECR
@@ -841,11 +841,11 @@
 #define CXCWX 300
 #define CYCWX 200
 
-#define CWX_TOPMOST 0x00000001L
-#define CWX_NOTOOLTIPS 0x00000002L
-#define CWX_EPERIOD 0x00000004L
-#define CWX_ECOMMA 0x00000008L
-#define CWX_DEFAULT 0x00000000L
+#define CWX_TOPMOST __MSABI_LONG(0x00000001)
+#define CWX_NOTOOLTIPS __MSABI_LONG(0x00000002)
+#define CWX_EPERIOD __MSABI_LONG(0x00000004)
+#define CWX_ECOMMA __MSABI_LONG(0x00000008)
+#define CWX_DEFAULT __MSABI_LONG(0x00000000)
 
 #define CWXA_CONTEXT 0x0001
 #define CWXA_KBD 0x0002
@@ -878,8 +878,8 @@
 #endif
 
 #ifdef JAPAN
-#define GPMI_OK 0L
-#define GPMI_INVALIDPMI 0x8000L
+#define GPMI_OK __MSABI_LONG(0)
+#define GPMI_INVALIDPMI __MSABI_LONG(0x8000)
 #endif
 
 #define INKWIDTH_MINIMUM 0
@@ -943,19 +943,19 @@
 #define RPA_DBCSPRIORITY 0x0004
 #define RPA_SBCSPRIORITY 0x0008
 
-#define PMIR_OK 0L
-#define PMIR_INDEX (-1L)
-#define PMIR_VALUE (-2L)
-#define PMIR_INVALIDBOXEDITINFO (-3L)
-#define PMIR_INIERROR (-4L)
-#define PMIR_ERROR (-5L)
-#define PMIR_NA (-6L)
+#define PMIR_OK __MSABI_LONG(0)
+#define PMIR_INDEX (__MSABI_LONG(-1))
+#define PMIR_VALUE (__MSABI_LONG(-2))
+#define PMIR_INVALIDBOXEDITINFO (__MSABI_LONG(-3))
+#define PMIR_INIERROR (__MSABI_LONG(-4))
+#define PMIR_ERROR (__MSABI_LONG(-5))
+#define PMIR_NA (__MSABI_LONG(-6))
 
 #ifdef JAPAN
-#define SPMI_OK 0L
-#define SPMI_INVALIDBOXEDITINFO 1L
-#define SPMI_INIERROR 2L
-#define SPMI_INVALIDPMI 0x8000L
+#define SPMI_OK __MSABI_LONG(0)
+#define SPMI_INVALIDBOXEDITINFO __MSABI_LONG(1)
+#define SPMI_INIERROR __MSABI_LONG(2)
+#define SPMI_INVALIDPMI __MSABI_LONG(0x8000)
 #endif
 #endif
 
@@ -975,22 +975,22 @@
 #define RCIP_ALLANSICHAR 0x0001
 #define RCIP_MASK 0x0001
 
-#define RCO_NOPOINTEREVENT 0x00000001L
-#define RCO_SAVEALLDATA 0x00000002L
-#define RCO_SAVEHPENDATA 0x00000004L
-#define RCO_NOFLASHUNKNOWN 0x00000008L
-#define RCO_TABLETCOORD 0x00000010L
-#define RCO_NOSPACEBREAK 0x00000020L
-#define RCO_NOHIDECURSOR 0x00000040L
-#define RCO_NOHOOK 0x00000080L
-#define RCO_BOXED 0x00000100L
-#define RCO_SUGGEST 0x00000200L
-#define RCO_DISABLEGESMAP 0x00000400L
-#define RCO_NOFLASHCURSOR 0x00000800L
-#define RCO_BOXCROSS 0x00001000L
-#define RCO_COLDRECOG 0x00008000L
-#define RCO_SAVEBACKGROUND 0x00010000L
-#define RCO_DODEFAULT 0x00020000L
+#define RCO_NOPOINTEREVENT __MSABI_LONG(0x00000001)
+#define RCO_SAVEALLDATA __MSABI_LONG(0x00000002)
+#define RCO_SAVEHPENDATA __MSABI_LONG(0x00000004)
+#define RCO_NOFLASHUNKNOWN __MSABI_LONG(0x00000008)
+#define RCO_TABLETCOORD __MSABI_LONG(0x00000010)
+#define RCO_NOSPACEBREAK __MSABI_LONG(0x00000020)
+#define RCO_NOHIDECURSOR __MSABI_LONG(0x00000040)
+#define RCO_NOHOOK __MSABI_LONG(0x00000080)
+#define RCO_BOXED __MSABI_LONG(0x00000100)
+#define RCO_SUGGEST __MSABI_LONG(0x00000200)
+#define RCO_DISABLEGESMAP __MSABI_LONG(0x00000400)
+#define RCO_NOFLASHCURSOR __MSABI_LONG(0x00000800)
+#define RCO_BOXCROSS __MSABI_LONG(0x00001000)
+#define RCO_COLDRECOG __MSABI_LONG(0x00008000)
+#define RCO_SAVEBACKGROUND __MSABI_LONG(0x00010000)
+#define RCO_DODEFAULT __MSABI_LONG(0x00020000)
 
 #define RCOR_NORMAL 1
 #define RCOR_RIGHT 2
@@ -1184,7 +1184,7 @@
 
 #ifndef NOPENBEDIT
 
-#define HEAL_DEFAULT -1L
+#define HEAL_DEFAULT __MSABI_LONG(-1)
 
 #define BEI_FACESIZE 32
 #define BEIF_BOXCROSS 0x0001
@@ -1233,9 +1233,9 @@
 #define PMSC_LOADPW 15
 #define PMSC_INKSTOP 16
 
-#define PMSCL_UNLOADED 0L
-#define PMSCL_LOADED 1L
-#define PMSCL_UNLOADING 2L
+#define PMSCL_UNLOADED __MSABI_LONG(0)
+#define PMSCL_LOADED __MSABI_LONG(1)
+#define PMSCL_UNLOADING __MSABI_LONG(2)
 
 #define WM_CTLINIT (WM_PENWINFIRST+7)
 
diff --git a/mingw-w64-headers/include/propidl.h b/mingw-w64-headers/include/propidl.h
index f18ff29..637915f 100644
--- a/mingw-w64-headers/include/propidl.h
+++ b/mingw-w64-headers/include/propidl.h
@@ -279,26 +279,26 @@
 #define PID_MIN_READONLY (0x80000000)
 #define PID_MAX_READONLY (0xbfffffff)
 
-#define PIDDI_THUMBNAIL 0x00000002L
+#define PIDDI_THUMBNAIL __MSABI_LONG(0x00000002)
 
-#define PIDSI_TITLE 0x00000002L
-#define PIDSI_SUBJECT 0x00000003L
-#define PIDSI_AUTHOR 0x00000004L
-#define PIDSI_KEYWORDS 0x00000005L
-#define PIDSI_COMMENTS 0x00000006L
-#define PIDSI_TEMPLATE 0x00000007L
-#define PIDSI_LASTAUTHOR 0x00000008L
-#define PIDSI_REVNUMBER 0x00000009L
-#define PIDSI_EDITTIME 0x0000000aL
-#define PIDSI_LASTPRINTED 0x0000000bL
-#define PIDSI_CREATE_DTM 0x0000000cL
-#define PIDSI_LASTSAVE_DTM 0x0000000dL
-#define PIDSI_PAGECOUNT 0x0000000eL
-#define PIDSI_WORDCOUNT 0x0000000fL
-#define PIDSI_CHARCOUNT 0x00000010L
-#define PIDSI_THUMBNAIL 0x00000011L
-#define PIDSI_APPNAME 0x00000012L
-#define PIDSI_DOC_SECURITY 0x00000013L
+#define PIDSI_TITLE __MSABI_LONG(0x00000002)
+#define PIDSI_SUBJECT __MSABI_LONG(0x00000003)
+#define PIDSI_AUTHOR __MSABI_LONG(0x00000004)
+#define PIDSI_KEYWORDS __MSABI_LONG(0x00000005)
+#define PIDSI_COMMENTS __MSABI_LONG(0x00000006)
+#define PIDSI_TEMPLATE __MSABI_LONG(0x00000007)
+#define PIDSI_LASTAUTHOR __MSABI_LONG(0x00000008)
+#define PIDSI_REVNUMBER __MSABI_LONG(0x00000009)
+#define PIDSI_EDITTIME __MSABI_LONG(0x0000000a)
+#define PIDSI_LASTPRINTED __MSABI_LONG(0x0000000b)
+#define PIDSI_CREATE_DTM __MSABI_LONG(0x0000000c)
+#define PIDSI_LASTSAVE_DTM __MSABI_LONG(0x0000000d)
+#define PIDSI_PAGECOUNT __MSABI_LONG(0x0000000e)
+#define PIDSI_WORDCOUNT __MSABI_LONG(0x0000000f)
+#define PIDSI_CHARCOUNT __MSABI_LONG(0x00000010)
+#define PIDSI_THUMBNAIL __MSABI_LONG(0x00000011)
+#define PIDSI_APPNAME __MSABI_LONG(0x00000012)
+#define PIDSI_DOC_SECURITY __MSABI_LONG(0x00000013)
 
 #define PIDDSI_CATEGORY 0x00000002
 #define PIDDSI_PRESFORMAT 0x00000003
@@ -316,16 +316,16 @@
 #define PIDDSI_COMPANY 0x0000000F
 #define PIDDSI_LINKSDIRTY 0x00000010
 
-#define PIDMSI_EDITOR 0x00000002L
-#define PIDMSI_SUPPLIER 0x00000003L
-#define PIDMSI_SOURCE 0x00000004L
-#define PIDMSI_SEQUENCE_NO 0x00000005L
-#define PIDMSI_PROJECT 0x00000006L
-#define PIDMSI_STATUS 0x00000007L
-#define PIDMSI_OWNER 0x00000008L
-#define PIDMSI_RATING 0x00000009L
-#define PIDMSI_PRODUCTION 0x0000000AL
-#define PIDMSI_COPYRIGHT 0x0000000BL
+#define PIDMSI_EDITOR __MSABI_LONG(0x00000002)
+#define PIDMSI_SUPPLIER __MSABI_LONG(0x00000003)
+#define PIDMSI_SOURCE __MSABI_LONG(0x00000004)
+#define PIDMSI_SEQUENCE_NO __MSABI_LONG(0x00000005)
+#define PIDMSI_PROJECT __MSABI_LONG(0x00000006)
+#define PIDMSI_STATUS __MSABI_LONG(0x00000007)
+#define PIDMSI_OWNER __MSABI_LONG(0x00000008)
+#define PIDMSI_RATING __MSABI_LONG(0x00000009)
+#define PIDMSI_PRODUCTION __MSABI_LONG(0x0000000A)
+#define PIDMSI_COPYRIGHT __MSABI_LONG(0x0000000B)
 
   enum PIDMSI_STATUS_VALUE {
     PIDMSI_STATUS_NORMAL = 0,PIDMSI_STATUS_NEW,PIDMSI_STATUS_PRELIM,
diff --git a/mingw-w64-headers/include/pstore.h b/mingw-w64-headers/include/pstore.h
index 9eb7396..99259da 100644
--- a/mingw-w64-headers/include/pstore.h
+++ b/mingw-w64-headers/include/pstore.h
@@ -43,7 +43,7 @@
 #define PST_AUTHENTICODE 1
 #define PST_BINARY_CHECK 2
 #define PST_SECURITY_DESCRIPTOR 4
-#define PST_SELF_RELATIVE_CLAUSE 0x80000000L
+#define PST_SELF_RELATIVE_CLAUSE __MSABI_LONG(0x80000000)
 
 #define PST_AC_SINGLE_CALLER 0
 #define PST_AC_TOP_LEVEL_CALLER 1
diff --git a/mingw-w64-headers/include/regstr.h b/mingw-w64-headers/include/regstr.h
index bb6c043..1f6ad57 100644
--- a/mingw-w64-headers/include/regstr.h
+++ b/mingw-w64-headers/include/regstr.h
@@ -261,7 +261,7 @@
 
 #define REGSTR_VAL_DOSOPTGLOBALFLAGS TEXT("GlobalFlags")
 
-#define DOSOPTGF_DEFCLEAN 0x00000001L
+#define DOSOPTGF_DEFCLEAN __MSABI_LONG(0x00000001)
 
 #define REGSTR_VAL_DOSOPTFLAGS TEXT("Flags")
 #define REGSTR_VAL_OPTORDER TEXT("Order")
@@ -270,24 +270,24 @@
 #define REGSTR_VAL_STDDOSOPTION TEXT("StdOption")
 #define REGSTR_VAL_DOSOPTTIP TEXT("TipText")
 
-#define DOSOPTF_DEFAULT 0x00000001L
-#define DOSOPTF_SUPPORTED 0x00000002L
-#define DOSOPTF_ALWAYSUSE 0x00000004L
-#define DOSOPTF_USESPMODE 0x00000008L
-#define DOSOPTF_PROVIDESUMB 0x00000010L
-#define DOSOPTF_NEEDSETUP 0x00000020L
-#define DOSOPTF_INDOSSTART 0x00000040L
-#define DOSOPTF_MULTIPLE 0x00000080L
+#define DOSOPTF_DEFAULT __MSABI_LONG(0x00000001)
+#define DOSOPTF_SUPPORTED __MSABI_LONG(0x00000002)
+#define DOSOPTF_ALWAYSUSE __MSABI_LONG(0x00000004)
+#define DOSOPTF_USESPMODE __MSABI_LONG(0x00000008)
+#define DOSOPTF_PROVIDESUMB __MSABI_LONG(0x00000010)
+#define DOSOPTF_NEEDSETUP __MSABI_LONG(0x00000020)
+#define DOSOPTF_INDOSSTART __MSABI_LONG(0x00000040)
+#define DOSOPTF_MULTIPLE __MSABI_LONG(0x00000080)
 
-#define SUF_FIRSTTIME 0x00000001L
-#define SUF_EXPRESS 0x00000002L
-#define SUF_BATCHINF 0x00000004L
-#define SUF_CLEAN 0x00000008L
-#define SUF_INSETUP 0x00000010L
-#define SUF_NETSETUP 0x00000020L
-#define SUF_NETHDBOOT 0x00000040L
-#define SUF_NETRPLBOOT 0x00000080L
-#define SUF_SBSCOPYOK 0x00000100L
+#define SUF_FIRSTTIME __MSABI_LONG(0x00000001)
+#define SUF_EXPRESS __MSABI_LONG(0x00000002)
+#define SUF_BATCHINF __MSABI_LONG(0x00000004)
+#define SUF_CLEAN __MSABI_LONG(0x00000008)
+#define SUF_INSETUP __MSABI_LONG(0x00000010)
+#define SUF_NETSETUP __MSABI_LONG(0x00000020)
+#define SUF_NETHDBOOT __MSABI_LONG(0x00000040)
+#define SUF_NETRPLBOOT __MSABI_LONG(0x00000080)
+#define SUF_SBSCOPYOK __MSABI_LONG(0x00000100)
 
 #define REGSTR_VAL_DOSPAGER TEXT("DOSPager")
 #define REGSTR_VAL_VXDGROUPS TEXT("VXDGroups")
@@ -424,12 +424,12 @@
 #define REGSTR_KEY_MODEM_CLASS TEXT("Modem")
 
 #define REGSTR_VAL_PCMCIA_OPT TEXT("Options")
-#define PCMCIA_OPT_HAVE_SOCKET 0x00000001l
+#define PCMCIA_OPT_HAVE_SOCKET __MSABI_LONG(0x00000001)
 
-#define PCMCIA_OPT_AUTOMEM 0x00000004l
-#define PCMCIA_OPT_NO_SOUND 0x00000008l
-#define PCMCIA_OPT_NO_AUDIO 0x00000010l
-#define PCMCIA_OPT_NO_APMREMOVE 0x00000020l
+#define PCMCIA_OPT_AUTOMEM __MSABI_LONG(0x00000004)
+#define PCMCIA_OPT_NO_SOUND __MSABI_LONG(0x00000008)
+#define PCMCIA_OPT_NO_AUDIO __MSABI_LONG(0x00000010)
+#define PCMCIA_OPT_NO_APMREMOVE __MSABI_LONG(0x00000020)
 
 #define REGSTR_VAL_PCMCIA_MEM TEXT("Memory")
 #define PCMCIA_DEF_MEMBEGIN 0x000C0000
@@ -451,20 +451,20 @@
 #define REGSTR_VAL_PCI TEXT("PCI")
 #define REGSTR_PCI_OPTIONS TEXT("Options")
 #define REGSTR_PCI_DUAL_IDE TEXT("PCIDualIDE")
-#define PCI_OPTIONS_USE_BIOS 0x00000001l
-#define PCI_OPTIONS_USE_IRQ_STEERING 0x00000002l
+#define PCI_OPTIONS_USE_BIOS __MSABI_LONG(0x00000001)
+#define PCI_OPTIONS_USE_IRQ_STEERING __MSABI_LONG(0x00000002)
 
-#define AGP_FLAG_NO_1X_RATE 0x00000001l
-#define AGP_FLAG_NO_2X_RATE 0x00000002l
-#define AGP_FLAG_NO_4X_RATE 0x00000004l
-#define AGP_FLAG_NO_8X_RATE 0x00000008l
-#define AGP_FLAG_REVERSE_INITIALIZATION 0x00000080l
+#define AGP_FLAG_NO_1X_RATE __MSABI_LONG(0x00000001)
+#define AGP_FLAG_NO_2X_RATE __MSABI_LONG(0x00000002)
+#define AGP_FLAG_NO_4X_RATE __MSABI_LONG(0x00000004)
+#define AGP_FLAG_NO_8X_RATE __MSABI_LONG(0x00000008)
+#define AGP_FLAG_REVERSE_INITIALIZATION __MSABI_LONG(0x00000080)
 
-#define AGP_FLAG_NO_SBA_ENABLE 0x00000100l
-#define AGP_FLAG_NO_FW_ENABLE 0x00000200l
+#define AGP_FLAG_NO_SBA_ENABLE __MSABI_LONG(0x00000100)
+#define AGP_FLAG_NO_FW_ENABLE __MSABI_LONG(0x00000200)
 
-#define AGP_FLAG_SPECIAL_TARGET 0x000FFFFFl
-#define AGP_FLAG_SPECIAL_RESERVE 0x000F8000l
+#define AGP_FLAG_SPECIAL_TARGET __MSABI_LONG(0x000FFFFF)
+#define AGP_FLAG_SPECIAL_RESERVE __MSABI_LONG(0x000F8000)
 
 #define REGSTR_KEY_CRASHES TEXT("Crashes")
 #define REGSTR_KEY_DANGERS TEXT("Dangers")
diff --git a/mingw-w64-headers/include/richole.h b/mingw-w64-headers/include/richole.h
index 5fe58a7..9333647 100644
--- a/mingw-w64-headers/include/richole.h
+++ b/mingw-w64-headers/include/richole.h
@@ -21,39 +21,39 @@
   DWORD dwUser;
 } REOBJECT;
 
-#define REO_GETOBJ_NO_INTERFACES (0x00000000L)
-#define REO_GETOBJ_POLEOBJ (0x00000001L)
-#define REO_GETOBJ_PSTG (0x00000002L)
-#define REO_GETOBJ_POLESITE (0x00000004L)
-#define REO_GETOBJ_ALL_INTERFACES (0x00000007L)
+#define REO_GETOBJ_NO_INTERFACES (__MSABI_LONG(0x00000000))
+#define REO_GETOBJ_POLEOBJ (__MSABI_LONG(0x00000001))
+#define REO_GETOBJ_PSTG (__MSABI_LONG(0x00000002))
+#define REO_GETOBJ_POLESITE (__MSABI_LONG(0x00000004))
+#define REO_GETOBJ_ALL_INTERFACES (__MSABI_LONG(0x00000007))
 
 #define REO_CP_SELECTION ((ULONG) -1)
 
 #define REO_IOB_SELECTION ((ULONG) -1)
 #define REO_IOB_USE_CP ((ULONG) -2)
 
-#define REO_NULL (0x00000000L)
-#define REO_READWRITEMASK (0x0000003FL)
-#define REO_DONTNEEDPALETTE (0x00000020L)
-#define REO_BLANK (0x00000010L)
-#define REO_DYNAMICSIZE (0x00000008L)
-#define REO_INVERTEDSELECT (0x00000004L)
-#define REO_BELOWBASELINE (0x00000002L)
-#define REO_RESIZABLE (0x00000001L)
-#define REO_LINK (0x80000000L)
-#define REO_STATIC (0x40000000L)
-#define REO_SELECTED (0x08000000L)
-#define REO_OPEN (0x04000000L)
-#define REO_INPLACEACTIVE (0x02000000L)
-#define REO_HILITED (0x01000000L)
-#define REO_LINKAVAILABLE (0x00800000L)
-#define REO_GETMETAFILE (0x00400000L)
+#define REO_NULL (__MSABI_LONG(0x00000000))
+#define REO_READWRITEMASK (__MSABI_LONG(0x0000003F))
+#define REO_DONTNEEDPALETTE (__MSABI_LONG(0x00000020))
+#define REO_BLANK (__MSABI_LONG(0x00000010))
+#define REO_DYNAMICSIZE (__MSABI_LONG(0x00000008))
+#define REO_INVERTEDSELECT (__MSABI_LONG(0x00000004))
+#define REO_BELOWBASELINE (__MSABI_LONG(0x00000002))
+#define REO_RESIZABLE (__MSABI_LONG(0x00000001))
+#define REO_LINK (__MSABI_LONG(0x80000000))
+#define REO_STATIC (__MSABI_LONG(0x40000000))
+#define REO_SELECTED (__MSABI_LONG(0x08000000))
+#define REO_OPEN (__MSABI_LONG(0x04000000))
+#define REO_INPLACEACTIVE (__MSABI_LONG(0x02000000))
+#define REO_HILITED (__MSABI_LONG(0x01000000))
+#define REO_LINKAVAILABLE (__MSABI_LONG(0x00800000))
+#define REO_GETMETAFILE (__MSABI_LONG(0x00400000))
 
-#define RECO_PASTE (0x00000000L)
-#define RECO_DROP (0x00000001L)
-#define RECO_COPY (0x00000002L)
-#define RECO_CUT (0x00000003L)
-#define RECO_DRAG (0x00000004L)
+#define RECO_PASTE (__MSABI_LONG(0x00000000))
+#define RECO_DROP (__MSABI_LONG(0x00000001))
+#define RECO_COPY (__MSABI_LONG(0x00000002))
+#define RECO_CUT (__MSABI_LONG(0x00000003))
+#define RECO_DRAG (__MSABI_LONG(0x00000004))
 
 #undef INTERFACE
 #define INTERFACE IRichEditOle
diff --git a/mingw-w64-headers/include/rpcdce.h b/mingw-w64-headers/include/rpcdce.h
index 73cf453..34e385c 100644
--- a/mingw-w64-headers/include/rpcdce.h
+++ b/mingw-w64-headers/include/rpcdce.h
@@ -301,12 +301,12 @@
 #define RPC_C_AUTHN_MSN 18
 #define RPC_C_AUTHN_DIGEST 21
 #define RPC_C_AUTHN_MQ 100
-#define RPC_C_AUTHN_DEFAULT 0xFFFFFFFFL
+#define RPC_C_AUTHN_DEFAULT __MSABI_LONG(0xFFFFFFFF)
 
 #define RPC_C_NO_CREDENTIALS ((RPC_AUTH_IDENTITY_HANDLE) MAXUINT_PTR)
 
-#define RPC_C_SECURITY_QOS_VERSION 1L
-#define RPC_C_SECURITY_QOS_VERSION_1 1L
+#define RPC_C_SECURITY_QOS_VERSION __MSABI_LONG(1)
+#define RPC_C_SECURITY_QOS_VERSION_1 __MSABI_LONG(1)
 
   typedef struct _RPC_SECURITY_QOS {
     unsigned long Version;
@@ -345,7 +345,7 @@
 #define PSEC_WINNT_AUTH_IDENTITY __MINGW_NAME_UAW(PSEC_WINNT_AUTH_IDENTITY)
 #define _SEC_WINNT_AUTH_IDENTITY __MINGW_NAME_UAW(_SEC_WINNT_AUTH_IDENTITY)
 
-#define RPC_C_SECURITY_QOS_VERSION_2 2L
+#define RPC_C_SECURITY_QOS_VERSION_2 __MSABI_LONG(2)
 
 #define RPC_C_AUTHN_INFO_TYPE_HTTP 1
 
@@ -403,7 +403,7 @@
     } u;
   } RPC_SECURITY_QOS_V2_A,*PRPC_SECURITY_QOS_V2_A;
 
-#define RPC_C_SECURITY_QOS_VERSION_3 3L
+#define RPC_C_SECURITY_QOS_VERSION_3 __MSABI_LONG(3)
 
   typedef struct _RPC_SECURITY_QOS_V3_W {
     unsigned long Version;
diff --git a/mingw-w64-headers/include/scesvc.h b/mingw-w64-headers/include/scesvc.h
index 8c29e09..43aaf1d 100644
--- a/mingw-w64-headers/include/scesvc.h
+++ b/mingw-w64-headers/include/scesvc.h
@@ -21,26 +21,26 @@
 
   typedef DWORD SCESTATUS;
 
-#define SCESTATUS_SUCCESS 0L
-#define SCESTATUS_INVALID_PARAMETER 1L
-#define SCESTATUS_RECORD_NOT_FOUND 2L
-#define SCESTATUS_INVALID_DATA 3L
-#define SCESTATUS_OBJECT_EXIST 4L
-#define SCESTATUS_BUFFER_TOO_SMALL 5L
-#define SCESTATUS_PROFILE_NOT_FOUND 6L
-#define SCESTATUS_BAD_FORMAT 7L
-#define SCESTATUS_NOT_ENOUGH_RESOURCE 8L
-#define SCESTATUS_ACCESS_DENIED 9L
-#define SCESTATUS_CANT_DELETE 10L
-#define SCESTATUS_PREFIX_OVERFLOW 11L
-#define SCESTATUS_OTHER_ERROR 12L
-#define SCESTATUS_ALREADY_RUNNING 13L
-#define SCESTATUS_SERVICE_NOT_SUPPORT 14L
-#define SCESTATUS_MOD_NOT_FOUND 15L
-#define SCESTATUS_EXCEPTION_IN_SERVER 16L
-#define SCESTATUS_NO_TEMPLATE_GIVEN 17L
-#define SCESTATUS_NO_MAPPING 18L
-#define SCESTATUS_TRUST_FAIL 19L
+#define SCESTATUS_SUCCESS __MSABI_LONG(0)
+#define SCESTATUS_INVALID_PARAMETER __MSABI_LONG(1)
+#define SCESTATUS_RECORD_NOT_FOUND __MSABI_LONG(2)
+#define SCESTATUS_INVALID_DATA __MSABI_LONG(3)
+#define SCESTATUS_OBJECT_EXIST __MSABI_LONG(4)
+#define SCESTATUS_BUFFER_TOO_SMALL __MSABI_LONG(5)
+#define SCESTATUS_PROFILE_NOT_FOUND __MSABI_LONG(6)
+#define SCESTATUS_BAD_FORMAT __MSABI_LONG(7)
+#define SCESTATUS_NOT_ENOUGH_RESOURCE __MSABI_LONG(8)
+#define SCESTATUS_ACCESS_DENIED __MSABI_LONG(9)
+#define SCESTATUS_CANT_DELETE __MSABI_LONG(10)
+#define SCESTATUS_PREFIX_OVERFLOW __MSABI_LONG(11)
+#define SCESTATUS_OTHER_ERROR __MSABI_LONG(12)
+#define SCESTATUS_ALREADY_RUNNING __MSABI_LONG(13)
+#define SCESTATUS_SERVICE_NOT_SUPPORT __MSABI_LONG(14)
+#define SCESTATUS_MOD_NOT_FOUND __MSABI_LONG(15)
+#define SCESTATUS_EXCEPTION_IN_SERVER __MSABI_LONG(16)
+#define SCESTATUS_NO_TEMPLATE_GIVEN __MSABI_LONG(17)
+#define SCESTATUS_NO_MAPPING __MSABI_LONG(18)
+#define SCESTATUS_TRUST_FAIL __MSABI_LONG(19)
 
   typedef struct _SCESVC_CONFIGURATION_LINE_ {
     LPTSTR Key;
@@ -77,7 +77,7 @@
     PSCESVC_ANALYSIS_LINE Lines;
   } SCESVC_ANALYSIS_INFO,*PSCESVC_ANALYSIS_INFO;
 
-#define SCESVC_ENUMERATION_MAX 100L
+#define SCESVC_ENUMERATION_MAX __MSABI_LONG(100)
 
   typedef SCESTATUS (CALLBACK *PFSCE_QUERY_INFO)(SCE_HANDLE sceHandle,SCESVC_INFO_TYPE sceType,LPTSTR lpPrefix,WINBOOL bExact,PVOID *ppvInfo,PSCE_ENUMERATION_CONTEXT psceEnumHandle);
   typedef SCESTATUS (CALLBACK *PFSCE_SET_INFO)(SCE_HANDLE sceHandle,SCESVC_INFO_TYPE sceType,LPTSTR lpPrefix,WINBOOL bExact,PVOID pvInfo);
diff --git a/mingw-w64-headers/include/setupapi.h b/mingw-w64-headers/include/setupapi.h
index 1681d6d..8e29087 100644
--- a/mingw-w64-headers/include/setupapi.h
+++ b/mingw-w64-headers/include/setupapi.h
@@ -535,67 +535,67 @@
   __MINGW_TYPEDEF_UAW(SP_DEVINSTALL_PARAMS)
   __MINGW_TYPEDEF_UAW(PSP_DEVINSTALL_PARAMS)
 
-#define DI_SHOWOEM 0x00000001L
-#define DI_SHOWCOMPAT 0x00000002L
-#define DI_SHOWCLASS 0x00000004L
-#define DI_SHOWALL 0x00000007L
-#define DI_NOVCP 0x00000008L
-#define DI_DIDCOMPAT 0x00000010L
-#define DI_DIDCLASS 0x00000020L
-#define DI_AUTOASSIGNRES 0x00000040L
-#define DI_NEEDRESTART 0x00000080L
-#define DI_NEEDREBOOT 0x00000100L
-#define DI_NOBROWSE 0x00000200L
-#define DI_MULTMFGS 0x00000400L
-#define DI_DISABLED 0x00000800L
-#define DI_GENERALPAGE_ADDED 0x00001000L
-#define DI_RESOURCEPAGE_ADDED 0x00002000L
-#define DI_PROPERTIES_CHANGE 0x00004000L
-#define DI_INF_IS_SORTED 0x00008000L
-#define DI_ENUMSINGLEINF 0x00010000L
-#define DI_DONOTCALLCONFIGMG 0x00020000L
-#define DI_INSTALLDISABLED 0x00040000L
-#define DI_COMPAT_FROM_CLASS 0x00080000L
-#define DI_CLASSINSTALLPARAMS 0x00100000L
-#define DI_NODI_DEFAULTACTION 0x00200000L
-#define DI_QUIETINSTALL 0x00800000L
-#define DI_NOFILECOPY 0x01000000L
-#define DI_FORCECOPY 0x02000000L
-#define DI_DRIVERPAGE_ADDED 0x04000000L
-#define DI_USECI_SELECTSTRINGS 0x08000000L
-#define DI_OVERRIDE_INFFLAGS 0x10000000L
-#define DI_PROPS_NOCHANGEUSAGE 0x20000000L
-#define DI_NOSELECTICONS 0x40000000L
-#define DI_NOWRITE_IDS 0x80000000L
-#define DI_FLAGSEX_USEOLDINFSEARCH 0x00000001L
-#define DI_FLAGSEX_RESERVED2 0x00000002L
-#define DI_FLAGSEX_CI_FAILED 0x00000004L
-#define DI_FLAGSEX_DIDINFOLIST 0x00000010L
-#define DI_FLAGSEX_DIDCOMPATINFO 0x00000020L
-#define DI_FLAGSEX_FILTERCLASSES 0x00000040L
-#define DI_FLAGSEX_SETFAILEDINSTALL 0x00000080L
-#define DI_FLAGSEX_DEVICECHANGE 0x00000100L
-#define DI_FLAGSEX_ALWAYSWRITEIDS 0x00000200L
-#define DI_FLAGSEX_PROPCHANGE_PENDING 0x00000400L
-#define DI_FLAGSEX_ALLOWEXCLUDEDDRVS 0x00000800L
-#define DI_FLAGSEX_NOUIONQUERYREMOVE 0x00001000L
-#define DI_FLAGSEX_USECLASSFORCOMPAT 0x00002000L
-#define DI_FLAGSEX_RESERVED3 0x00004000L
-#define DI_FLAGSEX_NO_DRVREG_MODIFY 0x00008000L
-#define DI_FLAGSEX_IN_SYSTEM_SETUP 0x00010000L
-#define DI_FLAGSEX_INET_DRIVER 0x00020000L
-#define DI_FLAGSEX_APPENDDRIVERLIST 0x00040000L
-#define DI_FLAGSEX_PREINSTALLBACKUP 0x00080000L
-#define DI_FLAGSEX_BACKUPONREPLACE 0x00100000L
-#define DI_FLAGSEX_DRIVERLIST_FROM_URL 0x00200000L
-#define DI_FLAGSEX_RESERVED1 0x00400000L
-#define DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS 0x00800000L
-#define DI_FLAGSEX_POWERPAGE_ADDED 0x01000000L
-#define DI_FLAGSEX_FILTERSIMILARDRIVERS 0x02000000L
-#define DI_FLAGSEX_INSTALLEDDRIVER 0x04000000L
-#define DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE 0x08000000L
-#define DI_FLAGSEX_ALTPLATFORM_DRVSEARCH 0x10000000L
-#define DI_FLAGSEX_RESTART_DEVICE_ONLY 0x20000000L
+#define DI_SHOWOEM __MSABI_LONG(0x00000001)
+#define DI_SHOWCOMPAT __MSABI_LONG(0x00000002)
+#define DI_SHOWCLASS __MSABI_LONG(0x00000004)
+#define DI_SHOWALL __MSABI_LONG(0x00000007)
+#define DI_NOVCP __MSABI_LONG(0x00000008)
+#define DI_DIDCOMPAT __MSABI_LONG(0x00000010)
+#define DI_DIDCLASS __MSABI_LONG(0x00000020)
+#define DI_AUTOASSIGNRES __MSABI_LONG(0x00000040)
+#define DI_NEEDRESTART __MSABI_LONG(0x00000080)
+#define DI_NEEDREBOOT __MSABI_LONG(0x00000100)
+#define DI_NOBROWSE __MSABI_LONG(0x00000200)
+#define DI_MULTMFGS __MSABI_LONG(0x00000400)
+#define DI_DISABLED __MSABI_LONG(0x00000800)
+#define DI_GENERALPAGE_ADDED __MSABI_LONG(0x00001000)
+#define DI_RESOURCEPAGE_ADDED __MSABI_LONG(0x00002000)
+#define DI_PROPERTIES_CHANGE __MSABI_LONG(0x00004000)
+#define DI_INF_IS_SORTED __MSABI_LONG(0x00008000)
+#define DI_ENUMSINGLEINF __MSABI_LONG(0x00010000)
+#define DI_DONOTCALLCONFIGMG __MSABI_LONG(0x00020000)
+#define DI_INSTALLDISABLED __MSABI_LONG(0x00040000)
+#define DI_COMPAT_FROM_CLASS __MSABI_LONG(0x00080000)
+#define DI_CLASSINSTALLPARAMS __MSABI_LONG(0x00100000)
+#define DI_NODI_DEFAULTACTION __MSABI_LONG(0x00200000)
+#define DI_QUIETINSTALL __MSABI_LONG(0x00800000)
+#define DI_NOFILECOPY __MSABI_LONG(0x01000000)
+#define DI_FORCECOPY __MSABI_LONG(0x02000000)
+#define DI_DRIVERPAGE_ADDED __MSABI_LONG(0x04000000)
+#define DI_USECI_SELECTSTRINGS __MSABI_LONG(0x08000000)
+#define DI_OVERRIDE_INFFLAGS __MSABI_LONG(0x10000000)
+#define DI_PROPS_NOCHANGEUSAGE __MSABI_LONG(0x20000000)
+#define DI_NOSELECTICONS __MSABI_LONG(0x40000000)
+#define DI_NOWRITE_IDS __MSABI_LONG(0x80000000)
+#define DI_FLAGSEX_USEOLDINFSEARCH __MSABI_LONG(0x00000001)
+#define DI_FLAGSEX_RESERVED2 __MSABI_LONG(0x00000002)
+#define DI_FLAGSEX_CI_FAILED __MSABI_LONG(0x00000004)
+#define DI_FLAGSEX_DIDINFOLIST __MSABI_LONG(0x00000010)
+#define DI_FLAGSEX_DIDCOMPATINFO __MSABI_LONG(0x00000020)
+#define DI_FLAGSEX_FILTERCLASSES __MSABI_LONG(0x00000040)
+#define DI_FLAGSEX_SETFAILEDINSTALL __MSABI_LONG(0x00000080)
+#define DI_FLAGSEX_DEVICECHANGE __MSABI_LONG(0x00000100)
+#define DI_FLAGSEX_ALWAYSWRITEIDS __MSABI_LONG(0x00000200)
+#define DI_FLAGSEX_PROPCHANGE_PENDING __MSABI_LONG(0x00000400)
+#define DI_FLAGSEX_ALLOWEXCLUDEDDRVS __MSABI_LONG(0x00000800)
+#define DI_FLAGSEX_NOUIONQUERYREMOVE __MSABI_LONG(0x00001000)
+#define DI_FLAGSEX_USECLASSFORCOMPAT __MSABI_LONG(0x00002000)
+#define DI_FLAGSEX_RESERVED3 __MSABI_LONG(0x00004000)
+#define DI_FLAGSEX_NO_DRVREG_MODIFY __MSABI_LONG(0x00008000)
+#define DI_FLAGSEX_IN_SYSTEM_SETUP __MSABI_LONG(0x00010000)
+#define DI_FLAGSEX_INET_DRIVER __MSABI_LONG(0x00020000)
+#define DI_FLAGSEX_APPENDDRIVERLIST __MSABI_LONG(0x00040000)
+#define DI_FLAGSEX_PREINSTALLBACKUP __MSABI_LONG(0x00080000)
+#define DI_FLAGSEX_BACKUPONREPLACE __MSABI_LONG(0x00100000)
+#define DI_FLAGSEX_DRIVERLIST_FROM_URL __MSABI_LONG(0x00200000)
+#define DI_FLAGSEX_RESERVED1 __MSABI_LONG(0x00400000)
+#define DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS __MSABI_LONG(0x00800000)
+#define DI_FLAGSEX_POWERPAGE_ADDED __MSABI_LONG(0x01000000)
+#define DI_FLAGSEX_FILTERSIMILARDRIVERS __MSABI_LONG(0x02000000)
+#define DI_FLAGSEX_INSTALLEDDRIVER __MSABI_LONG(0x04000000)
+#define DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE __MSABI_LONG(0x08000000)
+#define DI_FLAGSEX_ALTPLATFORM_DRVSEARCH __MSABI_LONG(0x10000000)
+#define DI_FLAGSEX_RESTART_DEVICE_ONLY __MSABI_LONG(0x20000000)
 
   typedef struct _SP_CLASSINSTALL_HEADER {
     DWORD cbSize;
diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
index 44d24df..3be23aa 100644
--- a/mingw-w64-headers/include/shlobj.h
+++ b/mingw-w64-headers/include/shlobj.h
@@ -1791,37 +1791,37 @@
     WINBOOL fRecursive;
   } SHChangeNotifyEntry;
 
-#define SHCNE_RENAMEITEM 0x00000001L
-#define SHCNE_CREATE 0x00000002L
-#define SHCNE_DELETE 0x00000004L
-#define SHCNE_MKDIR 0x00000008L
-#define SHCNE_RMDIR 0x00000010L
-#define SHCNE_MEDIAINSERTED 0x00000020L
-#define SHCNE_MEDIAREMOVED 0x00000040L
-#define SHCNE_DRIVEREMOVED 0x00000080L
-#define SHCNE_DRIVEADD 0x00000100L
-#define SHCNE_NETSHARE 0x00000200L
-#define SHCNE_NETUNSHARE 0x00000400L
-#define SHCNE_ATTRIBUTES 0x00000800L
-#define SHCNE_UPDATEDIR 0x00001000L
-#define SHCNE_UPDATEITEM 0x00002000L
-#define SHCNE_SERVERDISCONNECT 0x00004000L
-#define SHCNE_UPDATEIMAGE 0x00008000L
-#define SHCNE_DRIVEADDGUI 0x00010000L
-#define SHCNE_RENAMEFOLDER 0x00020000L
-#define SHCNE_FREESPACE 0x00040000L
-#define SHCNE_EXTENDED_EVENT 0x04000000L
+#define SHCNE_RENAMEITEM __MSABI_LONG(0x00000001)
+#define SHCNE_CREATE __MSABI_LONG(0x00000002)
+#define SHCNE_DELETE __MSABI_LONG(0x00000004)
+#define SHCNE_MKDIR __MSABI_LONG(0x00000008)
+#define SHCNE_RMDIR __MSABI_LONG(0x00000010)
+#define SHCNE_MEDIAINSERTED __MSABI_LONG(0x00000020)
+#define SHCNE_MEDIAREMOVED __MSABI_LONG(0x00000040)
+#define SHCNE_DRIVEREMOVED __MSABI_LONG(0x00000080)
+#define SHCNE_DRIVEADD __MSABI_LONG(0x00000100)
+#define SHCNE_NETSHARE __MSABI_LONG(0x00000200)
+#define SHCNE_NETUNSHARE __MSABI_LONG(0x00000400)
+#define SHCNE_ATTRIBUTES __MSABI_LONG(0x00000800)
+#define SHCNE_UPDATEDIR __MSABI_LONG(0x00001000)
+#define SHCNE_UPDATEITEM __MSABI_LONG(0x00002000)
+#define SHCNE_SERVERDISCONNECT __MSABI_LONG(0x00004000)
+#define SHCNE_UPDATEIMAGE __MSABI_LONG(0x00008000)
+#define SHCNE_DRIVEADDGUI __MSABI_LONG(0x00010000)
+#define SHCNE_RENAMEFOLDER __MSABI_LONG(0x00020000)
+#define SHCNE_FREESPACE __MSABI_LONG(0x00040000)
+#define SHCNE_EXTENDED_EVENT __MSABI_LONG(0x04000000)
 
-#define SHCNE_ASSOCCHANGED 0x08000000L
+#define SHCNE_ASSOCCHANGED __MSABI_LONG(0x08000000)
 
-#define SHCNE_DISKEVENTS 0x0002381FL
-#define SHCNE_GLOBALEVENTS 0x0C0581E0L
-#define SHCNE_ALLEVENTS 0x7FFFFFFFL
-#define SHCNE_INTERRUPT 0x80000000L
+#define SHCNE_DISKEVENTS __MSABI_LONG(0x0002381F)
+#define SHCNE_GLOBALEVENTS __MSABI_LONG(0x0C0581E0)
+#define SHCNE_ALLEVENTS __MSABI_LONG(0x7FFFFFFF)
+#define SHCNE_INTERRUPT __MSABI_LONG(0x80000000)
 
-#define SHCNEE_ORDERCHANGED 2L
-#define SHCNEE_MSI_CHANGE 4L
-#define SHCNEE_MSI_UNINSTALL 5L
+#define SHCNEE_ORDERCHANGED __MSABI_LONG(2)
+#define SHCNEE_MSI_CHANGE __MSABI_LONG(4)
+#define SHCNEE_MSI_UNINSTALL __MSABI_LONG(5)
 
 #define SHCNF_IDLIST 0x0000
 #define SHCNF_PATHA 0x0001
@@ -2026,9 +2026,9 @@
   SHSTDAPI_(int) RealDriveType(int iDrive,WINBOOL fOKToHitNet);
   SHSTDAPI_(int) IsNetDrive(int iDrive);
 
-#define MM_ADDSEPARATOR 0x00000001L
-#define MM_SUBMENUSHAVEIDS 0x00000002L
-#define MM_DONTREMOVESEPS 0x00000004L
+#define MM_ADDSEPARATOR __MSABI_LONG(0x00000001)
+#define MM_SUBMENUSHAVEIDS __MSABI_LONG(0x00000002)
+#define MM_DONTREMOVESEPS __MSABI_LONG(0x00000004)
 
   SHSTDAPI_(UINT) Shell_MergeMenus(HMENU hmDst,HMENU hmSrc,UINT uInsert,UINT uIDAdjust,UINT uIDAdjustMax,ULONG uFlags);
   SHSTDAPI_(WINBOOL) SHObjectProperties(HWND hwnd,DWORD dwType,LPCWSTR lpObject,LPCWSTR lpPage);
@@ -2044,9 +2044,9 @@
 #define SHFMT_OPT_FULL 0x0001
 #define SHFMT_OPT_SYSONLY 0x0002
 
-#define SHFMT_ERROR 0xFFFFFFFFL
-#define SHFMT_CANCEL 0xFFFFFFFEL
-#define SHFMT_NOFORMAT 0xFFFFFFFDL
+#define SHFMT_ERROR __MSABI_LONG(0xFFFFFFFF)
+#define SHFMT_CANCEL __MSABI_LONG(0xFFFFFFFE)
+#define SHFMT_NOFORMAT __MSABI_LONG(0xFFFFFFFD)
 
 #ifndef HPSXA_DEFINED
 #define HPSXA_DEFINED
diff --git a/mingw-w64-headers/include/shlwapi.h b/mingw-w64-headers/include/shlwapi.h
index 94a54f8..d9dfe42 100644
--- a/mingw-w64-headers/include/shlwapi.h
+++ b/mingw-w64-headers/include/shlwapi.h
@@ -203,8 +203,8 @@
 #define PathIsHTMLFileA(pszPath) PathIsContentTypeA(pszPath,SZ_CONTENTTYPE_HTMLA)
 #define PathIsHTMLFileW(pszPath) PathIsContentTypeW(pszPath,SZ_CONTENTTYPE_HTMLW)
 
-#define STIF_DEFAULT 0x00000000L
-#define STIF_SUPPORT_HEX 0x00000001L
+#define STIF_DEFAULT __MSABI_LONG(0x00000000)
+#define STIF_SUPPORT_HEX __MSABI_LONG(0x00000001)
 
 #define StrCatA lstrcatA
 #define StrCmpA lstrcmpA
diff --git a/mingw-w64-headers/include/shobjidl.h b/mingw-w64-headers/include/shobjidl.h
index e2b8e0d..d3313f2 100644
--- a/mingw-w64-headers/include/shobjidl.h
+++ b/mingw-w64-headers/include/shobjidl.h
@@ -872,43 +872,43 @@
   };
   typedef DWORD SHCONTF;
 
-#define SHCIDS_ALLFIELDS 0x80000000L
-#define SHCIDS_CANONICALONLY 0x10000000L
-#define SHCIDS_BITMASK 0xFFFF0000L
-#define SHCIDS_COLUMNMASK 0x0000FFFFL
+#define SHCIDS_ALLFIELDS __MSABI_LONG(0x80000000)
+#define SHCIDS_CANONICALONLY __MSABI_LONG(0x10000000)
+#define SHCIDS_BITMASK __MSABI_LONG(0xFFFF0000)
+#define SHCIDS_COLUMNMASK __MSABI_LONG(0x0000FFFF)
 #define SFGAO_CANCOPY DROPEFFECT_COPY
 #define SFGAO_CANMOVE DROPEFFECT_MOVE
 #define SFGAO_CANLINK DROPEFFECT_LINK
-#define SFGAO_STORAGE 0x00000008L
-#define SFGAO_CANRENAME 0x00000010L
-#define SFGAO_CANDELETE 0x00000020L
-#define SFGAO_HASPROPSHEET 0x00000040L
-#define SFGAO_DROPTARGET 0x00000100L
-#define SFGAO_CAPABILITYMASK 0x00000177L
-#define SFGAO_ENCRYPTED 0x00002000L
-#define SFGAO_ISSLOW 0x00004000L
-#define SFGAO_GHOSTED 0x00008000L
-#define SFGAO_LINK 0x00010000L
-#define SFGAO_SHARE 0x00020000L
-#define SFGAO_READONLY 0x00040000L
-#define SFGAO_HIDDEN 0x00080000L
-#define SFGAO_DISPLAYATTRMASK 0x000FC000L
-#define SFGAO_FILESYSANCESTOR 0x10000000L
-#define SFGAO_FOLDER 0x20000000L
-#define SFGAO_FILESYSTEM 0x40000000L
-#define SFGAO_HASSUBFOLDER 0x80000000L
-#define SFGAO_CONTENTSMASK 0x80000000L
-#define SFGAO_VALIDATE 0x01000000L
-#define SFGAO_REMOVABLE 0x02000000L
-#define SFGAO_COMPRESSED 0x04000000L
-#define SFGAO_BROWSABLE 0x08000000L
-#define SFGAO_NONENUMERATED 0x00100000L
-#define SFGAO_NEWCONTENT 0x00200000L
-#define SFGAO_CANMONIKER 0x00400000L
-#define SFGAO_HASSTORAGE 0x00400000L
-#define SFGAO_STREAM 0x00400000L
-#define SFGAO_STORAGEANCESTOR 0x00800000L
-#define SFGAO_STORAGECAPMASK 0x70C50008L
+#define SFGAO_STORAGE __MSABI_LONG(0x00000008)
+#define SFGAO_CANRENAME __MSABI_LONG(0x00000010)
+#define SFGAO_CANDELETE __MSABI_LONG(0x00000020)
+#define SFGAO_HASPROPSHEET __MSABI_LONG(0x00000040)
+#define SFGAO_DROPTARGET __MSABI_LONG(0x00000100)
+#define SFGAO_CAPABILITYMASK __MSABI_LONG(0x00000177)
+#define SFGAO_ENCRYPTED __MSABI_LONG(0x00002000)
+#define SFGAO_ISSLOW __MSABI_LONG(0x00004000)
+#define SFGAO_GHOSTED __MSABI_LONG(0x00008000)
+#define SFGAO_LINK __MSABI_LONG(0x00010000)
+#define SFGAO_SHARE __MSABI_LONG(0x00020000)
+#define SFGAO_READONLY __MSABI_LONG(0x00040000)
+#define SFGAO_HIDDEN __MSABI_LONG(0x00080000)
+#define SFGAO_DISPLAYATTRMASK __MSABI_LONG(0x000FC000)
+#define SFGAO_FILESYSANCESTOR __MSABI_LONG(0x10000000)
+#define SFGAO_FOLDER __MSABI_LONG(0x20000000)
+#define SFGAO_FILESYSTEM __MSABI_LONG(0x40000000)
+#define SFGAO_HASSUBFOLDER __MSABI_LONG(0x80000000)
+#define SFGAO_CONTENTSMASK __MSABI_LONG(0x80000000)
+#define SFGAO_VALIDATE __MSABI_LONG(0x01000000)
+#define SFGAO_REMOVABLE __MSABI_LONG(0x02000000)
+#define SFGAO_COMPRESSED __MSABI_LONG(0x04000000)
+#define SFGAO_BROWSABLE __MSABI_LONG(0x08000000)
+#define SFGAO_NONENUMERATED __MSABI_LONG(0x00100000)
+#define SFGAO_NEWCONTENT __MSABI_LONG(0x00200000)
+#define SFGAO_CANMONIKER __MSABI_LONG(0x00400000)
+#define SFGAO_HASSTORAGE __MSABI_LONG(0x00400000)
+#define SFGAO_STREAM __MSABI_LONG(0x00400000)
+#define SFGAO_STORAGEANCESTOR __MSABI_LONG(0x00800000)
+#define SFGAO_STORAGECAPMASK __MSABI_LONG(0x70C50008)
 typedef ULONG SFGAOF;
 #define STR_SKIP_BINDING_CLSID L"Skip Binding CLSID"
 #define STR_PARSE_PREFER_FOLDER_BROWSING L"Parse Prefer Folder Browsing"
diff --git a/mingw-w64-headers/include/sql.h b/mingw-w64-headers/include/sql.h
index 5d4f28a..0a4f67b 100644
--- a/mingw-w64-headers/include/sql.h
+++ b/mingw-w64-headers/include/sql.h
@@ -33,7 +33,7 @@
 #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
 
 #define SQL_NTS (-3)
-#define SQL_NTSL (-3L)
+#define SQL_NTSL (__MSABI_LONG(-3))
 
 #define SQL_MAX_MESSAGE_LENGTH 512
 
@@ -230,7 +230,7 @@
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_NULL_HANDLE 0L
+#define SQL_NULL_HANDLE __MSABI_LONG(0)
 #endif
 
 #define SQL_SCOPE_CURROW 0
@@ -413,12 +413,12 @@
 #endif
 
 #if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN 0x00000001L
-#define SQL_AT_DROP_COLUMN 0x00000002L
+#define SQL_AT_ADD_COLUMN __MSABI_LONG(0x00000001)
+#define SQL_AT_DROP_COLUMN __MSABI_LONG(0x00000002)
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_CONSTRAINT 0x00000008L
+#define SQL_AT_ADD_CONSTRAINT __MSABI_LONG(0x00000008)
 #endif
 
 #if (ODBCVER >= 0x0300)
@@ -431,15 +431,15 @@
 #define SQL_CB_CLOSE 1
 #define SQL_CB_PRESERVE 2
 
-#define SQL_FD_FETCH_NEXT 0x00000001L
-#define SQL_FD_FETCH_FIRST 0x00000002L
-#define SQL_FD_FETCH_LAST 0x00000004L
-#define SQL_FD_FETCH_PRIOR 0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE 0x00000010L
-#define SQL_FD_FETCH_RELATIVE 0x00000020L
+#define SQL_FD_FETCH_NEXT __MSABI_LONG(0x00000001)
+#define SQL_FD_FETCH_FIRST __MSABI_LONG(0x00000002)
+#define SQL_FD_FETCH_LAST __MSABI_LONG(0x00000004)
+#define SQL_FD_FETCH_PRIOR __MSABI_LONG(0x00000008)
+#define SQL_FD_FETCH_ABSOLUTE __MSABI_LONG(0x00000010)
+#define SQL_FD_FETCH_RELATIVE __MSABI_LONG(0x00000020)
 
-#define SQL_GD_ANY_COLUMN 0x00000001L
-#define SQL_GD_ANY_ORDER 0x00000002L
+#define SQL_GD_ANY_COLUMN __MSABI_LONG(0x00000001)
+#define SQL_GD_ANY_ORDER __MSABI_LONG(0x00000002)
 
 #define SQL_IC_UPPER 1
 #define SQL_IC_LOWER 2
@@ -447,19 +447,19 @@
 #define SQL_IC_MIXED 4
 
 #if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT 0x00000001L
-#define SQL_OJ_RIGHT 0x00000002L
-#define SQL_OJ_FULL 0x00000004L
-#define SQL_OJ_NESTED 0x00000008L
-#define SQL_OJ_NOT_ORDERED 0x00000010L
-#define SQL_OJ_INNER 0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS 0x00000040L
+#define SQL_OJ_LEFT __MSABI_LONG(0x00000001)
+#define SQL_OJ_RIGHT __MSABI_LONG(0x00000002)
+#define SQL_OJ_FULL __MSABI_LONG(0x00000004)
+#define SQL_OJ_NESTED __MSABI_LONG(0x00000008)
+#define SQL_OJ_NOT_ORDERED __MSABI_LONG(0x00000010)
+#define SQL_OJ_INNER __MSABI_LONG(0x00000020)
+#define SQL_OJ_ALL_COMPARISON_OPS __MSABI_LONG(0x00000040)
 #endif
 
-#define SQL_SCCO_READ_ONLY 0x00000001L
-#define SQL_SCCO_LOCK 0x00000002L
-#define SQL_SCCO_OPT_ROWVER 0x00000004L
-#define SQL_SCCO_OPT_VALUES 0x00000008L
+#define SQL_SCCO_READ_ONLY __MSABI_LONG(0x00000001)
+#define SQL_SCCO_LOCK __MSABI_LONG(0x00000002)
+#define SQL_SCCO_OPT_ROWVER __MSABI_LONG(0x00000004)
+#define SQL_SCCO_OPT_VALUES __MSABI_LONG(0x00000008)
 
 #define SQL_TC_NONE 0
 #define SQL_TC_DML 1
@@ -467,13 +467,13 @@
 #define SQL_TC_DDL_COMMIT 3
 #define SQL_TC_DDL_IGNORE 4
 
-#define SQL_TXN_READ_UNCOMMITTED 0x00000001L
+#define SQL_TXN_READ_UNCOMMITTED __MSABI_LONG(0x00000001)
 #define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED
-#define SQL_TXN_READ_COMMITTED 0x00000002L
+#define SQL_TXN_READ_COMMITTED __MSABI_LONG(0x00000002)
 #define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
-#define SQL_TXN_REPEATABLE_READ 0x00000004L
+#define SQL_TXN_REPEATABLE_READ __MSABI_LONG(0x00000004)
 #define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
-#define SQL_TXN_SERIALIZABLE 0x00000008L
+#define SQL_TXN_SERIALIZABLE __MSABI_LONG(0x00000008)
 #define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
 
 #define SQL_NC_HIGH 0
diff --git a/mingw-w64-headers/include/sqlext.h b/mingw-w64-headers/include/sqlext.h
index 7a1c258..6dbeccb 100644
--- a/mingw-w64-headers/include/sqlext.h
+++ b/mingw-w64-headers/include/sqlext.h
@@ -125,15 +125,15 @@
 #define SQL_DB_DISCONNECT 1UL
 #define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
 
-#define SQL_DTC_DONE 0L
+#define SQL_DTC_DONE __MSABI_LONG(0)
 #endif
 
-#define SQL_CD_TRUE 1L
-#define SQL_CD_FALSE 0L
+#define SQL_CD_TRUE __MSABI_LONG(1)
+#define SQL_CD_FALSE __MSABI_LONG(0)
 
 #if (ODBCVER >= 0x0351)
-#define SQL_AA_TRUE 1L
-#define SQL_AA_FALSE 0L
+#define SQL_AA_TRUE __MSABI_LONG(1)
+#define SQL_AA_FALSE __MSABI_LONG(0)
 #endif
 
 #define SQL_QUERY_TIMEOUT 0
@@ -462,7 +462,7 @@
 #define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
 
 #define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX (-1L)
+#define SQL_SETPARAM_VALUE_MAX (__MSABI_LONG(-1))
 
 #define SQL_COLUMN_COUNT 0
 #define SQL_COLUMN_NAME 1
@@ -711,222 +711,222 @@
 
 #if (ODBCVER >= 0x0300)
 
-#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
-#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
-#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
-#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
-#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
-#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
-#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
-#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
-#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
-#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
-#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
-#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
-#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
+#define SQL_AT_ADD_COLUMN_SINGLE __MSABI_LONG(0x00000020)
+#define SQL_AT_ADD_COLUMN_DEFAULT __MSABI_LONG(0x00000040)
+#define SQL_AT_ADD_COLUMN_COLLATION __MSABI_LONG(0x00000080)
+#define SQL_AT_SET_COLUMN_DEFAULT __MSABI_LONG(0x00000100)
+#define SQL_AT_DROP_COLUMN_DEFAULT __MSABI_LONG(0x00000200)
+#define SQL_AT_DROP_COLUMN_CASCADE __MSABI_LONG(0x00000400)
+#define SQL_AT_DROP_COLUMN_RESTRICT __MSABI_LONG(0x00000800)
+#define SQL_AT_ADD_TABLE_CONSTRAINT __MSABI_LONG(0x00001000)
+#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE __MSABI_LONG(0x00002000)
+#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT __MSABI_LONG(0x00004000)
+#define SQL_AT_CONSTRAINT_NAME_DEFINITION __MSABI_LONG(0x00008000)
+#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED __MSABI_LONG(0x00010000)
+#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE __MSABI_LONG(0x00020000)
+#define SQL_AT_CONSTRAINT_DEFERRABLE __MSABI_LONG(0x00040000)
+#define SQL_AT_CONSTRAINT_NON_DEFERRABLE __MSABI_LONG(0x00080000)
 #endif
 
-#define SQL_CVT_CHAR 0x00000001L
-#define SQL_CVT_NUMERIC 0x00000002L
-#define SQL_CVT_DECIMAL 0x00000004L
-#define SQL_CVT_INTEGER 0x00000008L
-#define SQL_CVT_SMALLINT 0x00000010L
-#define SQL_CVT_FLOAT 0x00000020L
-#define SQL_CVT_REAL 0x00000040L
-#define SQL_CVT_DOUBLE 0x00000080L
-#define SQL_CVT_VARCHAR 0x00000100L
-#define SQL_CVT_LONGVARCHAR 0x00000200L
-#define SQL_CVT_BINARY 0x00000400L
-#define SQL_CVT_VARBINARY 0x00000800L
-#define SQL_CVT_BIT 0x00001000L
-#define SQL_CVT_TINYINT 0x00002000L
-#define SQL_CVT_BIGINT 0x00004000L
-#define SQL_CVT_DATE 0x00008000L
-#define SQL_CVT_TIME 0x00010000L
-#define SQL_CVT_TIMESTAMP 0x00020000L
-#define SQL_CVT_LONGVARBINARY 0x00040000L
+#define SQL_CVT_CHAR __MSABI_LONG(0x00000001)
+#define SQL_CVT_NUMERIC __MSABI_LONG(0x00000002)
+#define SQL_CVT_DECIMAL __MSABI_LONG(0x00000004)
+#define SQL_CVT_INTEGER __MSABI_LONG(0x00000008)
+#define SQL_CVT_SMALLINT __MSABI_LONG(0x00000010)
+#define SQL_CVT_FLOAT __MSABI_LONG(0x00000020)
+#define SQL_CVT_REAL __MSABI_LONG(0x00000040)
+#define SQL_CVT_DOUBLE __MSABI_LONG(0x00000080)
+#define SQL_CVT_VARCHAR __MSABI_LONG(0x00000100)
+#define SQL_CVT_LONGVARCHAR __MSABI_LONG(0x00000200)
+#define SQL_CVT_BINARY __MSABI_LONG(0x00000400)
+#define SQL_CVT_VARBINARY __MSABI_LONG(0x00000800)
+#define SQL_CVT_BIT __MSABI_LONG(0x00001000)
+#define SQL_CVT_TINYINT __MSABI_LONG(0x00002000)
+#define SQL_CVT_BIGINT __MSABI_LONG(0x00004000)
+#define SQL_CVT_DATE __MSABI_LONG(0x00008000)
+#define SQL_CVT_TIME __MSABI_LONG(0x00010000)
+#define SQL_CVT_TIMESTAMP __MSABI_LONG(0x00020000)
+#define SQL_CVT_LONGVARBINARY __MSABI_LONG(0x00040000)
 #if (ODBCVER >= 0x0300)
-#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L
-#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L
-#define SQL_CVT_WCHAR 0x00200000L
-#define SQL_CVT_WLONGVARCHAR 0x00400000L
-#define SQL_CVT_WVARCHAR 0x00800000L
-#define SQL_CVT_GUID 0x01000000L
+#define SQL_CVT_INTERVAL_YEAR_MONTH __MSABI_LONG(0x00080000)
+#define SQL_CVT_INTERVAL_DAY_TIME __MSABI_LONG(0x00100000)
+#define SQL_CVT_WCHAR __MSABI_LONG(0x00200000)
+#define SQL_CVT_WLONGVARCHAR __MSABI_LONG(0x00400000)
+#define SQL_CVT_WVARCHAR __MSABI_LONG(0x00800000)
+#define SQL_CVT_GUID __MSABI_LONG(0x01000000)
 #endif
 
-#define SQL_FN_CVT_CONVERT 0x00000001L
+#define SQL_FN_CVT_CONVERT __MSABI_LONG(0x00000001)
 #if (ODBCVER >= 0x0300)
-#define SQL_FN_CVT_CAST 0x00000002L
+#define SQL_FN_CVT_CAST __MSABI_LONG(0x00000002)
 #endif
 
-#define SQL_FN_STR_CONCAT 0x00000001L
-#define SQL_FN_STR_INSERT 0x00000002L
-#define SQL_FN_STR_LEFT 0x00000004L
-#define SQL_FN_STR_LTRIM 0x00000008L
-#define SQL_FN_STR_LENGTH 0x00000010L
-#define SQL_FN_STR_LOCATE 0x00000020L
-#define SQL_FN_STR_LCASE 0x00000040L
-#define SQL_FN_STR_REPEAT 0x00000080L
-#define SQL_FN_STR_REPLACE 0x00000100L
-#define SQL_FN_STR_RIGHT 0x00000200L
-#define SQL_FN_STR_RTRIM 0x00000400L
-#define SQL_FN_STR_SUBSTRING 0x00000800L
-#define SQL_FN_STR_UCASE 0x00001000L
-#define SQL_FN_STR_ASCII 0x00002000L
-#define SQL_FN_STR_CHAR 0x00004000L
-#define SQL_FN_STR_DIFFERENCE 0x00008000L
-#define SQL_FN_STR_LOCATE_2 0x00010000L
-#define SQL_FN_STR_SOUNDEX 0x00020000L
-#define SQL_FN_STR_SPACE 0x00040000L
+#define SQL_FN_STR_CONCAT __MSABI_LONG(0x00000001)
+#define SQL_FN_STR_INSERT __MSABI_LONG(0x00000002)
+#define SQL_FN_STR_LEFT __MSABI_LONG(0x00000004)
+#define SQL_FN_STR_LTRIM __MSABI_LONG(0x00000008)
+#define SQL_FN_STR_LENGTH __MSABI_LONG(0x00000010)
+#define SQL_FN_STR_LOCATE __MSABI_LONG(0x00000020)
+#define SQL_FN_STR_LCASE __MSABI_LONG(0x00000040)
+#define SQL_FN_STR_REPEAT __MSABI_LONG(0x00000080)
+#define SQL_FN_STR_REPLACE __MSABI_LONG(0x00000100)
+#define SQL_FN_STR_RIGHT __MSABI_LONG(0x00000200)
+#define SQL_FN_STR_RTRIM __MSABI_LONG(0x00000400)
+#define SQL_FN_STR_SUBSTRING __MSABI_LONG(0x00000800)
+#define SQL_FN_STR_UCASE __MSABI_LONG(0x00001000)
+#define SQL_FN_STR_ASCII __MSABI_LONG(0x00002000)
+#define SQL_FN_STR_CHAR __MSABI_LONG(0x00004000)
+#define SQL_FN_STR_DIFFERENCE __MSABI_LONG(0x00008000)
+#define SQL_FN_STR_LOCATE_2 __MSABI_LONG(0x00010000)
+#define SQL_FN_STR_SOUNDEX __MSABI_LONG(0x00020000)
+#define SQL_FN_STR_SPACE __MSABI_LONG(0x00040000)
 #if (ODBCVER >= 0x0300)
-#define SQL_FN_STR_BIT_LENGTH 0x00080000L
-#define SQL_FN_STR_CHAR_LENGTH 0x00100000L
-#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L
-#define SQL_FN_STR_OCTET_LENGTH 0x00400000L
-#define SQL_FN_STR_POSITION 0x00800000L
+#define SQL_FN_STR_BIT_LENGTH __MSABI_LONG(0x00080000)
+#define SQL_FN_STR_CHAR_LENGTH __MSABI_LONG(0x00100000)
+#define SQL_FN_STR_CHARACTER_LENGTH __MSABI_LONG(0x00200000)
+#define SQL_FN_STR_OCTET_LENGTH __MSABI_LONG(0x00400000)
+#define SQL_FN_STR_POSITION __MSABI_LONG(0x00800000)
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_SSF_CONVERT 0x00000001L
-#define SQL_SSF_LOWER 0x00000002L
-#define SQL_SSF_UPPER 0x00000004L
-#define SQL_SSF_SUBSTRING 0x00000008L
-#define SQL_SSF_TRANSLATE 0x00000010L
-#define SQL_SSF_TRIM_BOTH 0x00000020L
-#define SQL_SSF_TRIM_LEADING 0x00000040L
-#define SQL_SSF_TRIM_TRAILING 0x00000080L
+#define SQL_SSF_CONVERT __MSABI_LONG(0x00000001)
+#define SQL_SSF_LOWER __MSABI_LONG(0x00000002)
+#define SQL_SSF_UPPER __MSABI_LONG(0x00000004)
+#define SQL_SSF_SUBSTRING __MSABI_LONG(0x00000008)
+#define SQL_SSF_TRANSLATE __MSABI_LONG(0x00000010)
+#define SQL_SSF_TRIM_BOTH __MSABI_LONG(0x00000020)
+#define SQL_SSF_TRIM_LEADING __MSABI_LONG(0x00000040)
+#define SQL_SSF_TRIM_TRAILING __MSABI_LONG(0x00000080)
 #endif
 
-#define SQL_FN_NUM_ABS 0x00000001L
-#define SQL_FN_NUM_ACOS 0x00000002L
-#define SQL_FN_NUM_ASIN 0x00000004L
-#define SQL_FN_NUM_ATAN 0x00000008L
-#define SQL_FN_NUM_ATAN2 0x00000010L
-#define SQL_FN_NUM_CEILING 0x00000020L
-#define SQL_FN_NUM_COS 0x00000040L
-#define SQL_FN_NUM_COT 0x00000080L
-#define SQL_FN_NUM_EXP 0x00000100L
-#define SQL_FN_NUM_FLOOR 0x00000200L
-#define SQL_FN_NUM_LOG 0x00000400L
-#define SQL_FN_NUM_MOD 0x00000800L
-#define SQL_FN_NUM_SIGN 0x00001000L
-#define SQL_FN_NUM_SIN 0x00002000L
-#define SQL_FN_NUM_SQRT 0x00004000L
-#define SQL_FN_NUM_TAN 0x00008000L
-#define SQL_FN_NUM_PI 0x00010000L
-#define SQL_FN_NUM_RAND 0x00020000L
-#define SQL_FN_NUM_DEGREES 0x00040000L
-#define SQL_FN_NUM_LOG10 0x00080000L
-#define SQL_FN_NUM_POWER 0x00100000L
-#define SQL_FN_NUM_RADIANS 0x00200000L
-#define SQL_FN_NUM_ROUND 0x00400000L
-#define SQL_FN_NUM_TRUNCATE 0x00800000L
+#define SQL_FN_NUM_ABS __MSABI_LONG(0x00000001)
+#define SQL_FN_NUM_ACOS __MSABI_LONG(0x00000002)
+#define SQL_FN_NUM_ASIN __MSABI_LONG(0x00000004)
+#define SQL_FN_NUM_ATAN __MSABI_LONG(0x00000008)
+#define SQL_FN_NUM_ATAN2 __MSABI_LONG(0x00000010)
+#define SQL_FN_NUM_CEILING __MSABI_LONG(0x00000020)
+#define SQL_FN_NUM_COS __MSABI_LONG(0x00000040)
+#define SQL_FN_NUM_COT __MSABI_LONG(0x00000080)
+#define SQL_FN_NUM_EXP __MSABI_LONG(0x00000100)
+#define SQL_FN_NUM_FLOOR __MSABI_LONG(0x00000200)
+#define SQL_FN_NUM_LOG __MSABI_LONG(0x00000400)
+#define SQL_FN_NUM_MOD __MSABI_LONG(0x00000800)
+#define SQL_FN_NUM_SIGN __MSABI_LONG(0x00001000)
+#define SQL_FN_NUM_SIN __MSABI_LONG(0x00002000)
+#define SQL_FN_NUM_SQRT __MSABI_LONG(0x00004000)
+#define SQL_FN_NUM_TAN __MSABI_LONG(0x00008000)
+#define SQL_FN_NUM_PI __MSABI_LONG(0x00010000)
+#define SQL_FN_NUM_RAND __MSABI_LONG(0x00020000)
+#define SQL_FN_NUM_DEGREES __MSABI_LONG(0x00040000)
+#define SQL_FN_NUM_LOG10 __MSABI_LONG(0x00080000)
+#define SQL_FN_NUM_POWER __MSABI_LONG(0x00100000)
+#define SQL_FN_NUM_RADIANS __MSABI_LONG(0x00200000)
+#define SQL_FN_NUM_ROUND __MSABI_LONG(0x00400000)
+#define SQL_FN_NUM_TRUNCATE __MSABI_LONG(0x00800000)
 
 #if (ODBCVER >= 0x0300)
-#define SQL_SNVF_BIT_LENGTH 0x00000001L
-#define SQL_SNVF_CHAR_LENGTH 0x00000002L
-#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L
-#define SQL_SNVF_EXTRACT 0x00000008L
-#define SQL_SNVF_OCTET_LENGTH 0x00000010L
-#define SQL_SNVF_POSITION 0x00000020L
+#define SQL_SNVF_BIT_LENGTH __MSABI_LONG(0x00000001)
+#define SQL_SNVF_CHAR_LENGTH __MSABI_LONG(0x00000002)
+#define SQL_SNVF_CHARACTER_LENGTH __MSABI_LONG(0x00000004)
+#define SQL_SNVF_EXTRACT __MSABI_LONG(0x00000008)
+#define SQL_SNVF_OCTET_LENGTH __MSABI_LONG(0x00000010)
+#define SQL_SNVF_POSITION __MSABI_LONG(0x00000020)
 #endif
 
-#define SQL_FN_TD_NOW 0x00000001L
-#define SQL_FN_TD_CURDATE 0x00000002L
-#define SQL_FN_TD_DAYOFMONTH 0x00000004L
-#define SQL_FN_TD_DAYOFWEEK 0x00000008L
-#define SQL_FN_TD_DAYOFYEAR 0x00000010L
-#define SQL_FN_TD_MONTH 0x00000020L
-#define SQL_FN_TD_QUARTER 0x00000040L
-#define SQL_FN_TD_WEEK 0x00000080L
-#define SQL_FN_TD_YEAR 0x00000100L
-#define SQL_FN_TD_CURTIME 0x00000200L
-#define SQL_FN_TD_HOUR 0x00000400L
-#define SQL_FN_TD_MINUTE 0x00000800L
-#define SQL_FN_TD_SECOND 0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD 0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L
-#define SQL_FN_TD_DAYNAME 0x00008000L
-#define SQL_FN_TD_MONTHNAME 0x00010000L
+#define SQL_FN_TD_NOW __MSABI_LONG(0x00000001)
+#define SQL_FN_TD_CURDATE __MSABI_LONG(0x00000002)
+#define SQL_FN_TD_DAYOFMONTH __MSABI_LONG(0x00000004)
+#define SQL_FN_TD_DAYOFWEEK __MSABI_LONG(0x00000008)
+#define SQL_FN_TD_DAYOFYEAR __MSABI_LONG(0x00000010)
+#define SQL_FN_TD_MONTH __MSABI_LONG(0x00000020)
+#define SQL_FN_TD_QUARTER __MSABI_LONG(0x00000040)
+#define SQL_FN_TD_WEEK __MSABI_LONG(0x00000080)
+#define SQL_FN_TD_YEAR __MSABI_LONG(0x00000100)
+#define SQL_FN_TD_CURTIME __MSABI_LONG(0x00000200)
+#define SQL_FN_TD_HOUR __MSABI_LONG(0x00000400)
+#define SQL_FN_TD_MINUTE __MSABI_LONG(0x00000800)
+#define SQL_FN_TD_SECOND __MSABI_LONG(0x00001000)
+#define SQL_FN_TD_TIMESTAMPADD __MSABI_LONG(0x00002000)
+#define SQL_FN_TD_TIMESTAMPDIFF __MSABI_LONG(0x00004000)
+#define SQL_FN_TD_DAYNAME __MSABI_LONG(0x00008000)
+#define SQL_FN_TD_MONTHNAME __MSABI_LONG(0x00010000)
 #if (ODBCVER >= 0x0300)
-#define SQL_FN_TD_CURRENT_DATE 0x00020000L
-#define SQL_FN_TD_CURRENT_TIME 0x00040000L
-#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
-#define SQL_FN_TD_EXTRACT 0x00100000L
+#define SQL_FN_TD_CURRENT_DATE __MSABI_LONG(0x00020000)
+#define SQL_FN_TD_CURRENT_TIME __MSABI_LONG(0x00040000)
+#define SQL_FN_TD_CURRENT_TIMESTAMP __MSABI_LONG(0x00080000)
+#define SQL_FN_TD_EXTRACT __MSABI_LONG(0x00100000)
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_SDF_CURRENT_DATE 0x00000001L
-#define SQL_SDF_CURRENT_TIME 0x00000002L
-#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
+#define SQL_SDF_CURRENT_DATE __MSABI_LONG(0x00000001)
+#define SQL_SDF_CURRENT_TIME __MSABI_LONG(0x00000002)
+#define SQL_SDF_CURRENT_TIMESTAMP __MSABI_LONG(0x00000004)
 #endif
 
-#define SQL_FN_SYS_USERNAME 0x00000001L
-#define SQL_FN_SYS_DBNAME 0x00000002L
-#define SQL_FN_SYS_IFNULL 0x00000004L
+#define SQL_FN_SYS_USERNAME __MSABI_LONG(0x00000001)
+#define SQL_FN_SYS_DBNAME __MSABI_LONG(0x00000002)
+#define SQL_FN_SYS_IFNULL __MSABI_LONG(0x00000004)
 
-#define SQL_FN_TSI_FRAC_SECOND 0x00000001L
-#define SQL_FN_TSI_SECOND 0x00000002L
-#define SQL_FN_TSI_MINUTE 0x00000004L
-#define SQL_FN_TSI_HOUR 0x00000008L
-#define SQL_FN_TSI_DAY 0x00000010L
-#define SQL_FN_TSI_WEEK 0x00000020L
-#define SQL_FN_TSI_MONTH 0x00000040L
-#define SQL_FN_TSI_QUARTER 0x00000080L
-#define SQL_FN_TSI_YEAR 0x00000100L
+#define SQL_FN_TSI_FRAC_SECOND __MSABI_LONG(0x00000001)
+#define SQL_FN_TSI_SECOND __MSABI_LONG(0x00000002)
+#define SQL_FN_TSI_MINUTE __MSABI_LONG(0x00000004)
+#define SQL_FN_TSI_HOUR __MSABI_LONG(0x00000008)
+#define SQL_FN_TSI_DAY __MSABI_LONG(0x00000010)
+#define SQL_FN_TSI_WEEK __MSABI_LONG(0x00000020)
+#define SQL_FN_TSI_MONTH __MSABI_LONG(0x00000040)
+#define SQL_FN_TSI_QUARTER __MSABI_LONG(0x00000080)
+#define SQL_FN_TSI_YEAR __MSABI_LONG(0x00000100)
 
 #if (ODBCVER >= 0x0300)
 
-#define SQL_CA1_NEXT 0x00000001L
-#define SQL_CA1_ABSOLUTE 0x00000002L
-#define SQL_CA1_RELATIVE 0x00000004L
-#define SQL_CA1_BOOKMARK 0x00000008L
+#define SQL_CA1_NEXT __MSABI_LONG(0x00000001)
+#define SQL_CA1_ABSOLUTE __MSABI_LONG(0x00000002)
+#define SQL_CA1_RELATIVE __MSABI_LONG(0x00000004)
+#define SQL_CA1_BOOKMARK __MSABI_LONG(0x00000008)
 
-#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L
-#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L
-#define SQL_CA1_LOCK_UNLOCK 0x00000100L
+#define SQL_CA1_LOCK_NO_CHANGE __MSABI_LONG(0x00000040)
+#define SQL_CA1_LOCK_EXCLUSIVE __MSABI_LONG(0x00000080)
+#define SQL_CA1_LOCK_UNLOCK __MSABI_LONG(0x00000100)
 
-#define SQL_CA1_POS_POSITION 0x00000200L
-#define SQL_CA1_POS_UPDATE 0x00000400L
-#define SQL_CA1_POS_DELETE 0x00000800L
-#define SQL_CA1_POS_REFRESH 0x00001000L
+#define SQL_CA1_POS_POSITION __MSABI_LONG(0x00000200)
+#define SQL_CA1_POS_UPDATE __MSABI_LONG(0x00000400)
+#define SQL_CA1_POS_DELETE __MSABI_LONG(0x00000800)
+#define SQL_CA1_POS_REFRESH __MSABI_LONG(0x00001000)
 
-#define SQL_CA1_POSITIONED_UPDATE 0x00002000L
-#define SQL_CA1_POSITIONED_DELETE 0x00004000L
-#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L
+#define SQL_CA1_POSITIONED_UPDATE __MSABI_LONG(0x00002000)
+#define SQL_CA1_POSITIONED_DELETE __MSABI_LONG(0x00004000)
+#define SQL_CA1_SELECT_FOR_UPDATE __MSABI_LONG(0x00008000)
 
-#define SQL_CA1_BULK_ADD 0x00010000L
-#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L
-#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L
-#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L
+#define SQL_CA1_BULK_ADD __MSABI_LONG(0x00010000)
+#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK __MSABI_LONG(0x00020000)
+#define SQL_CA1_BULK_DELETE_BY_BOOKMARK __MSABI_LONG(0x00040000)
+#define SQL_CA1_BULK_FETCH_BY_BOOKMARK __MSABI_LONG(0x00080000)
 #endif
 
 #if (ODBCVER >= 0x0300)
 
-#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L
-#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L
-#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L
-#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L
+#define SQL_CA2_READ_ONLY_CONCURRENCY __MSABI_LONG(0x00000001)
+#define SQL_CA2_LOCK_CONCURRENCY __MSABI_LONG(0x00000002)
+#define SQL_CA2_OPT_ROWVER_CONCURRENCY __MSABI_LONG(0x00000004)
+#define SQL_CA2_OPT_VALUES_CONCURRENCY __MSABI_LONG(0x00000008)
 
-#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L
-#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L
-#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L
+#define SQL_CA2_SENSITIVITY_ADDITIONS __MSABI_LONG(0x00000010)
+#define SQL_CA2_SENSITIVITY_DELETIONS __MSABI_LONG(0x00000020)
+#define SQL_CA2_SENSITIVITY_UPDATES __MSABI_LONG(0x00000040)
 
-#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L
-#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L
-#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L
-#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L
-#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L
+#define SQL_CA2_MAX_ROWS_SELECT __MSABI_LONG(0x00000080)
+#define SQL_CA2_MAX_ROWS_INSERT __MSABI_LONG(0x00000100)
+#define SQL_CA2_MAX_ROWS_DELETE __MSABI_LONG(0x00000200)
+#define SQL_CA2_MAX_ROWS_UPDATE __MSABI_LONG(0x00000400)
+#define SQL_CA2_MAX_ROWS_CATALOG __MSABI_LONG(0x00000800)
 #define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
 
-#define SQL_CA2_CRC_EXACT 0x00001000L
-#define SQL_CA2_CRC_APPROXIMATE 0x00002000L
+#define SQL_CA2_CRC_EXACT __MSABI_LONG(0x00001000)
+#define SQL_CA2_CRC_APPROXIMATE __MSABI_LONG(0x00002000)
 
-#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L
-#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L
-#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L
+#define SQL_CA2_SIMULATE_NON_UNIQUE __MSABI_LONG(0x00004000)
+#define SQL_CA2_SIMULATE_TRY_UNIQUE __MSABI_LONG(0x00008000)
+#define SQL_CA2_SIMULATE_UNIQUE __MSABI_LONG(0x00010000)
 #endif
 
 #define SQL_OAC_NONE 0x0000
@@ -943,13 +943,13 @@
 #define SQL_CB_NULL 0x0000
 #define SQL_CB_NON_NULL 0x0001
 
-#define SQL_SO_FORWARD_ONLY 0x00000001L
-#define SQL_SO_KEYSET_DRIVEN 0x00000002L
-#define SQL_SO_DYNAMIC 0x00000004L
-#define SQL_SO_MIXED 0x00000008L
-#define SQL_SO_STATIC 0x00000010L
+#define SQL_SO_FORWARD_ONLY __MSABI_LONG(0x00000001)
+#define SQL_SO_KEYSET_DRIVEN __MSABI_LONG(0x00000002)
+#define SQL_SO_DYNAMIC __MSABI_LONG(0x00000004)
+#define SQL_SO_MIXED __MSABI_LONG(0x00000008)
+#define SQL_SO_STATIC __MSABI_LONG(0x00000010)
 
-#define SQL_FD_FETCH_BOOKMARK 0x00000080L
+#define SQL_FD_FETCH_BOOKMARK __MSABI_LONG(0x00000080)
 
 #define SQL_CN_NONE 0x0000
 #define SQL_CN_DIFFERENT 0x0001
@@ -966,12 +966,12 @@
 #define SQL_FILE_QUALIFIER 0x0002
 #define SQL_FILE_CATALOG SQL_FILE_QUALIFIER
 
-#define SQL_GD_BLOCK 0x00000004L
-#define SQL_GD_BOUND 0x00000008L
+#define SQL_GD_BLOCK __MSABI_LONG(0x00000004)
+#define SQL_GD_BOUND __MSABI_LONG(0x00000008)
 
-#define SQL_PS_POSITIONED_DELETE 0x00000001L
-#define SQL_PS_POSITIONED_UPDATE 0x00000002L
-#define SQL_PS_SELECT_FOR_UPDATE 0x00000004L
+#define SQL_PS_POSITIONED_DELETE __MSABI_LONG(0x00000001)
+#define SQL_PS_POSITIONED_UPDATE __MSABI_LONG(0x00000002)
+#define SQL_PS_SELECT_FOR_UPDATE __MSABI_LONG(0x00000004)
 
 #define SQL_GB_NOT_SUPPORTED 0x0000
 #define SQL_GB_GROUP_BY_EQUALS_SELECT 0x0001
@@ -981,11 +981,11 @@
 #define SQL_GB_COLLATE 0x0004
 #endif
 
-#define SQL_OU_DML_STATEMENTS 0x00000001L
-#define SQL_OU_PROCEDURE_INVOCATION 0x00000002L
-#define SQL_OU_TABLE_DEFINITION 0x00000004L
-#define SQL_OU_INDEX_DEFINITION 0x00000008L
-#define SQL_OU_PRIVILEGE_DEFINITION 0x00000010L
+#define SQL_OU_DML_STATEMENTS __MSABI_LONG(0x00000001)
+#define SQL_OU_PROCEDURE_INVOCATION __MSABI_LONG(0x00000002)
+#define SQL_OU_TABLE_DEFINITION __MSABI_LONG(0x00000004)
+#define SQL_OU_INDEX_DEFINITION __MSABI_LONG(0x00000008)
+#define SQL_OU_PRIVILEGE_DEFINITION __MSABI_LONG(0x00000010)
 
 #if (ODBCVER >= 0x0300)
 #define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS
@@ -995,11 +995,11 @@
 #define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION
 #endif
 
-#define SQL_QU_DML_STATEMENTS 0x00000001L
-#define SQL_QU_PROCEDURE_INVOCATION 0x00000002L
-#define SQL_QU_TABLE_DEFINITION 0x00000004L
-#define SQL_QU_INDEX_DEFINITION 0x00000008L
-#define SQL_QU_PRIVILEGE_DEFINITION 0x00000010L
+#define SQL_QU_DML_STATEMENTS __MSABI_LONG(0x00000001)
+#define SQL_QU_PROCEDURE_INVOCATION __MSABI_LONG(0x00000002)
+#define SQL_QU_TABLE_DEFINITION __MSABI_LONG(0x00000004)
+#define SQL_QU_INDEX_DEFINITION __MSABI_LONG(0x00000008)
+#define SQL_QU_PRIVILEGE_DEFINITION __MSABI_LONG(0x00000010)
 
 #if (ODBCVER >= 0x0300)
 
@@ -1010,76 +1010,76 @@
 #define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION
 #endif
 
-#define SQL_SQ_COMPARISON 0x00000001L
-#define SQL_SQ_EXISTS 0x00000002L
-#define SQL_SQ_IN 0x00000004L
-#define SQL_SQ_QUANTIFIED 0x00000008L
-#define SQL_SQ_CORRELATED_SUBQUERIES 0x00000010L
+#define SQL_SQ_COMPARISON __MSABI_LONG(0x00000001)
+#define SQL_SQ_EXISTS __MSABI_LONG(0x00000002)
+#define SQL_SQ_IN __MSABI_LONG(0x00000004)
+#define SQL_SQ_QUANTIFIED __MSABI_LONG(0x00000008)
+#define SQL_SQ_CORRELATED_SUBQUERIES __MSABI_LONG(0x00000010)
 
-#define SQL_U_UNION 0x00000001L
-#define SQL_U_UNION_ALL 0x00000002L
+#define SQL_U_UNION __MSABI_LONG(0x00000001)
+#define SQL_U_UNION_ALL __MSABI_LONG(0x00000002)
 
-#define SQL_BP_CLOSE 0x00000001L
-#define SQL_BP_DELETE 0x00000002L
-#define SQL_BP_DROP 0x00000004L
-#define SQL_BP_TRANSACTION 0x00000008L
-#define SQL_BP_UPDATE 0x00000010L
-#define SQL_BP_OTHER_HSTMT 0x00000020L
-#define SQL_BP_SCROLL 0x00000040L
+#define SQL_BP_CLOSE __MSABI_LONG(0x00000001)
+#define SQL_BP_DELETE __MSABI_LONG(0x00000002)
+#define SQL_BP_DROP __MSABI_LONG(0x00000004)
+#define SQL_BP_TRANSACTION __MSABI_LONG(0x00000008)
+#define SQL_BP_UPDATE __MSABI_LONG(0x00000010)
+#define SQL_BP_OTHER_HSTMT __MSABI_LONG(0x00000020)
+#define SQL_BP_SCROLL __MSABI_LONG(0x00000040)
 
-#define SQL_SS_ADDITIONS 0x00000001L
-#define SQL_SS_DELETIONS 0x00000002L
-#define SQL_SS_UPDATES 0x00000004L
+#define SQL_SS_ADDITIONS __MSABI_LONG(0x00000001)
+#define SQL_SS_DELETIONS __MSABI_LONG(0x00000002)
+#define SQL_SS_UPDATES __MSABI_LONG(0x00000004)
 
-#define SQL_CV_CREATE_VIEW 0x00000001L
-#define SQL_CV_CHECK_OPTION 0x00000002L
-#define SQL_CV_CASCADED 0x00000004L
-#define SQL_CV_LOCAL 0x00000008L
+#define SQL_CV_CREATE_VIEW __MSABI_LONG(0x00000001)
+#define SQL_CV_CHECK_OPTION __MSABI_LONG(0x00000002)
+#define SQL_CV_CASCADED __MSABI_LONG(0x00000004)
+#define SQL_CV_LOCAL __MSABI_LONG(0x00000008)
 
-#define SQL_LCK_NO_CHANGE 0x00000001L
-#define SQL_LCK_EXCLUSIVE 0x00000002L
-#define SQL_LCK_UNLOCK 0x00000004L
+#define SQL_LCK_NO_CHANGE __MSABI_LONG(0x00000001)
+#define SQL_LCK_EXCLUSIVE __MSABI_LONG(0x00000002)
+#define SQL_LCK_UNLOCK __MSABI_LONG(0x00000004)
 
-#define SQL_POS_POSITION 0x00000001L
-#define SQL_POS_REFRESH 0x00000002L
-#define SQL_POS_UPDATE 0x00000004L
-#define SQL_POS_DELETE 0x00000008L
-#define SQL_POS_ADD 0x00000010L
+#define SQL_POS_POSITION __MSABI_LONG(0x00000001)
+#define SQL_POS_REFRESH __MSABI_LONG(0x00000002)
+#define SQL_POS_UPDATE __MSABI_LONG(0x00000004)
+#define SQL_POS_DELETE __MSABI_LONG(0x00000008)
+#define SQL_POS_ADD __MSABI_LONG(0x00000010)
 
 #define SQL_QL_START 0x0001
 #define SQL_QL_END 0x0002
 
 #if (ODBCVER >= 0x0300)
 
-#define SQL_AF_AVG 0x00000001L
-#define SQL_AF_COUNT 0x00000002L
-#define SQL_AF_MAX 0x00000004L
-#define SQL_AF_MIN 0x00000008L
-#define SQL_AF_SUM 0x00000010L
-#define SQL_AF_DISTINCT 0x00000020L
-#define SQL_AF_ALL 0x00000040L
+#define SQL_AF_AVG __MSABI_LONG(0x00000001)
+#define SQL_AF_COUNT __MSABI_LONG(0x00000002)
+#define SQL_AF_MAX __MSABI_LONG(0x00000004)
+#define SQL_AF_MIN __MSABI_LONG(0x00000008)
+#define SQL_AF_SUM __MSABI_LONG(0x00000010)
+#define SQL_AF_DISTINCT __MSABI_LONG(0x00000020)
+#define SQL_AF_ALL __MSABI_LONG(0x00000040)
 
-#define SQL_SC_SQL92_ENTRY 0x00000001L
-#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
-#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L
-#define SQL_SC_SQL92_FULL 0x00000008L
+#define SQL_SC_SQL92_ENTRY __MSABI_LONG(0x00000001)
+#define SQL_SC_FIPS127_2_TRANSITIONAL __MSABI_LONG(0x00000002)
+#define SQL_SC_SQL92_INTERMEDIATE __MSABI_LONG(0x00000004)
+#define SQL_SC_SQL92_FULL __MSABI_LONG(0x00000008)
 
-#define SQL_DL_SQL92_DATE 0x00000001L
-#define SQL_DL_SQL92_TIME 0x00000002L
-#define SQL_DL_SQL92_TIMESTAMP 0x00000004L
-#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L
-#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L
-#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L
-#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L
-#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L
-#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L
-#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L
-#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L
+#define SQL_DL_SQL92_DATE __MSABI_LONG(0x00000001)
+#define SQL_DL_SQL92_TIME __MSABI_LONG(0x00000002)
+#define SQL_DL_SQL92_TIMESTAMP __MSABI_LONG(0x00000004)
+#define SQL_DL_SQL92_INTERVAL_YEAR __MSABI_LONG(0x00000008)
+#define SQL_DL_SQL92_INTERVAL_MONTH __MSABI_LONG(0x00000010)
+#define SQL_DL_SQL92_INTERVAL_DAY __MSABI_LONG(0x00000020)
+#define SQL_DL_SQL92_INTERVAL_HOUR __MSABI_LONG(0x00000040)
+#define SQL_DL_SQL92_INTERVAL_MINUTE __MSABI_LONG(0x00000080)
+#define SQL_DL_SQL92_INTERVAL_SECOND __MSABI_LONG(0x00000100)
+#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH __MSABI_LONG(0x00000200)
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR __MSABI_LONG(0x00000400)
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE __MSABI_LONG(0x00000800)
+#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND __MSABI_LONG(0x00001000)
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE __MSABI_LONG(0x00002000)
+#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND __MSABI_LONG(0x00004000)
+#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND __MSABI_LONG(0x00008000)
 
 #define SQL_CL_START SQL_QL_START
 #define SQL_CL_END SQL_QL_END
@@ -1088,10 +1088,10 @@
 #define SQL_BRC_EXPLICIT 0x0000002
 #define SQL_BRC_ROLLED_UP 0x0000004
 
-#define SQL_BS_SELECT_EXPLICIT 0x00000001L
-#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L
-#define SQL_BS_SELECT_PROC 0x00000004L
-#define SQL_BS_ROW_COUNT_PROC 0x00000008L
+#define SQL_BS_SELECT_EXPLICIT __MSABI_LONG(0x00000001)
+#define SQL_BS_ROW_COUNT_EXPLICIT __MSABI_LONG(0x00000002)
+#define SQL_BS_SELECT_PROC __MSABI_LONG(0x00000004)
+#define SQL_BS_ROW_COUNT_PROC __MSABI_LONG(0x00000008)
 
 #define SQL_PARC_BATCH 1
 #define SQL_PARC_NO_BATCH 2
@@ -1100,212 +1100,212 @@
 #define SQL_PAS_NO_BATCH 2
 #define SQL_PAS_NO_SELECT 3
 
-#define SQL_IK_NONE 0x00000000L
-#define SQL_IK_ASC 0x00000001L
-#define SQL_IK_DESC 0x00000002L
+#define SQL_IK_NONE __MSABI_LONG(0x00000000)
+#define SQL_IK_ASC __MSABI_LONG(0x00000001)
+#define SQL_IK_DESC __MSABI_LONG(0x00000002)
 #define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC)
 
-#define SQL_ISV_ASSERTIONS 0x00000001L
-#define SQL_ISV_CHARACTER_SETS 0x00000002L
-#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L
-#define SQL_ISV_COLLATIONS 0x00000008L
-#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L
-#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L
-#define SQL_ISV_COLUMNS 0x00000040L
-#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L
-#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L
-#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L
-#define SQL_ISV_DOMAINS 0x00000400L
-#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L
-#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L
-#define SQL_ISV_SCHEMATA 0x00002000L
-#define SQL_ISV_SQL_LANGUAGES 0x00004000L
-#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L
-#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L
-#define SQL_ISV_TABLES 0x00020000L
-#define SQL_ISV_TRANSLATIONS 0x00040000L
-#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L
-#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L
-#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L
-#define SQL_ISV_VIEWS 0x00400000L
+#define SQL_ISV_ASSERTIONS __MSABI_LONG(0x00000001)
+#define SQL_ISV_CHARACTER_SETS __MSABI_LONG(0x00000002)
+#define SQL_ISV_CHECK_CONSTRAINTS __MSABI_LONG(0x00000004)
+#define SQL_ISV_COLLATIONS __MSABI_LONG(0x00000008)
+#define SQL_ISV_COLUMN_DOMAIN_USAGE __MSABI_LONG(0x00000010)
+#define SQL_ISV_COLUMN_PRIVILEGES __MSABI_LONG(0x00000020)
+#define SQL_ISV_COLUMNS __MSABI_LONG(0x00000040)
+#define SQL_ISV_CONSTRAINT_COLUMN_USAGE __MSABI_LONG(0x00000080)
+#define SQL_ISV_CONSTRAINT_TABLE_USAGE __MSABI_LONG(0x00000100)
+#define SQL_ISV_DOMAIN_CONSTRAINTS __MSABI_LONG(0x00000200)
+#define SQL_ISV_DOMAINS __MSABI_LONG(0x00000400)
+#define SQL_ISV_KEY_COLUMN_USAGE __MSABI_LONG(0x00000800)
+#define SQL_ISV_REFERENTIAL_CONSTRAINTS __MSABI_LONG(0x00001000)
+#define SQL_ISV_SCHEMATA __MSABI_LONG(0x00002000)
+#define SQL_ISV_SQL_LANGUAGES __MSABI_LONG(0x00004000)
+#define SQL_ISV_TABLE_CONSTRAINTS __MSABI_LONG(0x00008000)
+#define SQL_ISV_TABLE_PRIVILEGES __MSABI_LONG(0x00010000)
+#define SQL_ISV_TABLES __MSABI_LONG(0x00020000)
+#define SQL_ISV_TRANSLATIONS __MSABI_LONG(0x00040000)
+#define SQL_ISV_USAGE_PRIVILEGES __MSABI_LONG(0x00080000)
+#define SQL_ISV_VIEW_COLUMN_USAGE __MSABI_LONG(0x00100000)
+#define SQL_ISV_VIEW_TABLE_USAGE __MSABI_LONG(0x00200000)
+#define SQL_ISV_VIEWS __MSABI_LONG(0x00400000)
 
 #define SQL_AM_NONE 0
 #define SQL_AM_CONNECTION 1
 #define SQL_AM_STATEMENT 2
 
-#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
-#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
-#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
-#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
-#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_AD_CONSTRAINT_NAME_DEFINITION __MSABI_LONG(0x00000001)
+#define SQL_AD_ADD_DOMAIN_CONSTRAINT __MSABI_LONG(0x00000002)
+#define SQL_AD_DROP_DOMAIN_CONSTRAINT __MSABI_LONG(0x00000004)
+#define SQL_AD_ADD_DOMAIN_DEFAULT __MSABI_LONG(0x00000008)
+#define SQL_AD_DROP_DOMAIN_DEFAULT __MSABI_LONG(0x00000010)
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED __MSABI_LONG(0x00000020)
+#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE __MSABI_LONG(0x00000040)
+#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE __MSABI_LONG(0x00000080)
+#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE __MSABI_LONG(0x00000100)
 
-#define SQL_CS_CREATE_SCHEMA 0x00000001L
-#define SQL_CS_AUTHORIZATION 0x00000002L
-#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L
+#define SQL_CS_CREATE_SCHEMA __MSABI_LONG(0x00000001)
+#define SQL_CS_AUTHORIZATION __MSABI_LONG(0x00000002)
+#define SQL_CS_DEFAULT_CHARACTER_SET __MSABI_LONG(0x00000004)
 
-#define SQL_CTR_CREATE_TRANSLATION 0x00000001L
+#define SQL_CTR_CREATE_TRANSLATION __MSABI_LONG(0x00000001)
 
-#define SQL_CA_CREATE_ASSERTION 0x00000001L
-#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L
-#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L
-#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L
-#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L
+#define SQL_CA_CREATE_ASSERTION __MSABI_LONG(0x00000001)
+#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED __MSABI_LONG(0x00000010)
+#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE __MSABI_LONG(0x00000020)
+#define SQL_CA_CONSTRAINT_DEFERRABLE __MSABI_LONG(0x00000040)
+#define SQL_CA_CONSTRAINT_NON_DEFERRABLE __MSABI_LONG(0x00000080)
 
-#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L
-#define SQL_CCS_COLLATE_CLAUSE 0x00000002L
-#define SQL_CCS_LIMITED_COLLATION 0x00000004L
+#define SQL_CCS_CREATE_CHARACTER_SET __MSABI_LONG(0x00000001)
+#define SQL_CCS_COLLATE_CLAUSE __MSABI_LONG(0x00000002)
+#define SQL_CCS_LIMITED_COLLATION __MSABI_LONG(0x00000004)
 
-#define SQL_CCOL_CREATE_COLLATION 0x00000001L
+#define SQL_CCOL_CREATE_COLLATION __MSABI_LONG(0x00000001)
 
-#define SQL_CDO_CREATE_DOMAIN 0x00000001L
-#define SQL_CDO_DEFAULT 0x00000002L
-#define SQL_CDO_CONSTRAINT 0x00000004L
-#define SQL_CDO_COLLATION 0x00000008L
-#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L
-#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L
+#define SQL_CDO_CREATE_DOMAIN __MSABI_LONG(0x00000001)
+#define SQL_CDO_DEFAULT __MSABI_LONG(0x00000002)
+#define SQL_CDO_CONSTRAINT __MSABI_LONG(0x00000004)
+#define SQL_CDO_COLLATION __MSABI_LONG(0x00000008)
+#define SQL_CDO_CONSTRAINT_NAME_DEFINITION __MSABI_LONG(0x00000010)
+#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED __MSABI_LONG(0x00000020)
+#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE __MSABI_LONG(0x00000040)
+#define SQL_CDO_CONSTRAINT_DEFERRABLE __MSABI_LONG(0x00000080)
+#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE __MSABI_LONG(0x00000100)
 
-#define SQL_CT_CREATE_TABLE 0x00000001L
-#define SQL_CT_COMMIT_PRESERVE 0x00000002L
-#define SQL_CT_COMMIT_DELETE 0x00000004L
-#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L
-#define SQL_CT_LOCAL_TEMPORARY 0x00000010L
-#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L
-#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L
-#define SQL_CT_COLUMN_DEFAULT 0x00000400L
-#define SQL_CT_COLUMN_COLLATION 0x00000800L
-#define SQL_CT_TABLE_CONSTRAINT 0x00001000L
-#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L
+#define SQL_CT_CREATE_TABLE __MSABI_LONG(0x00000001)
+#define SQL_CT_COMMIT_PRESERVE __MSABI_LONG(0x00000002)
+#define SQL_CT_COMMIT_DELETE __MSABI_LONG(0x00000004)
+#define SQL_CT_GLOBAL_TEMPORARY __MSABI_LONG(0x00000008)
+#define SQL_CT_LOCAL_TEMPORARY __MSABI_LONG(0x00000010)
+#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED __MSABI_LONG(0x00000020)
+#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE __MSABI_LONG(0x00000040)
+#define SQL_CT_CONSTRAINT_DEFERRABLE __MSABI_LONG(0x00000080)
+#define SQL_CT_CONSTRAINT_NON_DEFERRABLE __MSABI_LONG(0x00000100)
+#define SQL_CT_COLUMN_CONSTRAINT __MSABI_LONG(0x00000200)
+#define SQL_CT_COLUMN_DEFAULT __MSABI_LONG(0x00000400)
+#define SQL_CT_COLUMN_COLLATION __MSABI_LONG(0x00000800)
+#define SQL_CT_TABLE_CONSTRAINT __MSABI_LONG(0x00001000)
+#define SQL_CT_CONSTRAINT_NAME_DEFINITION __MSABI_LONG(0x00002000)
 
-#define SQL_DI_CREATE_INDEX 0x00000001L
-#define SQL_DI_DROP_INDEX 0x00000002L
+#define SQL_DI_CREATE_INDEX __MSABI_LONG(0x00000001)
+#define SQL_DI_DROP_INDEX __MSABI_LONG(0x00000002)
 
-#define SQL_DC_DROP_COLLATION 0x00000001L
+#define SQL_DC_DROP_COLLATION __MSABI_LONG(0x00000001)
 
-#define SQL_DD_DROP_DOMAIN 0x00000001L
-#define SQL_DD_RESTRICT 0x00000002L
-#define SQL_DD_CASCADE 0x00000004L
+#define SQL_DD_DROP_DOMAIN __MSABI_LONG(0x00000001)
+#define SQL_DD_RESTRICT __MSABI_LONG(0x00000002)
+#define SQL_DD_CASCADE __MSABI_LONG(0x00000004)
 
-#define SQL_DS_DROP_SCHEMA 0x00000001L
-#define SQL_DS_RESTRICT 0x00000002L
-#define SQL_DS_CASCADE 0x00000004L
+#define SQL_DS_DROP_SCHEMA __MSABI_LONG(0x00000001)
+#define SQL_DS_RESTRICT __MSABI_LONG(0x00000002)
+#define SQL_DS_CASCADE __MSABI_LONG(0x00000004)
 
-#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L
+#define SQL_DCS_DROP_CHARACTER_SET __MSABI_LONG(0x00000001)
 
-#define SQL_DA_DROP_ASSERTION 0x00000001L
+#define SQL_DA_DROP_ASSERTION __MSABI_LONG(0x00000001)
 
-#define SQL_DT_DROP_TABLE 0x00000001L
-#define SQL_DT_RESTRICT 0x00000002L
-#define SQL_DT_CASCADE 0x00000004L
+#define SQL_DT_DROP_TABLE __MSABI_LONG(0x00000001)
+#define SQL_DT_RESTRICT __MSABI_LONG(0x00000002)
+#define SQL_DT_CASCADE __MSABI_LONG(0x00000004)
 
-#define SQL_DTR_DROP_TRANSLATION 0x00000001L
+#define SQL_DTR_DROP_TRANSLATION __MSABI_LONG(0x00000001)
 
-#define SQL_DV_DROP_VIEW 0x00000001L
-#define SQL_DV_RESTRICT 0x00000002L
-#define SQL_DV_CASCADE 0x00000004L
+#define SQL_DV_DROP_VIEW __MSABI_LONG(0x00000001)
+#define SQL_DV_RESTRICT __MSABI_LONG(0x00000002)
+#define SQL_DV_CASCADE __MSABI_LONG(0x00000004)
 
-#define SQL_IS_INSERT_LITERALS 0x00000001L
-#define SQL_IS_INSERT_SEARCHED 0x00000002L
-#define SQL_IS_SELECT_INTO 0x00000004L
+#define SQL_IS_INSERT_LITERALS __MSABI_LONG(0x00000001)
+#define SQL_IS_INSERT_SEARCHED __MSABI_LONG(0x00000002)
+#define SQL_IS_SELECT_INTO __MSABI_LONG(0x00000004)
 
 #define SQL_OIC_CORE 1UL
 #define SQL_OIC_LEVEL1 2UL
 #define SQL_OIC_LEVEL2 3UL
 
-#define SQL_SFKD_CASCADE 0x00000001L
-#define SQL_SFKD_NO_ACTION 0x00000002L
-#define SQL_SFKD_SET_DEFAULT 0x00000004L
-#define SQL_SFKD_SET_NULL 0x00000008L
+#define SQL_SFKD_CASCADE __MSABI_LONG(0x00000001)
+#define SQL_SFKD_NO_ACTION __MSABI_LONG(0x00000002)
+#define SQL_SFKD_SET_DEFAULT __MSABI_LONG(0x00000004)
+#define SQL_SFKD_SET_NULL __MSABI_LONG(0x00000008)
 
-#define SQL_SFKU_CASCADE 0x00000001L
-#define SQL_SFKU_NO_ACTION 0x00000002L
-#define SQL_SFKU_SET_DEFAULT 0x00000004L
-#define SQL_SFKU_SET_NULL 0x00000008L
+#define SQL_SFKU_CASCADE __MSABI_LONG(0x00000001)
+#define SQL_SFKU_NO_ACTION __MSABI_LONG(0x00000002)
+#define SQL_SFKU_SET_DEFAULT __MSABI_LONG(0x00000004)
+#define SQL_SFKU_SET_NULL __MSABI_LONG(0x00000008)
 
-#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SG_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SG_WITH_GRANT_OPTION 0x00000010L
-#define SQL_SG_DELETE_TABLE 0x00000020L
-#define SQL_SG_INSERT_TABLE 0x00000040L
-#define SQL_SG_INSERT_COLUMN 0x00000080L
-#define SQL_SG_REFERENCES_TABLE 0x00000100L
-#define SQL_SG_REFERENCES_COLUMN 0x00000200L
-#define SQL_SG_SELECT_TABLE 0x00000400L
-#define SQL_SG_UPDATE_TABLE 0x00000800L
-#define SQL_SG_UPDATE_COLUMN 0x00001000L
+#define SQL_SG_USAGE_ON_DOMAIN __MSABI_LONG(0x00000001)
+#define SQL_SG_USAGE_ON_CHARACTER_SET __MSABI_LONG(0x00000002)
+#define SQL_SG_USAGE_ON_COLLATION __MSABI_LONG(0x00000004)
+#define SQL_SG_USAGE_ON_TRANSLATION __MSABI_LONG(0x00000008)
+#define SQL_SG_WITH_GRANT_OPTION __MSABI_LONG(0x00000010)
+#define SQL_SG_DELETE_TABLE __MSABI_LONG(0x00000020)
+#define SQL_SG_INSERT_TABLE __MSABI_LONG(0x00000040)
+#define SQL_SG_INSERT_COLUMN __MSABI_LONG(0x00000080)
+#define SQL_SG_REFERENCES_TABLE __MSABI_LONG(0x00000100)
+#define SQL_SG_REFERENCES_COLUMN __MSABI_LONG(0x00000200)
+#define SQL_SG_SELECT_TABLE __MSABI_LONG(0x00000400)
+#define SQL_SG_UPDATE_TABLE __MSABI_LONG(0x00000800)
+#define SQL_SG_UPDATE_COLUMN __MSABI_LONG(0x00001000)
 
-#define SQL_SP_EXISTS 0x00000001L
-#define SQL_SP_ISNOTNULL 0x00000002L
-#define SQL_SP_ISNULL 0x00000004L
-#define SQL_SP_MATCH_FULL 0x00000008L
-#define SQL_SP_MATCH_PARTIAL 0x00000010L
-#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L
-#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L
-#define SQL_SP_OVERLAPS 0x00000080L
-#define SQL_SP_UNIQUE 0x00000100L
-#define SQL_SP_LIKE 0x00000200L
-#define SQL_SP_IN 0x00000400L
-#define SQL_SP_BETWEEN 0x00000800L
-#define SQL_SP_COMPARISON 0x00001000L
-#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L
+#define SQL_SP_EXISTS __MSABI_LONG(0x00000001)
+#define SQL_SP_ISNOTNULL __MSABI_LONG(0x00000002)
+#define SQL_SP_ISNULL __MSABI_LONG(0x00000004)
+#define SQL_SP_MATCH_FULL __MSABI_LONG(0x00000008)
+#define SQL_SP_MATCH_PARTIAL __MSABI_LONG(0x00000010)
+#define SQL_SP_MATCH_UNIQUE_FULL __MSABI_LONG(0x00000020)
+#define SQL_SP_MATCH_UNIQUE_PARTIAL __MSABI_LONG(0x00000040)
+#define SQL_SP_OVERLAPS __MSABI_LONG(0x00000080)
+#define SQL_SP_UNIQUE __MSABI_LONG(0x00000100)
+#define SQL_SP_LIKE __MSABI_LONG(0x00000200)
+#define SQL_SP_IN __MSABI_LONG(0x00000400)
+#define SQL_SP_BETWEEN __MSABI_LONG(0x00000800)
+#define SQL_SP_COMPARISON __MSABI_LONG(0x00001000)
+#define SQL_SP_QUANTIFIED_COMPARISON __MSABI_LONG(0x00002000)
 
-#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L
-#define SQL_SRJO_CROSS_JOIN 0x00000002L
-#define SQL_SRJO_EXCEPT_JOIN 0x00000004L
-#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L
-#define SQL_SRJO_INNER_JOIN 0x00000010L
-#define SQL_SRJO_INTERSECT_JOIN 0x00000020L
-#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L
-#define SQL_SRJO_NATURAL_JOIN 0x00000080L
-#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L
-#define SQL_SRJO_UNION_JOIN 0x00000200L
+#define SQL_SRJO_CORRESPONDING_CLAUSE __MSABI_LONG(0x00000001)
+#define SQL_SRJO_CROSS_JOIN __MSABI_LONG(0x00000002)
+#define SQL_SRJO_EXCEPT_JOIN __MSABI_LONG(0x00000004)
+#define SQL_SRJO_FULL_OUTER_JOIN __MSABI_LONG(0x00000008)
+#define SQL_SRJO_INNER_JOIN __MSABI_LONG(0x00000010)
+#define SQL_SRJO_INTERSECT_JOIN __MSABI_LONG(0x00000020)
+#define SQL_SRJO_LEFT_OUTER_JOIN __MSABI_LONG(0x00000040)
+#define SQL_SRJO_NATURAL_JOIN __MSABI_LONG(0x00000080)
+#define SQL_SRJO_RIGHT_OUTER_JOIN __MSABI_LONG(0x00000100)
+#define SQL_SRJO_UNION_JOIN __MSABI_LONG(0x00000200)
 
-#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SR_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SR_GRANT_OPTION_FOR 0x00000010L
-#define SQL_SR_CASCADE 0x00000020L
-#define SQL_SR_RESTRICT 0x00000040L
-#define SQL_SR_DELETE_TABLE 0x00000080L
-#define SQL_SR_INSERT_TABLE 0x00000100L
-#define SQL_SR_INSERT_COLUMN 0x00000200L
-#define SQL_SR_REFERENCES_TABLE 0x00000400L
-#define SQL_SR_REFERENCES_COLUMN 0x00000800L
-#define SQL_SR_SELECT_TABLE 0x00001000L
-#define SQL_SR_UPDATE_TABLE 0x00002000L
-#define SQL_SR_UPDATE_COLUMN 0x00004000L
+#define SQL_SR_USAGE_ON_DOMAIN __MSABI_LONG(0x00000001)
+#define SQL_SR_USAGE_ON_CHARACTER_SET __MSABI_LONG(0x00000002)
+#define SQL_SR_USAGE_ON_COLLATION __MSABI_LONG(0x00000004)
+#define SQL_SR_USAGE_ON_TRANSLATION __MSABI_LONG(0x00000008)
+#define SQL_SR_GRANT_OPTION_FOR __MSABI_LONG(0x00000010)
+#define SQL_SR_CASCADE __MSABI_LONG(0x00000020)
+#define SQL_SR_RESTRICT __MSABI_LONG(0x00000040)
+#define SQL_SR_DELETE_TABLE __MSABI_LONG(0x00000080)
+#define SQL_SR_INSERT_TABLE __MSABI_LONG(0x00000100)
+#define SQL_SR_INSERT_COLUMN __MSABI_LONG(0x00000200)
+#define SQL_SR_REFERENCES_TABLE __MSABI_LONG(0x00000400)
+#define SQL_SR_REFERENCES_COLUMN __MSABI_LONG(0x00000800)
+#define SQL_SR_SELECT_TABLE __MSABI_LONG(0x00001000)
+#define SQL_SR_UPDATE_TABLE __MSABI_LONG(0x00002000)
+#define SQL_SR_UPDATE_COLUMN __MSABI_LONG(0x00004000)
 
-#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L
-#define SQL_SRVC_NULL 0x00000002L
-#define SQL_SRVC_DEFAULT 0x00000004L
-#define SQL_SRVC_ROW_SUBQUERY 0x00000008L
+#define SQL_SRVC_VALUE_EXPRESSION __MSABI_LONG(0x00000001)
+#define SQL_SRVC_NULL __MSABI_LONG(0x00000002)
+#define SQL_SRVC_DEFAULT __MSABI_LONG(0x00000004)
+#define SQL_SRVC_ROW_SUBQUERY __MSABI_LONG(0x00000008)
 
-#define SQL_SVE_CASE 0x00000001L
-#define SQL_SVE_CAST 0x00000002L
-#define SQL_SVE_COALESCE 0x00000004L
-#define SQL_SVE_NULLIF 0x00000008L
+#define SQL_SVE_CASE __MSABI_LONG(0x00000001)
+#define SQL_SVE_CAST __MSABI_LONG(0x00000002)
+#define SQL_SVE_COALESCE __MSABI_LONG(0x00000004)
+#define SQL_SVE_NULLIF __MSABI_LONG(0x00000008)
 
-#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
-#define SQL_SCC_ISO92_CLI 0x00000002L
+#define SQL_SCC_XOPEN_CLI_VERSION1 __MSABI_LONG(0x00000001)
+#define SQL_SCC_ISO92_CLI __MSABI_LONG(0x00000002)
 
 #define SQL_US_UNION SQL_U_UNION
 #define SQL_US_UNION_ALL SQL_U_UNION_ALL
 #endif
 
-#define SQL_DTC_ENLIST_EXPENSIVE 0x00000001L
-#define SQL_DTC_UNENLIST_EXPENSIVE 0x00000002L
+#define SQL_DTC_ENLIST_EXPENSIVE __MSABI_LONG(0x00000001)
+#define SQL_DTC_UNENLIST_EXPENSIVE __MSABI_LONG(0x00000002)
 
 #if (ODBCVER >= 0x0300)
 #define SQL_FETCH_FIRST_USER 31
@@ -1479,10 +1479,10 @@
 #define SQL_CC_PRESERVE SQL_CB_PRESERVE
 #define SQL_CR_PRESERVE SQL_CB_PRESERVE
 
-#define SQL_SCROLL_FORWARD_ONLY 0L
-#define SQL_SCROLL_KEYSET_DRIVEN (-1L)
-#define SQL_SCROLL_DYNAMIC (-2L)
-#define SQL_SCROLL_STATIC (-3L)
+#define SQL_SCROLL_FORWARD_ONLY __MSABI_LONG(0)
+#define SQL_SCROLL_KEYSET_DRIVEN (__MSABI_LONG(-1))
+#define SQL_SCROLL_DYNAMIC (__MSABI_LONG(-2))
+#define SQL_SCROLL_STATIC (__MSABI_LONG(-3))
 
 #ifndef RC_INVOKED
 
@@ -1495,18 +1495,18 @@
   VOID SQL_API TraceReturn(RETCODE,RETCODE);
   DWORD SQL_API TraceVersion();
 
-#define TRACE_ON 0x00000001L
-#define TRACE_VS_EVENT_ON 0x00000002L
+#define TRACE_ON __MSABI_LONG(0x00000001)
+#define TRACE_VS_EVENT_ON __MSABI_LONG(0x00000002)
 
   RETCODE SQL_API TraceVSControl(DWORD);
 
   WINBOOL SQL_API ODBCSetTryWaitValue(DWORD dwValue);
   DWORD SQL_API ODBCGetTryWaitValue();
 
-#define ODBC_VS_FLAG_UNICODE_ARG 0x00000001L
-#define ODBC_VS_FLAG_UNICODE_COR 0x00000002L
-#define ODBC_VS_FLAG_RETCODE 0x00000004L
-#define ODBC_VS_FLAG_STOP 0x00000008L
+#define ODBC_VS_FLAG_UNICODE_ARG __MSABI_LONG(0x00000001)
+#define ODBC_VS_FLAG_UNICODE_COR __MSABI_LONG(0x00000002)
+#define ODBC_VS_FLAG_RETCODE __MSABI_LONG(0x00000004)
+#define ODBC_VS_FLAG_STOP __MSABI_LONG(0x00000008)
 
   typedef struct tagODBC_VS_ARGS {
     const GUID *pguidEvent;
diff --git a/mingw-w64-headers/include/sqloledb.h b/mingw-w64-headers/include/sqloledb.h
index 4fdb157..1edd997 100644
--- a/mingw-w64-headers/include/sqloledb.h
+++ b/mingw-w64-headers/include/sqloledb.h
@@ -80,7 +80,7 @@
 #endif
 
 #if (OLEDBVER==0x0210)
-#define DBPROP_INIT_GENERALTIMEOUT 0x11cL
+#define DBPROP_INIT_GENERALTIMEOUT __MSABI_LONG(0x11c)
 #endif
 
 #define SSPROP_ENABLEFASTLOAD 2
diff --git a/mingw-w64-headers/include/tapi.h b/mingw-w64-headers/include/tapi.h
index 42f54a5..30d6a74 100644
--- a/mingw-w64-headers/include/tapi.h
+++ b/mingw-w64-headers/include/tapi.h
@@ -56,43 +56,43 @@
   typedef void (CALLBACK *LINECALLBACK)(DWORD hDevice,DWORD dwMessage,DWORD_PTR dwInstance,DWORD_PTR dwParam1,DWORD_PTR dwParam2,DWORD_PTR dwParam3);
   typedef void (CALLBACK *PHONECALLBACK)(DWORD hDevice,DWORD dwMessage,DWORD_PTR dwInstance,DWORD_PTR dwParam1,DWORD_PTR dwParam2,DWORD_PTR dwParam3);
 
-#define LINE_ADDRESSSTATE 0L
-#define LINE_CALLINFO 1L
-#define LINE_CALLSTATE 2L
-#define LINE_CLOSE 3L
-#define LINE_DEVSPECIFIC 4L
-#define LINE_DEVSPECIFICFEATURE 5L
-#define LINE_GATHERDIGITS 6L
-#define LINE_GENERATE 7L
-#define LINE_LINEDEVSTATE 8L
-#define LINE_MONITORDIGITS 9L
-#define LINE_MONITORMEDIA 10L
-#define LINE_MONITORTONE 11L
-#define LINE_REPLY 12L
-#define LINE_REQUEST 13L
-#define PHONE_BUTTON 14L
-#define PHONE_CLOSE 15L
-#define PHONE_DEVSPECIFIC 16L
-#define PHONE_REPLY 17L
-#define PHONE_STATE 18L
-#define LINE_CREATE 19L
-#define PHONE_CREATE 20L
-#define LINE_AGENTSPECIFIC 21L
-#define LINE_AGENTSTATUS 22L
-#define LINE_APPNEWCALL 23L
-#define LINE_PROXYREQUEST 24L
-#define LINE_REMOVE 25L
-#define PHONE_REMOVE 26L
+#define LINE_ADDRESSSTATE __MSABI_LONG(0)
+#define LINE_CALLINFO __MSABI_LONG(1)
+#define LINE_CALLSTATE __MSABI_LONG(2)
+#define LINE_CLOSE __MSABI_LONG(3)
+#define LINE_DEVSPECIFIC __MSABI_LONG(4)
+#define LINE_DEVSPECIFICFEATURE __MSABI_LONG(5)
+#define LINE_GATHERDIGITS __MSABI_LONG(6)
+#define LINE_GENERATE __MSABI_LONG(7)
+#define LINE_LINEDEVSTATE __MSABI_LONG(8)
+#define LINE_MONITORDIGITS __MSABI_LONG(9)
+#define LINE_MONITORMEDIA __MSABI_LONG(10)
+#define LINE_MONITORTONE __MSABI_LONG(11)
+#define LINE_REPLY __MSABI_LONG(12)
+#define LINE_REQUEST __MSABI_LONG(13)
+#define PHONE_BUTTON __MSABI_LONG(14)
+#define PHONE_CLOSE __MSABI_LONG(15)
+#define PHONE_DEVSPECIFIC __MSABI_LONG(16)
+#define PHONE_REPLY __MSABI_LONG(17)
+#define PHONE_STATE __MSABI_LONG(18)
+#define LINE_CREATE __MSABI_LONG(19)
+#define PHONE_CREATE __MSABI_LONG(20)
+#define LINE_AGENTSPECIFIC __MSABI_LONG(21)
+#define LINE_AGENTSTATUS __MSABI_LONG(22)
+#define LINE_APPNEWCALL __MSABI_LONG(23)
+#define LINE_PROXYREQUEST __MSABI_LONG(24)
+#define LINE_REMOVE __MSABI_LONG(25)
+#define PHONE_REMOVE __MSABI_LONG(26)
 
-#define LINE_AGENTSESSIONSTATUS 27L
-#define LINE_QUEUESTATUS 28L
-#define LINE_AGENTSTATUSEX 29L
-#define LINE_GROUPSTATUS 30L
-#define LINE_PROXYSTATUS 31L
+#define LINE_AGENTSESSIONSTATUS __MSABI_LONG(27)
+#define LINE_QUEUESTATUS __MSABI_LONG(28)
+#define LINE_AGENTSTATUSEX __MSABI_LONG(29)
+#define LINE_GROUPSTATUS __MSABI_LONG(30)
+#define LINE_PROXYSTATUS __MSABI_LONG(31)
 
-#define LINE_APPNEWCALLHUB 32L
-#define LINE_CALLHUBCLOSE 33L
-#define LINE_DEVSPECIFICEX 34L
+#define LINE_APPNEWCALLHUB __MSABI_LONG(32)
+#define LINE_CALLHUBCLOSE __MSABI_LONG(33)
+#define LINE_DEVSPECIFICEX __MSABI_LONG(34)
 
 #define INITIALIZE_NEGOTIATION 0xFFFFFFFFUL
 
@@ -956,37 +956,37 @@
 
 #define TAPI_REPLY WM_USER + 99
 
-#define TAPIERR_CONNECTED 0L
-#define TAPIERR_DROPPED -1L
-#define TAPIERR_NOREQUESTRECIPIENT -2L
-#define TAPIERR_REQUESTQUEUEFULL -3L
-#define TAPIERR_INVALDESTADDRESS -4L
-#define TAPIERR_INVALWINDOWHANDLE -5L
-#define TAPIERR_INVALDEVICECLASS -6L
-#define TAPIERR_INVALDEVICEID -7L
-#define TAPIERR_DEVICECLASSUNAVAIL -8L
-#define TAPIERR_DEVICEIDUNAVAIL -9L
-#define TAPIERR_DEVICEINUSE -10L
-#define TAPIERR_DESTBUSY -11L
-#define TAPIERR_DESTNOANSWER -12L
-#define TAPIERR_DESTUNAVAIL -13L
-#define TAPIERR_UNKNOWNWINHANDLE -14L
-#define TAPIERR_UNKNOWNREQUESTID -15L
-#define TAPIERR_REQUESTFAILED -16L
-#define TAPIERR_REQUESTCANCELLED -17L
-#define TAPIERR_INVALPOINTER -18L
-#define TAPIERR_NOTADMIN -19L
-#define TAPIERR_MMCWRITELOCKED -20L
-#define TAPIERR_PROVIDERALREADYINSTALLED -21L
-#define TAPIERR_SCP_ALREADY_EXISTS -22L
-#define TAPIERR_SCP_DOES_NOT_EXIST -23L
+#define TAPIERR_CONNECTED __MSABI_LONG(0)
+#define TAPIERR_DROPPED __MSABI_LONG(-1)
+#define TAPIERR_NOREQUESTRECIPIENT __MSABI_LONG(-2)
+#define TAPIERR_REQUESTQUEUEFULL __MSABI_LONG(-3)
+#define TAPIERR_INVALDESTADDRESS __MSABI_LONG(-4)
+#define TAPIERR_INVALWINDOWHANDLE __MSABI_LONG(-5)
+#define TAPIERR_INVALDEVICECLASS __MSABI_LONG(-6)
+#define TAPIERR_INVALDEVICEID __MSABI_LONG(-7)
+#define TAPIERR_DEVICECLASSUNAVAIL __MSABI_LONG(-8)
+#define TAPIERR_DEVICEIDUNAVAIL __MSABI_LONG(-9)
+#define TAPIERR_DEVICEINUSE __MSABI_LONG(-10)
+#define TAPIERR_DESTBUSY __MSABI_LONG(-11)
+#define TAPIERR_DESTNOANSWER __MSABI_LONG(-12)
+#define TAPIERR_DESTUNAVAIL __MSABI_LONG(-13)
+#define TAPIERR_UNKNOWNWINHANDLE __MSABI_LONG(-14)
+#define TAPIERR_UNKNOWNREQUESTID __MSABI_LONG(-15)
+#define TAPIERR_REQUESTFAILED __MSABI_LONG(-16)
+#define TAPIERR_REQUESTCANCELLED __MSABI_LONG(-17)
+#define TAPIERR_INVALPOINTER __MSABI_LONG(-18)
+#define TAPIERR_NOTADMIN __MSABI_LONG(-19)
+#define TAPIERR_MMCWRITELOCKED __MSABI_LONG(-20)
+#define TAPIERR_PROVIDERALREADYINSTALLED __MSABI_LONG(-21)
+#define TAPIERR_SCP_ALREADY_EXISTS __MSABI_LONG(-22)
+#define TAPIERR_SCP_DOES_NOT_EXIST __MSABI_LONG(-23)
 
-#define TAPIMAXDESTADDRESSSIZE 80L
-#define TAPIMAXAPPNAMESIZE 40L
-#define TAPIMAXCALLEDPARTYSIZE 40L
-#define TAPIMAXCOMMENTSIZE 80L
-#define TAPIMAXDEVICECLASSSIZE 40L
-#define TAPIMAXDEVICEIDSIZE 40L
+#define TAPIMAXDESTADDRESSSIZE __MSABI_LONG(80)
+#define TAPIMAXAPPNAMESIZE __MSABI_LONG(40)
+#define TAPIMAXCALLEDPARTYSIZE __MSABI_LONG(40)
+#define TAPIMAXCOMMENTSIZE __MSABI_LONG(80)
+#define TAPIMAXDEVICECLASSSIZE __MSABI_LONG(40)
+#define TAPIMAXDEVICEIDSIZE __MSABI_LONG(40)
 
 #ifndef GUID_DEFINED
 #define GUID_DEFINED
diff --git a/mingw-w64-headers/include/tspi.h b/mingw-w64-headers/include/tspi.h
index fe6b108..d980f42 100644
--- a/mingw-w64-headers/include/tspi.h
+++ b/mingw-w64-headers/include/tspi.h
@@ -98,10 +98,10 @@
 
 #define LINETSPIOPTION_NONREENTRANT 0x00000001
 
-#define TUISPIDLL_OBJECT_LINEID 1L
-#define TUISPIDLL_OBJECT_PHONEID 2L
-#define TUISPIDLL_OBJECT_PROVIDERID 3L
-#define TUISPIDLL_OBJECT_DIALOGINSTANCE 4L
+#define TUISPIDLL_OBJECT_LINEID __MSABI_LONG(1)
+#define TUISPIDLL_OBJECT_PHONEID __MSABI_LONG(2)
+#define TUISPIDLL_OBJECT_PROVIDERID __MSABI_LONG(3)
+#define TUISPIDLL_OBJECT_DIALOGINSTANCE __MSABI_LONG(4)
 
 #define PRIVATEOBJECT_NONE 0x00000001
 #define PRIVATEOBJECT_CALLID 0x00000002
diff --git a/mingw-w64-headers/include/usbdi.h b/mingw-w64-headers/include/usbdi.h
index 7d39f73..cb8c213 100644
--- a/mingw-w64-headers/include/usbdi.h
+++ b/mingw-w64-headers/include/usbdi.h
@@ -40,7 +40,7 @@
 
 
 #define USBD_HALTED(Status)  ((ULONG)(Status) >> 30 == 3)
-#define USBD_STATUS(Status) ((ULONG)(Status) & 0x0FFFFFFFL)
+#define USBD_STATUS(Status) ((ULONG)(Status) & __MSABI_LONG(0x0FFFFFFF))
 
 #define URB_FUNCTION_RESERVED0                      0x0016
 #define URB_FUNCTION_RESERVED                       0x001D
diff --git a/mingw-w64-headers/include/vcr.h b/mingw-w64-headers/include/vcr.h
index 5c857fc..4cce6bc 100644
--- a/mingw-w64-headers/include/vcr.h
+++ b/mingw-w64-headers/include/vcr.h
@@ -19,147 +19,147 @@
 #define MCI_SETVCR (MCI_USER_MESSAGES + 3)
 #define MCI_SETTIMECODE (MCI_USER_MESSAGES + 4)
 
-#define MCI_TEST 0x00000020L
+#define MCI_TEST __MSABI_LONG(0x00000020)
 
-#define MCI_VCR_GETDEVCAPS_CAN_DETECT_LENGTH 0x00004001L
-#define MCI_VCR_GETDEVCAPS_SEEK_ACCURACY 0x00004002L
-#define MCI_VCR_GETDEVCAPS_HAS_CLOCK 0x00004003L
-#define MCI_VCR_GETDEVCAPS_CAN_REVERSE 0x00004004L
-#define MCI_VCR_GETDEVCAPS_NUMBER_OF_MARKS 0x00004005L
-#define MCI_VCR_GETDEVCAPS_CAN_TEST 0x00004006L
-#define MCI_VCR_GETDEVCAPS_CAN_PREROLL 0x00004007L
-#define MCI_VCR_GETDEVCAPS_CAN_PREVIEW 0x00004008L
-#define MCI_VCR_GETDEVCAPS_CAN_MONITOR_SOURCES 0x00004009L
-#define MCI_VCR_GETDEVCAPS_HAS_TIMECODE 0x0000400AL
-#define MCI_VCR_GETDEVCAPS_CAN_FREEZE 0x0000401BL
-#define MCI_VCR_GETDEVCAPS_CLOCK_INCREMENT_RATE 0x0000401CL
+#define MCI_VCR_GETDEVCAPS_CAN_DETECT_LENGTH __MSABI_LONG(0x00004001)
+#define MCI_VCR_GETDEVCAPS_SEEK_ACCURACY __MSABI_LONG(0x00004002)
+#define MCI_VCR_GETDEVCAPS_HAS_CLOCK __MSABI_LONG(0x00004003)
+#define MCI_VCR_GETDEVCAPS_CAN_REVERSE __MSABI_LONG(0x00004004)
+#define MCI_VCR_GETDEVCAPS_NUMBER_OF_MARKS __MSABI_LONG(0x00004005)
+#define MCI_VCR_GETDEVCAPS_CAN_TEST __MSABI_LONG(0x00004006)
+#define MCI_VCR_GETDEVCAPS_CAN_PREROLL __MSABI_LONG(0x00004007)
+#define MCI_VCR_GETDEVCAPS_CAN_PREVIEW __MSABI_LONG(0x00004008)
+#define MCI_VCR_GETDEVCAPS_CAN_MONITOR_SOURCES __MSABI_LONG(0x00004009)
+#define MCI_VCR_GETDEVCAPS_HAS_TIMECODE __MSABI_LONG(0x0000400A)
+#define MCI_VCR_GETDEVCAPS_CAN_FREEZE __MSABI_LONG(0x0000401B)
+#define MCI_VCR_GETDEVCAPS_CLOCK_INCREMENT_RATE __MSABI_LONG(0x0000401C)
 
-#define MCI_VCR_INFO_VERSION 0x00010000L
+#define MCI_VCR_INFO_VERSION __MSABI_LONG(0x00010000)
 
-#define MCI_VCR_PLAY_REVERSE 0x00010000L
-#define MCI_VCR_PLAY_AT 0x00020000L
-#define MCI_VCR_PLAY_SCAN 0x00040000L
+#define MCI_VCR_PLAY_REVERSE __MSABI_LONG(0x00010000)
+#define MCI_VCR_PLAY_AT __MSABI_LONG(0x00020000)
+#define MCI_VCR_PLAY_SCAN __MSABI_LONG(0x00040000)
 
-#define MCI_VCR_RECORD_INITIALIZE 0x00010000L
-#define MCI_VCR_RECORD_AT 0x00020000L
-#define MCI_VCR_RECORD_PREVIEW 0x00040000L
+#define MCI_VCR_RECORD_INITIALIZE __MSABI_LONG(0x00010000)
+#define MCI_VCR_RECORD_AT __MSABI_LONG(0x00020000)
+#define MCI_VCR_RECORD_PREVIEW __MSABI_LONG(0x00040000)
 
-#define MCI_VCR_CUE_INPUT 0x00010000L
-#define MCI_VCR_CUE_OUTPUT 0x00020000L
-#define MCI_VCR_CUE_PREROLL 0x00040000L
-#define MCI_VCR_CUE_REVERSE 0x00080000L
+#define MCI_VCR_CUE_INPUT __MSABI_LONG(0x00010000)
+#define MCI_VCR_CUE_OUTPUT __MSABI_LONG(0x00020000)
+#define MCI_VCR_CUE_PREROLL __MSABI_LONG(0x00040000)
+#define MCI_VCR_CUE_REVERSE __MSABI_LONG(0x00080000)
 
-#define MCI_VCR_SEEK_REVERSE 0x00010000L
-#define MCI_VCR_SEEK_MARK 0x00020000L
-#define MCI_VCR_SEEK_AT 0x00040000L
+#define MCI_VCR_SEEK_REVERSE __MSABI_LONG(0x00010000)
+#define MCI_VCR_SEEK_MARK __MSABI_LONG(0x00020000)
+#define MCI_VCR_SEEK_AT __MSABI_LONG(0x00040000)
 
-#define MCI_VCR_SETTUNER_CHANNEL 0x00010000L
-#define MCI_VCR_SETTUNER_CHANNEL_UP 0x00020000L
-#define MCI_VCR_SETTUNER_CHANNEL_DOWN 0x00040000L
-#define MCI_VCR_SETTUNER_CHANNEL_SEEK_UP 0x00080000L
-#define MCI_VCR_SETTUNER_CHANNEL_SEEK_DOWN 0x00100000L
-#define MCI_VCR_SETTUNER_NUMBER 0x00200000L
+#define MCI_VCR_SETTUNER_CHANNEL __MSABI_LONG(0x00010000)
+#define MCI_VCR_SETTUNER_CHANNEL_UP __MSABI_LONG(0x00020000)
+#define MCI_VCR_SETTUNER_CHANNEL_DOWN __MSABI_LONG(0x00040000)
+#define MCI_VCR_SETTUNER_CHANNEL_SEEK_UP __MSABI_LONG(0x00080000)
+#define MCI_VCR_SETTUNER_CHANNEL_SEEK_DOWN __MSABI_LONG(0x00100000)
+#define MCI_VCR_SETTUNER_NUMBER __MSABI_LONG(0x00200000)
 
-#define MCI_VCR_SET_TIME_MODE 0x00010000L
-#define MCI_VCR_SET_POWER 0x00020000L
-#define MCI_VCR_SET_RECORD_FORMAT 0x00040000L
-#define MCI_VCR_SET_COUNTER_FORMAT 0x00080000L
-#define MCI_VCR_SET_INDEX 0x00100000L
-#define MCI_VCR_SET_ASSEMBLE_RECORD 0x00200000L
-#define MCI_VCR_SET_TRACKING 0x00400000L
-#define MCI_VCR_SET_SPEED 0x00800000L
-#define MCI_VCR_SET_TAPE_LENGTH 0x01000000L
-#define MCI_VCR_SET_COUNTER_VALUE 0x02000000L
-#define MCI_VCR_SET_CLOCK 0x04000000L
-#define MCI_VCR_SET_PAUSE_TIMEOUT 0x08000000L
-#define MCI_VCR_SET_PREROLL_DURATION 0x10000000L
-#define MCI_VCR_SET_POSTROLL_DURATION 0x20000000L
+#define MCI_VCR_SET_TIME_MODE __MSABI_LONG(0x00010000)
+#define MCI_VCR_SET_POWER __MSABI_LONG(0x00020000)
+#define MCI_VCR_SET_RECORD_FORMAT __MSABI_LONG(0x00040000)
+#define MCI_VCR_SET_COUNTER_FORMAT __MSABI_LONG(0x00080000)
+#define MCI_VCR_SET_INDEX __MSABI_LONG(0x00100000)
+#define MCI_VCR_SET_ASSEMBLE_RECORD __MSABI_LONG(0x00200000)
+#define MCI_VCR_SET_TRACKING __MSABI_LONG(0x00400000)
+#define MCI_VCR_SET_SPEED __MSABI_LONG(0x00800000)
+#define MCI_VCR_SET_TAPE_LENGTH __MSABI_LONG(0x01000000)
+#define MCI_VCR_SET_COUNTER_VALUE __MSABI_LONG(0x02000000)
+#define MCI_VCR_SET_CLOCK __MSABI_LONG(0x04000000)
+#define MCI_VCR_SET_PAUSE_TIMEOUT __MSABI_LONG(0x08000000)
+#define MCI_VCR_SET_PREROLL_DURATION __MSABI_LONG(0x10000000)
+#define MCI_VCR_SET_POSTROLL_DURATION __MSABI_LONG(0x20000000)
 
-#define MCI_VCR_SETTIMECODE_RECORD 0x00010000L
+#define MCI_VCR_SETTIMECODE_RECORD __MSABI_LONG(0x00010000)
 
-#define MCI_VCR_STATUS_FRAME_RATE 0x00004001L
-#define MCI_VCR_STATUS_SPEED 0x00004002L
-#define MCI_VCR_STATUS_MEDIA_TYPE 0x00004003L
-#define MCI_VCR_STATUS_RECORD_FORMAT 0x00004004L
-#define MCI_VCR_STATUS_PLAY_FORMAT 0x00004005L
-#define MCI_VCR_STATUS_AUDIO_SOURCE 0x00004006L
-#define MCI_VCR_STATUS_AUDIO_SOURCE_NUMBER 0x00004007L
-#define MCI_VCR_STATUS_VIDEO_SOURCE 0x00004008L
-#define MCI_VCR_STATUS_VIDEO_SOURCE_NUMBER 0x00004009L
-#define MCI_VCR_STATUS_AUDIO_MONITOR 0x0000400AL
-#define MCI_VCR_STATUS_AUDIO_MONITOR_NUMBER 0x0000400BL
-#define MCI_VCR_STATUS_VIDEO_MONITOR 0x0000400CL
-#define MCI_VCR_STATUS_VIDEO_MONITOR_NUMBER 0x0000400DL
-#define MCI_VCR_STATUS_INDEX_ON 0x0000400EL
-#define MCI_VCR_STATUS_INDEX 0x0000400FL
-#define MCI_VCR_STATUS_COUNTER_FORMAT 0x00004010L
-#define MCI_VCR_STATUS_COUNTER_RESOLUTION 0x00004011L
-#define MCI_VCR_STATUS_TIMECODE_TYPE 0x00004012L
-#define MCI_VCR_STATUS_COUNTER_VALUE 0x00004013L
-#define MCI_VCR_STATUS_TUNER_CHANNEL 0x00004014L
-#define MCI_VCR_STATUS_WRITE_PROTECTED 0x00004015L
-#define MCI_VCR_STATUS_TIMECODE_RECORD 0x00004016L
-#define MCI_VCR_STATUS_VIDEO_RECORD 0x00004017L
-#define MCI_VCR_STATUS_AUDIO_RECORD 0x00004018L
-#define MCI_VCR_STATUS_TIME_TYPE 0x00004019L
-#define MCI_VCR_STATUS_TIME_MODE 0x0000401AL
-#define MCI_VCR_STATUS_POWER_ON 0x0000401BL
-#define MCI_VCR_STATUS_CLOCK 0x0000401CL
-#define MCI_VCR_STATUS_ASSEMBLE_RECORD 0x0000401DL
-#define MCI_VCR_STATUS_TIMECODE_PRESENT 0x0000401EL
-#define MCI_VCR_STATUS_NUMBER_OF_VIDEO_TRACKS 0x0000401FL
-#define MCI_VCR_STATUS_NUMBER_OF_AUDIO_TRACKS 0x00004020L
-#define MCI_VCR_STATUS_CLOCK_ID 0x00004021L
-#define MCI_VCR_STATUS_PAUSE_TIMEOUT 0x00004022L
-#define MCI_VCR_STATUS_PREROLL_DURATION 0x00004023L
-#define MCI_VCR_STATUS_POSTROLL_DURATION 0x00004024L
-#define MCI_VCR_STATUS_VIDEO 0x00004025L
-#define MCI_VCR_STATUS_AUDIO 0x00004026L
+#define MCI_VCR_STATUS_FRAME_RATE __MSABI_LONG(0x00004001)
+#define MCI_VCR_STATUS_SPEED __MSABI_LONG(0x00004002)
+#define MCI_VCR_STATUS_MEDIA_TYPE __MSABI_LONG(0x00004003)
+#define MCI_VCR_STATUS_RECORD_FORMAT __MSABI_LONG(0x00004004)
+#define MCI_VCR_STATUS_PLAY_FORMAT __MSABI_LONG(0x00004005)
+#define MCI_VCR_STATUS_AUDIO_SOURCE __MSABI_LONG(0x00004006)
+#define MCI_VCR_STATUS_AUDIO_SOURCE_NUMBER __MSABI_LONG(0x00004007)
+#define MCI_VCR_STATUS_VIDEO_SOURCE __MSABI_LONG(0x00004008)
+#define MCI_VCR_STATUS_VIDEO_SOURCE_NUMBER __MSABI_LONG(0x00004009)
+#define MCI_VCR_STATUS_AUDIO_MONITOR __MSABI_LONG(0x0000400A)
+#define MCI_VCR_STATUS_AUDIO_MONITOR_NUMBER __MSABI_LONG(0x0000400B)
+#define MCI_VCR_STATUS_VIDEO_MONITOR __MSABI_LONG(0x0000400C)
+#define MCI_VCR_STATUS_VIDEO_MONITOR_NUMBER __MSABI_LONG(0x0000400D)
+#define MCI_VCR_STATUS_INDEX_ON __MSABI_LONG(0x0000400E)
+#define MCI_VCR_STATUS_INDEX __MSABI_LONG(0x0000400F)
+#define MCI_VCR_STATUS_COUNTER_FORMAT __MSABI_LONG(0x00004010)
+#define MCI_VCR_STATUS_COUNTER_RESOLUTION __MSABI_LONG(0x00004011)
+#define MCI_VCR_STATUS_TIMECODE_TYPE __MSABI_LONG(0x00004012)
+#define MCI_VCR_STATUS_COUNTER_VALUE __MSABI_LONG(0x00004013)
+#define MCI_VCR_STATUS_TUNER_CHANNEL __MSABI_LONG(0x00004014)
+#define MCI_VCR_STATUS_WRITE_PROTECTED __MSABI_LONG(0x00004015)
+#define MCI_VCR_STATUS_TIMECODE_RECORD __MSABI_LONG(0x00004016)
+#define MCI_VCR_STATUS_VIDEO_RECORD __MSABI_LONG(0x00004017)
+#define MCI_VCR_STATUS_AUDIO_RECORD __MSABI_LONG(0x00004018)
+#define MCI_VCR_STATUS_TIME_TYPE __MSABI_LONG(0x00004019)
+#define MCI_VCR_STATUS_TIME_MODE __MSABI_LONG(0x0000401A)
+#define MCI_VCR_STATUS_POWER_ON __MSABI_LONG(0x0000401B)
+#define MCI_VCR_STATUS_CLOCK __MSABI_LONG(0x0000401C)
+#define MCI_VCR_STATUS_ASSEMBLE_RECORD __MSABI_LONG(0x0000401D)
+#define MCI_VCR_STATUS_TIMECODE_PRESENT __MSABI_LONG(0x0000401E)
+#define MCI_VCR_STATUS_NUMBER_OF_VIDEO_TRACKS __MSABI_LONG(0x0000401F)
+#define MCI_VCR_STATUS_NUMBER_OF_AUDIO_TRACKS __MSABI_LONG(0x00004020)
+#define MCI_VCR_STATUS_CLOCK_ID __MSABI_LONG(0x00004021)
+#define MCI_VCR_STATUS_PAUSE_TIMEOUT __MSABI_LONG(0x00004022)
+#define MCI_VCR_STATUS_PREROLL_DURATION __MSABI_LONG(0x00004023)
+#define MCI_VCR_STATUS_POSTROLL_DURATION __MSABI_LONG(0x00004024)
+#define MCI_VCR_STATUS_VIDEO __MSABI_LONG(0x00004025)
+#define MCI_VCR_STATUS_AUDIO __MSABI_LONG(0x00004026)
 
-#define MCI_VCR_STATUS_NUMBER 0x00080000L
+#define MCI_VCR_STATUS_NUMBER __MSABI_LONG(0x00080000)
 
-#define MCI_VCR_ESCAPE_STRING 0x00000100L
+#define MCI_VCR_ESCAPE_STRING __MSABI_LONG(0x00000100)
 
-#define MCI_VCR_LIST_VIDEO_SOURCE 0x00010000L
-#define MCI_VCR_LIST_AUDIO_SOURCE 0x00020000L
-#define MCI_VCR_LIST_COUNT 0x00040000L
-#define MCI_VCR_LIST_NUMBER 0x00080000L
+#define MCI_VCR_LIST_VIDEO_SOURCE __MSABI_LONG(0x00010000)
+#define MCI_VCR_LIST_AUDIO_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_VCR_LIST_COUNT __MSABI_LONG(0x00040000)
+#define MCI_VCR_LIST_NUMBER __MSABI_LONG(0x00080000)
 
-#define MCI_VCR_MARK_WRITE 0x00010000L
-#define MCI_VCR_MARK_ERASE 0x00020000L
+#define MCI_VCR_MARK_WRITE __MSABI_LONG(0x00010000)
+#define MCI_VCR_MARK_ERASE __MSABI_LONG(0x00020000)
 
-#define MCI_VCR_SETAUDIO_RECORD 0x00010000L
-#define MCI_VCR_SETAUDIO_SOURCE 0x00020000L
-#define MCI_VCR_SETAUDIO_MONITOR 0x00040000L
-#define MCI_VCR_SETAUDIO_TO 0x00200000L
-#define MCI_VCR_SETAUDIO_NUMBER 0x00400000L
+#define MCI_VCR_SETAUDIO_RECORD __MSABI_LONG(0x00010000)
+#define MCI_VCR_SETAUDIO_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_VCR_SETAUDIO_MONITOR __MSABI_LONG(0x00040000)
+#define MCI_VCR_SETAUDIO_TO __MSABI_LONG(0x00200000)
+#define MCI_VCR_SETAUDIO_NUMBER __MSABI_LONG(0x00400000)
 
-#define MCI_VCR_SETVIDEO_RECORD 0x00010000L
-#define MCI_VCR_SETVIDEO_SOURCE 0x00020000L
-#define MCI_VCR_SETVIDEO_MONITOR 0x00040000L
-#define MCI_VCR_SETVIDEO_TO 0x00100000L
-#define MCI_VCR_SETVIDEO_NUMBER 0x00200000L
+#define MCI_VCR_SETVIDEO_RECORD __MSABI_LONG(0x00010000)
+#define MCI_VCR_SETVIDEO_SOURCE __MSABI_LONG(0x00020000)
+#define MCI_VCR_SETVIDEO_MONITOR __MSABI_LONG(0x00040000)
+#define MCI_VCR_SETVIDEO_TO __MSABI_LONG(0x00100000)
+#define MCI_VCR_SETVIDEO_NUMBER __MSABI_LONG(0x00200000)
 
 #define SEND_VCRSIGNAL(dwFlags,dwCallback,hDriver,wDeviceID,dwUser,dwPos) DriverCallback((dwCallback),DCB_WINDOW,(HANDLE)(wDeviceID),MM_MCISIGNAL,hDriver,((dwFlags) & MCI_VCR_SIGNAL_POSITION) ? (dwPos):(dwUser),((dwFlags) & MCI_VCR_SIGNAL_POSITION) ? (dwUser):(dwPos))
 
 #define MM_MCISIGNAL 0x3CB
 
-#define MCI_VCR_SIGNAL_AT 0x00010000L
-#define MCI_VCR_SIGNAL_EVERY 0x00020000L
-#define MCI_VCR_SIGNAL_USERVAL 0x00040000L
-#define MCI_VCR_SIGNAL_CANCEL 0x00080000L
-#define MCI_VCR_SIGNAL_POSITION 0x00100000L
+#define MCI_VCR_SIGNAL_AT __MSABI_LONG(0x00010000)
+#define MCI_VCR_SIGNAL_EVERY __MSABI_LONG(0x00020000)
+#define MCI_VCR_SIGNAL_USERVAL __MSABI_LONG(0x00040000)
+#define MCI_VCR_SIGNAL_CANCEL __MSABI_LONG(0x00080000)
+#define MCI_VCR_SIGNAL_POSITION __MSABI_LONG(0x00100000)
 
-#define MCI_VCR_STEP_FRAMES 0x00010000L
-#define MCI_VCR_STEP_REVERSE 0x00020000L
+#define MCI_VCR_STEP_FRAMES __MSABI_LONG(0x00010000)
+#define MCI_VCR_STEP_REVERSE __MSABI_LONG(0x00020000)
 
-#define MCI_VCR_FREEZE_INPUT 0x00010000L
-#define MCI_VCR_FREEZE_OUTPUT 0x00020000L
-#define MCI_VCR_FREEZE_FIELD 0x00040000L
-#define MCI_VCR_FREEZE_FRAME 0x00080000L
+#define MCI_VCR_FREEZE_INPUT __MSABI_LONG(0x00010000)
+#define MCI_VCR_FREEZE_OUTPUT __MSABI_LONG(0x00020000)
+#define MCI_VCR_FREEZE_FIELD __MSABI_LONG(0x00040000)
+#define MCI_VCR_FREEZE_FRAME __MSABI_LONG(0x00080000)
 
-#define MCI_VCR_UNFREEZE_INPUT 0x00010000L
-#define MCI_VCR_UNFREEZE_OUTPUT 0x00020000L
+#define MCI_VCR_UNFREEZE_INPUT __MSABI_LONG(0x00010000)
+#define MCI_VCR_UNFREEZE_OUTPUT __MSABI_LONG(0x00020000)
 
 #define MCI_VCR_MEDIA_8MM (MCI_VCR_OFFSET + 1)
 #define MCI_VCR_MEDIA_HI8 (MCI_VCR_OFFSET + 2)
diff --git a/mingw-w64-headers/include/vdmdbg.h b/mingw-w64-headers/include/vdmdbg.h
index 3cbb712..f6e47a3 100644
--- a/mingw-w64-headers/include/vdmdbg.h
+++ b/mingw-w64-headers/include/vdmdbg.h
@@ -50,12 +50,12 @@
 #define VDMCONTEXT_i386 0x00010000
 #define VDMCONTEXT_i486 0x00010000
 
-#define VDMCONTEXT_CONTROL (VDMCONTEXT_i386 | 0x00000001L)
-#define VDMCONTEXT_INTEGER (VDMCONTEXT_i386 | 0x00000002L)
-#define VDMCONTEXT_SEGMENTS (VDMCONTEXT_i386 | 0x00000004L)
-#define VDMCONTEXT_FLOATING_POINT (VDMCONTEXT_i386 | 0x00000008L)
-#define VDMCONTEXT_DEBUG_REGISTERS (VDMCONTEXT_i386 | 0x00000010L)
-#define VDMCONTEXT_EXTENDED_REGISTERS (VDMCONTEXT_i386 | 0x00000020L)
+#define VDMCONTEXT_CONTROL (VDMCONTEXT_i386 | __MSABI_LONG(0x00000001))
+#define VDMCONTEXT_INTEGER (VDMCONTEXT_i386 | __MSABI_LONG(0x00000002))
+#define VDMCONTEXT_SEGMENTS (VDMCONTEXT_i386 | __MSABI_LONG(0x00000004))
+#define VDMCONTEXT_FLOATING_POINT (VDMCONTEXT_i386 | __MSABI_LONG(0x00000008))
+#define VDMCONTEXT_DEBUG_REGISTERS (VDMCONTEXT_i386 | __MSABI_LONG(0x00000010))
+#define VDMCONTEXT_EXTENDED_REGISTERS (VDMCONTEXT_i386 | __MSABI_LONG(0x00000020))
 
 #define VDMCONTEXT_FULL (VDMCONTEXT_CONTROL | VDMCONTEXT_INTEGER | VDMCONTEXT_SEGMENTS)
 
diff --git a/mingw-w64-headers/include/vfw.h b/mingw-w64-headers/include/vfw.h
index c9a0662..05c6d76 100644
--- a/mingw-w64-headers/include/vfw.h
+++ b/mingw-w64-headers/include/vfw.h
@@ -62,27 +62,27 @@
 #endif
 
 #ifndef ICERR_OK
-#define ICERR_OK 0L
-#define ICERR_DONTDRAW 1L
-#define ICERR_NEWPALETTE 2L
-#define ICERR_GOTOKEYFRAME 3L
-#define ICERR_STOPDRAWING 4L
+#define ICERR_OK __MSABI_LONG(0)
+#define ICERR_DONTDRAW __MSABI_LONG(1)
+#define ICERR_NEWPALETTE __MSABI_LONG(2)
+#define ICERR_GOTOKEYFRAME __MSABI_LONG(3)
+#define ICERR_STOPDRAWING __MSABI_LONG(4)
 
-#define ICERR_UNSUPPORTED -1L
-#define ICERR_BADFORMAT -2L
-#define ICERR_MEMORY -3L
-#define ICERR_INTERNAL -4L
-#define ICERR_BADFLAGS -5L
-#define ICERR_BADPARAM -6L
-#define ICERR_BADSIZE -7L
-#define ICERR_BADHANDLE -8L
-#define ICERR_CANTUPDATE -9L
-#define ICERR_ABORT -10L
-#define ICERR_ERROR -100L
-#define ICERR_BADBITDEPTH -200L
-#define ICERR_BADIMAGESIZE -201L
+#define ICERR_UNSUPPORTED __MSABI_LONG(-1)
+#define ICERR_BADFORMAT __MSABI_LONG(-2)
+#define ICERR_MEMORY __MSABI_LONG(-3)
+#define ICERR_INTERNAL __MSABI_LONG(-4)
+#define ICERR_BADFLAGS __MSABI_LONG(-5)
+#define ICERR_BADPARAM __MSABI_LONG(-6)
+#define ICERR_BADSIZE __MSABI_LONG(-7)
+#define ICERR_BADHANDLE __MSABI_LONG(-8)
+#define ICERR_CANTUPDATE __MSABI_LONG(-9)
+#define ICERR_ABORT __MSABI_LONG(-10)
+#define ICERR_ERROR __MSABI_LONG(-100)
+#define ICERR_BADBITDEPTH __MSABI_LONG(-200)
+#define ICERR_BADIMAGESIZE __MSABI_LONG(-201)
 
-#define ICERR_CUSTOM -400L
+#define ICERR_CUSTOM __MSABI_LONG(-400)
 #endif
 
 #ifndef ICMODE_COMPRESS
@@ -94,9 +94,9 @@
 #define ICMODE_DRAW 8
 #endif
 
-#define AVIIF_LIST 0x00000001L
-#define AVIIF_TWOCC 0x00000002L
-#define AVIIF_KEYFRAME 0x00000010L
+#define AVIIF_LIST __MSABI_LONG(0x00000001)
+#define AVIIF_TWOCC __MSABI_LONG(0x00000002)
+#define AVIIF_KEYFRAME __MSABI_LONG(0x00000010)
 
 #define ICQUALITY_LOW 0
 #define ICQUALITY_HIGH 10000
@@ -216,7 +216,7 @@
 #define VIDCF_FASTTEMPORALD 0x0080
 #define VIDCF_FASTTEMPORAL	(VIDCF_FASTTEMPORALC|VIDCF_FASTTEMPORALD)
 
-#define ICCOMPRESS_KEYFRAME 0x00000001L
+#define ICCOMPRESS_KEYFRAME __MSABI_LONG(0x00000001)
 
   typedef struct {
     DWORD dwFlags;
@@ -267,11 +267,11 @@
     LONG (CALLBACK *Status)(LPARAM lParam,UINT message,LONG l);
   } ICSETSTATUSPROC;
 
-#define ICDECOMPRESS_HURRYUP 0x80000000L
-#define ICDECOMPRESS_UPDATE 0x40000000L
-#define ICDECOMPRESS_PREROLL 0x20000000L
-#define ICDECOMPRESS_NULLFRAME 0x10000000L
-#define ICDECOMPRESS_NOTKEYFRAME 0x08000000L
+#define ICDECOMPRESS_HURRYUP __MSABI_LONG(0x80000000)
+#define ICDECOMPRESS_UPDATE __MSABI_LONG(0x40000000)
+#define ICDECOMPRESS_PREROLL __MSABI_LONG(0x20000000)
+#define ICDECOMPRESS_NULLFRAME __MSABI_LONG(0x10000000)
+#define ICDECOMPRESS_NOTKEYFRAME __MSABI_LONG(0x08000000)
 
   typedef struct {
     DWORD dwFlags;
@@ -299,15 +299,15 @@
     int dySrc;
   } ICDECOMPRESSEX;
 
-#define ICDRAW_QUERY 0x00000001L
-#define ICDRAW_FULLSCREEN 0x00000002L
-#define ICDRAW_HDC 0x00000004L
-#define ICDRAW_ANIMATE 0x00000008L
-#define ICDRAW_CONTINUE 0x00000010L
-#define ICDRAW_MEMORYDC 0x00000020L
-#define ICDRAW_UPDATING 0x00000040L
-#define ICDRAW_RENDER 0x00000080L
-#define ICDRAW_BUFFER 0x00000100L
+#define ICDRAW_QUERY __MSABI_LONG(0x00000001)
+#define ICDRAW_FULLSCREEN __MSABI_LONG(0x00000002)
+#define ICDRAW_HDC __MSABI_LONG(0x00000004)
+#define ICDRAW_ANIMATE __MSABI_LONG(0x00000008)
+#define ICDRAW_CONTINUE __MSABI_LONG(0x00000010)
+#define ICDRAW_MEMORYDC __MSABI_LONG(0x00000020)
+#define ICDRAW_UPDATING __MSABI_LONG(0x00000040)
+#define ICDRAW_RENDER __MSABI_LONG(0x00000080)
+#define ICDRAW_BUFFER __MSABI_LONG(0x00000100)
 
   typedef struct {
     DWORD dwFlags;
@@ -327,11 +327,11 @@
     DWORD dwScale;
   } ICDRAWBEGIN;
 
-#define ICDRAW_HURRYUP 0x80000000L
-#define ICDRAW_UPDATE 0x40000000L
-#define ICDRAW_PREROLL 0x20000000L
-#define ICDRAW_NULLFRAME 0x10000000L
-#define ICDRAW_NOTKEYFRAME 0x08000000L
+#define ICDRAW_HURRYUP __MSABI_LONG(0x80000000)
+#define ICDRAW_UPDATE __MSABI_LONG(0x40000000)
+#define ICDRAW_PREROLL __MSABI_LONG(0x20000000)
+#define ICDRAW_NULLFRAME __MSABI_LONG(0x10000000)
+#define ICDRAW_NOTKEYFRAME __MSABI_LONG(0x08000000)
 
   typedef struct {
     DWORD dwFlags;
@@ -398,7 +398,7 @@
 #define ICCompressGetFormatSize(hic,lpbi) (DWORD) ICCompressGetFormat(hic,lpbi,NULL)
 #define ICCompressGetSize(hic,lpbiInput,lpbiOutput) (DWORD) ICSendMessage(hic,ICM_COMPRESS_GET_SIZE,(DWORD_PTR)(LPVOID)(lpbiInput),(DWORD_PTR)(LPVOID)(lpbiOutput))
 #define ICCompressEnd(hic) ICSendMessage(hic,ICM_COMPRESS_END,(DWORD_PTR)0,(DWORD_PTR)0)
-#define ICDECOMPRESS_HURRYUP 0x80000000L
+#define ICDECOMPRESS_HURRYUP __MSABI_LONG(0x80000000)
 
   DWORD WINAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,LPVOID lpData,LPBITMAPINFOHEADER lpbi,LPVOID lpBits);
 
@@ -468,14 +468,14 @@
 
 #define ICDecompressExEnd(hic) ICSendMessage(hic,ICM_DECOMPRESSEX_END,(DWORD_PTR)0,(DWORD_PTR)0)
 
-#define ICDRAW_QUERY 0x00000001L
-#define ICDRAW_FULLSCREEN 0x00000002L
-#define ICDRAW_HDC 0x00000004L
+#define ICDRAW_QUERY __MSABI_LONG(0x00000001)
+#define ICDRAW_FULLSCREEN __MSABI_LONG(0x00000002)
+#define ICDRAW_HDC __MSABI_LONG(0x00000004)
 
   DWORD WINAPIV ICDrawBegin(HIC hic,DWORD dwFlags,HPALETTE hpal,HWND hwnd,HDC hdc,int xDst,int yDst,int dxDst,int dyDst,LPBITMAPINFOHEADER lpbi,int xSrc,int ySrc,int dxSrc,int dySrc,DWORD dwRate,DWORD dwScale);
 
-#define ICDRAW_HURRYUP 0x80000000L
-#define ICDRAW_UPDATE 0x40000000L
+#define ICDRAW_HURRYUP __MSABI_LONG(0x80000000)
+#define ICDRAW_UPDATE __MSABI_LONG(0x40000000)
 
   DWORD WINAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime);
 
@@ -719,14 +719,14 @@
     RECT rcFrame;
   } AVIStreamHeader;
 
-#define AVIIF_LIST 0x00000001L
-#define AVIIF_KEYFRAME 0x00000010L
-#define AVIIF_FIRSTPART 0x00000020L
-#define AVIIF_LASTPART 0x00000040L
+#define AVIIF_LIST __MSABI_LONG(0x00000001)
+#define AVIIF_KEYFRAME __MSABI_LONG(0x00000010)
+#define AVIIF_FIRSTPART __MSABI_LONG(0x00000020)
+#define AVIIF_LASTPART __MSABI_LONG(0x00000040)
 #define AVIIF_MIDPART (AVIIF_LASTPART|AVIIF_FIRSTPART)
 
-#define AVIIF_NOTIME 0x00000100L
-#define AVIIF_COMPUSE 0x0FFF0000L
+#define AVIIF_NOTIME __MSABI_LONG(0x00000100)
+#define AVIIF_COMPUSE __MSABI_LONG(0x0FFF0000)
 
   typedef struct {
     DWORD ckid;
@@ -774,7 +774,7 @@
 #endif
 
 #ifndef AVIIF_KEYFRAME
-#define AVIIF_KEYFRAME 0x00000010L
+#define AVIIF_KEYFRAME __MSABI_LONG(0x00000010)
 #endif
 
 #define AVIGETFRAMEF_BESTDISPLAYFMT 1
@@ -1042,7 +1042,7 @@
   STDAPI AVIStreamReadData (PAVISTREAM pavi,DWORD fcc,LPVOID lp,LONG *lpcb);
   STDAPI AVIStreamWriteData (PAVISTREAM pavi,DWORD fcc,LPVOID lp,LONG cb);
   STDAPI AVIStreamRead (PAVISTREAM pavi,LONG lStart,LONG lSamples,LPVOID lpBuffer,LONG cbBuffer,LONG *plBytes,LONG *plSamples);
-#define AVISTREAMREAD_CONVENIENT (-1L)
+#define AVISTREAMREAD_CONVENIENT (__MSABI_LONG(-1))
   STDAPI AVIStreamWrite (PAVISTREAM pavi,LONG lStart,LONG lSamples,LPVOID lpBuffer,LONG cbBuffer,DWORD dwFlags,LONG *plSampWritten,LONG *plBytesWritten);
   STDAPI_(LONG) AVIStreamStart (PAVISTREAM pavi);
   STDAPI_(LONG) AVIStreamLength (PAVISTREAM pavi);
@@ -1057,22 +1057,22 @@
   STDAPI AVIStreamOpenFromFileW(PAVISTREAM *ppavi,LPCWSTR szFile,DWORD fccType,LONG lParam,UINT mode,CLSID *pclsidHandler);
   STDAPI AVIStreamCreate(PAVISTREAM *ppavi,LONG lParam1,LONG lParam2,CLSID *pclsidHandler);
 
-#define FIND_DIR 0x0000000FL
-#define FIND_NEXT 0x00000001L
-#define FIND_PREV 0x00000004L
-#define FIND_FROM_START 0x00000008L
+#define FIND_DIR __MSABI_LONG(0x0000000F)
+#define FIND_NEXT __MSABI_LONG(0x00000001)
+#define FIND_PREV __MSABI_LONG(0x00000004)
+#define FIND_FROM_START __MSABI_LONG(0x00000008)
 
-#define FIND_TYPE 0x000000F0L
-#define FIND_KEY 0x00000010L
-#define FIND_ANY 0x00000020L
-#define FIND_FORMAT 0x00000040L
+#define FIND_TYPE __MSABI_LONG(0x000000F0)
+#define FIND_KEY __MSABI_LONG(0x00000010)
+#define FIND_ANY __MSABI_LONG(0x00000020)
+#define FIND_FORMAT __MSABI_LONG(0x00000040)
 
-#define FIND_RET 0x0000F000L
-#define FIND_POS 0x00000000L
-#define FIND_LENGTH 0x00001000L
-#define FIND_OFFSET 0x00002000L
-#define FIND_SIZE 0x00003000L
-#define FIND_INDEX 0x00004000L
+#define FIND_RET __MSABI_LONG(0x0000F000)
+#define FIND_POS __MSABI_LONG(0x00000000)
+#define FIND_LENGTH __MSABI_LONG(0x00001000)
+#define FIND_OFFSET __MSABI_LONG(0x00002000)
+#define FIND_SIZE __MSABI_LONG(0x00003000)
+#define FIND_INDEX __MSABI_LONG(0x00004000)
 
 #define AVIStreamFindKeyFrame AVIStreamFindSample
 #define FindKeyFrame FindSample
@@ -1148,7 +1148,7 @@
   STDAPI EditStreamSetInfoA(PAVISTREAM pavi,LPAVISTREAMINFOA lpInfo,LONG cbInfo);
 
 #ifndef AVIERR_OK
-#define AVIERR_OK 0L
+#define AVIERR_OK __MSABI_LONG(0)
 
 #define MAKE_AVIERR(error) MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x4000 + error)
 
diff --git a/mingw-w64-headers/include/wabcode.h b/mingw-w64-headers/include/wabcode.h
index 1529c1f..671b026 100644
--- a/mingw-w64-headers/include/wabcode.h
+++ b/mingw-w64-headers/include/wabcode.h
@@ -16,7 +16,7 @@
 #ifdef SUCCESS_SUCCESS
 #undef SUCCESS_SUCCESS
 #endif
-#define SUCCESS_SUCCESS 0L
+#define SUCCESS_SUCCESS __MSABI_LONG(0)
 
 #define MAPI_E_CALL_FAILED E_FAIL
 #define MAPI_E_NOT_ENOUGH_MEMORY E_OUTOFMEMORY
diff --git a/mingw-w64-headers/include/wabdefs.h b/mingw-w64-headers/include/wabdefs.h
index 251688d..a6223ce 100644
--- a/mingw-w64-headers/include/wabdefs.h
+++ b/mingw-w64-headers/include/wabdefs.h
@@ -589,7 +589,7 @@
       MAPI_IMAPIPROGRESS_METHODS(PURE)
   };
 
-#define MAPI_ERROR_VERSION 0x00000000L
+#define MAPI_ERROR_VERSION __MSABI_LONG(0x00000000)
 
 #define KEEP_OPEN_READONLY ((ULONG) 0x00000001)
 #define KEEP_OPEN_READWRITE ((ULONG) 0x00000002)
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index d558c4c..008b02d 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -620,7 +620,7 @@
 #define DRIVE_CDROM 5
 #define DRIVE_RAMDISK 6
 
-#define GetFreeSpace(w) (0x100000L)
+#define GetFreeSpace(w) (__MSABI_LONG(0x100000))
 #define FILE_TYPE_UNKNOWN 0x0
 #define FILE_TYPE_DISK 0x1
 #define FILE_TYPE_CHAR 0x2
diff --git a/mingw-w64-headers/include/winber.h b/mingw-w64-headers/include/winber.h
index 32dc0b2..e662ca8 100644
--- a/mingw-w64-headers/include/winber.h
+++ b/mingw-w64-headers/include/winber.h
@@ -20,8 +20,8 @@
 #define BERAPI __cdecl
 #endif
 
-#define LBER_ERROR 0xffffffffL
-#define LBER_DEFAULT 0xffffffffL
+#define LBER_ERROR __MSABI_LONG(0xffffffff)
+#define LBER_DEFAULT __MSABI_LONG(0xffffffff)
 
   typedef unsigned int ber_tag_t;
   typedef int ber_int_t;
diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h
index b9dc3ce..f691291 100644
--- a/mingw-w64-headers/include/wincrypt.h
+++ b/mingw-w64-headers/include/wincrypt.h
@@ -1698,7 +1698,7 @@
 #define CRL_DIST_POINT_ERR_INDEX_SHIFT 24
 #define GET_CRL_DIST_POINT_ERR_INDEX(X) ((X >> CRL_DIST_POINT_ERR_INDEX_SHIFT) & CRL_DIST_POINT_ERR_INDEX_MASK)
 
-#define CRL_DIST_POINT_ERR_CRL_ISSUER_BIT 0x80000000L
+#define CRL_DIST_POINT_ERR_CRL_ISSUER_BIT __MSABI_LONG(0x80000000)
 #define IS_CRL_DIST_POINT_ERR_CRL_ISSUER(X) (0!=(X & CRL_DIST_POINT_ERR_CRL_ISSUER_BIT))
 
   typedef struct _CROSS_CERT_DIST_POINTS_INFO {
@@ -1738,7 +1738,7 @@
     PCERT_GENERAL_SUBTREE rgExcludedSubtree;
   } CERT_NAME_CONSTRAINTS_INFO,*PCERT_NAME_CONSTRAINTS_INFO;
 
-#define CERT_EXCLUDED_SUBTREE_BIT 0x80000000L
+#define CERT_EXCLUDED_SUBTREE_BIT __MSABI_LONG(0x80000000)
 #define IS_CERT_EXCLUDED_SUBTREE(X) (0!=(X & CERT_EXCLUDED_SUBTREE_BIT))
 
 #define SORTED_CTL_EXT_FLAGS_OFFSET (0*4)
diff --git a/mingw-w64-headers/include/winddi.h b/mingw-w64-headers/include/winddi.h
index 775319e..4a23dd2 100644
--- a/mingw-w64-headers/include/winddi.h
+++ b/mingw-w64-headers/include/winddi.h
@@ -282,16 +282,16 @@
 #define GCAPS_NUP               0x80000000
 
 /* DEVINFO.iDitherFormat constants */
-#define BMF_1BPP       1L
-#define BMF_4BPP       2L
-#define BMF_8BPP       3L
-#define BMF_16BPP      4L
-#define BMF_24BPP      5L
-#define BMF_32BPP      6L
-#define BMF_4RLE       7L
-#define BMF_8RLE       8L
-#define BMF_JPEG       9L
-#define BMF_PNG       10L
+#define BMF_1BPP       __MSABI_LONG(1)
+#define BMF_4BPP       __MSABI_LONG(2)
+#define BMF_8BPP       __MSABI_LONG(3)
+#define BMF_16BPP      __MSABI_LONG(4)
+#define BMF_24BPP      __MSABI_LONG(5)
+#define BMF_32BPP      __MSABI_LONG(6)
+#define BMF_4RLE       __MSABI_LONG(7)
+#define BMF_8RLE       __MSABI_LONG(8)
+#define BMF_JPEG       __MSABI_LONG(9)
+#define BMF_PNG       __MSABI_LONG(10)
 
 /* DEVINFO.flGraphicsCaps2 flags */
 #define GCAPS2_JPEGSRC          0x00000001
@@ -332,100 +332,100 @@
 } DRIVEROBJ;
 
 /* DRVFN.iFunc constants */
-#define INDEX_DrvEnablePDEV               0L
-#define INDEX_DrvCompletePDEV             1L
-#define INDEX_DrvDisablePDEV              2L
-#define INDEX_DrvEnableSurface            3L
-#define INDEX_DrvDisableSurface           4L
-#define INDEX_DrvAssertMode               5L
-#define INDEX_DrvOffset                   6L
-#define INDEX_DrvResetPDEV                7L
-#define INDEX_DrvDisableDriver            8L
-#define INDEX_DrvUnknown1                 9L
-#define INDEX_DrvCreateDeviceBitmap       10L
-#define INDEX_DrvDeleteDeviceBitmap       11L
-#define INDEX_DrvRealizeBrush             12L
-#define INDEX_DrvDitherColor              13L
-#define INDEX_DrvStrokePath               14L
-#define INDEX_DrvFillPath                 15L
-#define INDEX_DrvStrokeAndFillPath        16L
-#define INDEX_DrvPaint                    17L
-#define INDEX_DrvBitBlt                   18L
-#define INDEX_DrvCopyBits                 19L
-#define INDEX_DrvStretchBlt               20L
-#define INDEX_DrvUnknown2                 21L
-#define INDEX_DrvSetPalette               22L
-#define INDEX_DrvTextOut                  23L
-#define INDEX_DrvEscape                   24L
-#define INDEX_DrvDrawEscape               25L
-#define INDEX_DrvQueryFont                26L
-#define INDEX_DrvQueryFontTree            27L
-#define INDEX_DrvQueryFontData            28L
-#define INDEX_DrvSetPointerShape          29L
-#define INDEX_DrvMovePointer              30L
-#define INDEX_DrvLineTo                   31L
-#define INDEX_DrvSendPage                 32L
-#define INDEX_DrvStartPage                33L
-#define INDEX_DrvEndDoc                   34L
-#define INDEX_DrvStartDoc                 35L
-#define INDEX_DrvUnknown3                 36L
-#define INDEX_DrvGetGlyphMode             37L
-#define INDEX_DrvSynchronize              38L
-#define INDEX_DrvUnknown4                 39L
-#define INDEX_DrvSaveScreenBits           40L
-#define INDEX_DrvGetModes                 41L
-#define INDEX_DrvFree                     42L
-#define INDEX_DrvDestroyFont              43L
-#define INDEX_DrvQueryFontCaps            44L
-#define INDEX_DrvLoadFontFile             45L
-#define INDEX_DrvUnloadFontFile           46L
-#define INDEX_DrvFontManagement           47L
-#define INDEX_DrvQueryTrueTypeTable       48L
-#define INDEX_DrvQueryTrueTypeOutline     49L
-#define INDEX_DrvGetTrueTypeFile          50L
-#define INDEX_DrvQueryFontFile            51L
-#define INDEX_DrvMovePanning              52L
-#define INDEX_DrvQueryAdvanceWidths       53L
-#define INDEX_DrvSetPixelFormat           54L
-#define INDEX_DrvDescribePixelFormat      55L
-#define INDEX_DrvSwapBuffers              56L
-#define INDEX_DrvStartBanding             57L
-#define INDEX_DrvNextBand                 58L
-#define INDEX_DrvGetDirectDrawInfo        59L
-#define INDEX_DrvEnableDirectDraw         60L
-#define INDEX_DrvDisableDirectDraw        61L
-#define INDEX_DrvQuerySpoolType           62L
-#define INDEX_DrvUnknown5                 63L
-#define INDEX_DrvIcmCreateColorTransform  64L
-#define INDEX_DrvIcmDeleteColorTransform  65L
-#define INDEX_DrvIcmCheckBitmapBits       66L
-#define INDEX_DrvIcmSetDeviceGammaRamp    67L
-#define INDEX_DrvGradientFill             68L
-#define INDEX_DrvStretchBltROP            69L
-#define INDEX_DrvPlgBlt                   70L
-#define INDEX_DrvAlphaBlend               71L
-#define INDEX_DrvSynthesizeFont           72L
-#define INDEX_DrvGetSynthesizedFontFiles  73L
-#define INDEX_DrvTransparentBlt           74L
-#define INDEX_DrvQueryPerBandInfo         75L
-#define INDEX_DrvQueryDeviceSupport       76L
-#define INDEX_DrvReserved1                77L
-#define INDEX_DrvReserved2                78L
-#define INDEX_DrvReserved3                79L
-#define INDEX_DrvReserved4                80L
-#define INDEX_DrvReserved5                81L
-#define INDEX_DrvReserved6                82L
-#define INDEX_DrvReserved7                83L
-#define INDEX_DrvReserved8                84L
-#define INDEX_DrvDeriveSurface            85L
-#define INDEX_DrvQueryGlyphAttrs          86L
-#define INDEX_DrvNotify                   87L
-#define INDEX_DrvSynchronizeSurface       88L
-#define INDEX_DrvResetDevice              89L
-#define INDEX_DrvReserved9                90L
-#define INDEX_DrvReserved10               91L
-#define INDEX_DrvReserved11               92L
-#define INDEX_LAST                        93L
+#define INDEX_DrvEnablePDEV               __MSABI_LONG(0)
+#define INDEX_DrvCompletePDEV             __MSABI_LONG(1)
+#define INDEX_DrvDisablePDEV              __MSABI_LONG(2)
+#define INDEX_DrvEnableSurface            __MSABI_LONG(3)
+#define INDEX_DrvDisableSurface           __MSABI_LONG(4)
+#define INDEX_DrvAssertMode               __MSABI_LONG(5)
+#define INDEX_DrvOffset                   __MSABI_LONG(6)
+#define INDEX_DrvResetPDEV                __MSABI_LONG(7)
+#define INDEX_DrvDisableDriver            __MSABI_LONG(8)
+#define INDEX_DrvUnknown1                 __MSABI_LONG(9)
+#define INDEX_DrvCreateDeviceBitmap       __MSABI_LONG(10)
+#define INDEX_DrvDeleteDeviceBitmap       __MSABI_LONG(11)
+#define INDEX_DrvRealizeBrush             __MSABI_LONG(12)
+#define INDEX_DrvDitherColor              __MSABI_LONG(13)
+#define INDEX_DrvStrokePath               __MSABI_LONG(14)
+#define INDEX_DrvFillPath                 __MSABI_LONG(15)
+#define INDEX_DrvStrokeAndFillPath        __MSABI_LONG(16)
+#define INDEX_DrvPaint                    __MSABI_LONG(17)
+#define INDEX_DrvBitBlt                   __MSABI_LONG(18)
+#define INDEX_DrvCopyBits                 __MSABI_LONG(19)
+#define INDEX_DrvStretchBlt               __MSABI_LONG(20)
+#define INDEX_DrvUnknown2                 __MSABI_LONG(21)
+#define INDEX_DrvSetPalette               __MSABI_LONG(22)
+#define INDEX_DrvTextOut                  __MSABI_LONG(23)
+#define INDEX_DrvEscape                   __MSABI_LONG(24)
+#define INDEX_DrvDrawEscape               __MSABI_LONG(25)
+#define INDEX_DrvQueryFont                __MSABI_LONG(26)
+#define INDEX_DrvQueryFontTree            __MSABI_LONG(27)
+#define INDEX_DrvQueryFontData            __MSABI_LONG(28)
+#define INDEX_DrvSetPointerShape          __MSABI_LONG(29)
+#define INDEX_DrvMovePointer              __MSABI_LONG(30)
+#define INDEX_DrvLineTo                   __MSABI_LONG(31)
+#define INDEX_DrvSendPage                 __MSABI_LONG(32)
+#define INDEX_DrvStartPage                __MSABI_LONG(33)
+#define INDEX_DrvEndDoc                   __MSABI_LONG(34)
+#define INDEX_DrvStartDoc                 __MSABI_LONG(35)
+#define INDEX_DrvUnknown3                 __MSABI_LONG(36)
+#define INDEX_DrvGetGlyphMode             __MSABI_LONG(37)
+#define INDEX_DrvSynchronize              __MSABI_LONG(38)
+#define INDEX_DrvUnknown4                 __MSABI_LONG(39)
+#define INDEX_DrvSaveScreenBits           __MSABI_LONG(40)
+#define INDEX_DrvGetModes                 __MSABI_LONG(41)
+#define INDEX_DrvFree                     __MSABI_LONG(42)
+#define INDEX_DrvDestroyFont              __MSABI_LONG(43)
+#define INDEX_DrvQueryFontCaps            __MSABI_LONG(44)
+#define INDEX_DrvLoadFontFile             __MSABI_LONG(45)
+#define INDEX_DrvUnloadFontFile           __MSABI_LONG(46)
+#define INDEX_DrvFontManagement           __MSABI_LONG(47)
+#define INDEX_DrvQueryTrueTypeTable       __MSABI_LONG(48)
+#define INDEX_DrvQueryTrueTypeOutline     __MSABI_LONG(49)
+#define INDEX_DrvGetTrueTypeFile          __MSABI_LONG(50)
+#define INDEX_DrvQueryFontFile            __MSABI_LONG(51)
+#define INDEX_DrvMovePanning              __MSABI_LONG(52)
+#define INDEX_DrvQueryAdvanceWidths       __MSABI_LONG(53)
+#define INDEX_DrvSetPixelFormat           __MSABI_LONG(54)
+#define INDEX_DrvDescribePixelFormat      __MSABI_LONG(55)
+#define INDEX_DrvSwapBuffers              __MSABI_LONG(56)
+#define INDEX_DrvStartBanding             __MSABI_LONG(57)
+#define INDEX_DrvNextBand                 __MSABI_LONG(58)
+#define INDEX_DrvGetDirectDrawInfo        __MSABI_LONG(59)
+#define INDEX_DrvEnableDirectDraw         __MSABI_LONG(60)
+#define INDEX_DrvDisableDirectDraw        __MSABI_LONG(61)
+#define INDEX_DrvQuerySpoolType           __MSABI_LONG(62)
+#define INDEX_DrvUnknown5                 __MSABI_LONG(63)
+#define INDEX_DrvIcmCreateColorTransform  __MSABI_LONG(64)
+#define INDEX_DrvIcmDeleteColorTransform  __MSABI_LONG(65)
+#define INDEX_DrvIcmCheckBitmapBits       __MSABI_LONG(66)
+#define INDEX_DrvIcmSetDeviceGammaRamp    __MSABI_LONG(67)
+#define INDEX_DrvGradientFill             __MSABI_LONG(68)
+#define INDEX_DrvStretchBltROP            __MSABI_LONG(69)
+#define INDEX_DrvPlgBlt                   __MSABI_LONG(70)
+#define INDEX_DrvAlphaBlend               __MSABI_LONG(71)
+#define INDEX_DrvSynthesizeFont           __MSABI_LONG(72)
+#define INDEX_DrvGetSynthesizedFontFiles  __MSABI_LONG(73)
+#define INDEX_DrvTransparentBlt           __MSABI_LONG(74)
+#define INDEX_DrvQueryPerBandInfo         __MSABI_LONG(75)
+#define INDEX_DrvQueryDeviceSupport       __MSABI_LONG(76)
+#define INDEX_DrvReserved1                __MSABI_LONG(77)
+#define INDEX_DrvReserved2                __MSABI_LONG(78)
+#define INDEX_DrvReserved3                __MSABI_LONG(79)
+#define INDEX_DrvReserved4                __MSABI_LONG(80)
+#define INDEX_DrvReserved5                __MSABI_LONG(81)
+#define INDEX_DrvReserved6                __MSABI_LONG(82)
+#define INDEX_DrvReserved7                __MSABI_LONG(83)
+#define INDEX_DrvReserved8                __MSABI_LONG(84)
+#define INDEX_DrvDeriveSurface            __MSABI_LONG(85)
+#define INDEX_DrvQueryGlyphAttrs          __MSABI_LONG(86)
+#define INDEX_DrvNotify                   __MSABI_LONG(87)
+#define INDEX_DrvSynchronizeSurface       __MSABI_LONG(88)
+#define INDEX_DrvResetDevice              __MSABI_LONG(89)
+#define INDEX_DrvReserved9                __MSABI_LONG(90)
+#define INDEX_DrvReserved10               __MSABI_LONG(91)
+#define INDEX_DrvReserved11               __MSABI_LONG(92)
+#define INDEX_LAST                        __MSABI_LONG(93)
 
 typedef struct _DRVFN {
   ULONG  iFunc;
@@ -596,8 +596,8 @@
 } FONTSIM;
 
 /* FONTINFO.flCaps constants */
-#define FO_DEVICE_FONT                    1L
-#define FO_OUTLINE_CAPABLE                2L
+#define FO_DEVICE_FONT                    __MSABI_LONG(1)
+#define FO_OUTLINE_CAPABLE                __MSABI_LONG(2)
 
 typedef struct _FONTINFO {
   ULONG  cjThis;
@@ -983,14 +983,14 @@
 #define LA_STYLED                         0x00000008
 
 /* LINEATTRS.iJoin */
-#define JOIN_ROUND                        0L
-#define JOIN_BEVEL                        1L
-#define JOIN_MITER                        2L
+#define JOIN_ROUND                        __MSABI_LONG(0)
+#define JOIN_BEVEL                        __MSABI_LONG(1)
+#define JOIN_MITER                        __MSABI_LONG(2)
 
 /* LINEATTRS.iEndCap */
-#define ENDCAP_ROUND                      0L
-#define ENDCAP_SQUARE                     1L
-#define ENDCAP_BUTT                       2L
+#define ENDCAP_ROUND                      __MSABI_LONG(0)
+#define ENDCAP_SQUARE                     __MSABI_LONG(1)
+#define ENDCAP_BUTT                       __MSABI_LONG(2)
 
 typedef struct _LINEATTRS {
   FLONG  fl;
@@ -1041,9 +1041,9 @@
 
 
 /* SURFOBJ.iType constants */
-#define STYPE_BITMAP                      0L
-#define STYPE_DEVICE                      1L
-#define STYPE_DEVBITMAP                   3L
+#define STYPE_BITMAP                      __MSABI_LONG(0)
+#define STYPE_DEVICE                      __MSABI_LONG(1)
+#define STYPE_DEVBITMAP                   __MSABI_LONG(3)
 
 /* SURFOBJ.fjBitmap constants */
 #define BMF_TOPDOWN                       0x0001
@@ -1165,7 +1165,7 @@
   ULONG  *pv);
 
 /* CLIPOBJ_cEnumStart.iType constants */
-#define CT_RECTANGLES                     0L
+#define CT_RECTANGLES                     __MSABI_LONG(0)
 
 /* CLIPOBJ_cEnumStart.iDirection constants */
 #define CD_RIGHTDOWN                      0x00000000
@@ -2755,10 +2755,10 @@
   PVOID  pvConsumer);
 
 /* XFORMOBJ_bApplyXform.iMode constants */
-#define XF_LTOL                           0L
-#define XF_INV_LTOL                       1L
-#define XF_LTOFX                          2L
-#define XF_INV_FXTOL                      3L
+#define XF_LTOL                           __MSABI_LONG(0)
+#define XF_INV_LTOL                       __MSABI_LONG(1)
+#define XF_LTOFX                          __MSABI_LONG(2)
+#define XF_INV_FXTOL                      __MSABI_LONG(3)
 
 WIN32KAPI
 WINBOOL
@@ -3013,9 +3013,9 @@
   ULONG_PTR  id);
 
 /* DrvGetGlyphMode return values */
-#define FO_HGLYPHS                        0L
-#define FO_GLYPHBITS                      1L
-#define FO_PATHOBJ                        2L
+#define FO_HGLYPHS                        __MSABI_LONG(0)
+#define FO_GLYPHBITS                      __MSABI_LONG(1)
+#define FO_PATHOBJ                        __MSABI_LONG(2)
 
 ULONG
 APIENTRY
@@ -3228,14 +3228,14 @@
   ULONG  *pulCaps);
 
 /* DrvQueryFontData.iMode constants */
-#define QFD_GLYPHANDBITMAP                1L
-#define QFD_GLYPHANDOUTLINE               2L
-#define QFD_MAXEXTENTS                    3L
-#define QFD_TT_GLYPHANDBITMAP             4L
-#define QFD_TT_GRAY1_BITMAP               5L
-#define QFD_TT_GRAY2_BITMAP               6L
-#define QFD_TT_GRAY4_BITMAP               8L
-#define QFD_TT_GRAY8_BITMAP               9L
+#define QFD_GLYPHANDBITMAP                __MSABI_LONG(1)
+#define QFD_GLYPHANDOUTLINE               __MSABI_LONG(2)
+#define QFD_MAXEXTENTS                    __MSABI_LONG(3)
+#define QFD_TT_GLYPHANDBITMAP             __MSABI_LONG(4)
+#define QFD_TT_GRAY1_BITMAP               __MSABI_LONG(5)
+#define QFD_TT_GRAY2_BITMAP               __MSABI_LONG(6)
+#define QFD_TT_GRAY4_BITMAP               __MSABI_LONG(8)
+#define QFD_TT_GRAY8_BITMAP               __MSABI_LONG(9)
 
 #define QFD_TT_MONO_BITMAP QFD_TT_GRAY1_BITMAP
 
@@ -3263,10 +3263,10 @@
   ULONG  *pulBuf);
 
 /* DrvQueryFontTree.iMode constants */
-#define QFT_UNICODE                       0L
-#define QFT_LIGATURES                     1L
-#define QFT_KERNPAIRS                     2L
-#define QFT_GLYPHSET                      3L
+#define QFT_UNICODE                       __MSABI_LONG(0)
+#define QFT_LIGATURES                     __MSABI_LONG(1)
+#define QFT_KERNPAIRS                     __MSABI_LONG(2)
+#define QFT_GLYPHSET                      __MSABI_LONG(3)
 
 PVOID
 APIENTRY
@@ -3318,7 +3318,7 @@
   ULONG *pcjTable);
 
 /* DrvRealizeBrush.iHatch constants */
-#define RB_DITHERCOLOR                    0x80000000L
+#define RB_DITHERCOLOR                    __MSABI_LONG(0x80000000)
 
 #define HS_DDI_MAX                        6
 
@@ -3390,13 +3390,13 @@
 #define SPS_ACCEPT_SYNCHRONOUS            0x00000004
 
 /* DrvSetPointerShape.fl constants */
-#define SPS_CHANGE                        0x00000001L
-#define SPS_ASYNCCHANGE                   0x00000002L
-#define SPS_ANIMATESTART                  0x00000004L
-#define SPS_ANIMATEUPDATE                 0x00000008L
-#define SPS_ALPHA                         0x00000010L
-#define SPS_LENGTHMASK                    0x00000F00L
-#define SPS_FREQMASK                      0x000FF000L
+#define SPS_CHANGE                        __MSABI_LONG(0x00000001)
+#define SPS_ASYNCCHANGE                   __MSABI_LONG(0x00000002)
+#define SPS_ANIMATESTART                  __MSABI_LONG(0x00000004)
+#define SPS_ANIMATEUPDATE                 __MSABI_LONG(0x00000008)
+#define SPS_ALPHA                         __MSABI_LONG(0x00000010)
+#define SPS_LENGTHMASK                    __MSABI_LONG(0x00000F00)
+#define SPS_FREQMASK                      __MSABI_LONG(0x000FF000)
 
 ULONG
 APIENTRY
diff --git a/mingw-w64-headers/include/winerror.h b/mingw-w64-headers/include/winerror.h
index 235f142..1fff12c 100644
--- a/mingw-w64-headers/include/winerror.h
+++ b/mingw-w64-headers/include/winerror.h
@@ -37,1578 +37,1578 @@
 #define FACILITY_BACKGROUNDCOPY 32
 #define FACILITY_ACS 20
 #define FACILITY_AAF 18
-#define ERROR_SUCCESS 0L
-#define NO_ERROR 0L
+#define ERROR_SUCCESS __MSABI_LONG(0)
+#define NO_ERROR __MSABI_LONG(0)
 #define SEC_E_OK ((HRESULT)0x00000000)
-#define ERROR_INVALID_FUNCTION 1L
-#define ERROR_FILE_NOT_FOUND 2L
-#define ERROR_PATH_NOT_FOUND 3L
-#define ERROR_TOO_MANY_OPEN_FILES 4L
-#define ERROR_ACCESS_DENIED 5L
-#define ERROR_INVALID_HANDLE 6L
-#define ERROR_ARENA_TRASHED 7L
-#define ERROR_NOT_ENOUGH_MEMORY 8L
-#define ERROR_INVALID_BLOCK 9L
-#define ERROR_BAD_ENVIRONMENT 10L
-#define ERROR_BAD_FORMAT 11L
-#define ERROR_INVALID_ACCESS 12L
-#define ERROR_INVALID_DATA 13L
-#define ERROR_OUTOFMEMORY 14L
-#define ERROR_INVALID_DRIVE 15L
-#define ERROR_CURRENT_DIRECTORY 16L
-#define ERROR_NOT_SAME_DEVICE 17L
-#define ERROR_NO_MORE_FILES 18L
-#define ERROR_WRITE_PROTECT 19L
-#define ERROR_BAD_UNIT 20L
-#define ERROR_NOT_READY 21L
-#define ERROR_BAD_COMMAND 22L
-#define ERROR_CRC 23L
-#define ERROR_BAD_LENGTH 24L
-#define ERROR_SEEK 25L
-#define ERROR_NOT_DOS_DISK 26L
-#define ERROR_SECTOR_NOT_FOUND 27L
-#define ERROR_OUT_OF_PAPER 28L
-#define ERROR_WRITE_FAULT 29L
-#define ERROR_READ_FAULT 30L
-#define ERROR_GEN_FAILURE 31L
-#define ERROR_SHARING_VIOLATION 32L
-#define ERROR_LOCK_VIOLATION 33L
-#define ERROR_WRONG_DISK 34L
-#define ERROR_SHARING_BUFFER_EXCEEDED 36L
-#define ERROR_HANDLE_EOF 38L
-#define ERROR_HANDLE_DISK_FULL 39L
-#define ERROR_NOT_SUPPORTED 50L
-#define ERROR_REM_NOT_LIST 51L
-#define ERROR_DUP_NAME 52L
-#define ERROR_BAD_NETPATH 53L
-#define ERROR_NETWORK_BUSY 54L
-#define ERROR_DEV_NOT_EXIST 55L
-#define ERROR_TOO_MANY_CMDS 56L
-#define ERROR_ADAP_HDW_ERR 57L
-#define ERROR_BAD_NET_RESP 58L
-#define ERROR_UNEXP_NET_ERR 59L
-#define ERROR_BAD_REM_ADAP 60L
-#define ERROR_PRINTQ_FULL 61L
-#define ERROR_NO_SPOOL_SPACE 62L
-#define ERROR_PRINT_CANCELLED 63L
-#define ERROR_NETNAME_DELETED 64L
-#define ERROR_NETWORK_ACCESS_DENIED 65L
-#define ERROR_BAD_DEV_TYPE 66L
-#define ERROR_BAD_NET_NAME 67L
-#define ERROR_TOO_MANY_NAMES 68L
-#define ERROR_TOO_MANY_SESS 69L
-#define ERROR_SHARING_PAUSED 70L
-#define ERROR_REQ_NOT_ACCEP 71L
-#define ERROR_REDIR_PAUSED 72L
-#define ERROR_FILE_EXISTS 80L
-#define ERROR_CANNOT_MAKE 82L
-#define ERROR_FAIL_I24 83L
-#define ERROR_OUT_OF_STRUCTURES 84L
-#define ERROR_ALREADY_ASSIGNED 85L
-#define ERROR_INVALID_PASSWORD 86L
-#define ERROR_INVALID_PARAMETER 87L
-#define ERROR_NET_WRITE_FAULT 88L
-#define ERROR_NO_PROC_SLOTS 89L
-#define ERROR_TOO_MANY_SEMAPHORES 100L
-#define ERROR_EXCL_SEM_ALREADY_OWNED 101L
-#define ERROR_SEM_IS_SET 102L
-#define ERROR_TOO_MANY_SEM_REQUESTS 103L
-#define ERROR_INVALID_AT_INTERRUPT_TIME 104L
-#define ERROR_SEM_OWNER_DIED 105L
-#define ERROR_SEM_USER_LIMIT 106L
-#define ERROR_DISK_CHANGE 107L
-#define ERROR_DRIVE_LOCKED 108L
-#define ERROR_BROKEN_PIPE 109L
-#define ERROR_OPEN_FAILED 110L
-#define ERROR_BUFFER_OVERFLOW 111L
-#define ERROR_DISK_FULL 112L
-#define ERROR_NO_MORE_SEARCH_HANDLES 113L
-#define ERROR_INVALID_TARGET_HANDLE 114L
-#define ERROR_INVALID_CATEGORY 117L
-#define ERROR_INVALID_VERIFY_SWITCH 118L
-#define ERROR_BAD_DRIVER_LEVEL 119L
-#define ERROR_CALL_NOT_IMPLEMENTED 120L
-#define ERROR_SEM_TIMEOUT 121L
-#define ERROR_INSUFFICIENT_BUFFER 122L
-#define ERROR_INVALID_NAME 123L
-#define ERROR_INVALID_LEVEL 124L
-#define ERROR_NO_VOLUME_LABEL 125L
-#define ERROR_MOD_NOT_FOUND 126L
-#define ERROR_PROC_NOT_FOUND 127L
-#define ERROR_WAIT_NO_CHILDREN 128L
-#define ERROR_CHILD_NOT_COMPLETE 129L
-#define ERROR_DIRECT_ACCESS_HANDLE 130L
-#define ERROR_NEGATIVE_SEEK 131L
-#define ERROR_SEEK_ON_DEVICE 132L
-#define ERROR_IS_JOIN_TARGET 133L
-#define ERROR_IS_JOINED 134L
-#define ERROR_IS_SUBSTED 135L
-#define ERROR_NOT_JOINED 136L
-#define ERROR_NOT_SUBSTED 137L
-#define ERROR_JOIN_TO_JOIN 138L
-#define ERROR_SUBST_TO_SUBST 139L
-#define ERROR_JOIN_TO_SUBST 140L
-#define ERROR_SUBST_TO_JOIN 141L
-#define ERROR_BUSY_DRIVE 142L
-#define ERROR_SAME_DRIVE 143L
-#define ERROR_DIR_NOT_ROOT 144L
-#define ERROR_DIR_NOT_EMPTY 145L
-#define ERROR_IS_SUBST_PATH 146L
-#define ERROR_IS_JOIN_PATH 147L
-#define ERROR_PATH_BUSY 148L
-#define ERROR_IS_SUBST_TARGET 149L
-#define ERROR_SYSTEM_TRACE 150L
-#define ERROR_INVALID_EVENT_COUNT 151L
-#define ERROR_TOO_MANY_MUXWAITERS 152L
-#define ERROR_INVALID_LIST_FORMAT 153L
-#define ERROR_LABEL_TOO_LONG 154L
-#define ERROR_TOO_MANY_TCBS 155L
-#define ERROR_SIGNAL_REFUSED 156L
-#define ERROR_DISCARDED 157L
-#define ERROR_NOT_LOCKED 158L
-#define ERROR_BAD_THREADID_ADDR 159L
-#define ERROR_BAD_ARGUMENTS 160L
-#define ERROR_BAD_PATHNAME 161L
-#define ERROR_SIGNAL_PENDING 162L
-#define ERROR_MAX_THRDS_REACHED 164L
-#define ERROR_LOCK_FAILED 167L
-#define ERROR_BUSY 170L
-#define ERROR_CANCEL_VIOLATION 173L
-#define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174L
-#define ERROR_INVALID_SEGMENT_NUMBER 180L
-#define ERROR_INVALID_ORDINAL 182L
-#define ERROR_ALREADY_EXISTS 183L
-#define ERROR_INVALID_FLAG_NUMBER 186L
-#define ERROR_SEM_NOT_FOUND 187L
-#define ERROR_INVALID_STARTING_CODESEG 188L
-#define ERROR_INVALID_STACKSEG 189L
-#define ERROR_INVALID_MODULETYPE 190L
-#define ERROR_INVALID_EXE_SIGNATURE 191L
-#define ERROR_EXE_MARKED_INVALID 192L
-#define ERROR_BAD_EXE_FORMAT 193L
-#define ERROR_ITERATED_DATA_EXCEEDS_64k 194L
-#define ERROR_INVALID_MINALLOCSIZE 195L
-#define ERROR_DYNLINK_FROM_INVALID_RING 196L
-#define ERROR_IOPL_NOT_ENABLED 197L
-#define ERROR_INVALID_SEGDPL 198L
-#define ERROR_AUTODATASEG_EXCEEDS_64k 199L
-#define ERROR_RING2SEG_MUST_BE_MOVABLE 200L
-#define ERROR_RELOC_CHAIN_XEEDS_SEGLIM 201L
-#define ERROR_INFLOOP_IN_RELOC_CHAIN 202L
-#define ERROR_ENVVAR_NOT_FOUND 203L
-#define ERROR_NO_SIGNAL_SENT 205L
-#define ERROR_FILENAME_EXCED_RANGE 206L
-#define ERROR_RING2_STACK_IN_USE 207L
-#define ERROR_META_EXPANSION_TOO_LONG 208L
-#define ERROR_INVALID_SIGNAL_NUMBER 209L
-#define ERROR_THREAD_1_INACTIVE 210L
-#define ERROR_LOCKED 212L
-#define ERROR_TOO_MANY_MODULES 214L
-#define ERROR_NESTING_NOT_ALLOWED 215L
-#define ERROR_EXE_MACHINE_TYPE_MISMATCH 216L
-#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217L
-#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218L
-#define ERROR_BAD_PIPE 230L
-#define ERROR_PIPE_BUSY 231L
-#define ERROR_NO_DATA 232L
-#define ERROR_PIPE_NOT_CONNECTED 233L
-#define ERROR_MORE_DATA 234L
-#define ERROR_VC_DISCONNECTED 240L
-#define ERROR_INVALID_EA_NAME 254L
-#define ERROR_EA_LIST_INCONSISTENT 255L
-#define WAIT_TIMEOUT 258L
-#define ERROR_NO_MORE_ITEMS 259L
-#define ERROR_CANNOT_COPY 266L
-#define ERROR_DIRECTORY 267L
-#define ERROR_EAS_DIDNT_FIT 275L
-#define ERROR_EA_FILE_CORRUPT 276L
-#define ERROR_EA_TABLE_FULL 277L
-#define ERROR_INVALID_EA_HANDLE 278L
-#define ERROR_EAS_NOT_SUPPORTED 282L
-#define ERROR_NOT_OWNER 288L
-#define ERROR_TOO_MANY_POSTS 298L
-#define ERROR_PARTIAL_COPY 299L
-#define ERROR_OPLOCK_NOT_GRANTED 300L
-#define ERROR_INVALID_OPLOCK_PROTOCOL 301L
-#define ERROR_DISK_TOO_FRAGMENTED 302L
-#define ERROR_DELETE_PENDING 303L
-#define ERROR_MR_MID_NOT_FOUND 317L
-#define ERROR_SCOPE_NOT_FOUND 318L
-#define ERROR_INVALID_ADDRESS 487L
-#define ERROR_ARITHMETIC_OVERFLOW 534L
-#define ERROR_PIPE_CONNECTED 535L
-#define ERROR_PIPE_LISTENING 536L
-#define ERROR_EA_ACCESS_DENIED 994L
-#define ERROR_OPERATION_ABORTED 995L
-#define ERROR_IO_INCOMPLETE 996L
-#define ERROR_IO_PENDING 997L
-#define ERROR_NOACCESS 998L
-#define ERROR_SWAPERROR 999L
-#define ERROR_STACK_OVERFLOW 1001L
-#define ERROR_INVALID_MESSAGE 1002L
-#define ERROR_CAN_NOT_COMPLETE 1003L
-#define ERROR_INVALID_FLAGS 1004L
-#define ERROR_UNRECOGNIZED_VOLUME 1005L
-#define ERROR_FILE_INVALID 1006L
-#define ERROR_FULLSCREEN_MODE 1007L
-#define ERROR_NO_TOKEN 1008L
-#define ERROR_BADDB 1009L
-#define ERROR_BADKEY 1010L
-#define ERROR_CANTOPEN 1011L
-#define ERROR_CANTREAD 1012L
-#define ERROR_CANTWRITE 1013L
-#define ERROR_REGISTRY_RECOVERED 1014L
-#define ERROR_REGISTRY_CORRUPT 1015L
-#define ERROR_REGISTRY_IO_FAILED 1016L
-#define ERROR_NOT_REGISTRY_FILE 1017L
-#define ERROR_KEY_DELETED 1018L
-#define ERROR_NO_LOG_SPACE 1019L
-#define ERROR_KEY_HAS_CHILDREN 1020L
-#define ERROR_CHILD_MUST_BE_VOLATILE 1021L
-#define ERROR_NOTIFY_ENUM_DIR 1022L
-#define ERROR_DEPENDENT_SERVICES_RUNNING 1051L
-#define ERROR_INVALID_SERVICE_CONTROL 1052L
-#define ERROR_SERVICE_REQUEST_TIMEOUT 1053L
-#define ERROR_SERVICE_NO_THREAD 1054L
-#define ERROR_SERVICE_DATABASE_LOCKED 1055L
-#define ERROR_SERVICE_ALREADY_RUNNING 1056L
-#define ERROR_INVALID_SERVICE_ACCOUNT 1057L
-#define ERROR_SERVICE_DISABLED 1058L
-#define ERROR_CIRCULAR_DEPENDENCY 1059L
-#define ERROR_SERVICE_DOES_NOT_EXIST 1060L
-#define ERROR_SERVICE_CANNOT_ACCEPT_CTRL 1061L
-#define ERROR_SERVICE_NOT_ACTIVE 1062L
-#define ERROR_FAILED_SERVICE_CONTROLLER_CONNECT 1063L
-#define ERROR_EXCEPTION_IN_SERVICE 1064L
-#define ERROR_DATABASE_DOES_NOT_EXIST 1065L
-#define ERROR_SERVICE_SPECIFIC_ERROR 1066L
-#define ERROR_PROCESS_ABORTED 1067L
-#define ERROR_SERVICE_DEPENDENCY_FAIL 1068L
-#define ERROR_SERVICE_LOGON_FAILED 1069L
-#define ERROR_SERVICE_START_HANG 1070L
-#define ERROR_INVALID_SERVICE_LOCK 1071L
-#define ERROR_SERVICE_MARKED_FOR_DELETE 1072L
-#define ERROR_SERVICE_EXISTS 1073L
-#define ERROR_ALREADY_RUNNING_LKG 1074L
-#define ERROR_SERVICE_DEPENDENCY_DELETED 1075L
-#define ERROR_BOOT_ALREADY_ACCEPTED 1076L
-#define ERROR_SERVICE_NEVER_STARTED 1077L
-#define ERROR_DUPLICATE_SERVICE_NAME 1078L
-#define ERROR_DIFFERENT_SERVICE_ACCOUNT 1079L
-#define ERROR_CANNOT_DETECT_DRIVER_FAILURE 1080L
-#define ERROR_CANNOT_DETECT_PROCESS_ABORT 1081L
-#define ERROR_NO_RECOVERY_PROGRAM 1082L
-#define ERROR_SERVICE_NOT_IN_EXE 1083L
-#define ERROR_NOT_SAFEBOOT_SERVICE 1084L
-#define ERROR_END_OF_MEDIA 1100L
-#define ERROR_FILEMARK_DETECTED 1101L
-#define ERROR_BEGINNING_OF_MEDIA 1102L
-#define ERROR_SETMARK_DETECTED 1103L
-#define ERROR_NO_DATA_DETECTED 1104L
-#define ERROR_PARTITION_FAILURE 1105L
-#define ERROR_INVALID_BLOCK_LENGTH 1106L
-#define ERROR_DEVICE_NOT_PARTITIONED 1107L
-#define ERROR_UNABLE_TO_LOCK_MEDIA 1108L
-#define ERROR_UNABLE_TO_UNLOAD_MEDIA 1109L
-#define ERROR_MEDIA_CHANGED 1110L
-#define ERROR_BUS_RESET 1111L
-#define ERROR_NO_MEDIA_IN_DRIVE 1112L
-#define ERROR_NO_UNICODE_TRANSLATION 1113L
-#define ERROR_DLL_INIT_FAILED 1114L
-#define ERROR_SHUTDOWN_IN_PROGRESS 1115L
-#define ERROR_NO_SHUTDOWN_IN_PROGRESS 1116L
-#define ERROR_IO_DEVICE 1117L
-#define ERROR_SERIAL_NO_DEVICE 1118L
-#define ERROR_IRQ_BUSY 1119L
-#define ERROR_MORE_WRITES 1120L
-#define ERROR_COUNTER_TIMEOUT 1121L
-#define ERROR_FLOPPY_ID_MARK_NOT_FOUND 1122L
-#define ERROR_FLOPPY_WRONG_CYLINDER 1123L
-#define ERROR_FLOPPY_UNKNOWN_ERROR 1124L
-#define ERROR_FLOPPY_BAD_REGISTERS 1125L
-#define ERROR_DISK_RECALIBRATE_FAILED 1126L
-#define ERROR_DISK_OPERATION_FAILED 1127L
-#define ERROR_DISK_RESET_FAILED 1128L
-#define ERROR_EOM_OVERFLOW 1129L
-#define ERROR_NOT_ENOUGH_SERVER_MEMORY 1130L
-#define ERROR_POSSIBLE_DEADLOCK 1131L
-#define ERROR_MAPPED_ALIGNMENT 1132L
-#define ERROR_SET_POWER_STATE_VETOED 1140L
-#define ERROR_SET_POWER_STATE_FAILED 1141L
-#define ERROR_TOO_MANY_LINKS 1142L
-#define ERROR_OLD_WIN_VERSION 1150L
-#define ERROR_APP_WRONG_OS 1151L
-#define ERROR_SINGLE_INSTANCE_APP 1152L
-#define ERROR_RMODE_APP 1153L
-#define ERROR_INVALID_DLL 1154L
-#define ERROR_NO_ASSOCIATION 1155L
-#define ERROR_DDE_FAIL 1156L
-#define ERROR_DLL_NOT_FOUND 1157L
-#define ERROR_NO_MORE_USER_HANDLES 1158L
-#define ERROR_MESSAGE_SYNC_ONLY 1159L
-#define ERROR_SOURCE_ELEMENT_EMPTY 1160L
-#define ERROR_DESTINATION_ELEMENT_FULL 1161L
-#define ERROR_ILLEGAL_ELEMENT_ADDRESS 1162L
-#define ERROR_MAGAZINE_NOT_PRESENT 1163L
-#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164L
-#define ERROR_DEVICE_REQUIRES_CLEANING 1165L
-#define ERROR_DEVICE_DOOR_OPEN 1166L
-#define ERROR_DEVICE_NOT_CONNECTED 1167L
-#define ERROR_NOT_FOUND 1168L
-#define ERROR_NO_MATCH 1169L
-#define ERROR_SET_NOT_FOUND 1170L
-#define ERROR_POINT_NOT_FOUND 1171L
-#define ERROR_NO_TRACKING_SERVICE 1172L
-#define ERROR_NO_VOLUME_ID 1173L
-#define ERROR_UNABLE_TO_REMOVE_REPLACED 1175L
-#define ERROR_UNABLE_TO_MOVE_REPLACEMENT 1176L
-#define ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 1177L
-#define ERROR_JOURNAL_DELETE_IN_PROGRESS 1178L
-#define ERROR_JOURNAL_NOT_ACTIVE 1179L
-#define ERROR_POTENTIAL_FILE_FOUND 1180L
-#define ERROR_JOURNAL_ENTRY_DELETED 1181L
-#define ERROR_BAD_DEVICE 1200L
-#define ERROR_CONNECTION_UNAVAIL 1201L
-#define ERROR_DEVICE_ALREADY_REMEMBERED 1202L
-#define ERROR_NO_NET_OR_BAD_PATH 1203L
-#define ERROR_BAD_PROVIDER 1204L
-#define ERROR_CANNOT_OPEN_PROFILE 1205L
-#define ERROR_BAD_PROFILE 1206L
-#define ERROR_NOT_CONTAINER 1207L
-#define ERROR_EXTENDED_ERROR 1208L
-#define ERROR_INVALID_GROUPNAME 1209L
-#define ERROR_INVALID_COMPUTERNAME 1210L
-#define ERROR_INVALID_EVENTNAME 1211L
-#define ERROR_INVALID_DOMAINNAME 1212L
-#define ERROR_INVALID_SERVICENAME 1213L
-#define ERROR_INVALID_NETNAME 1214L
-#define ERROR_INVALID_SHARENAME 1215L
-#define ERROR_INVALID_PASSWORDNAME 1216L
-#define ERROR_INVALID_MESSAGENAME 1217L
-#define ERROR_INVALID_MESSAGEDEST 1218L
-#define ERROR_SESSION_CREDENTIAL_CONFLICT 1219L
-#define ERROR_REMOTE_SESSION_LIMIT_EXCEEDED 1220L
-#define ERROR_DUP_DOMAINNAME 1221L
-#define ERROR_NO_NETWORK 1222L
-#define ERROR_CANCELLED 1223L
-#define ERROR_USER_MAPPED_FILE 1224L
-#define ERROR_CONNECTION_REFUSED 1225L
-#define ERROR_GRACEFUL_DISCONNECT 1226L
-#define ERROR_ADDRESS_ALREADY_ASSOCIATED 1227L
-#define ERROR_ADDRESS_NOT_ASSOCIATED 1228L
-#define ERROR_CONNECTION_INVALID 1229L
-#define ERROR_CONNECTION_ACTIVE 1230L
-#define ERROR_NETWORK_UNREACHABLE 1231L
-#define ERROR_HOST_UNREACHABLE 1232L
-#define ERROR_PROTOCOL_UNREACHABLE 1233L
-#define ERROR_PORT_UNREACHABLE 1234L
-#define ERROR_REQUEST_ABORTED 1235L
-#define ERROR_CONNECTION_ABORTED 1236L
-#define ERROR_RETRY 1237L
-#define ERROR_CONNECTION_COUNT_LIMIT 1238L
-#define ERROR_LOGIN_TIME_RESTRICTION 1239L
-#define ERROR_LOGIN_WKSTA_RESTRICTION 1240L
-#define ERROR_INCORRECT_ADDRESS 1241L
-#define ERROR_ALREADY_REGISTERED 1242L
-#define ERROR_SERVICE_NOT_FOUND 1243L
-#define ERROR_NOT_AUTHENTICATED 1244L
-#define ERROR_NOT_LOGGED_ON 1245L
-#define ERROR_CONTINUE 1246L
-#define ERROR_ALREADY_INITIALIZED 1247L
-#define ERROR_NO_MORE_DEVICES 1248L
-#define ERROR_NO_SUCH_SITE 1249L
-#define ERROR_DOMAIN_CONTROLLER_EXISTS 1250L
-#define ERROR_ONLY_IF_CONNECTED 1251L
-#define ERROR_OVERRIDE_NOCHANGES 1252L
-#define ERROR_BAD_USER_PROFILE 1253L
-#define ERROR_NOT_SUPPORTED_ON_SBS 1254L
-#define ERROR_SERVER_SHUTDOWN_IN_PROGRESS 1255L
-#define ERROR_HOST_DOWN 1256L
-#define ERROR_NON_ACCOUNT_SID 1257L
-#define ERROR_NON_DOMAIN_SID 1258L
-#define ERROR_APPHELP_BLOCK 1259L
-#define ERROR_ACCESS_DISABLED_BY_POLICY 1260L
-#define ERROR_REG_NAT_CONSUMPTION 1261L
-#define ERROR_CSCSHARE_OFFLINE 1262L
-#define ERROR_PKINIT_FAILURE 1263L
-#define ERROR_SMARTCARD_SUBSYSTEM_FAILURE 1264L
-#define ERROR_DOWNGRADE_DETECTED 1265L
-#define ERROR_MACHINE_LOCKED 1271L
-#define ERROR_CALLBACK_SUPPLIED_INVALID_DATA 1273L
-#define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED 1274L
-#define ERROR_DRIVER_BLOCKED 1275L
-#define ERROR_INVALID_IMPORT_OF_NON_DLL 1276L
-#define ERROR_ACCESS_DISABLED_WEBBLADE 1277L
-#define ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER 1278L
-#define ERROR_RECOVERY_FAILURE 1279L
-#define ERROR_ALREADY_FIBER 1280L
-#define ERROR_ALREADY_THREAD 1281L
-#define ERROR_STACK_BUFFER_OVERRUN 1282L
-#define ERROR_PARAMETER_QUOTA_EXCEEDED 1283L
-#define ERROR_DEBUGGER_INACTIVE 1284L
-#define ERROR_DELAY_LOAD_FAILED 1285L
-#define ERROR_VDM_DISALLOWED 1286L
-#define ERROR_UNIDENTIFIED_ERROR 1287L
-#define ERROR_NOT_ALL_ASSIGNED 1300L
-#define ERROR_SOME_NOT_MAPPED 1301L
-#define ERROR_NO_QUOTAS_FOR_ACCOUNT 1302L
-#define ERROR_LOCAL_USER_SESSION_KEY 1303L
-#define ERROR_NULL_LM_PASSWORD 1304L
-#define ERROR_UNKNOWN_REVISION 1305L
-#define ERROR_REVISION_MISMATCH 1306L
-#define ERROR_INVALID_OWNER 1307L
-#define ERROR_INVALID_PRIMARY_GROUP 1308L
-#define ERROR_NO_IMPERSONATION_TOKEN 1309L
-#define ERROR_CANT_DISABLE_MANDATORY 1310L
-#define ERROR_NO_LOGON_SERVERS 1311L
-#define ERROR_NO_SUCH_LOGON_SESSION 1312L
-#define ERROR_NO_SUCH_PRIVILEGE 1313L
-#define ERROR_PRIVILEGE_NOT_HELD 1314L
-#define ERROR_INVALID_ACCOUNT_NAME 1315L
-#define ERROR_USER_EXISTS 1316L
-#define ERROR_NO_SUCH_USER 1317L
-#define ERROR_GROUP_EXISTS 1318L
-#define ERROR_NO_SUCH_GROUP 1319L
-#define ERROR_MEMBER_IN_GROUP 1320L
-#define ERROR_MEMBER_NOT_IN_GROUP 1321L
-#define ERROR_LAST_ADMIN 1322L
-#define ERROR_WRONG_PASSWORD 1323L
-#define ERROR_ILL_FORMED_PASSWORD 1324L
-#define ERROR_PASSWORD_RESTRICTION 1325L
-#define ERROR_LOGON_FAILURE 1326L
-#define ERROR_ACCOUNT_RESTRICTION 1327L
-#define ERROR_INVALID_LOGON_HOURS 1328L
-#define ERROR_INVALID_WORKSTATION 1329L
-#define ERROR_PASSWORD_EXPIRED 1330L
-#define ERROR_ACCOUNT_DISABLED 1331L
-#define ERROR_NONE_MAPPED 1332L
-#define ERROR_TOO_MANY_LUIDS_REQUESTED 1333L
-#define ERROR_LUIDS_EXHAUSTED 1334L
-#define ERROR_INVALID_SUB_AUTHORITY 1335L
-#define ERROR_INVALID_ACL 1336L
-#define ERROR_INVALID_SID 1337L
-#define ERROR_INVALID_SECURITY_DESCR 1338L
-#define ERROR_BAD_INHERITANCE_ACL 1340L
-#define ERROR_SERVER_DISABLED 1341L
-#define ERROR_SERVER_NOT_DISABLED 1342L
-#define ERROR_INVALID_ID_AUTHORITY 1343L
-#define ERROR_ALLOTTED_SPACE_EXCEEDED 1344L
-#define ERROR_INVALID_GROUP_ATTRIBUTES 1345L
-#define ERROR_BAD_IMPERSONATION_LEVEL 1346L
-#define ERROR_CANT_OPEN_ANONYMOUS 1347L
-#define ERROR_BAD_VALIDATION_CLASS 1348L
-#define ERROR_BAD_TOKEN_TYPE 1349L
-#define ERROR_NO_SECURITY_ON_OBJECT 1350L
-#define ERROR_CANT_ACCESS_DOMAIN_INFO 1351L
-#define ERROR_INVALID_SERVER_STATE 1352L
-#define ERROR_INVALID_DOMAIN_STATE 1353L
-#define ERROR_INVALID_DOMAIN_ROLE 1354L
-#define ERROR_NO_SUCH_DOMAIN 1355L
-#define ERROR_DOMAIN_EXISTS 1356L
-#define ERROR_DOMAIN_LIMIT_EXCEEDED 1357L
-#define ERROR_INTERNAL_DB_CORRUPTION 1358L
-#define ERROR_INTERNAL_ERROR 1359L
-#define ERROR_GENERIC_NOT_MAPPED 1360L
-#define ERROR_BAD_DESCRIPTOR_FORMAT 1361L
-#define ERROR_NOT_LOGON_PROCESS 1362L
-#define ERROR_LOGON_SESSION_EXISTS 1363L
-#define ERROR_NO_SUCH_PACKAGE 1364L
-#define ERROR_BAD_LOGON_SESSION_STATE 1365L
-#define ERROR_LOGON_SESSION_COLLISION 1366L
-#define ERROR_INVALID_LOGON_TYPE 1367L
-#define ERROR_CANNOT_IMPERSONATE 1368L
-#define ERROR_RXACT_INVALID_STATE 1369L
-#define ERROR_RXACT_COMMIT_FAILURE 1370L
-#define ERROR_SPECIAL_ACCOUNT 1371L
-#define ERROR_SPECIAL_GROUP 1372L
-#define ERROR_SPECIAL_USER 1373L
-#define ERROR_MEMBERS_PRIMARY_GROUP 1374L
-#define ERROR_TOKEN_ALREADY_IN_USE 1375L
-#define ERROR_NO_SUCH_ALIAS 1376L
-#define ERROR_MEMBER_NOT_IN_ALIAS 1377L
-#define ERROR_MEMBER_IN_ALIAS 1378L
-#define ERROR_ALIAS_EXISTS 1379L
-#define ERROR_LOGON_NOT_GRANTED 1380L
-#define ERROR_TOO_MANY_SECRETS 1381L
-#define ERROR_SECRET_TOO_LONG 1382L
-#define ERROR_INTERNAL_DB_ERROR 1383L
-#define ERROR_TOO_MANY_CONTEXT_IDS 1384L
-#define ERROR_LOGON_TYPE_NOT_GRANTED 1385L
-#define ERROR_NT_CROSS_ENCRYPTION_REQUIRED 1386L
-#define ERROR_NO_SUCH_MEMBER 1387L
-#define ERROR_INVALID_MEMBER 1388L
-#define ERROR_TOO_MANY_SIDS 1389L
-#define ERROR_LM_CROSS_ENCRYPTION_REQUIRED 1390L
-#define ERROR_NO_INHERITANCE 1391L
-#define ERROR_FILE_CORRUPT 1392L
-#define ERROR_DISK_CORRUPT 1393L
-#define ERROR_NO_USER_SESSION_KEY 1394L
-#define ERROR_LICENSE_QUOTA_EXCEEDED 1395L
-#define ERROR_WRONG_TARGET_NAME 1396L
-#define ERROR_MUTUAL_AUTH_FAILED 1397L
-#define ERROR_TIME_SKEW 1398L
-#define ERROR_CURRENT_DOMAIN_NOT_ALLOWED 1399L
-#define ERROR_INVALID_WINDOW_HANDLE 1400L
-#define ERROR_INVALID_MENU_HANDLE 1401L
-#define ERROR_INVALID_CURSOR_HANDLE 1402L
-#define ERROR_INVALID_ACCEL_HANDLE 1403L
-#define ERROR_INVALID_HOOK_HANDLE 1404L
-#define ERROR_INVALID_DWP_HANDLE 1405L
-#define ERROR_TLW_WITH_WSCHILD 1406L
-#define ERROR_CANNOT_FIND_WND_CLASS 1407L
-#define ERROR_WINDOW_OF_OTHER_THREAD 1408L
-#define ERROR_HOTKEY_ALREADY_REGISTERED 1409L
-#define ERROR_CLASS_ALREADY_EXISTS 1410L
-#define ERROR_CLASS_DOES_NOT_EXIST 1411L
-#define ERROR_CLASS_HAS_WINDOWS 1412L
-#define ERROR_INVALID_INDEX 1413L
-#define ERROR_INVALID_ICON_HANDLE 1414L
-#define ERROR_PRIVATE_DIALOG_INDEX 1415L
-#define ERROR_LISTBOX_ID_NOT_FOUND 1416L
-#define ERROR_NO_WILDCARD_CHARACTERS 1417L
-#define ERROR_CLIPBOARD_NOT_OPEN 1418L
-#define ERROR_HOTKEY_NOT_REGISTERED 1419L
-#define ERROR_WINDOW_NOT_DIALOG 1420L
-#define ERROR_CONTROL_ID_NOT_FOUND 1421L
-#define ERROR_INVALID_COMBOBOX_MESSAGE 1422L
-#define ERROR_WINDOW_NOT_COMBOBOX 1423L
-#define ERROR_INVALID_EDIT_HEIGHT 1424L
-#define ERROR_DC_NOT_FOUND 1425L
-#define ERROR_INVALID_HOOK_FILTER 1426L
-#define ERROR_INVALID_FILTER_PROC 1427L
-#define ERROR_HOOK_NEEDS_HMOD 1428L
-#define ERROR_GLOBAL_ONLY_HOOK 1429L
-#define ERROR_JOURNAL_HOOK_SET 1430L
-#define ERROR_HOOK_NOT_INSTALLED 1431L
-#define ERROR_INVALID_LB_MESSAGE 1432L
-#define ERROR_SETCOUNT_ON_BAD_LB 1433L
-#define ERROR_LB_WITHOUT_TABSTOPS 1434L
-#define ERROR_DESTROY_OBJECT_OF_OTHER_THREAD 1435L
-#define ERROR_CHILD_WINDOW_MENU 1436L
-#define ERROR_NO_SYSTEM_MENU 1437L
-#define ERROR_INVALID_MSGBOX_STYLE 1438L
-#define ERROR_INVALID_SPI_VALUE 1439L
-#define ERROR_SCREEN_ALREADY_LOCKED 1440L
-#define ERROR_HWNDS_HAVE_DIFF_PARENT 1441L
-#define ERROR_NOT_CHILD_WINDOW 1442L
-#define ERROR_INVALID_GW_COMMAND 1443L
-#define ERROR_INVALID_THREAD_ID 1444L
-#define ERROR_NON_MDICHILD_WINDOW 1445L
-#define ERROR_POPUP_ALREADY_ACTIVE 1446L
-#define ERROR_NO_SCROLLBARS 1447L
-#define ERROR_INVALID_SCROLLBAR_RANGE 1448L
-#define ERROR_INVALID_SHOWWIN_COMMAND 1449L
-#define ERROR_NO_SYSTEM_RESOURCES 1450L
-#define ERROR_NONPAGED_SYSTEM_RESOURCES 1451L
-#define ERROR_PAGED_SYSTEM_RESOURCES 1452L
-#define ERROR_WORKING_SET_QUOTA 1453L
-#define ERROR_PAGEFILE_QUOTA 1454L
-#define ERROR_COMMITMENT_LIMIT 1455L
-#define ERROR_MENU_ITEM_NOT_FOUND 1456L
-#define ERROR_INVALID_KEYBOARD_HANDLE 1457L
-#define ERROR_HOOK_TYPE_NOT_ALLOWED 1458L
-#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459L
-#define ERROR_TIMEOUT 1460L
-#define ERROR_INVALID_MONITOR_HANDLE 1461L
-#define ERROR_INCORRECT_SIZE 1462L
-#define ERROR_EVENTLOG_FILE_CORRUPT 1500L
-#define ERROR_EVENTLOG_CANT_START 1501L
-#define ERROR_LOG_FILE_FULL 1502L
-#define ERROR_EVENTLOG_FILE_CHANGED 1503L
-#define ERROR_INSTALL_SERVICE_FAILURE 1601L
-#define ERROR_INSTALL_USEREXIT 1602L
-#define ERROR_INSTALL_FAILURE 1603L
-#define ERROR_INSTALL_SUSPEND 1604L
-#define ERROR_UNKNOWN_PRODUCT 1605L
-#define ERROR_UNKNOWN_FEATURE 1606L
-#define ERROR_UNKNOWN_COMPONENT 1607L
-#define ERROR_UNKNOWN_PROPERTY 1608L
-#define ERROR_INVALID_HANDLE_STATE 1609L
-#define ERROR_BAD_CONFIGURATION 1610L
-#define ERROR_INDEX_ABSENT 1611L
-#define ERROR_INSTALL_SOURCE_ABSENT 1612L
-#define ERROR_INSTALL_PACKAGE_VERSION 1613L
-#define ERROR_PRODUCT_UNINSTALLED 1614L
-#define ERROR_BAD_QUERY_SYNTAX 1615L
-#define ERROR_INVALID_FIELD 1616L
-#define ERROR_DEVICE_REMOVED 1617L
-#define ERROR_INSTALL_ALREADY_RUNNING 1618L
-#define ERROR_INSTALL_PACKAGE_OPEN_FAILED 1619L
-#define ERROR_INSTALL_PACKAGE_INVALID 1620L
-#define ERROR_INSTALL_UI_FAILURE 1621L
-#define ERROR_INSTALL_LOG_FAILURE 1622L
-#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED 1623L
-#define ERROR_INSTALL_TRANSFORM_FAILURE 1624L
-#define ERROR_INSTALL_PACKAGE_REJECTED 1625L
-#define ERROR_FUNCTION_NOT_CALLED 1626L
-#define ERROR_FUNCTION_FAILED 1627L
-#define ERROR_INVALID_TABLE 1628L
-#define ERROR_DATATYPE_MISMATCH 1629L
-#define ERROR_UNSUPPORTED_TYPE 1630L
-#define ERROR_CREATE_FAILED 1631L
-#define ERROR_INSTALL_TEMP_UNWRITABLE 1632L
-#define ERROR_INSTALL_PLATFORM_UNSUPPORTED 1633L
-#define ERROR_INSTALL_NOTUSED 1634L
-#define ERROR_PATCH_PACKAGE_OPEN_FAILED 1635L
-#define ERROR_PATCH_PACKAGE_INVALID 1636L
-#define ERROR_PATCH_PACKAGE_UNSUPPORTED 1637L
-#define ERROR_PRODUCT_VERSION 1638L
-#define ERROR_INVALID_COMMAND_LINE 1639L
-#define ERROR_INSTALL_REMOTE_DISALLOWED 1640L
-#define ERROR_SUCCESS_REBOOT_INITIATED 1641L
-#define ERROR_PATCH_TARGET_NOT_FOUND 1642L
-#define ERROR_PATCH_PACKAGE_REJECTED 1643L
-#define ERROR_INSTALL_TRANSFORM_REJECTED 1644L
-#define ERROR_INSTALL_REMOTE_PROHIBITED 1645L
-#define RPC_S_INVALID_STRING_BINDING 1700L
-#define RPC_S_WRONG_KIND_OF_BINDING 1701L
-#define RPC_S_INVALID_BINDING 1702L
-#define RPC_S_PROTSEQ_NOT_SUPPORTED 1703L
-#define RPC_S_INVALID_RPC_PROTSEQ 1704L
-#define RPC_S_INVALID_STRING_UUID 1705L
-#define RPC_S_INVALID_ENDPOINT_FORMAT 1706L
-#define RPC_S_INVALID_NET_ADDR 1707L
-#define RPC_S_NO_ENDPOINT_FOUND 1708L
-#define RPC_S_INVALID_TIMEOUT 1709L
-#define RPC_S_OBJECT_NOT_FOUND 1710L
-#define RPC_S_ALREADY_REGISTERED 1711L
-#define RPC_S_TYPE_ALREADY_REGISTERED 1712L
-#define RPC_S_ALREADY_LISTENING 1713L
-#define RPC_S_NO_PROTSEQS_REGISTERED 1714L
-#define RPC_S_NOT_LISTENING 1715L
-#define RPC_S_UNKNOWN_MGR_TYPE 1716L
-#define RPC_S_UNKNOWN_IF 1717L
-#define RPC_S_NO_BINDINGS 1718L
-#define RPC_S_NO_PROTSEQS 1719L
-#define RPC_S_CANT_CREATE_ENDPOINT 1720L
-#define RPC_S_OUT_OF_RESOURCES 1721L
-#define RPC_S_SERVER_UNAVAILABLE 1722L
-#define RPC_S_SERVER_TOO_BUSY 1723L
-#define RPC_S_INVALID_NETWORK_OPTIONS 1724L
-#define RPC_S_NO_CALL_ACTIVE 1725L
-#define RPC_S_CALL_FAILED 1726L
-#define RPC_S_CALL_FAILED_DNE 1727L
-#define RPC_S_PROTOCOL_ERROR 1728L
-#define RPC_S_UNSUPPORTED_TRANS_SYN 1730L
-#define RPC_S_UNSUPPORTED_TYPE 1732L
-#define RPC_S_INVALID_TAG 1733L
-#define RPC_S_INVALID_BOUND 1734L
-#define RPC_S_NO_ENTRY_NAME 1735L
-#define RPC_S_INVALID_NAME_SYNTAX 1736L
-#define RPC_S_UNSUPPORTED_NAME_SYNTAX 1737L
-#define RPC_S_UUID_NO_ADDRESS 1739L
-#define RPC_S_DUPLICATE_ENDPOINT 1740L
-#define RPC_S_UNKNOWN_AUTHN_TYPE 1741L
-#define RPC_S_MAX_CALLS_TOO_SMALL 1742L
-#define RPC_S_STRING_TOO_LONG 1743L
-#define RPC_S_PROTSEQ_NOT_FOUND 1744L
-#define RPC_S_PROCNUM_OUT_OF_RANGE 1745L
-#define RPC_S_BINDING_HAS_NO_AUTH 1746L
-#define RPC_S_UNKNOWN_AUTHN_SERVICE 1747L
-#define RPC_S_UNKNOWN_AUTHN_LEVEL 1748L
-#define RPC_S_INVALID_AUTH_IDENTITY 1749L
-#define RPC_S_UNKNOWN_AUTHZ_SERVICE 1750L
-#define EPT_S_INVALID_ENTRY 1751L
-#define EPT_S_CANT_PERFORM_OP 1752L
-#define EPT_S_NOT_REGISTERED 1753L
-#define RPC_S_NOTHING_TO_EXPORT 1754L
-#define RPC_S_INCOMPLETE_NAME 1755L
-#define RPC_S_INVALID_VERS_OPTION 1756L
-#define RPC_S_NO_MORE_MEMBERS 1757L
-#define RPC_S_NOT_ALL_OBJS_UNEXPORTED 1758L
-#define RPC_S_INTERFACE_NOT_FOUND 1759L
-#define RPC_S_ENTRY_ALREADY_EXISTS 1760L
-#define RPC_S_ENTRY_NOT_FOUND 1761L
-#define RPC_S_NAME_SERVICE_UNAVAILABLE 1762L
-#define RPC_S_INVALID_NAF_ID 1763L
-#define RPC_S_CANNOT_SUPPORT 1764L
-#define RPC_S_NO_CONTEXT_AVAILABLE 1765L
-#define RPC_S_INTERNAL_ERROR 1766L
-#define RPC_S_ZERO_DIVIDE 1767L
-#define RPC_S_ADDRESS_ERROR 1768L
-#define RPC_S_FP_DIV_ZERO 1769L
-#define RPC_S_FP_UNDERFLOW 1770L
-#define RPC_S_FP_OVERFLOW 1771L
-#define RPC_X_NO_MORE_ENTRIES 1772L
-#define RPC_X_SS_CHAR_TRANS_OPEN_FAIL 1773L
-#define RPC_X_SS_CHAR_TRANS_SHORT_FILE 1774L
-#define RPC_X_SS_IN_NULL_CONTEXT 1775L
-#define RPC_X_SS_CONTEXT_DAMAGED 1777L
-#define RPC_X_SS_HANDLES_MISMATCH 1778L
-#define RPC_X_SS_CANNOT_GET_CALL_HANDLE 1779L
-#define RPC_X_NULL_REF_POINTER 1780L
-#define RPC_X_ENUM_VALUE_OUT_OF_RANGE 1781L
-#define RPC_X_BYTE_COUNT_TOO_SMALL 1782L
-#define RPC_X_BAD_STUB_DATA 1783L
-#define ERROR_INVALID_USER_BUFFER 1784L
-#define ERROR_UNRECOGNIZED_MEDIA 1785L
-#define ERROR_NO_TRUST_LSA_SECRET 1786L
-#define ERROR_NO_TRUST_SAM_ACCOUNT 1787L
-#define ERROR_TRUSTED_DOMAIN_FAILURE 1788L
-#define ERROR_TRUSTED_RELATIONSHIP_FAILURE 1789L
-#define ERROR_TRUST_FAILURE 1790L
-#define RPC_S_CALL_IN_PROGRESS 1791L
-#define ERROR_NETLOGON_NOT_STARTED 1792L
-#define ERROR_ACCOUNT_EXPIRED 1793L
-#define ERROR_REDIRECTOR_HAS_OPEN_HANDLES 1794L
-#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED 1795L
-#define ERROR_UNKNOWN_PORT 1796L
-#define ERROR_UNKNOWN_PRINTER_DRIVER 1797L
-#define ERROR_UNKNOWN_PRINTPROCESSOR 1798L
-#define ERROR_INVALID_SEPARATOR_FILE 1799L
-#define ERROR_INVALID_PRIORITY 1800L
-#define ERROR_INVALID_PRINTER_NAME 1801L
-#define ERROR_PRINTER_ALREADY_EXISTS 1802L
-#define ERROR_INVALID_PRINTER_COMMAND 1803L
-#define ERROR_INVALID_DATATYPE 1804L
-#define ERROR_INVALID_ENVIRONMENT 1805L
-#define RPC_S_NO_MORE_BINDINGS 1806L
-#define ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 1807L
-#define ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT 1808L
-#define ERROR_NOLOGON_SERVER_TRUST_ACCOUNT 1809L
-#define ERROR_DOMAIN_TRUST_INCONSISTENT 1810L
-#define ERROR_SERVER_HAS_OPEN_HANDLES 1811L
-#define ERROR_RESOURCE_DATA_NOT_FOUND 1812L
-#define ERROR_RESOURCE_TYPE_NOT_FOUND 1813L
-#define ERROR_RESOURCE_NAME_NOT_FOUND 1814L
-#define ERROR_RESOURCE_LANG_NOT_FOUND 1815L
-#define ERROR_NOT_ENOUGH_QUOTA 1816L
-#define RPC_S_NO_INTERFACES 1817L
-#define RPC_S_CALL_CANCELLED 1818L
-#define RPC_S_BINDING_INCOMPLETE 1819L
-#define RPC_S_COMM_FAILURE 1820L
-#define RPC_S_UNSUPPORTED_AUTHN_LEVEL 1821L
-#define RPC_S_NO_PRINC_NAME 1822L
-#define RPC_S_NOT_RPC_ERROR 1823L
-#define RPC_S_UUID_LOCAL_ONLY 1824L
-#define RPC_S_SEC_PKG_ERROR 1825L
-#define RPC_S_NOT_CANCELLED 1826L
-#define RPC_X_INVALID_ES_ACTION 1827L
-#define RPC_X_WRONG_ES_VERSION 1828L
-#define RPC_X_WRONG_STUB_VERSION 1829L
-#define RPC_X_INVALID_PIPE_OBJECT 1830L
-#define RPC_X_WRONG_PIPE_ORDER 1831L
-#define RPC_X_WRONG_PIPE_VERSION 1832L
-#define RPC_S_GROUP_MEMBER_NOT_FOUND 1898L
-#define EPT_S_CANT_CREATE 1899L
-#define RPC_S_INVALID_OBJECT 1900L
-#define ERROR_INVALID_TIME 1901L
-#define ERROR_INVALID_FORM_NAME 1902L
-#define ERROR_INVALID_FORM_SIZE 1903L
-#define ERROR_ALREADY_WAITING 1904L
-#define ERROR_PRINTER_DELETED 1905L
-#define ERROR_INVALID_PRINTER_STATE 1906L
-#define ERROR_PASSWORD_MUST_CHANGE 1907L
-#define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L
-#define ERROR_ACCOUNT_LOCKED_OUT 1909L
-#define OR_INVALID_OXID 1910L
-#define OR_INVALID_OID 1911L
-#define OR_INVALID_SET 1912L
-#define RPC_S_SEND_INCOMPLETE 1913L
-#define RPC_S_INVALID_ASYNC_HANDLE 1914L
-#define RPC_S_INVALID_ASYNC_CALL 1915L
-#define RPC_X_PIPE_CLOSED 1916L
-#define RPC_X_PIPE_DISCIPLINE_ERROR 1917L
-#define RPC_X_PIPE_EMPTY 1918L
-#define ERROR_NO_SITENAME 1919L
-#define ERROR_CANT_ACCESS_FILE 1920L
-#define ERROR_CANT_RESOLVE_FILENAME 1921L
-#define RPC_S_ENTRY_TYPE_MISMATCH 1922L
-#define RPC_S_NOT_ALL_OBJS_EXPORTED 1923L
-#define RPC_S_INTERFACE_NOT_EXPORTED 1924L
-#define RPC_S_PROFILE_NOT_ADDED 1925L
-#define RPC_S_PRF_ELT_NOT_ADDED 1926L
-#define RPC_S_PRF_ELT_NOT_REMOVED 1927L
-#define RPC_S_GRP_ELT_NOT_ADDED 1928L
-#define RPC_S_GRP_ELT_NOT_REMOVED 1929L
-#define ERROR_KM_DRIVER_BLOCKED 1930L
-#define ERROR_CONTEXT_EXPIRED 1931L
-#define ERROR_PER_USER_TRUST_QUOTA_EXCEEDED 1932L
-#define ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED 1933L
-#define ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED 1934L
-#define ERROR_AUTHENTICATION_FIREWALL_FAILED 1935L
-#define ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED 1936L
-#define ERROR_INVALID_PIXEL_FORMAT 2000L
-#define ERROR_BAD_DRIVER 2001L
-#define ERROR_INVALID_WINDOW_STYLE 2002L
-#define ERROR_METAFILE_NOT_SUPPORTED 2003L
-#define ERROR_TRANSFORM_NOT_SUPPORTED 2004L
-#define ERROR_CLIPPING_NOT_SUPPORTED 2005L
-#define ERROR_INVALID_CMM 2010L
-#define ERROR_INVALID_PROFILE 2011L
-#define ERROR_TAG_NOT_FOUND 2012L
-#define ERROR_TAG_NOT_PRESENT 2013L
-#define ERROR_DUPLICATE_TAG 2014L
-#define ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE 2015L
-#define ERROR_PROFILE_NOT_FOUND 2016L
-#define ERROR_INVALID_COLORSPACE 2017L
-#define ERROR_ICM_NOT_ENABLED 2018L
-#define ERROR_DELETING_ICM_XFORM 2019L
-#define ERROR_INVALID_TRANSFORM 2020L
-#define ERROR_COLORSPACE_MISMATCH 2021L
-#define ERROR_INVALID_COLORINDEX 2022L
-#define ERROR_CONNECTED_OTHER_PASSWORD 2108L
-#define ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT 2109L
-#define ERROR_BAD_USERNAME 2202L
-#define ERROR_NOT_CONNECTED 2250L
-#define ERROR_OPEN_FILES 2401L
-#define ERROR_ACTIVE_CONNECTIONS 2402L
-#define ERROR_DEVICE_IN_USE 2404L
-#define ERROR_UNKNOWN_PRINT_MONITOR 3000L
-#define ERROR_PRINTER_DRIVER_IN_USE 3001L
-#define ERROR_SPOOL_FILE_NOT_FOUND 3002L
-#define ERROR_SPL_NO_STARTDOC 3003L
-#define ERROR_SPL_NO_ADDJOB 3004L
-#define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED 3005L
-#define ERROR_PRINT_MONITOR_ALREADY_INSTALLED 3006L
-#define ERROR_INVALID_PRINT_MONITOR 3007L
-#define ERROR_PRINT_MONITOR_IN_USE 3008L
-#define ERROR_PRINTER_HAS_JOBS_QUEUED 3009L
-#define ERROR_SUCCESS_REBOOT_REQUIRED 3010L
-#define ERROR_SUCCESS_RESTART_REQUIRED 3011L
-#define ERROR_PRINTER_NOT_FOUND 3012L
-#define ERROR_PRINTER_DRIVER_WARNED 3013L
-#define ERROR_PRINTER_DRIVER_BLOCKED 3014L
-#define ERROR_WINS_INTERNAL 4000L
-#define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001L
-#define ERROR_STATIC_INIT 4002L
-#define ERROR_INC_BACKUP 4003L
-#define ERROR_FULL_BACKUP 4004L
-#define ERROR_REC_NON_EXISTENT 4005L
-#define ERROR_RPL_NOT_ALLOWED 4006L
-#define ERROR_DHCP_ADDRESS_CONFLICT 4100L
-#define ERROR_WMI_GUID_NOT_FOUND 4200L
-#define ERROR_WMI_INSTANCE_NOT_FOUND 4201L
-#define ERROR_WMI_ITEMID_NOT_FOUND 4202L
-#define ERROR_WMI_TRY_AGAIN 4203L
-#define ERROR_WMI_DP_NOT_FOUND 4204L
-#define ERROR_WMI_UNRESOLVED_INSTANCE_REF 4205L
-#define ERROR_WMI_ALREADY_ENABLED 4206L
-#define ERROR_WMI_GUID_DISCONNECTED 4207L
-#define ERROR_WMI_SERVER_UNAVAILABLE 4208L
-#define ERROR_WMI_DP_FAILED 4209L
-#define ERROR_WMI_INVALID_MOF 4210L
-#define ERROR_WMI_INVALID_REGINFO 4211L
-#define ERROR_WMI_ALREADY_DISABLED 4212L
-#define ERROR_WMI_READ_ONLY 4213L
-#define ERROR_WMI_SET_FAILURE 4214L
-#define ERROR_INVALID_MEDIA 4300L
-#define ERROR_INVALID_LIBRARY 4301L
-#define ERROR_INVALID_MEDIA_POOL 4302L
-#define ERROR_DRIVE_MEDIA_MISMATCH 4303L
-#define ERROR_MEDIA_OFFLINE 4304L
-#define ERROR_LIBRARY_OFFLINE 4305L
-#define ERROR_EMPTY 4306L
-#define ERROR_NOT_EMPTY 4307L
-#define ERROR_MEDIA_UNAVAILABLE 4308L
-#define ERROR_RESOURCE_DISABLED 4309L
-#define ERROR_INVALID_CLEANER 4310L
-#define ERROR_UNABLE_TO_CLEAN 4311L
-#define ERROR_OBJECT_NOT_FOUND 4312L
-#define ERROR_DATABASE_FAILURE 4313L
-#define ERROR_DATABASE_FULL 4314L
-#define ERROR_MEDIA_INCOMPATIBLE 4315L
-#define ERROR_RESOURCE_NOT_PRESENT 4316L
-#define ERROR_INVALID_OPERATION 4317L
-#define ERROR_MEDIA_NOT_AVAILABLE 4318L
-#define ERROR_DEVICE_NOT_AVAILABLE 4319L
-#define ERROR_REQUEST_REFUSED 4320L
-#define ERROR_INVALID_DRIVE_OBJECT 4321L
-#define ERROR_LIBRARY_FULL 4322L
-#define ERROR_MEDIUM_NOT_ACCESSIBLE 4323L
-#define ERROR_UNABLE_TO_LOAD_MEDIUM 4324L
-#define ERROR_UNABLE_TO_INVENTORY_DRIVE 4325L
-#define ERROR_UNABLE_TO_INVENTORY_SLOT 4326L
-#define ERROR_UNABLE_TO_INVENTORY_TRANSPORT 4327L
-#define ERROR_TRANSPORT_FULL 4328L
-#define ERROR_CONTROLLING_IEPORT 4329L
-#define ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA 4330L
-#define ERROR_CLEANER_SLOT_SET 4331L
-#define ERROR_CLEANER_SLOT_NOT_SET 4332L
-#define ERROR_CLEANER_CARTRIDGE_SPENT 4333L
-#define ERROR_UNEXPECTED_OMID 4334L
-#define ERROR_CANT_DELETE_LAST_ITEM 4335L
-#define ERROR_MESSAGE_EXCEEDS_MAX_SIZE 4336L
-#define ERROR_VOLUME_CONTAINS_SYS_FILES 4337L
-#define ERROR_INDIGENOUS_TYPE 4338L
-#define ERROR_NO_SUPPORTING_DRIVES 4339L
-#define ERROR_CLEANER_CARTRIDGE_INSTALLED 4340L
-#define ERROR_IEPORT_FULL 4341L
-#define ERROR_FILE_OFFLINE 4350L
-#define ERROR_REMOTE_STORAGE_NOT_ACTIVE 4351L
-#define ERROR_REMOTE_STORAGE_MEDIA_ERROR 4352L
-#define ERROR_NOT_A_REPARSE_POINT 4390L
-#define ERROR_REPARSE_ATTRIBUTE_CONFLICT 4391L
-#define ERROR_INVALID_REPARSE_DATA 4392L
-#define ERROR_REPARSE_TAG_INVALID 4393L
-#define ERROR_REPARSE_TAG_MISMATCH 4394L
-#define ERROR_VOLUME_NOT_SIS_ENABLED 4500L
-#define ERROR_DEPENDENT_RESOURCE_EXISTS 5001L
-#define ERROR_DEPENDENCY_NOT_FOUND 5002L
-#define ERROR_DEPENDENCY_ALREADY_EXISTS 5003L
-#define ERROR_RESOURCE_NOT_ONLINE 5004L
-#define ERROR_HOST_NODE_NOT_AVAILABLE 5005L
-#define ERROR_RESOURCE_NOT_AVAILABLE 5006L
-#define ERROR_RESOURCE_NOT_FOUND 5007L
-#define ERROR_SHUTDOWN_CLUSTER 5008L
-#define ERROR_CANT_EVICT_ACTIVE_NODE 5009L
-#define ERROR_OBJECT_ALREADY_EXISTS 5010L
-#define ERROR_OBJECT_IN_LIST 5011L
-#define ERROR_GROUP_NOT_AVAILABLE 5012L
-#define ERROR_GROUP_NOT_FOUND 5013L
-#define ERROR_GROUP_NOT_ONLINE 5014L
-#define ERROR_HOST_NODE_NOT_RESOURCE_OWNER 5015L
-#define ERROR_HOST_NODE_NOT_GROUP_OWNER 5016L
-#define ERROR_RESMON_CREATE_FAILED 5017L
-#define ERROR_RESMON_ONLINE_FAILED 5018L
-#define ERROR_RESOURCE_ONLINE 5019L
-#define ERROR_QUORUM_RESOURCE 5020L
-#define ERROR_NOT_QUORUM_CAPABLE 5021L
-#define ERROR_CLUSTER_SHUTTING_DOWN 5022L
-#define ERROR_INVALID_STATE 5023L
-#define ERROR_RESOURCE_PROPERTIES_STORED 5024L
-#define ERROR_NOT_QUORUM_CLASS 5025L
-#define ERROR_CORE_RESOURCE 5026L
-#define ERROR_QUORUM_RESOURCE_ONLINE_FAILED 5027L
-#define ERROR_QUORUMLOG_OPEN_FAILED 5028L
-#define ERROR_CLUSTERLOG_CORRUPT 5029L
-#define ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE 5030L
-#define ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE 5031L
-#define ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND 5032L
-#define ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE 5033L
-#define ERROR_QUORUM_OWNER_ALIVE 5034L
-#define ERROR_NETWORK_NOT_AVAILABLE 5035L
-#define ERROR_NODE_NOT_AVAILABLE 5036L
-#define ERROR_ALL_NODES_NOT_AVAILABLE 5037L
-#define ERROR_RESOURCE_FAILED 5038L
-#define ERROR_CLUSTER_INVALID_NODE 5039L
-#define ERROR_CLUSTER_NODE_EXISTS 5040L
-#define ERROR_CLUSTER_JOIN_IN_PROGRESS 5041L
-#define ERROR_CLUSTER_NODE_NOT_FOUND 5042L
-#define ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND 5043L
-#define ERROR_CLUSTER_NETWORK_EXISTS 5044L
-#define ERROR_CLUSTER_NETWORK_NOT_FOUND 5045L
-#define ERROR_CLUSTER_NETINTERFACE_EXISTS 5046L
-#define ERROR_CLUSTER_NETINTERFACE_NOT_FOUND 5047L
-#define ERROR_CLUSTER_INVALID_REQUEST 5048L
-#define ERROR_CLUSTER_INVALID_NETWORK_PROVIDER 5049L
-#define ERROR_CLUSTER_NODE_DOWN 5050L
-#define ERROR_CLUSTER_NODE_UNREACHABLE 5051L
-#define ERROR_CLUSTER_NODE_NOT_MEMBER 5052L
-#define ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS 5053L
-#define ERROR_CLUSTER_INVALID_NETWORK 5054L
-#define ERROR_CLUSTER_NODE_UP 5056L
-#define ERROR_CLUSTER_IPADDR_IN_USE 5057L
-#define ERROR_CLUSTER_NODE_NOT_PAUSED 5058L
-#define ERROR_CLUSTER_NO_SECURITY_CONTEXT 5059L
-#define ERROR_CLUSTER_NETWORK_NOT_INTERNAL 5060L
-#define ERROR_CLUSTER_NODE_ALREADY_UP 5061L
-#define ERROR_CLUSTER_NODE_ALREADY_DOWN 5062L
-#define ERROR_CLUSTER_NETWORK_ALREADY_ONLINE 5063L
-#define ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE 5064L
-#define ERROR_CLUSTER_NODE_ALREADY_MEMBER 5065L
-#define ERROR_CLUSTER_LAST_INTERNAL_NETWORK 5066L
-#define ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS 5067L
-#define ERROR_INVALID_OPERATION_ON_QUORUM 5068L
-#define ERROR_DEPENDENCY_NOT_ALLOWED 5069L
-#define ERROR_CLUSTER_NODE_PAUSED 5070L
-#define ERROR_NODE_CANT_HOST_RESOURCE 5071L
-#define ERROR_CLUSTER_NODE_NOT_READY 5072L
-#define ERROR_CLUSTER_NODE_SHUTTING_DOWN 5073L
-#define ERROR_CLUSTER_JOIN_ABORTED 5074L
-#define ERROR_CLUSTER_INCOMPATIBLE_VERSIONS 5075L
-#define ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED 5076L
-#define ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED 5077L
-#define ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND 5078L
-#define ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED 5079L
-#define ERROR_CLUSTER_RESNAME_NOT_FOUND 5080L
-#define ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED 5081L
-#define ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST 5082L
-#define ERROR_CLUSTER_DATABASE_SEQMISMATCH 5083L
-#define ERROR_RESMON_INVALID_STATE 5084L
-#define ERROR_CLUSTER_GUM_NOT_LOCKER 5085L
-#define ERROR_QUORUM_DISK_NOT_FOUND 5086L
-#define ERROR_DATABASE_BACKUP_CORRUPT 5087L
-#define ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT 5088L
-#define ERROR_RESOURCE_PROPERTY_UNCHANGEABLE 5089L
-#define ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE 5890L
-#define ERROR_CLUSTER_QUORUMLOG_NOT_FOUND 5891L
-#define ERROR_CLUSTER_MEMBERSHIP_HALT 5892L
-#define ERROR_CLUSTER_INSTANCE_ID_MISMATCH 5893L
-#define ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP 5894L
-#define ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH 5895L
-#define ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP 5896L
-#define ERROR_CLUSTER_PARAMETER_MISMATCH 5897L
-#define ERROR_NODE_CANNOT_BE_CLUSTERED 5898L
-#define ERROR_CLUSTER_WRONG_OS_VERSION 5899L
-#define ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME 5900L
-#define ERROR_CLUSCFG_ALREADY_COMMITTED 5901L
-#define ERROR_CLUSCFG_ROLLBACK_FAILED 5902L
-#define ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT 5903L
-#define ERROR_CLUSTER_OLD_VERSION 5904L
-#define ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME 5905L
-#define ERROR_ENCRYPTION_FAILED 6000L
-#define ERROR_DECRYPTION_FAILED 6001L
-#define ERROR_FILE_ENCRYPTED 6002L
-#define ERROR_NO_RECOVERY_POLICY 6003L
-#define ERROR_NO_EFS 6004L
-#define ERROR_WRONG_EFS 6005L
-#define ERROR_NO_USER_KEYS 6006L
-#define ERROR_FILE_NOT_ENCRYPTED 6007L
-#define ERROR_NOT_EXPORT_FORMAT 6008L
-#define ERROR_FILE_READ_ONLY 6009L
-#define ERROR_DIR_EFS_DISALLOWED 6010L
-#define ERROR_EFS_SERVER_NOT_TRUSTED 6011L
-#define ERROR_BAD_RECOVERY_POLICY 6012L
-#define ERROR_EFS_ALG_BLOB_TOO_BIG 6013L
-#define ERROR_VOLUME_NOT_SUPPORT_EFS 6014L
-#define ERROR_EFS_DISABLED 6015L
-#define ERROR_EFS_VERSION_NOT_SUPPORT 6016L
-#define ERROR_NO_BROWSER_SERVERS_FOUND 6118L
-#define SCHED_E_SERVICE_NOT_LOCALSYSTEM 6200L
-#define ERROR_CTX_WINSTATION_NAME_INVALID 7001L
-#define ERROR_CTX_INVALID_PD 7002L
-#define ERROR_CTX_PD_NOT_FOUND 7003L
-#define ERROR_CTX_WD_NOT_FOUND 7004L
-#define ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY 7005L
-#define ERROR_CTX_SERVICE_NAME_COLLISION 7006L
-#define ERROR_CTX_CLOSE_PENDING 7007L
-#define ERROR_CTX_NO_OUTBUF 7008L
-#define ERROR_CTX_MODEM_INF_NOT_FOUND 7009L
-#define ERROR_CTX_INVALID_MODEMNAME 7010L
-#define ERROR_CTX_MODEM_RESPONSE_ERROR 7011L
-#define ERROR_CTX_MODEM_RESPONSE_TIMEOUT 7012L
-#define ERROR_CTX_MODEM_RESPONSE_NO_CARRIER 7013L
-#define ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE 7014L
-#define ERROR_CTX_MODEM_RESPONSE_BUSY 7015L
-#define ERROR_CTX_MODEM_RESPONSE_VOICE 7016L
-#define ERROR_CTX_TD_ERROR 7017L
-#define ERROR_CTX_WINSTATION_NOT_FOUND 7022L
-#define ERROR_CTX_WINSTATION_ALREADY_EXISTS 7023L
-#define ERROR_CTX_WINSTATION_BUSY 7024L
-#define ERROR_CTX_BAD_VIDEO_MODE 7025L
-#define ERROR_CTX_GRAPHICS_INVALID 7035L
-#define ERROR_CTX_LOGON_DISABLED 7037L
-#define ERROR_CTX_NOT_CONSOLE 7038L
-#define ERROR_CTX_CLIENT_QUERY_TIMEOUT 7040L
-#define ERROR_CTX_CONSOLE_DISCONNECT 7041L
-#define ERROR_CTX_CONSOLE_CONNECT 7042L
-#define ERROR_CTX_SHADOW_DENIED 7044L
-#define ERROR_CTX_WINSTATION_ACCESS_DENIED 7045L
-#define ERROR_CTX_INVALID_WD 7049L
-#define ERROR_CTX_SHADOW_INVALID 7050L
-#define ERROR_CTX_SHADOW_DISABLED 7051L
-#define ERROR_CTX_CLIENT_LICENSE_IN_USE 7052L
-#define ERROR_CTX_CLIENT_LICENSE_NOT_SET 7053L
-#define ERROR_CTX_LICENSE_NOT_AVAILABLE 7054L
-#define ERROR_CTX_LICENSE_CLIENT_INVALID 7055L
-#define ERROR_CTX_LICENSE_EXPIRED 7056L
-#define ERROR_CTX_SHADOW_NOT_RUNNING 7057L
-#define ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE 7058L
-#define ERROR_ACTIVATION_COUNT_EXCEEDED 7059L
-#define FRS_ERR_INVALID_API_SEQUENCE 8001L
-#define FRS_ERR_STARTING_SERVICE 8002L
-#define FRS_ERR_STOPPING_SERVICE 8003L
-#define FRS_ERR_INTERNAL_API 8004L
-#define FRS_ERR_INTERNAL 8005L
-#define FRS_ERR_SERVICE_COMM 8006L
-#define FRS_ERR_INSUFFICIENT_PRIV 8007L
-#define FRS_ERR_AUTHENTICATION 8008L
-#define FRS_ERR_PARENT_INSUFFICIENT_PRIV 8009L
-#define FRS_ERR_PARENT_AUTHENTICATION 8010L
-#define FRS_ERR_CHILD_TO_PARENT_COMM 8011L
-#define FRS_ERR_PARENT_TO_CHILD_COMM 8012L
-#define FRS_ERR_SYSVOL_POPULATE 8013L
-#define FRS_ERR_SYSVOL_POPULATE_TIMEOUT 8014L
-#define FRS_ERR_SYSVOL_IS_BUSY 8015L
-#define FRS_ERR_SYSVOL_DEMOTE 8016L
-#define FRS_ERR_INVALID_SERVICE_PARAMETER 8017L
+#define ERROR_INVALID_FUNCTION __MSABI_LONG(1)
+#define ERROR_FILE_NOT_FOUND __MSABI_LONG(2)
+#define ERROR_PATH_NOT_FOUND __MSABI_LONG(3)
+#define ERROR_TOO_MANY_OPEN_FILES __MSABI_LONG(4)
+#define ERROR_ACCESS_DENIED __MSABI_LONG(5)
+#define ERROR_INVALID_HANDLE __MSABI_LONG(6)
+#define ERROR_ARENA_TRASHED __MSABI_LONG(7)
+#define ERROR_NOT_ENOUGH_MEMORY __MSABI_LONG(8)
+#define ERROR_INVALID_BLOCK __MSABI_LONG(9)
+#define ERROR_BAD_ENVIRONMENT __MSABI_LONG(10)
+#define ERROR_BAD_FORMAT __MSABI_LONG(11)
+#define ERROR_INVALID_ACCESS __MSABI_LONG(12)
+#define ERROR_INVALID_DATA __MSABI_LONG(13)
+#define ERROR_OUTOFMEMORY __MSABI_LONG(14)
+#define ERROR_INVALID_DRIVE __MSABI_LONG(15)
+#define ERROR_CURRENT_DIRECTORY __MSABI_LONG(16)
+#define ERROR_NOT_SAME_DEVICE __MSABI_LONG(17)
+#define ERROR_NO_MORE_FILES __MSABI_LONG(18)
+#define ERROR_WRITE_PROTECT __MSABI_LONG(19)
+#define ERROR_BAD_UNIT __MSABI_LONG(20)
+#define ERROR_NOT_READY __MSABI_LONG(21)
+#define ERROR_BAD_COMMAND __MSABI_LONG(22)
+#define ERROR_CRC __MSABI_LONG(23)
+#define ERROR_BAD_LENGTH __MSABI_LONG(24)
+#define ERROR_SEEK __MSABI_LONG(25)
+#define ERROR_NOT_DOS_DISK __MSABI_LONG(26)
+#define ERROR_SECTOR_NOT_FOUND __MSABI_LONG(27)
+#define ERROR_OUT_OF_PAPER __MSABI_LONG(28)
+#define ERROR_WRITE_FAULT __MSABI_LONG(29)
+#define ERROR_READ_FAULT __MSABI_LONG(30)
+#define ERROR_GEN_FAILURE __MSABI_LONG(31)
+#define ERROR_SHARING_VIOLATION __MSABI_LONG(32)
+#define ERROR_LOCK_VIOLATION __MSABI_LONG(33)
+#define ERROR_WRONG_DISK __MSABI_LONG(34)
+#define ERROR_SHARING_BUFFER_EXCEEDED __MSABI_LONG(36)
+#define ERROR_HANDLE_EOF __MSABI_LONG(38)
+#define ERROR_HANDLE_DISK_FULL __MSABI_LONG(39)
+#define ERROR_NOT_SUPPORTED __MSABI_LONG(50)
+#define ERROR_REM_NOT_LIST __MSABI_LONG(51)
+#define ERROR_DUP_NAME __MSABI_LONG(52)
+#define ERROR_BAD_NETPATH __MSABI_LONG(53)
+#define ERROR_NETWORK_BUSY __MSABI_LONG(54)
+#define ERROR_DEV_NOT_EXIST __MSABI_LONG(55)
+#define ERROR_TOO_MANY_CMDS __MSABI_LONG(56)
+#define ERROR_ADAP_HDW_ERR __MSABI_LONG(57)
+#define ERROR_BAD_NET_RESP __MSABI_LONG(58)
+#define ERROR_UNEXP_NET_ERR __MSABI_LONG(59)
+#define ERROR_BAD_REM_ADAP __MSABI_LONG(60)
+#define ERROR_PRINTQ_FULL __MSABI_LONG(61)
+#define ERROR_NO_SPOOL_SPACE __MSABI_LONG(62)
+#define ERROR_PRINT_CANCELLED __MSABI_LONG(63)
+#define ERROR_NETNAME_DELETED __MSABI_LONG(64)
+#define ERROR_NETWORK_ACCESS_DENIED __MSABI_LONG(65)
+#define ERROR_BAD_DEV_TYPE __MSABI_LONG(66)
+#define ERROR_BAD_NET_NAME __MSABI_LONG(67)
+#define ERROR_TOO_MANY_NAMES __MSABI_LONG(68)
+#define ERROR_TOO_MANY_SESS __MSABI_LONG(69)
+#define ERROR_SHARING_PAUSED __MSABI_LONG(70)
+#define ERROR_REQ_NOT_ACCEP __MSABI_LONG(71)
+#define ERROR_REDIR_PAUSED __MSABI_LONG(72)
+#define ERROR_FILE_EXISTS __MSABI_LONG(80)
+#define ERROR_CANNOT_MAKE __MSABI_LONG(82)
+#define ERROR_FAIL_I24 __MSABI_LONG(83)
+#define ERROR_OUT_OF_STRUCTURES __MSABI_LONG(84)
+#define ERROR_ALREADY_ASSIGNED __MSABI_LONG(85)
+#define ERROR_INVALID_PASSWORD __MSABI_LONG(86)
+#define ERROR_INVALID_PARAMETER __MSABI_LONG(87)
+#define ERROR_NET_WRITE_FAULT __MSABI_LONG(88)
+#define ERROR_NO_PROC_SLOTS __MSABI_LONG(89)
+#define ERROR_TOO_MANY_SEMAPHORES __MSABI_LONG(100)
+#define ERROR_EXCL_SEM_ALREADY_OWNED __MSABI_LONG(101)
+#define ERROR_SEM_IS_SET __MSABI_LONG(102)
+#define ERROR_TOO_MANY_SEM_REQUESTS __MSABI_LONG(103)
+#define ERROR_INVALID_AT_INTERRUPT_TIME __MSABI_LONG(104)
+#define ERROR_SEM_OWNER_DIED __MSABI_LONG(105)
+#define ERROR_SEM_USER_LIMIT __MSABI_LONG(106)
+#define ERROR_DISK_CHANGE __MSABI_LONG(107)
+#define ERROR_DRIVE_LOCKED __MSABI_LONG(108)
+#define ERROR_BROKEN_PIPE __MSABI_LONG(109)
+#define ERROR_OPEN_FAILED __MSABI_LONG(110)
+#define ERROR_BUFFER_OVERFLOW __MSABI_LONG(111)
+#define ERROR_DISK_FULL __MSABI_LONG(112)
+#define ERROR_NO_MORE_SEARCH_HANDLES __MSABI_LONG(113)
+#define ERROR_INVALID_TARGET_HANDLE __MSABI_LONG(114)
+#define ERROR_INVALID_CATEGORY __MSABI_LONG(117)
+#define ERROR_INVALID_VERIFY_SWITCH __MSABI_LONG(118)
+#define ERROR_BAD_DRIVER_LEVEL __MSABI_LONG(119)
+#define ERROR_CALL_NOT_IMPLEMENTED __MSABI_LONG(120)
+#define ERROR_SEM_TIMEOUT __MSABI_LONG(121)
+#define ERROR_INSUFFICIENT_BUFFER __MSABI_LONG(122)
+#define ERROR_INVALID_NAME __MSABI_LONG(123)
+#define ERROR_INVALID_LEVEL __MSABI_LONG(124)
+#define ERROR_NO_VOLUME_LABEL __MSABI_LONG(125)
+#define ERROR_MOD_NOT_FOUND __MSABI_LONG(126)
+#define ERROR_PROC_NOT_FOUND __MSABI_LONG(127)
+#define ERROR_WAIT_NO_CHILDREN __MSABI_LONG(128)
+#define ERROR_CHILD_NOT_COMPLETE __MSABI_LONG(129)
+#define ERROR_DIRECT_ACCESS_HANDLE __MSABI_LONG(130)
+#define ERROR_NEGATIVE_SEEK __MSABI_LONG(131)
+#define ERROR_SEEK_ON_DEVICE __MSABI_LONG(132)
+#define ERROR_IS_JOIN_TARGET __MSABI_LONG(133)
+#define ERROR_IS_JOINED __MSABI_LONG(134)
+#define ERROR_IS_SUBSTED __MSABI_LONG(135)
+#define ERROR_NOT_JOINED __MSABI_LONG(136)
+#define ERROR_NOT_SUBSTED __MSABI_LONG(137)
+#define ERROR_JOIN_TO_JOIN __MSABI_LONG(138)
+#define ERROR_SUBST_TO_SUBST __MSABI_LONG(139)
+#define ERROR_JOIN_TO_SUBST __MSABI_LONG(140)
+#define ERROR_SUBST_TO_JOIN __MSABI_LONG(141)
+#define ERROR_BUSY_DRIVE __MSABI_LONG(142)
+#define ERROR_SAME_DRIVE __MSABI_LONG(143)
+#define ERROR_DIR_NOT_ROOT __MSABI_LONG(144)
+#define ERROR_DIR_NOT_EMPTY __MSABI_LONG(145)
+#define ERROR_IS_SUBST_PATH __MSABI_LONG(146)
+#define ERROR_IS_JOIN_PATH __MSABI_LONG(147)
+#define ERROR_PATH_BUSY __MSABI_LONG(148)
+#define ERROR_IS_SUBST_TARGET __MSABI_LONG(149)
+#define ERROR_SYSTEM_TRACE __MSABI_LONG(150)
+#define ERROR_INVALID_EVENT_COUNT __MSABI_LONG(151)
+#define ERROR_TOO_MANY_MUXWAITERS __MSABI_LONG(152)
+#define ERROR_INVALID_LIST_FORMAT __MSABI_LONG(153)
+#define ERROR_LABEL_TOO_LONG __MSABI_LONG(154)
+#define ERROR_TOO_MANY_TCBS __MSABI_LONG(155)
+#define ERROR_SIGNAL_REFUSED __MSABI_LONG(156)
+#define ERROR_DISCARDED __MSABI_LONG(157)
+#define ERROR_NOT_LOCKED __MSABI_LONG(158)
+#define ERROR_BAD_THREADID_ADDR __MSABI_LONG(159)
+#define ERROR_BAD_ARGUMENTS __MSABI_LONG(160)
+#define ERROR_BAD_PATHNAME __MSABI_LONG(161)
+#define ERROR_SIGNAL_PENDING __MSABI_LONG(162)
+#define ERROR_MAX_THRDS_REACHED __MSABI_LONG(164)
+#define ERROR_LOCK_FAILED __MSABI_LONG(167)
+#define ERROR_BUSY __MSABI_LONG(170)
+#define ERROR_CANCEL_VIOLATION __MSABI_LONG(173)
+#define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED __MSABI_LONG(174)
+#define ERROR_INVALID_SEGMENT_NUMBER __MSABI_LONG(180)
+#define ERROR_INVALID_ORDINAL __MSABI_LONG(182)
+#define ERROR_ALREADY_EXISTS __MSABI_LONG(183)
+#define ERROR_INVALID_FLAG_NUMBER __MSABI_LONG(186)
+#define ERROR_SEM_NOT_FOUND __MSABI_LONG(187)
+#define ERROR_INVALID_STARTING_CODESEG __MSABI_LONG(188)
+#define ERROR_INVALID_STACKSEG __MSABI_LONG(189)
+#define ERROR_INVALID_MODULETYPE __MSABI_LONG(190)
+#define ERROR_INVALID_EXE_SIGNATURE __MSABI_LONG(191)
+#define ERROR_EXE_MARKED_INVALID __MSABI_LONG(192)
+#define ERROR_BAD_EXE_FORMAT __MSABI_LONG(193)
+#define ERROR_ITERATED_DATA_EXCEEDS_64k __MSABI_LONG(194)
+#define ERROR_INVALID_MINALLOCSIZE __MSABI_LONG(195)
+#define ERROR_DYNLINK_FROM_INVALID_RING __MSABI_LONG(196)
+#define ERROR_IOPL_NOT_ENABLED __MSABI_LONG(197)
+#define ERROR_INVALID_SEGDPL __MSABI_LONG(198)
+#define ERROR_AUTODATASEG_EXCEEDS_64k __MSABI_LONG(199)
+#define ERROR_RING2SEG_MUST_BE_MOVABLE __MSABI_LONG(200)
+#define ERROR_RELOC_CHAIN_XEEDS_SEGLIM __MSABI_LONG(201)
+#define ERROR_INFLOOP_IN_RELOC_CHAIN __MSABI_LONG(202)
+#define ERROR_ENVVAR_NOT_FOUND __MSABI_LONG(203)
+#define ERROR_NO_SIGNAL_SENT __MSABI_LONG(205)
+#define ERROR_FILENAME_EXCED_RANGE __MSABI_LONG(206)
+#define ERROR_RING2_STACK_IN_USE __MSABI_LONG(207)
+#define ERROR_META_EXPANSION_TOO_LONG __MSABI_LONG(208)
+#define ERROR_INVALID_SIGNAL_NUMBER __MSABI_LONG(209)
+#define ERROR_THREAD_1_INACTIVE __MSABI_LONG(210)
+#define ERROR_LOCKED __MSABI_LONG(212)
+#define ERROR_TOO_MANY_MODULES __MSABI_LONG(214)
+#define ERROR_NESTING_NOT_ALLOWED __MSABI_LONG(215)
+#define ERROR_EXE_MACHINE_TYPE_MISMATCH __MSABI_LONG(216)
+#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY __MSABI_LONG(217)
+#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY __MSABI_LONG(218)
+#define ERROR_BAD_PIPE __MSABI_LONG(230)
+#define ERROR_PIPE_BUSY __MSABI_LONG(231)
+#define ERROR_NO_DATA __MSABI_LONG(232)
+#define ERROR_PIPE_NOT_CONNECTED __MSABI_LONG(233)
+#define ERROR_MORE_DATA __MSABI_LONG(234)
+#define ERROR_VC_DISCONNECTED __MSABI_LONG(240)
+#define ERROR_INVALID_EA_NAME __MSABI_LONG(254)
+#define ERROR_EA_LIST_INCONSISTENT __MSABI_LONG(255)
+#define WAIT_TIMEOUT __MSABI_LONG(258)
+#define ERROR_NO_MORE_ITEMS __MSABI_LONG(259)
+#define ERROR_CANNOT_COPY __MSABI_LONG(266)
+#define ERROR_DIRECTORY __MSABI_LONG(267)
+#define ERROR_EAS_DIDNT_FIT __MSABI_LONG(275)
+#define ERROR_EA_FILE_CORRUPT __MSABI_LONG(276)
+#define ERROR_EA_TABLE_FULL __MSABI_LONG(277)
+#define ERROR_INVALID_EA_HANDLE __MSABI_LONG(278)
+#define ERROR_EAS_NOT_SUPPORTED __MSABI_LONG(282)
+#define ERROR_NOT_OWNER __MSABI_LONG(288)
+#define ERROR_TOO_MANY_POSTS __MSABI_LONG(298)
+#define ERROR_PARTIAL_COPY __MSABI_LONG(299)
+#define ERROR_OPLOCK_NOT_GRANTED __MSABI_LONG(300)
+#define ERROR_INVALID_OPLOCK_PROTOCOL __MSABI_LONG(301)
+#define ERROR_DISK_TOO_FRAGMENTED __MSABI_LONG(302)
+#define ERROR_DELETE_PENDING __MSABI_LONG(303)
+#define ERROR_MR_MID_NOT_FOUND __MSABI_LONG(317)
+#define ERROR_SCOPE_NOT_FOUND __MSABI_LONG(318)
+#define ERROR_INVALID_ADDRESS __MSABI_LONG(487)
+#define ERROR_ARITHMETIC_OVERFLOW __MSABI_LONG(534)
+#define ERROR_PIPE_CONNECTED __MSABI_LONG(535)
+#define ERROR_PIPE_LISTENING __MSABI_LONG(536)
+#define ERROR_EA_ACCESS_DENIED __MSABI_LONG(994)
+#define ERROR_OPERATION_ABORTED __MSABI_LONG(995)
+#define ERROR_IO_INCOMPLETE __MSABI_LONG(996)
+#define ERROR_IO_PENDING __MSABI_LONG(997)
+#define ERROR_NOACCESS __MSABI_LONG(998)
+#define ERROR_SWAPERROR __MSABI_LONG(999)
+#define ERROR_STACK_OVERFLOW __MSABI_LONG(1001)
+#define ERROR_INVALID_MESSAGE __MSABI_LONG(1002)
+#define ERROR_CAN_NOT_COMPLETE __MSABI_LONG(1003)
+#define ERROR_INVALID_FLAGS __MSABI_LONG(1004)
+#define ERROR_UNRECOGNIZED_VOLUME __MSABI_LONG(1005)
+#define ERROR_FILE_INVALID __MSABI_LONG(1006)
+#define ERROR_FULLSCREEN_MODE __MSABI_LONG(1007)
+#define ERROR_NO_TOKEN __MSABI_LONG(1008)
+#define ERROR_BADDB __MSABI_LONG(1009)
+#define ERROR_BADKEY __MSABI_LONG(1010)
+#define ERROR_CANTOPEN __MSABI_LONG(1011)
+#define ERROR_CANTREAD __MSABI_LONG(1012)
+#define ERROR_CANTWRITE __MSABI_LONG(1013)
+#define ERROR_REGISTRY_RECOVERED __MSABI_LONG(1014)
+#define ERROR_REGISTRY_CORRUPT __MSABI_LONG(1015)
+#define ERROR_REGISTRY_IO_FAILED __MSABI_LONG(1016)
+#define ERROR_NOT_REGISTRY_FILE __MSABI_LONG(1017)
+#define ERROR_KEY_DELETED __MSABI_LONG(1018)
+#define ERROR_NO_LOG_SPACE __MSABI_LONG(1019)
+#define ERROR_KEY_HAS_CHILDREN __MSABI_LONG(1020)
+#define ERROR_CHILD_MUST_BE_VOLATILE __MSABI_LONG(1021)
+#define ERROR_NOTIFY_ENUM_DIR __MSABI_LONG(1022)
+#define ERROR_DEPENDENT_SERVICES_RUNNING __MSABI_LONG(1051)
+#define ERROR_INVALID_SERVICE_CONTROL __MSABI_LONG(1052)
+#define ERROR_SERVICE_REQUEST_TIMEOUT __MSABI_LONG(1053)
+#define ERROR_SERVICE_NO_THREAD __MSABI_LONG(1054)
+#define ERROR_SERVICE_DATABASE_LOCKED __MSABI_LONG(1055)
+#define ERROR_SERVICE_ALREADY_RUNNING __MSABI_LONG(1056)
+#define ERROR_INVALID_SERVICE_ACCOUNT __MSABI_LONG(1057)
+#define ERROR_SERVICE_DISABLED __MSABI_LONG(1058)
+#define ERROR_CIRCULAR_DEPENDENCY __MSABI_LONG(1059)
+#define ERROR_SERVICE_DOES_NOT_EXIST __MSABI_LONG(1060)
+#define ERROR_SERVICE_CANNOT_ACCEPT_CTRL __MSABI_LONG(1061)
+#define ERROR_SERVICE_NOT_ACTIVE __MSABI_LONG(1062)
+#define ERROR_FAILED_SERVICE_CONTROLLER_CONNECT __MSABI_LONG(1063)
+#define ERROR_EXCEPTION_IN_SERVICE __MSABI_LONG(1064)
+#define ERROR_DATABASE_DOES_NOT_EXIST __MSABI_LONG(1065)
+#define ERROR_SERVICE_SPECIFIC_ERROR __MSABI_LONG(1066)
+#define ERROR_PROCESS_ABORTED __MSABI_LONG(1067)
+#define ERROR_SERVICE_DEPENDENCY_FAIL __MSABI_LONG(1068)
+#define ERROR_SERVICE_LOGON_FAILED __MSABI_LONG(1069)
+#define ERROR_SERVICE_START_HANG __MSABI_LONG(1070)
+#define ERROR_INVALID_SERVICE_LOCK __MSABI_LONG(1071)
+#define ERROR_SERVICE_MARKED_FOR_DELETE __MSABI_LONG(1072)
+#define ERROR_SERVICE_EXISTS __MSABI_LONG(1073)
+#define ERROR_ALREADY_RUNNING_LKG __MSABI_LONG(1074)
+#define ERROR_SERVICE_DEPENDENCY_DELETED __MSABI_LONG(1075)
+#define ERROR_BOOT_ALREADY_ACCEPTED __MSABI_LONG(1076)
+#define ERROR_SERVICE_NEVER_STARTED __MSABI_LONG(1077)
+#define ERROR_DUPLICATE_SERVICE_NAME __MSABI_LONG(1078)
+#define ERROR_DIFFERENT_SERVICE_ACCOUNT __MSABI_LONG(1079)
+#define ERROR_CANNOT_DETECT_DRIVER_FAILURE __MSABI_LONG(1080)
+#define ERROR_CANNOT_DETECT_PROCESS_ABORT __MSABI_LONG(1081)
+#define ERROR_NO_RECOVERY_PROGRAM __MSABI_LONG(1082)
+#define ERROR_SERVICE_NOT_IN_EXE __MSABI_LONG(1083)
+#define ERROR_NOT_SAFEBOOT_SERVICE __MSABI_LONG(1084)
+#define ERROR_END_OF_MEDIA __MSABI_LONG(1100)
+#define ERROR_FILEMARK_DETECTED __MSABI_LONG(1101)
+#define ERROR_BEGINNING_OF_MEDIA __MSABI_LONG(1102)
+#define ERROR_SETMARK_DETECTED __MSABI_LONG(1103)
+#define ERROR_NO_DATA_DETECTED __MSABI_LONG(1104)
+#define ERROR_PARTITION_FAILURE __MSABI_LONG(1105)
+#define ERROR_INVALID_BLOCK_LENGTH __MSABI_LONG(1106)
+#define ERROR_DEVICE_NOT_PARTITIONED __MSABI_LONG(1107)
+#define ERROR_UNABLE_TO_LOCK_MEDIA __MSABI_LONG(1108)
+#define ERROR_UNABLE_TO_UNLOAD_MEDIA __MSABI_LONG(1109)
+#define ERROR_MEDIA_CHANGED __MSABI_LONG(1110)
+#define ERROR_BUS_RESET __MSABI_LONG(1111)
+#define ERROR_NO_MEDIA_IN_DRIVE __MSABI_LONG(1112)
+#define ERROR_NO_UNICODE_TRANSLATION __MSABI_LONG(1113)
+#define ERROR_DLL_INIT_FAILED __MSABI_LONG(1114)
+#define ERROR_SHUTDOWN_IN_PROGRESS __MSABI_LONG(1115)
+#define ERROR_NO_SHUTDOWN_IN_PROGRESS __MSABI_LONG(1116)
+#define ERROR_IO_DEVICE __MSABI_LONG(1117)
+#define ERROR_SERIAL_NO_DEVICE __MSABI_LONG(1118)
+#define ERROR_IRQ_BUSY __MSABI_LONG(1119)
+#define ERROR_MORE_WRITES __MSABI_LONG(1120)
+#define ERROR_COUNTER_TIMEOUT __MSABI_LONG(1121)
+#define ERROR_FLOPPY_ID_MARK_NOT_FOUND __MSABI_LONG(1122)
+#define ERROR_FLOPPY_WRONG_CYLINDER __MSABI_LONG(1123)
+#define ERROR_FLOPPY_UNKNOWN_ERROR __MSABI_LONG(1124)
+#define ERROR_FLOPPY_BAD_REGISTERS __MSABI_LONG(1125)
+#define ERROR_DISK_RECALIBRATE_FAILED __MSABI_LONG(1126)
+#define ERROR_DISK_OPERATION_FAILED __MSABI_LONG(1127)
+#define ERROR_DISK_RESET_FAILED __MSABI_LONG(1128)
+#define ERROR_EOM_OVERFLOW __MSABI_LONG(1129)
+#define ERROR_NOT_ENOUGH_SERVER_MEMORY __MSABI_LONG(1130)
+#define ERROR_POSSIBLE_DEADLOCK __MSABI_LONG(1131)
+#define ERROR_MAPPED_ALIGNMENT __MSABI_LONG(1132)
+#define ERROR_SET_POWER_STATE_VETOED __MSABI_LONG(1140)
+#define ERROR_SET_POWER_STATE_FAILED __MSABI_LONG(1141)
+#define ERROR_TOO_MANY_LINKS __MSABI_LONG(1142)
+#define ERROR_OLD_WIN_VERSION __MSABI_LONG(1150)
+#define ERROR_APP_WRONG_OS __MSABI_LONG(1151)
+#define ERROR_SINGLE_INSTANCE_APP __MSABI_LONG(1152)
+#define ERROR_RMODE_APP __MSABI_LONG(1153)
+#define ERROR_INVALID_DLL __MSABI_LONG(1154)
+#define ERROR_NO_ASSOCIATION __MSABI_LONG(1155)
+#define ERROR_DDE_FAIL __MSABI_LONG(1156)
+#define ERROR_DLL_NOT_FOUND __MSABI_LONG(1157)
+#define ERROR_NO_MORE_USER_HANDLES __MSABI_LONG(1158)
+#define ERROR_MESSAGE_SYNC_ONLY __MSABI_LONG(1159)
+#define ERROR_SOURCE_ELEMENT_EMPTY __MSABI_LONG(1160)
+#define ERROR_DESTINATION_ELEMENT_FULL __MSABI_LONG(1161)
+#define ERROR_ILLEGAL_ELEMENT_ADDRESS __MSABI_LONG(1162)
+#define ERROR_MAGAZINE_NOT_PRESENT __MSABI_LONG(1163)
+#define ERROR_DEVICE_REINITIALIZATION_NEEDED __MSABI_LONG(1164)
+#define ERROR_DEVICE_REQUIRES_CLEANING __MSABI_LONG(1165)
+#define ERROR_DEVICE_DOOR_OPEN __MSABI_LONG(1166)
+#define ERROR_DEVICE_NOT_CONNECTED __MSABI_LONG(1167)
+#define ERROR_NOT_FOUND __MSABI_LONG(1168)
+#define ERROR_NO_MATCH __MSABI_LONG(1169)
+#define ERROR_SET_NOT_FOUND __MSABI_LONG(1170)
+#define ERROR_POINT_NOT_FOUND __MSABI_LONG(1171)
+#define ERROR_NO_TRACKING_SERVICE __MSABI_LONG(1172)
+#define ERROR_NO_VOLUME_ID __MSABI_LONG(1173)
+#define ERROR_UNABLE_TO_REMOVE_REPLACED __MSABI_LONG(1175)
+#define ERROR_UNABLE_TO_MOVE_REPLACEMENT __MSABI_LONG(1176)
+#define ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 __MSABI_LONG(1177)
+#define ERROR_JOURNAL_DELETE_IN_PROGRESS __MSABI_LONG(1178)
+#define ERROR_JOURNAL_NOT_ACTIVE __MSABI_LONG(1179)
+#define ERROR_POTENTIAL_FILE_FOUND __MSABI_LONG(1180)
+#define ERROR_JOURNAL_ENTRY_DELETED __MSABI_LONG(1181)
+#define ERROR_BAD_DEVICE __MSABI_LONG(1200)
+#define ERROR_CONNECTION_UNAVAIL __MSABI_LONG(1201)
+#define ERROR_DEVICE_ALREADY_REMEMBERED __MSABI_LONG(1202)
+#define ERROR_NO_NET_OR_BAD_PATH __MSABI_LONG(1203)
+#define ERROR_BAD_PROVIDER __MSABI_LONG(1204)
+#define ERROR_CANNOT_OPEN_PROFILE __MSABI_LONG(1205)
+#define ERROR_BAD_PROFILE __MSABI_LONG(1206)
+#define ERROR_NOT_CONTAINER __MSABI_LONG(1207)
+#define ERROR_EXTENDED_ERROR __MSABI_LONG(1208)
+#define ERROR_INVALID_GROUPNAME __MSABI_LONG(1209)
+#define ERROR_INVALID_COMPUTERNAME __MSABI_LONG(1210)
+#define ERROR_INVALID_EVENTNAME __MSABI_LONG(1211)
+#define ERROR_INVALID_DOMAINNAME __MSABI_LONG(1212)
+#define ERROR_INVALID_SERVICENAME __MSABI_LONG(1213)
+#define ERROR_INVALID_NETNAME __MSABI_LONG(1214)
+#define ERROR_INVALID_SHARENAME __MSABI_LONG(1215)
+#define ERROR_INVALID_PASSWORDNAME __MSABI_LONG(1216)
+#define ERROR_INVALID_MESSAGENAME __MSABI_LONG(1217)
+#define ERROR_INVALID_MESSAGEDEST __MSABI_LONG(1218)
+#define ERROR_SESSION_CREDENTIAL_CONFLICT __MSABI_LONG(1219)
+#define ERROR_REMOTE_SESSION_LIMIT_EXCEEDED __MSABI_LONG(1220)
+#define ERROR_DUP_DOMAINNAME __MSABI_LONG(1221)
+#define ERROR_NO_NETWORK __MSABI_LONG(1222)
+#define ERROR_CANCELLED __MSABI_LONG(1223)
+#define ERROR_USER_MAPPED_FILE __MSABI_LONG(1224)
+#define ERROR_CONNECTION_REFUSED __MSABI_LONG(1225)
+#define ERROR_GRACEFUL_DISCONNECT __MSABI_LONG(1226)
+#define ERROR_ADDRESS_ALREADY_ASSOCIATED __MSABI_LONG(1227)
+#define ERROR_ADDRESS_NOT_ASSOCIATED __MSABI_LONG(1228)
+#define ERROR_CONNECTION_INVALID __MSABI_LONG(1229)
+#define ERROR_CONNECTION_ACTIVE __MSABI_LONG(1230)
+#define ERROR_NETWORK_UNREACHABLE __MSABI_LONG(1231)
+#define ERROR_HOST_UNREACHABLE __MSABI_LONG(1232)
+#define ERROR_PROTOCOL_UNREACHABLE __MSABI_LONG(1233)
+#define ERROR_PORT_UNREACHABLE __MSABI_LONG(1234)
+#define ERROR_REQUEST_ABORTED __MSABI_LONG(1235)
+#define ERROR_CONNECTION_ABORTED __MSABI_LONG(1236)
+#define ERROR_RETRY __MSABI_LONG(1237)
+#define ERROR_CONNECTION_COUNT_LIMIT __MSABI_LONG(1238)
+#define ERROR_LOGIN_TIME_RESTRICTION __MSABI_LONG(1239)
+#define ERROR_LOGIN_WKSTA_RESTRICTION __MSABI_LONG(1240)
+#define ERROR_INCORRECT_ADDRESS __MSABI_LONG(1241)
+#define ERROR_ALREADY_REGISTERED __MSABI_LONG(1242)
+#define ERROR_SERVICE_NOT_FOUND __MSABI_LONG(1243)
+#define ERROR_NOT_AUTHENTICATED __MSABI_LONG(1244)
+#define ERROR_NOT_LOGGED_ON __MSABI_LONG(1245)
+#define ERROR_CONTINUE __MSABI_LONG(1246)
+#define ERROR_ALREADY_INITIALIZED __MSABI_LONG(1247)
+#define ERROR_NO_MORE_DEVICES __MSABI_LONG(1248)
+#define ERROR_NO_SUCH_SITE __MSABI_LONG(1249)
+#define ERROR_DOMAIN_CONTROLLER_EXISTS __MSABI_LONG(1250)
+#define ERROR_ONLY_IF_CONNECTED __MSABI_LONG(1251)
+#define ERROR_OVERRIDE_NOCHANGES __MSABI_LONG(1252)
+#define ERROR_BAD_USER_PROFILE __MSABI_LONG(1253)
+#define ERROR_NOT_SUPPORTED_ON_SBS __MSABI_LONG(1254)
+#define ERROR_SERVER_SHUTDOWN_IN_PROGRESS __MSABI_LONG(1255)
+#define ERROR_HOST_DOWN __MSABI_LONG(1256)
+#define ERROR_NON_ACCOUNT_SID __MSABI_LONG(1257)
+#define ERROR_NON_DOMAIN_SID __MSABI_LONG(1258)
+#define ERROR_APPHELP_BLOCK __MSABI_LONG(1259)
+#define ERROR_ACCESS_DISABLED_BY_POLICY __MSABI_LONG(1260)
+#define ERROR_REG_NAT_CONSUMPTION __MSABI_LONG(1261)
+#define ERROR_CSCSHARE_OFFLINE __MSABI_LONG(1262)
+#define ERROR_PKINIT_FAILURE __MSABI_LONG(1263)
+#define ERROR_SMARTCARD_SUBSYSTEM_FAILURE __MSABI_LONG(1264)
+#define ERROR_DOWNGRADE_DETECTED __MSABI_LONG(1265)
+#define ERROR_MACHINE_LOCKED __MSABI_LONG(1271)
+#define ERROR_CALLBACK_SUPPLIED_INVALID_DATA __MSABI_LONG(1273)
+#define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED __MSABI_LONG(1274)
+#define ERROR_DRIVER_BLOCKED __MSABI_LONG(1275)
+#define ERROR_INVALID_IMPORT_OF_NON_DLL __MSABI_LONG(1276)
+#define ERROR_ACCESS_DISABLED_WEBBLADE __MSABI_LONG(1277)
+#define ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER __MSABI_LONG(1278)
+#define ERROR_RECOVERY_FAILURE __MSABI_LONG(1279)
+#define ERROR_ALREADY_FIBER __MSABI_LONG(1280)
+#define ERROR_ALREADY_THREAD __MSABI_LONG(1281)
+#define ERROR_STACK_BUFFER_OVERRUN __MSABI_LONG(1282)
+#define ERROR_PARAMETER_QUOTA_EXCEEDED __MSABI_LONG(1283)
+#define ERROR_DEBUGGER_INACTIVE __MSABI_LONG(1284)
+#define ERROR_DELAY_LOAD_FAILED __MSABI_LONG(1285)
+#define ERROR_VDM_DISALLOWED __MSABI_LONG(1286)
+#define ERROR_UNIDENTIFIED_ERROR __MSABI_LONG(1287)
+#define ERROR_NOT_ALL_ASSIGNED __MSABI_LONG(1300)
+#define ERROR_SOME_NOT_MAPPED __MSABI_LONG(1301)
+#define ERROR_NO_QUOTAS_FOR_ACCOUNT __MSABI_LONG(1302)
+#define ERROR_LOCAL_USER_SESSION_KEY __MSABI_LONG(1303)
+#define ERROR_NULL_LM_PASSWORD __MSABI_LONG(1304)
+#define ERROR_UNKNOWN_REVISION __MSABI_LONG(1305)
+#define ERROR_REVISION_MISMATCH __MSABI_LONG(1306)
+#define ERROR_INVALID_OWNER __MSABI_LONG(1307)
+#define ERROR_INVALID_PRIMARY_GROUP __MSABI_LONG(1308)
+#define ERROR_NO_IMPERSONATION_TOKEN __MSABI_LONG(1309)
+#define ERROR_CANT_DISABLE_MANDATORY __MSABI_LONG(1310)
+#define ERROR_NO_LOGON_SERVERS __MSABI_LONG(1311)
+#define ERROR_NO_SUCH_LOGON_SESSION __MSABI_LONG(1312)
+#define ERROR_NO_SUCH_PRIVILEGE __MSABI_LONG(1313)
+#define ERROR_PRIVILEGE_NOT_HELD __MSABI_LONG(1314)
+#define ERROR_INVALID_ACCOUNT_NAME __MSABI_LONG(1315)
+#define ERROR_USER_EXISTS __MSABI_LONG(1316)
+#define ERROR_NO_SUCH_USER __MSABI_LONG(1317)
+#define ERROR_GROUP_EXISTS __MSABI_LONG(1318)
+#define ERROR_NO_SUCH_GROUP __MSABI_LONG(1319)
+#define ERROR_MEMBER_IN_GROUP __MSABI_LONG(1320)
+#define ERROR_MEMBER_NOT_IN_GROUP __MSABI_LONG(1321)
+#define ERROR_LAST_ADMIN __MSABI_LONG(1322)
+#define ERROR_WRONG_PASSWORD __MSABI_LONG(1323)
+#define ERROR_ILL_FORMED_PASSWORD __MSABI_LONG(1324)
+#define ERROR_PASSWORD_RESTRICTION __MSABI_LONG(1325)
+#define ERROR_LOGON_FAILURE __MSABI_LONG(1326)
+#define ERROR_ACCOUNT_RESTRICTION __MSABI_LONG(1327)
+#define ERROR_INVALID_LOGON_HOURS __MSABI_LONG(1328)
+#define ERROR_INVALID_WORKSTATION __MSABI_LONG(1329)
+#define ERROR_PASSWORD_EXPIRED __MSABI_LONG(1330)
+#define ERROR_ACCOUNT_DISABLED __MSABI_LONG(1331)
+#define ERROR_NONE_MAPPED __MSABI_LONG(1332)
+#define ERROR_TOO_MANY_LUIDS_REQUESTED __MSABI_LONG(1333)
+#define ERROR_LUIDS_EXHAUSTED __MSABI_LONG(1334)
+#define ERROR_INVALID_SUB_AUTHORITY __MSABI_LONG(1335)
+#define ERROR_INVALID_ACL __MSABI_LONG(1336)
+#define ERROR_INVALID_SID __MSABI_LONG(1337)
+#define ERROR_INVALID_SECURITY_DESCR __MSABI_LONG(1338)
+#define ERROR_BAD_INHERITANCE_ACL __MSABI_LONG(1340)
+#define ERROR_SERVER_DISABLED __MSABI_LONG(1341)
+#define ERROR_SERVER_NOT_DISABLED __MSABI_LONG(1342)
+#define ERROR_INVALID_ID_AUTHORITY __MSABI_LONG(1343)
+#define ERROR_ALLOTTED_SPACE_EXCEEDED __MSABI_LONG(1344)
+#define ERROR_INVALID_GROUP_ATTRIBUTES __MSABI_LONG(1345)
+#define ERROR_BAD_IMPERSONATION_LEVEL __MSABI_LONG(1346)
+#define ERROR_CANT_OPEN_ANONYMOUS __MSABI_LONG(1347)
+#define ERROR_BAD_VALIDATION_CLASS __MSABI_LONG(1348)
+#define ERROR_BAD_TOKEN_TYPE __MSABI_LONG(1349)
+#define ERROR_NO_SECURITY_ON_OBJECT __MSABI_LONG(1350)
+#define ERROR_CANT_ACCESS_DOMAIN_INFO __MSABI_LONG(1351)
+#define ERROR_INVALID_SERVER_STATE __MSABI_LONG(1352)
+#define ERROR_INVALID_DOMAIN_STATE __MSABI_LONG(1353)
+#define ERROR_INVALID_DOMAIN_ROLE __MSABI_LONG(1354)
+#define ERROR_NO_SUCH_DOMAIN __MSABI_LONG(1355)
+#define ERROR_DOMAIN_EXISTS __MSABI_LONG(1356)
+#define ERROR_DOMAIN_LIMIT_EXCEEDED __MSABI_LONG(1357)
+#define ERROR_INTERNAL_DB_CORRUPTION __MSABI_LONG(1358)
+#define ERROR_INTERNAL_ERROR __MSABI_LONG(1359)
+#define ERROR_GENERIC_NOT_MAPPED __MSABI_LONG(1360)
+#define ERROR_BAD_DESCRIPTOR_FORMAT __MSABI_LONG(1361)
+#define ERROR_NOT_LOGON_PROCESS __MSABI_LONG(1362)
+#define ERROR_LOGON_SESSION_EXISTS __MSABI_LONG(1363)
+#define ERROR_NO_SUCH_PACKAGE __MSABI_LONG(1364)
+#define ERROR_BAD_LOGON_SESSION_STATE __MSABI_LONG(1365)
+#define ERROR_LOGON_SESSION_COLLISION __MSABI_LONG(1366)
+#define ERROR_INVALID_LOGON_TYPE __MSABI_LONG(1367)
+#define ERROR_CANNOT_IMPERSONATE __MSABI_LONG(1368)
+#define ERROR_RXACT_INVALID_STATE __MSABI_LONG(1369)
+#define ERROR_RXACT_COMMIT_FAILURE __MSABI_LONG(1370)
+#define ERROR_SPECIAL_ACCOUNT __MSABI_LONG(1371)
+#define ERROR_SPECIAL_GROUP __MSABI_LONG(1372)
+#define ERROR_SPECIAL_USER __MSABI_LONG(1373)
+#define ERROR_MEMBERS_PRIMARY_GROUP __MSABI_LONG(1374)
+#define ERROR_TOKEN_ALREADY_IN_USE __MSABI_LONG(1375)
+#define ERROR_NO_SUCH_ALIAS __MSABI_LONG(1376)
+#define ERROR_MEMBER_NOT_IN_ALIAS __MSABI_LONG(1377)
+#define ERROR_MEMBER_IN_ALIAS __MSABI_LONG(1378)
+#define ERROR_ALIAS_EXISTS __MSABI_LONG(1379)
+#define ERROR_LOGON_NOT_GRANTED __MSABI_LONG(1380)
+#define ERROR_TOO_MANY_SECRETS __MSABI_LONG(1381)
+#define ERROR_SECRET_TOO_LONG __MSABI_LONG(1382)
+#define ERROR_INTERNAL_DB_ERROR __MSABI_LONG(1383)
+#define ERROR_TOO_MANY_CONTEXT_IDS __MSABI_LONG(1384)
+#define ERROR_LOGON_TYPE_NOT_GRANTED __MSABI_LONG(1385)
+#define ERROR_NT_CROSS_ENCRYPTION_REQUIRED __MSABI_LONG(1386)
+#define ERROR_NO_SUCH_MEMBER __MSABI_LONG(1387)
+#define ERROR_INVALID_MEMBER __MSABI_LONG(1388)
+#define ERROR_TOO_MANY_SIDS __MSABI_LONG(1389)
+#define ERROR_LM_CROSS_ENCRYPTION_REQUIRED __MSABI_LONG(1390)
+#define ERROR_NO_INHERITANCE __MSABI_LONG(1391)
+#define ERROR_FILE_CORRUPT __MSABI_LONG(1392)
+#define ERROR_DISK_CORRUPT __MSABI_LONG(1393)
+#define ERROR_NO_USER_SESSION_KEY __MSABI_LONG(1394)
+#define ERROR_LICENSE_QUOTA_EXCEEDED __MSABI_LONG(1395)
+#define ERROR_WRONG_TARGET_NAME __MSABI_LONG(1396)
+#define ERROR_MUTUAL_AUTH_FAILED __MSABI_LONG(1397)
+#define ERROR_TIME_SKEW __MSABI_LONG(1398)
+#define ERROR_CURRENT_DOMAIN_NOT_ALLOWED __MSABI_LONG(1399)
+#define ERROR_INVALID_WINDOW_HANDLE __MSABI_LONG(1400)
+#define ERROR_INVALID_MENU_HANDLE __MSABI_LONG(1401)
+#define ERROR_INVALID_CURSOR_HANDLE __MSABI_LONG(1402)
+#define ERROR_INVALID_ACCEL_HANDLE __MSABI_LONG(1403)
+#define ERROR_INVALID_HOOK_HANDLE __MSABI_LONG(1404)
+#define ERROR_INVALID_DWP_HANDLE __MSABI_LONG(1405)
+#define ERROR_TLW_WITH_WSCHILD __MSABI_LONG(1406)
+#define ERROR_CANNOT_FIND_WND_CLASS __MSABI_LONG(1407)
+#define ERROR_WINDOW_OF_OTHER_THREAD __MSABI_LONG(1408)
+#define ERROR_HOTKEY_ALREADY_REGISTERED __MSABI_LONG(1409)
+#define ERROR_CLASS_ALREADY_EXISTS __MSABI_LONG(1410)
+#define ERROR_CLASS_DOES_NOT_EXIST __MSABI_LONG(1411)
+#define ERROR_CLASS_HAS_WINDOWS __MSABI_LONG(1412)
+#define ERROR_INVALID_INDEX __MSABI_LONG(1413)
+#define ERROR_INVALID_ICON_HANDLE __MSABI_LONG(1414)
+#define ERROR_PRIVATE_DIALOG_INDEX __MSABI_LONG(1415)
+#define ERROR_LISTBOX_ID_NOT_FOUND __MSABI_LONG(1416)
+#define ERROR_NO_WILDCARD_CHARACTERS __MSABI_LONG(1417)
+#define ERROR_CLIPBOARD_NOT_OPEN __MSABI_LONG(1418)
+#define ERROR_HOTKEY_NOT_REGISTERED __MSABI_LONG(1419)
+#define ERROR_WINDOW_NOT_DIALOG __MSABI_LONG(1420)
+#define ERROR_CONTROL_ID_NOT_FOUND __MSABI_LONG(1421)
+#define ERROR_INVALID_COMBOBOX_MESSAGE __MSABI_LONG(1422)
+#define ERROR_WINDOW_NOT_COMBOBOX __MSABI_LONG(1423)
+#define ERROR_INVALID_EDIT_HEIGHT __MSABI_LONG(1424)
+#define ERROR_DC_NOT_FOUND __MSABI_LONG(1425)
+#define ERROR_INVALID_HOOK_FILTER __MSABI_LONG(1426)
+#define ERROR_INVALID_FILTER_PROC __MSABI_LONG(1427)
+#define ERROR_HOOK_NEEDS_HMOD __MSABI_LONG(1428)
+#define ERROR_GLOBAL_ONLY_HOOK __MSABI_LONG(1429)
+#define ERROR_JOURNAL_HOOK_SET __MSABI_LONG(1430)
+#define ERROR_HOOK_NOT_INSTALLED __MSABI_LONG(1431)
+#define ERROR_INVALID_LB_MESSAGE __MSABI_LONG(1432)
+#define ERROR_SETCOUNT_ON_BAD_LB __MSABI_LONG(1433)
+#define ERROR_LB_WITHOUT_TABSTOPS __MSABI_LONG(1434)
+#define ERROR_DESTROY_OBJECT_OF_OTHER_THREAD __MSABI_LONG(1435)
+#define ERROR_CHILD_WINDOW_MENU __MSABI_LONG(1436)
+#define ERROR_NO_SYSTEM_MENU __MSABI_LONG(1437)
+#define ERROR_INVALID_MSGBOX_STYLE __MSABI_LONG(1438)
+#define ERROR_INVALID_SPI_VALUE __MSABI_LONG(1439)
+#define ERROR_SCREEN_ALREADY_LOCKED __MSABI_LONG(1440)
+#define ERROR_HWNDS_HAVE_DIFF_PARENT __MSABI_LONG(1441)
+#define ERROR_NOT_CHILD_WINDOW __MSABI_LONG(1442)
+#define ERROR_INVALID_GW_COMMAND __MSABI_LONG(1443)
+#define ERROR_INVALID_THREAD_ID __MSABI_LONG(1444)
+#define ERROR_NON_MDICHILD_WINDOW __MSABI_LONG(1445)
+#define ERROR_POPUP_ALREADY_ACTIVE __MSABI_LONG(1446)
+#define ERROR_NO_SCROLLBARS __MSABI_LONG(1447)
+#define ERROR_INVALID_SCROLLBAR_RANGE __MSABI_LONG(1448)
+#define ERROR_INVALID_SHOWWIN_COMMAND __MSABI_LONG(1449)
+#define ERROR_NO_SYSTEM_RESOURCES __MSABI_LONG(1450)
+#define ERROR_NONPAGED_SYSTEM_RESOURCES __MSABI_LONG(1451)
+#define ERROR_PAGED_SYSTEM_RESOURCES __MSABI_LONG(1452)
+#define ERROR_WORKING_SET_QUOTA __MSABI_LONG(1453)
+#define ERROR_PAGEFILE_QUOTA __MSABI_LONG(1454)
+#define ERROR_COMMITMENT_LIMIT __MSABI_LONG(1455)
+#define ERROR_MENU_ITEM_NOT_FOUND __MSABI_LONG(1456)
+#define ERROR_INVALID_KEYBOARD_HANDLE __MSABI_LONG(1457)
+#define ERROR_HOOK_TYPE_NOT_ALLOWED __MSABI_LONG(1458)
+#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION __MSABI_LONG(1459)
+#define ERROR_TIMEOUT __MSABI_LONG(1460)
+#define ERROR_INVALID_MONITOR_HANDLE __MSABI_LONG(1461)
+#define ERROR_INCORRECT_SIZE __MSABI_LONG(1462)
+#define ERROR_EVENTLOG_FILE_CORRUPT __MSABI_LONG(1500)
+#define ERROR_EVENTLOG_CANT_START __MSABI_LONG(1501)
+#define ERROR_LOG_FILE_FULL __MSABI_LONG(1502)
+#define ERROR_EVENTLOG_FILE_CHANGED __MSABI_LONG(1503)
+#define ERROR_INSTALL_SERVICE_FAILURE __MSABI_LONG(1601)
+#define ERROR_INSTALL_USEREXIT __MSABI_LONG(1602)
+#define ERROR_INSTALL_FAILURE __MSABI_LONG(1603)
+#define ERROR_INSTALL_SUSPEND __MSABI_LONG(1604)
+#define ERROR_UNKNOWN_PRODUCT __MSABI_LONG(1605)
+#define ERROR_UNKNOWN_FEATURE __MSABI_LONG(1606)
+#define ERROR_UNKNOWN_COMPONENT __MSABI_LONG(1607)
+#define ERROR_UNKNOWN_PROPERTY __MSABI_LONG(1608)
+#define ERROR_INVALID_HANDLE_STATE __MSABI_LONG(1609)
+#define ERROR_BAD_CONFIGURATION __MSABI_LONG(1610)
+#define ERROR_INDEX_ABSENT __MSABI_LONG(1611)
+#define ERROR_INSTALL_SOURCE_ABSENT __MSABI_LONG(1612)
+#define ERROR_INSTALL_PACKAGE_VERSION __MSABI_LONG(1613)
+#define ERROR_PRODUCT_UNINSTALLED __MSABI_LONG(1614)
+#define ERROR_BAD_QUERY_SYNTAX __MSABI_LONG(1615)
+#define ERROR_INVALID_FIELD __MSABI_LONG(1616)
+#define ERROR_DEVICE_REMOVED __MSABI_LONG(1617)
+#define ERROR_INSTALL_ALREADY_RUNNING __MSABI_LONG(1618)
+#define ERROR_INSTALL_PACKAGE_OPEN_FAILED __MSABI_LONG(1619)
+#define ERROR_INSTALL_PACKAGE_INVALID __MSABI_LONG(1620)
+#define ERROR_INSTALL_UI_FAILURE __MSABI_LONG(1621)
+#define ERROR_INSTALL_LOG_FAILURE __MSABI_LONG(1622)
+#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED __MSABI_LONG(1623)
+#define ERROR_INSTALL_TRANSFORM_FAILURE __MSABI_LONG(1624)
+#define ERROR_INSTALL_PACKAGE_REJECTED __MSABI_LONG(1625)
+#define ERROR_FUNCTION_NOT_CALLED __MSABI_LONG(1626)
+#define ERROR_FUNCTION_FAILED __MSABI_LONG(1627)
+#define ERROR_INVALID_TABLE __MSABI_LONG(1628)
+#define ERROR_DATATYPE_MISMATCH __MSABI_LONG(1629)
+#define ERROR_UNSUPPORTED_TYPE __MSABI_LONG(1630)
+#define ERROR_CREATE_FAILED __MSABI_LONG(1631)
+#define ERROR_INSTALL_TEMP_UNWRITABLE __MSABI_LONG(1632)
+#define ERROR_INSTALL_PLATFORM_UNSUPPORTED __MSABI_LONG(1633)
+#define ERROR_INSTALL_NOTUSED __MSABI_LONG(1634)
+#define ERROR_PATCH_PACKAGE_OPEN_FAILED __MSABI_LONG(1635)
+#define ERROR_PATCH_PACKAGE_INVALID __MSABI_LONG(1636)
+#define ERROR_PATCH_PACKAGE_UNSUPPORTED __MSABI_LONG(1637)
+#define ERROR_PRODUCT_VERSION __MSABI_LONG(1638)
+#define ERROR_INVALID_COMMAND_LINE __MSABI_LONG(1639)
+#define ERROR_INSTALL_REMOTE_DISALLOWED __MSABI_LONG(1640)
+#define ERROR_SUCCESS_REBOOT_INITIATED __MSABI_LONG(1641)
+#define ERROR_PATCH_TARGET_NOT_FOUND __MSABI_LONG(1642)
+#define ERROR_PATCH_PACKAGE_REJECTED __MSABI_LONG(1643)
+#define ERROR_INSTALL_TRANSFORM_REJECTED __MSABI_LONG(1644)
+#define ERROR_INSTALL_REMOTE_PROHIBITED __MSABI_LONG(1645)
+#define RPC_S_INVALID_STRING_BINDING __MSABI_LONG(1700)
+#define RPC_S_WRONG_KIND_OF_BINDING __MSABI_LONG(1701)
+#define RPC_S_INVALID_BINDING __MSABI_LONG(1702)
+#define RPC_S_PROTSEQ_NOT_SUPPORTED __MSABI_LONG(1703)
+#define RPC_S_INVALID_RPC_PROTSEQ __MSABI_LONG(1704)
+#define RPC_S_INVALID_STRING_UUID __MSABI_LONG(1705)
+#define RPC_S_INVALID_ENDPOINT_FORMAT __MSABI_LONG(1706)
+#define RPC_S_INVALID_NET_ADDR __MSABI_LONG(1707)
+#define RPC_S_NO_ENDPOINT_FOUND __MSABI_LONG(1708)
+#define RPC_S_INVALID_TIMEOUT __MSABI_LONG(1709)
+#define RPC_S_OBJECT_NOT_FOUND __MSABI_LONG(1710)
+#define RPC_S_ALREADY_REGISTERED __MSABI_LONG(1711)
+#define RPC_S_TYPE_ALREADY_REGISTERED __MSABI_LONG(1712)
+#define RPC_S_ALREADY_LISTENING __MSABI_LONG(1713)
+#define RPC_S_NO_PROTSEQS_REGISTERED __MSABI_LONG(1714)
+#define RPC_S_NOT_LISTENING __MSABI_LONG(1715)
+#define RPC_S_UNKNOWN_MGR_TYPE __MSABI_LONG(1716)
+#define RPC_S_UNKNOWN_IF __MSABI_LONG(1717)
+#define RPC_S_NO_BINDINGS __MSABI_LONG(1718)
+#define RPC_S_NO_PROTSEQS __MSABI_LONG(1719)
+#define RPC_S_CANT_CREATE_ENDPOINT __MSABI_LONG(1720)
+#define RPC_S_OUT_OF_RESOURCES __MSABI_LONG(1721)
+#define RPC_S_SERVER_UNAVAILABLE __MSABI_LONG(1722)
+#define RPC_S_SERVER_TOO_BUSY __MSABI_LONG(1723)
+#define RPC_S_INVALID_NETWORK_OPTIONS __MSABI_LONG(1724)
+#define RPC_S_NO_CALL_ACTIVE __MSABI_LONG(1725)
+#define RPC_S_CALL_FAILED __MSABI_LONG(1726)
+#define RPC_S_CALL_FAILED_DNE __MSABI_LONG(1727)
+#define RPC_S_PROTOCOL_ERROR __MSABI_LONG(1728)
+#define RPC_S_UNSUPPORTED_TRANS_SYN __MSABI_LONG(1730)
+#define RPC_S_UNSUPPORTED_TYPE __MSABI_LONG(1732)
+#define RPC_S_INVALID_TAG __MSABI_LONG(1733)
+#define RPC_S_INVALID_BOUND __MSABI_LONG(1734)
+#define RPC_S_NO_ENTRY_NAME __MSABI_LONG(1735)
+#define RPC_S_INVALID_NAME_SYNTAX __MSABI_LONG(1736)
+#define RPC_S_UNSUPPORTED_NAME_SYNTAX __MSABI_LONG(1737)
+#define RPC_S_UUID_NO_ADDRESS __MSABI_LONG(1739)
+#define RPC_S_DUPLICATE_ENDPOINT __MSABI_LONG(1740)
+#define RPC_S_UNKNOWN_AUTHN_TYPE __MSABI_LONG(1741)
+#define RPC_S_MAX_CALLS_TOO_SMALL __MSABI_LONG(1742)
+#define RPC_S_STRING_TOO_LONG __MSABI_LONG(1743)
+#define RPC_S_PROTSEQ_NOT_FOUND __MSABI_LONG(1744)
+#define RPC_S_PROCNUM_OUT_OF_RANGE __MSABI_LONG(1745)
+#define RPC_S_BINDING_HAS_NO_AUTH __MSABI_LONG(1746)
+#define RPC_S_UNKNOWN_AUTHN_SERVICE __MSABI_LONG(1747)
+#define RPC_S_UNKNOWN_AUTHN_LEVEL __MSABI_LONG(1748)
+#define RPC_S_INVALID_AUTH_IDENTITY __MSABI_LONG(1749)
+#define RPC_S_UNKNOWN_AUTHZ_SERVICE __MSABI_LONG(1750)
+#define EPT_S_INVALID_ENTRY __MSABI_LONG(1751)
+#define EPT_S_CANT_PERFORM_OP __MSABI_LONG(1752)
+#define EPT_S_NOT_REGISTERED __MSABI_LONG(1753)
+#define RPC_S_NOTHING_TO_EXPORT __MSABI_LONG(1754)
+#define RPC_S_INCOMPLETE_NAME __MSABI_LONG(1755)
+#define RPC_S_INVALID_VERS_OPTION __MSABI_LONG(1756)
+#define RPC_S_NO_MORE_MEMBERS __MSABI_LONG(1757)
+#define RPC_S_NOT_ALL_OBJS_UNEXPORTED __MSABI_LONG(1758)
+#define RPC_S_INTERFACE_NOT_FOUND __MSABI_LONG(1759)
+#define RPC_S_ENTRY_ALREADY_EXISTS __MSABI_LONG(1760)
+#define RPC_S_ENTRY_NOT_FOUND __MSABI_LONG(1761)
+#define RPC_S_NAME_SERVICE_UNAVAILABLE __MSABI_LONG(1762)
+#define RPC_S_INVALID_NAF_ID __MSABI_LONG(1763)
+#define RPC_S_CANNOT_SUPPORT __MSABI_LONG(1764)
+#define RPC_S_NO_CONTEXT_AVAILABLE __MSABI_LONG(1765)
+#define RPC_S_INTERNAL_ERROR __MSABI_LONG(1766)
+#define RPC_S_ZERO_DIVIDE __MSABI_LONG(1767)
+#define RPC_S_ADDRESS_ERROR __MSABI_LONG(1768)
+#define RPC_S_FP_DIV_ZERO __MSABI_LONG(1769)
+#define RPC_S_FP_UNDERFLOW __MSABI_LONG(1770)
+#define RPC_S_FP_OVERFLOW __MSABI_LONG(1771)
+#define RPC_X_NO_MORE_ENTRIES __MSABI_LONG(1772)
+#define RPC_X_SS_CHAR_TRANS_OPEN_FAIL __MSABI_LONG(1773)
+#define RPC_X_SS_CHAR_TRANS_SHORT_FILE __MSABI_LONG(1774)
+#define RPC_X_SS_IN_NULL_CONTEXT __MSABI_LONG(1775)
+#define RPC_X_SS_CONTEXT_DAMAGED __MSABI_LONG(1777)
+#define RPC_X_SS_HANDLES_MISMATCH __MSABI_LONG(1778)
+#define RPC_X_SS_CANNOT_GET_CALL_HANDLE __MSABI_LONG(1779)
+#define RPC_X_NULL_REF_POINTER __MSABI_LONG(1780)
+#define RPC_X_ENUM_VALUE_OUT_OF_RANGE __MSABI_LONG(1781)
+#define RPC_X_BYTE_COUNT_TOO_SMALL __MSABI_LONG(1782)
+#define RPC_X_BAD_STUB_DATA __MSABI_LONG(1783)
+#define ERROR_INVALID_USER_BUFFER __MSABI_LONG(1784)
+#define ERROR_UNRECOGNIZED_MEDIA __MSABI_LONG(1785)
+#define ERROR_NO_TRUST_LSA_SECRET __MSABI_LONG(1786)
+#define ERROR_NO_TRUST_SAM_ACCOUNT __MSABI_LONG(1787)
+#define ERROR_TRUSTED_DOMAIN_FAILURE __MSABI_LONG(1788)
+#define ERROR_TRUSTED_RELATIONSHIP_FAILURE __MSABI_LONG(1789)
+#define ERROR_TRUST_FAILURE __MSABI_LONG(1790)
+#define RPC_S_CALL_IN_PROGRESS __MSABI_LONG(1791)
+#define ERROR_NETLOGON_NOT_STARTED __MSABI_LONG(1792)
+#define ERROR_ACCOUNT_EXPIRED __MSABI_LONG(1793)
+#define ERROR_REDIRECTOR_HAS_OPEN_HANDLES __MSABI_LONG(1794)
+#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED __MSABI_LONG(1795)
+#define ERROR_UNKNOWN_PORT __MSABI_LONG(1796)
+#define ERROR_UNKNOWN_PRINTER_DRIVER __MSABI_LONG(1797)
+#define ERROR_UNKNOWN_PRINTPROCESSOR __MSABI_LONG(1798)
+#define ERROR_INVALID_SEPARATOR_FILE __MSABI_LONG(1799)
+#define ERROR_INVALID_PRIORITY __MSABI_LONG(1800)
+#define ERROR_INVALID_PRINTER_NAME __MSABI_LONG(1801)
+#define ERROR_PRINTER_ALREADY_EXISTS __MSABI_LONG(1802)
+#define ERROR_INVALID_PRINTER_COMMAND __MSABI_LONG(1803)
+#define ERROR_INVALID_DATATYPE __MSABI_LONG(1804)
+#define ERROR_INVALID_ENVIRONMENT __MSABI_LONG(1805)
+#define RPC_S_NO_MORE_BINDINGS __MSABI_LONG(1806)
+#define ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT __MSABI_LONG(1807)
+#define ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT __MSABI_LONG(1808)
+#define ERROR_NOLOGON_SERVER_TRUST_ACCOUNT __MSABI_LONG(1809)
+#define ERROR_DOMAIN_TRUST_INCONSISTENT __MSABI_LONG(1810)
+#define ERROR_SERVER_HAS_OPEN_HANDLES __MSABI_LONG(1811)
+#define ERROR_RESOURCE_DATA_NOT_FOUND __MSABI_LONG(1812)
+#define ERROR_RESOURCE_TYPE_NOT_FOUND __MSABI_LONG(1813)
+#define ERROR_RESOURCE_NAME_NOT_FOUND __MSABI_LONG(1814)
+#define ERROR_RESOURCE_LANG_NOT_FOUND __MSABI_LONG(1815)
+#define ERROR_NOT_ENOUGH_QUOTA __MSABI_LONG(1816)
+#define RPC_S_NO_INTERFACES __MSABI_LONG(1817)
+#define RPC_S_CALL_CANCELLED __MSABI_LONG(1818)
+#define RPC_S_BINDING_INCOMPLETE __MSABI_LONG(1819)
+#define RPC_S_COMM_FAILURE __MSABI_LONG(1820)
+#define RPC_S_UNSUPPORTED_AUTHN_LEVEL __MSABI_LONG(1821)
+#define RPC_S_NO_PRINC_NAME __MSABI_LONG(1822)
+#define RPC_S_NOT_RPC_ERROR __MSABI_LONG(1823)
+#define RPC_S_UUID_LOCAL_ONLY __MSABI_LONG(1824)
+#define RPC_S_SEC_PKG_ERROR __MSABI_LONG(1825)
+#define RPC_S_NOT_CANCELLED __MSABI_LONG(1826)
+#define RPC_X_INVALID_ES_ACTION __MSABI_LONG(1827)
+#define RPC_X_WRONG_ES_VERSION __MSABI_LONG(1828)
+#define RPC_X_WRONG_STUB_VERSION __MSABI_LONG(1829)
+#define RPC_X_INVALID_PIPE_OBJECT __MSABI_LONG(1830)
+#define RPC_X_WRONG_PIPE_ORDER __MSABI_LONG(1831)
+#define RPC_X_WRONG_PIPE_VERSION __MSABI_LONG(1832)
+#define RPC_S_GROUP_MEMBER_NOT_FOUND __MSABI_LONG(1898)
+#define EPT_S_CANT_CREATE __MSABI_LONG(1899)
+#define RPC_S_INVALID_OBJECT __MSABI_LONG(1900)
+#define ERROR_INVALID_TIME __MSABI_LONG(1901)
+#define ERROR_INVALID_FORM_NAME __MSABI_LONG(1902)
+#define ERROR_INVALID_FORM_SIZE __MSABI_LONG(1903)
+#define ERROR_ALREADY_WAITING __MSABI_LONG(1904)
+#define ERROR_PRINTER_DELETED __MSABI_LONG(1905)
+#define ERROR_INVALID_PRINTER_STATE __MSABI_LONG(1906)
+#define ERROR_PASSWORD_MUST_CHANGE __MSABI_LONG(1907)
+#define ERROR_DOMAIN_CONTROLLER_NOT_FOUND __MSABI_LONG(1908)
+#define ERROR_ACCOUNT_LOCKED_OUT __MSABI_LONG(1909)
+#define OR_INVALID_OXID __MSABI_LONG(1910)
+#define OR_INVALID_OID __MSABI_LONG(1911)
+#define OR_INVALID_SET __MSABI_LONG(1912)
+#define RPC_S_SEND_INCOMPLETE __MSABI_LONG(1913)
+#define RPC_S_INVALID_ASYNC_HANDLE __MSABI_LONG(1914)
+#define RPC_S_INVALID_ASYNC_CALL __MSABI_LONG(1915)
+#define RPC_X_PIPE_CLOSED __MSABI_LONG(1916)
+#define RPC_X_PIPE_DISCIPLINE_ERROR __MSABI_LONG(1917)
+#define RPC_X_PIPE_EMPTY __MSABI_LONG(1918)
+#define ERROR_NO_SITENAME __MSABI_LONG(1919)
+#define ERROR_CANT_ACCESS_FILE __MSABI_LONG(1920)
+#define ERROR_CANT_RESOLVE_FILENAME __MSABI_LONG(1921)
+#define RPC_S_ENTRY_TYPE_MISMATCH __MSABI_LONG(1922)
+#define RPC_S_NOT_ALL_OBJS_EXPORTED __MSABI_LONG(1923)
+#define RPC_S_INTERFACE_NOT_EXPORTED __MSABI_LONG(1924)
+#define RPC_S_PROFILE_NOT_ADDED __MSABI_LONG(1925)
+#define RPC_S_PRF_ELT_NOT_ADDED __MSABI_LONG(1926)
+#define RPC_S_PRF_ELT_NOT_REMOVED __MSABI_LONG(1927)
+#define RPC_S_GRP_ELT_NOT_ADDED __MSABI_LONG(1928)
+#define RPC_S_GRP_ELT_NOT_REMOVED __MSABI_LONG(1929)
+#define ERROR_KM_DRIVER_BLOCKED __MSABI_LONG(1930)
+#define ERROR_CONTEXT_EXPIRED __MSABI_LONG(1931)
+#define ERROR_PER_USER_TRUST_QUOTA_EXCEEDED __MSABI_LONG(1932)
+#define ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED __MSABI_LONG(1933)
+#define ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED __MSABI_LONG(1934)
+#define ERROR_AUTHENTICATION_FIREWALL_FAILED __MSABI_LONG(1935)
+#define ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED __MSABI_LONG(1936)
+#define ERROR_INVALID_PIXEL_FORMAT __MSABI_LONG(2000)
+#define ERROR_BAD_DRIVER __MSABI_LONG(2001)
+#define ERROR_INVALID_WINDOW_STYLE __MSABI_LONG(2002)
+#define ERROR_METAFILE_NOT_SUPPORTED __MSABI_LONG(2003)
+#define ERROR_TRANSFORM_NOT_SUPPORTED __MSABI_LONG(2004)
+#define ERROR_CLIPPING_NOT_SUPPORTED __MSABI_LONG(2005)
+#define ERROR_INVALID_CMM __MSABI_LONG(2010)
+#define ERROR_INVALID_PROFILE __MSABI_LONG(2011)
+#define ERROR_TAG_NOT_FOUND __MSABI_LONG(2012)
+#define ERROR_TAG_NOT_PRESENT __MSABI_LONG(2013)
+#define ERROR_DUPLICATE_TAG __MSABI_LONG(2014)
+#define ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE __MSABI_LONG(2015)
+#define ERROR_PROFILE_NOT_FOUND __MSABI_LONG(2016)
+#define ERROR_INVALID_COLORSPACE __MSABI_LONG(2017)
+#define ERROR_ICM_NOT_ENABLED __MSABI_LONG(2018)
+#define ERROR_DELETING_ICM_XFORM __MSABI_LONG(2019)
+#define ERROR_INVALID_TRANSFORM __MSABI_LONG(2020)
+#define ERROR_COLORSPACE_MISMATCH __MSABI_LONG(2021)
+#define ERROR_INVALID_COLORINDEX __MSABI_LONG(2022)
+#define ERROR_CONNECTED_OTHER_PASSWORD __MSABI_LONG(2108)
+#define ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT __MSABI_LONG(2109)
+#define ERROR_BAD_USERNAME __MSABI_LONG(2202)
+#define ERROR_NOT_CONNECTED __MSABI_LONG(2250)
+#define ERROR_OPEN_FILES __MSABI_LONG(2401)
+#define ERROR_ACTIVE_CONNECTIONS __MSABI_LONG(2402)
+#define ERROR_DEVICE_IN_USE __MSABI_LONG(2404)
+#define ERROR_UNKNOWN_PRINT_MONITOR __MSABI_LONG(3000)
+#define ERROR_PRINTER_DRIVER_IN_USE __MSABI_LONG(3001)
+#define ERROR_SPOOL_FILE_NOT_FOUND __MSABI_LONG(3002)
+#define ERROR_SPL_NO_STARTDOC __MSABI_LONG(3003)
+#define ERROR_SPL_NO_ADDJOB __MSABI_LONG(3004)
+#define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED __MSABI_LONG(3005)
+#define ERROR_PRINT_MONITOR_ALREADY_INSTALLED __MSABI_LONG(3006)
+#define ERROR_INVALID_PRINT_MONITOR __MSABI_LONG(3007)
+#define ERROR_PRINT_MONITOR_IN_USE __MSABI_LONG(3008)
+#define ERROR_PRINTER_HAS_JOBS_QUEUED __MSABI_LONG(3009)
+#define ERROR_SUCCESS_REBOOT_REQUIRED __MSABI_LONG(3010)
+#define ERROR_SUCCESS_RESTART_REQUIRED __MSABI_LONG(3011)
+#define ERROR_PRINTER_NOT_FOUND __MSABI_LONG(3012)
+#define ERROR_PRINTER_DRIVER_WARNED __MSABI_LONG(3013)
+#define ERROR_PRINTER_DRIVER_BLOCKED __MSABI_LONG(3014)
+#define ERROR_WINS_INTERNAL __MSABI_LONG(4000)
+#define ERROR_CAN_NOT_DEL_LOCAL_WINS __MSABI_LONG(4001)
+#define ERROR_STATIC_INIT __MSABI_LONG(4002)
+#define ERROR_INC_BACKUP __MSABI_LONG(4003)
+#define ERROR_FULL_BACKUP __MSABI_LONG(4004)
+#define ERROR_REC_NON_EXISTENT __MSABI_LONG(4005)
+#define ERROR_RPL_NOT_ALLOWED __MSABI_LONG(4006)
+#define ERROR_DHCP_ADDRESS_CONFLICT __MSABI_LONG(4100)
+#define ERROR_WMI_GUID_NOT_FOUND __MSABI_LONG(4200)
+#define ERROR_WMI_INSTANCE_NOT_FOUND __MSABI_LONG(4201)
+#define ERROR_WMI_ITEMID_NOT_FOUND __MSABI_LONG(4202)
+#define ERROR_WMI_TRY_AGAIN __MSABI_LONG(4203)
+#define ERROR_WMI_DP_NOT_FOUND __MSABI_LONG(4204)
+#define ERROR_WMI_UNRESOLVED_INSTANCE_REF __MSABI_LONG(4205)
+#define ERROR_WMI_ALREADY_ENABLED __MSABI_LONG(4206)
+#define ERROR_WMI_GUID_DISCONNECTED __MSABI_LONG(4207)
+#define ERROR_WMI_SERVER_UNAVAILABLE __MSABI_LONG(4208)
+#define ERROR_WMI_DP_FAILED __MSABI_LONG(4209)
+#define ERROR_WMI_INVALID_MOF __MSABI_LONG(4210)
+#define ERROR_WMI_INVALID_REGINFO __MSABI_LONG(4211)
+#define ERROR_WMI_ALREADY_DISABLED __MSABI_LONG(4212)
+#define ERROR_WMI_READ_ONLY __MSABI_LONG(4213)
+#define ERROR_WMI_SET_FAILURE __MSABI_LONG(4214)
+#define ERROR_INVALID_MEDIA __MSABI_LONG(4300)
+#define ERROR_INVALID_LIBRARY __MSABI_LONG(4301)
+#define ERROR_INVALID_MEDIA_POOL __MSABI_LONG(4302)
+#define ERROR_DRIVE_MEDIA_MISMATCH __MSABI_LONG(4303)
+#define ERROR_MEDIA_OFFLINE __MSABI_LONG(4304)
+#define ERROR_LIBRARY_OFFLINE __MSABI_LONG(4305)
+#define ERROR_EMPTY __MSABI_LONG(4306)
+#define ERROR_NOT_EMPTY __MSABI_LONG(4307)
+#define ERROR_MEDIA_UNAVAILABLE __MSABI_LONG(4308)
+#define ERROR_RESOURCE_DISABLED __MSABI_LONG(4309)
+#define ERROR_INVALID_CLEANER __MSABI_LONG(4310)
+#define ERROR_UNABLE_TO_CLEAN __MSABI_LONG(4311)
+#define ERROR_OBJECT_NOT_FOUND __MSABI_LONG(4312)
+#define ERROR_DATABASE_FAILURE __MSABI_LONG(4313)
+#define ERROR_DATABASE_FULL __MSABI_LONG(4314)
+#define ERROR_MEDIA_INCOMPATIBLE __MSABI_LONG(4315)
+#define ERROR_RESOURCE_NOT_PRESENT __MSABI_LONG(4316)
+#define ERROR_INVALID_OPERATION __MSABI_LONG(4317)
+#define ERROR_MEDIA_NOT_AVAILABLE __MSABI_LONG(4318)
+#define ERROR_DEVICE_NOT_AVAILABLE __MSABI_LONG(4319)
+#define ERROR_REQUEST_REFUSED __MSABI_LONG(4320)
+#define ERROR_INVALID_DRIVE_OBJECT __MSABI_LONG(4321)
+#define ERROR_LIBRARY_FULL __MSABI_LONG(4322)
+#define ERROR_MEDIUM_NOT_ACCESSIBLE __MSABI_LONG(4323)
+#define ERROR_UNABLE_TO_LOAD_MEDIUM __MSABI_LONG(4324)
+#define ERROR_UNABLE_TO_INVENTORY_DRIVE __MSABI_LONG(4325)
+#define ERROR_UNABLE_TO_INVENTORY_SLOT __MSABI_LONG(4326)
+#define ERROR_UNABLE_TO_INVENTORY_TRANSPORT __MSABI_LONG(4327)
+#define ERROR_TRANSPORT_FULL __MSABI_LONG(4328)
+#define ERROR_CONTROLLING_IEPORT __MSABI_LONG(4329)
+#define ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA __MSABI_LONG(4330)
+#define ERROR_CLEANER_SLOT_SET __MSABI_LONG(4331)
+#define ERROR_CLEANER_SLOT_NOT_SET __MSABI_LONG(4332)
+#define ERROR_CLEANER_CARTRIDGE_SPENT __MSABI_LONG(4333)
+#define ERROR_UNEXPECTED_OMID __MSABI_LONG(4334)
+#define ERROR_CANT_DELETE_LAST_ITEM __MSABI_LONG(4335)
+#define ERROR_MESSAGE_EXCEEDS_MAX_SIZE __MSABI_LONG(4336)
+#define ERROR_VOLUME_CONTAINS_SYS_FILES __MSABI_LONG(4337)
+#define ERROR_INDIGENOUS_TYPE __MSABI_LONG(4338)
+#define ERROR_NO_SUPPORTING_DRIVES __MSABI_LONG(4339)
+#define ERROR_CLEANER_CARTRIDGE_INSTALLED __MSABI_LONG(4340)
+#define ERROR_IEPORT_FULL __MSABI_LONG(4341)
+#define ERROR_FILE_OFFLINE __MSABI_LONG(4350)
+#define ERROR_REMOTE_STORAGE_NOT_ACTIVE __MSABI_LONG(4351)
+#define ERROR_REMOTE_STORAGE_MEDIA_ERROR __MSABI_LONG(4352)
+#define ERROR_NOT_A_REPARSE_POINT __MSABI_LONG(4390)
+#define ERROR_REPARSE_ATTRIBUTE_CONFLICT __MSABI_LONG(4391)
+#define ERROR_INVALID_REPARSE_DATA __MSABI_LONG(4392)
+#define ERROR_REPARSE_TAG_INVALID __MSABI_LONG(4393)
+#define ERROR_REPARSE_TAG_MISMATCH __MSABI_LONG(4394)
+#define ERROR_VOLUME_NOT_SIS_ENABLED __MSABI_LONG(4500)
+#define ERROR_DEPENDENT_RESOURCE_EXISTS __MSABI_LONG(5001)
+#define ERROR_DEPENDENCY_NOT_FOUND __MSABI_LONG(5002)
+#define ERROR_DEPENDENCY_ALREADY_EXISTS __MSABI_LONG(5003)
+#define ERROR_RESOURCE_NOT_ONLINE __MSABI_LONG(5004)
+#define ERROR_HOST_NODE_NOT_AVAILABLE __MSABI_LONG(5005)
+#define ERROR_RESOURCE_NOT_AVAILABLE __MSABI_LONG(5006)
+#define ERROR_RESOURCE_NOT_FOUND __MSABI_LONG(5007)
+#define ERROR_SHUTDOWN_CLUSTER __MSABI_LONG(5008)
+#define ERROR_CANT_EVICT_ACTIVE_NODE __MSABI_LONG(5009)
+#define ERROR_OBJECT_ALREADY_EXISTS __MSABI_LONG(5010)
+#define ERROR_OBJECT_IN_LIST __MSABI_LONG(5011)
+#define ERROR_GROUP_NOT_AVAILABLE __MSABI_LONG(5012)
+#define ERROR_GROUP_NOT_FOUND __MSABI_LONG(5013)
+#define ERROR_GROUP_NOT_ONLINE __MSABI_LONG(5014)
+#define ERROR_HOST_NODE_NOT_RESOURCE_OWNER __MSABI_LONG(5015)
+#define ERROR_HOST_NODE_NOT_GROUP_OWNER __MSABI_LONG(5016)
+#define ERROR_RESMON_CREATE_FAILED __MSABI_LONG(5017)
+#define ERROR_RESMON_ONLINE_FAILED __MSABI_LONG(5018)
+#define ERROR_RESOURCE_ONLINE __MSABI_LONG(5019)
+#define ERROR_QUORUM_RESOURCE __MSABI_LONG(5020)
+#define ERROR_NOT_QUORUM_CAPABLE __MSABI_LONG(5021)
+#define ERROR_CLUSTER_SHUTTING_DOWN __MSABI_LONG(5022)
+#define ERROR_INVALID_STATE __MSABI_LONG(5023)
+#define ERROR_RESOURCE_PROPERTIES_STORED __MSABI_LONG(5024)
+#define ERROR_NOT_QUORUM_CLASS __MSABI_LONG(5025)
+#define ERROR_CORE_RESOURCE __MSABI_LONG(5026)
+#define ERROR_QUORUM_RESOURCE_ONLINE_FAILED __MSABI_LONG(5027)
+#define ERROR_QUORUMLOG_OPEN_FAILED __MSABI_LONG(5028)
+#define ERROR_CLUSTERLOG_CORRUPT __MSABI_LONG(5029)
+#define ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE __MSABI_LONG(5030)
+#define ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE __MSABI_LONG(5031)
+#define ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND __MSABI_LONG(5032)
+#define ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE __MSABI_LONG(5033)
+#define ERROR_QUORUM_OWNER_ALIVE __MSABI_LONG(5034)
+#define ERROR_NETWORK_NOT_AVAILABLE __MSABI_LONG(5035)
+#define ERROR_NODE_NOT_AVAILABLE __MSABI_LONG(5036)
+#define ERROR_ALL_NODES_NOT_AVAILABLE __MSABI_LONG(5037)
+#define ERROR_RESOURCE_FAILED __MSABI_LONG(5038)
+#define ERROR_CLUSTER_INVALID_NODE __MSABI_LONG(5039)
+#define ERROR_CLUSTER_NODE_EXISTS __MSABI_LONG(5040)
+#define ERROR_CLUSTER_JOIN_IN_PROGRESS __MSABI_LONG(5041)
+#define ERROR_CLUSTER_NODE_NOT_FOUND __MSABI_LONG(5042)
+#define ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND __MSABI_LONG(5043)
+#define ERROR_CLUSTER_NETWORK_EXISTS __MSABI_LONG(5044)
+#define ERROR_CLUSTER_NETWORK_NOT_FOUND __MSABI_LONG(5045)
+#define ERROR_CLUSTER_NETINTERFACE_EXISTS __MSABI_LONG(5046)
+#define ERROR_CLUSTER_NETINTERFACE_NOT_FOUND __MSABI_LONG(5047)
+#define ERROR_CLUSTER_INVALID_REQUEST __MSABI_LONG(5048)
+#define ERROR_CLUSTER_INVALID_NETWORK_PROVIDER __MSABI_LONG(5049)
+#define ERROR_CLUSTER_NODE_DOWN __MSABI_LONG(5050)
+#define ERROR_CLUSTER_NODE_UNREACHABLE __MSABI_LONG(5051)
+#define ERROR_CLUSTER_NODE_NOT_MEMBER __MSABI_LONG(5052)
+#define ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS __MSABI_LONG(5053)
+#define ERROR_CLUSTER_INVALID_NETWORK __MSABI_LONG(5054)
+#define ERROR_CLUSTER_NODE_UP __MSABI_LONG(5056)
+#define ERROR_CLUSTER_IPADDR_IN_USE __MSABI_LONG(5057)
+#define ERROR_CLUSTER_NODE_NOT_PAUSED __MSABI_LONG(5058)
+#define ERROR_CLUSTER_NO_SECURITY_CONTEXT __MSABI_LONG(5059)
+#define ERROR_CLUSTER_NETWORK_NOT_INTERNAL __MSABI_LONG(5060)
+#define ERROR_CLUSTER_NODE_ALREADY_UP __MSABI_LONG(5061)
+#define ERROR_CLUSTER_NODE_ALREADY_DOWN __MSABI_LONG(5062)
+#define ERROR_CLUSTER_NETWORK_ALREADY_ONLINE __MSABI_LONG(5063)
+#define ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE __MSABI_LONG(5064)
+#define ERROR_CLUSTER_NODE_ALREADY_MEMBER __MSABI_LONG(5065)
+#define ERROR_CLUSTER_LAST_INTERNAL_NETWORK __MSABI_LONG(5066)
+#define ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS __MSABI_LONG(5067)
+#define ERROR_INVALID_OPERATION_ON_QUORUM __MSABI_LONG(5068)
+#define ERROR_DEPENDENCY_NOT_ALLOWED __MSABI_LONG(5069)
+#define ERROR_CLUSTER_NODE_PAUSED __MSABI_LONG(5070)
+#define ERROR_NODE_CANT_HOST_RESOURCE __MSABI_LONG(5071)
+#define ERROR_CLUSTER_NODE_NOT_READY __MSABI_LONG(5072)
+#define ERROR_CLUSTER_NODE_SHUTTING_DOWN __MSABI_LONG(5073)
+#define ERROR_CLUSTER_JOIN_ABORTED __MSABI_LONG(5074)
+#define ERROR_CLUSTER_INCOMPATIBLE_VERSIONS __MSABI_LONG(5075)
+#define ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED __MSABI_LONG(5076)
+#define ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED __MSABI_LONG(5077)
+#define ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND __MSABI_LONG(5078)
+#define ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED __MSABI_LONG(5079)
+#define ERROR_CLUSTER_RESNAME_NOT_FOUND __MSABI_LONG(5080)
+#define ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED __MSABI_LONG(5081)
+#define ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST __MSABI_LONG(5082)
+#define ERROR_CLUSTER_DATABASE_SEQMISMATCH __MSABI_LONG(5083)
+#define ERROR_RESMON_INVALID_STATE __MSABI_LONG(5084)
+#define ERROR_CLUSTER_GUM_NOT_LOCKER __MSABI_LONG(5085)
+#define ERROR_QUORUM_DISK_NOT_FOUND __MSABI_LONG(5086)
+#define ERROR_DATABASE_BACKUP_CORRUPT __MSABI_LONG(5087)
+#define ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT __MSABI_LONG(5088)
+#define ERROR_RESOURCE_PROPERTY_UNCHANGEABLE __MSABI_LONG(5089)
+#define ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE __MSABI_LONG(5890)
+#define ERROR_CLUSTER_QUORUMLOG_NOT_FOUND __MSABI_LONG(5891)
+#define ERROR_CLUSTER_MEMBERSHIP_HALT __MSABI_LONG(5892)
+#define ERROR_CLUSTER_INSTANCE_ID_MISMATCH __MSABI_LONG(5893)
+#define ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP __MSABI_LONG(5894)
+#define ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH __MSABI_LONG(5895)
+#define ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP __MSABI_LONG(5896)
+#define ERROR_CLUSTER_PARAMETER_MISMATCH __MSABI_LONG(5897)
+#define ERROR_NODE_CANNOT_BE_CLUSTERED __MSABI_LONG(5898)
+#define ERROR_CLUSTER_WRONG_OS_VERSION __MSABI_LONG(5899)
+#define ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME __MSABI_LONG(5900)
+#define ERROR_CLUSCFG_ALREADY_COMMITTED __MSABI_LONG(5901)
+#define ERROR_CLUSCFG_ROLLBACK_FAILED __MSABI_LONG(5902)
+#define ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT __MSABI_LONG(5903)
+#define ERROR_CLUSTER_OLD_VERSION __MSABI_LONG(5904)
+#define ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME __MSABI_LONG(5905)
+#define ERROR_ENCRYPTION_FAILED __MSABI_LONG(6000)
+#define ERROR_DECRYPTION_FAILED __MSABI_LONG(6001)
+#define ERROR_FILE_ENCRYPTED __MSABI_LONG(6002)
+#define ERROR_NO_RECOVERY_POLICY __MSABI_LONG(6003)
+#define ERROR_NO_EFS __MSABI_LONG(6004)
+#define ERROR_WRONG_EFS __MSABI_LONG(6005)
+#define ERROR_NO_USER_KEYS __MSABI_LONG(6006)
+#define ERROR_FILE_NOT_ENCRYPTED __MSABI_LONG(6007)
+#define ERROR_NOT_EXPORT_FORMAT __MSABI_LONG(6008)
+#define ERROR_FILE_READ_ONLY __MSABI_LONG(6009)
+#define ERROR_DIR_EFS_DISALLOWED __MSABI_LONG(6010)
+#define ERROR_EFS_SERVER_NOT_TRUSTED __MSABI_LONG(6011)
+#define ERROR_BAD_RECOVERY_POLICY __MSABI_LONG(6012)
+#define ERROR_EFS_ALG_BLOB_TOO_BIG __MSABI_LONG(6013)
+#define ERROR_VOLUME_NOT_SUPPORT_EFS __MSABI_LONG(6014)
+#define ERROR_EFS_DISABLED __MSABI_LONG(6015)
+#define ERROR_EFS_VERSION_NOT_SUPPORT __MSABI_LONG(6016)
+#define ERROR_NO_BROWSER_SERVERS_FOUND __MSABI_LONG(6118)
+#define SCHED_E_SERVICE_NOT_LOCALSYSTEM __MSABI_LONG(6200)
+#define ERROR_CTX_WINSTATION_NAME_INVALID __MSABI_LONG(7001)
+#define ERROR_CTX_INVALID_PD __MSABI_LONG(7002)
+#define ERROR_CTX_PD_NOT_FOUND __MSABI_LONG(7003)
+#define ERROR_CTX_WD_NOT_FOUND __MSABI_LONG(7004)
+#define ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY __MSABI_LONG(7005)
+#define ERROR_CTX_SERVICE_NAME_COLLISION __MSABI_LONG(7006)
+#define ERROR_CTX_CLOSE_PENDING __MSABI_LONG(7007)
+#define ERROR_CTX_NO_OUTBUF __MSABI_LONG(7008)
+#define ERROR_CTX_MODEM_INF_NOT_FOUND __MSABI_LONG(7009)
+#define ERROR_CTX_INVALID_MODEMNAME __MSABI_LONG(7010)
+#define ERROR_CTX_MODEM_RESPONSE_ERROR __MSABI_LONG(7011)
+#define ERROR_CTX_MODEM_RESPONSE_TIMEOUT __MSABI_LONG(7012)
+#define ERROR_CTX_MODEM_RESPONSE_NO_CARRIER __MSABI_LONG(7013)
+#define ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE __MSABI_LONG(7014)
+#define ERROR_CTX_MODEM_RESPONSE_BUSY __MSABI_LONG(7015)
+#define ERROR_CTX_MODEM_RESPONSE_VOICE __MSABI_LONG(7016)
+#define ERROR_CTX_TD_ERROR __MSABI_LONG(7017)
+#define ERROR_CTX_WINSTATION_NOT_FOUND __MSABI_LONG(7022)
+#define ERROR_CTX_WINSTATION_ALREADY_EXISTS __MSABI_LONG(7023)
+#define ERROR_CTX_WINSTATION_BUSY __MSABI_LONG(7024)
+#define ERROR_CTX_BAD_VIDEO_MODE __MSABI_LONG(7025)
+#define ERROR_CTX_GRAPHICS_INVALID __MSABI_LONG(7035)
+#define ERROR_CTX_LOGON_DISABLED __MSABI_LONG(7037)
+#define ERROR_CTX_NOT_CONSOLE __MSABI_LONG(7038)
+#define ERROR_CTX_CLIENT_QUERY_TIMEOUT __MSABI_LONG(7040)
+#define ERROR_CTX_CONSOLE_DISCONNECT __MSABI_LONG(7041)
+#define ERROR_CTX_CONSOLE_CONNECT __MSABI_LONG(7042)
+#define ERROR_CTX_SHADOW_DENIED __MSABI_LONG(7044)
+#define ERROR_CTX_WINSTATION_ACCESS_DENIED __MSABI_LONG(7045)
+#define ERROR_CTX_INVALID_WD __MSABI_LONG(7049)
+#define ERROR_CTX_SHADOW_INVALID __MSABI_LONG(7050)
+#define ERROR_CTX_SHADOW_DISABLED __MSABI_LONG(7051)
+#define ERROR_CTX_CLIENT_LICENSE_IN_USE __MSABI_LONG(7052)
+#define ERROR_CTX_CLIENT_LICENSE_NOT_SET __MSABI_LONG(7053)
+#define ERROR_CTX_LICENSE_NOT_AVAILABLE __MSABI_LONG(7054)
+#define ERROR_CTX_LICENSE_CLIENT_INVALID __MSABI_LONG(7055)
+#define ERROR_CTX_LICENSE_EXPIRED __MSABI_LONG(7056)
+#define ERROR_CTX_SHADOW_NOT_RUNNING __MSABI_LONG(7057)
+#define ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE __MSABI_LONG(7058)
+#define ERROR_ACTIVATION_COUNT_EXCEEDED __MSABI_LONG(7059)
+#define FRS_ERR_INVALID_API_SEQUENCE __MSABI_LONG(8001)
+#define FRS_ERR_STARTING_SERVICE __MSABI_LONG(8002)
+#define FRS_ERR_STOPPING_SERVICE __MSABI_LONG(8003)
+#define FRS_ERR_INTERNAL_API __MSABI_LONG(8004)
+#define FRS_ERR_INTERNAL __MSABI_LONG(8005)
+#define FRS_ERR_SERVICE_COMM __MSABI_LONG(8006)
+#define FRS_ERR_INSUFFICIENT_PRIV __MSABI_LONG(8007)
+#define FRS_ERR_AUTHENTICATION __MSABI_LONG(8008)
+#define FRS_ERR_PARENT_INSUFFICIENT_PRIV __MSABI_LONG(8009)
+#define FRS_ERR_PARENT_AUTHENTICATION __MSABI_LONG(8010)
+#define FRS_ERR_CHILD_TO_PARENT_COMM __MSABI_LONG(8011)
+#define FRS_ERR_PARENT_TO_CHILD_COMM __MSABI_LONG(8012)
+#define FRS_ERR_SYSVOL_POPULATE __MSABI_LONG(8013)
+#define FRS_ERR_SYSVOL_POPULATE_TIMEOUT __MSABI_LONG(8014)
+#define FRS_ERR_SYSVOL_IS_BUSY __MSABI_LONG(8015)
+#define FRS_ERR_SYSVOL_DEMOTE __MSABI_LONG(8016)
+#define FRS_ERR_INVALID_SERVICE_PARAMETER __MSABI_LONG(8017)
 #define DS_S_SUCCESS NO_ERROR
-#define ERROR_DS_NOT_INSTALLED 8200L
-#define ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY 8201L
-#define ERROR_DS_NO_ATTRIBUTE_OR_VALUE 8202L
-#define ERROR_DS_INVALID_ATTRIBUTE_SYNTAX 8203L
-#define ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED 8204L
-#define ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS 8205L
-#define ERROR_DS_BUSY 8206L
-#define ERROR_DS_UNAVAILABLE 8207L
-#define ERROR_DS_NO_RIDS_ALLOCATED 8208L
-#define ERROR_DS_NO_MORE_RIDS 8209L
-#define ERROR_DS_INCORRECT_ROLE_OWNER 8210L
-#define ERROR_DS_RIDMGR_INIT_ERROR 8211L
-#define ERROR_DS_OBJ_CLASS_VIOLATION 8212L
-#define ERROR_DS_CANT_ON_NON_LEAF 8213L
-#define ERROR_DS_CANT_ON_RDN 8214L
-#define ERROR_DS_CANT_MOD_OBJ_CLASS 8215L
-#define ERROR_DS_CROSS_DOM_MOVE_ERROR 8216L
-#define ERROR_DS_GC_NOT_AVAILABLE 8217L
-#define ERROR_SHARED_POLICY 8218L
-#define ERROR_POLICY_OBJECT_NOT_FOUND 8219L
-#define ERROR_POLICY_ONLY_IN_DS 8220L
-#define ERROR_PROMOTION_ACTIVE 8221L
-#define ERROR_NO_PROMOTION_ACTIVE 8222L
-#define ERROR_DS_OPERATIONS_ERROR 8224L
-#define ERROR_DS_PROTOCOL_ERROR 8225L
-#define ERROR_DS_TIMELIMIT_EXCEEDED 8226L
-#define ERROR_DS_SIZELIMIT_EXCEEDED 8227L
-#define ERROR_DS_ADMIN_LIMIT_EXCEEDED 8228L
-#define ERROR_DS_COMPARE_FALSE 8229L
-#define ERROR_DS_COMPARE_TRUE 8230L
-#define ERROR_DS_AUTH_METHOD_NOT_SUPPORTED 8231L
-#define ERROR_DS_STRONG_AUTH_REQUIRED 8232L
-#define ERROR_DS_INAPPROPRIATE_AUTH 8233L
-#define ERROR_DS_AUTH_UNKNOWN 8234L
-#define ERROR_DS_REFERRAL 8235L
-#define ERROR_DS_UNAVAILABLE_CRIT_EXTENSION 8236L
-#define ERROR_DS_CONFIDENTIALITY_REQUIRED 8237L
-#define ERROR_DS_INAPPROPRIATE_MATCHING 8238L
-#define ERROR_DS_CONSTRAINT_VIOLATION 8239L
-#define ERROR_DS_NO_SUCH_OBJECT 8240L
-#define ERROR_DS_ALIAS_PROBLEM 8241L
-#define ERROR_DS_INVALID_DN_SYNTAX 8242L
-#define ERROR_DS_IS_LEAF 8243L
-#define ERROR_DS_ALIAS_DEREF_PROBLEM 8244L
-#define ERROR_DS_UNWILLING_TO_PERFORM 8245L
-#define ERROR_DS_LOOP_DETECT 8246L
-#define ERROR_DS_NAMING_VIOLATION 8247L
-#define ERROR_DS_OBJECT_RESULTS_TOO_LARGE 8248L
-#define ERROR_DS_AFFECTS_MULTIPLE_DSAS 8249L
-#define ERROR_DS_SERVER_DOWN 8250L
-#define ERROR_DS_LOCAL_ERROR 8251L
-#define ERROR_DS_ENCODING_ERROR 8252L
-#define ERROR_DS_DECODING_ERROR 8253L
-#define ERROR_DS_FILTER_UNKNOWN 8254L
-#define ERROR_DS_PARAM_ERROR 8255L
-#define ERROR_DS_NOT_SUPPORTED 8256L
-#define ERROR_DS_NO_RESULTS_RETURNED 8257L
-#define ERROR_DS_CONTROL_NOT_FOUND 8258L
-#define ERROR_DS_CLIENT_LOOP 8259L
-#define ERROR_DS_REFERRAL_LIMIT_EXCEEDED 8260L
-#define ERROR_DS_SORT_CONTROL_MISSING 8261L
-#define ERROR_DS_OFFSET_RANGE_ERROR 8262L
-#define ERROR_DS_ROOT_MUST_BE_NC 8301L
-#define ERROR_DS_ADD_REPLICA_INHIBITED 8302L
-#define ERROR_DS_ATT_NOT_DEF_IN_SCHEMA 8303L
-#define ERROR_DS_MAX_OBJ_SIZE_EXCEEDED 8304L
-#define ERROR_DS_OBJ_STRING_NAME_EXISTS 8305L
-#define ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA 8306L
-#define ERROR_DS_RDN_DOESNT_MATCH_SCHEMA 8307L
-#define ERROR_DS_NO_REQUESTED_ATTS_FOUND 8308L
-#define ERROR_DS_USER_BUFFER_TO_SMALL 8309L
-#define ERROR_DS_ATT_IS_NOT_ON_OBJ 8310L
-#define ERROR_DS_ILLEGAL_MOD_OPERATION 8311L
-#define ERROR_DS_OBJ_TOO_LARGE 8312L
-#define ERROR_DS_BAD_INSTANCE_TYPE 8313L
-#define ERROR_DS_MASTERDSA_REQUIRED 8314L
-#define ERROR_DS_OBJECT_CLASS_REQUIRED 8315L
-#define ERROR_DS_MISSING_REQUIRED_ATT 8316L
-#define ERROR_DS_ATT_NOT_DEF_FOR_CLASS 8317L
-#define ERROR_DS_ATT_ALREADY_EXISTS 8318L
-#define ERROR_DS_CANT_ADD_ATT_VALUES 8320L
-#define ERROR_DS_SINGLE_VALUE_CONSTRAINT 8321L
-#define ERROR_DS_RANGE_CONSTRAINT 8322L
-#define ERROR_DS_ATT_VAL_ALREADY_EXISTS 8323L
-#define ERROR_DS_CANT_REM_MISSING_ATT 8324L
-#define ERROR_DS_CANT_REM_MISSING_ATT_VAL 8325L
-#define ERROR_DS_ROOT_CANT_BE_SUBREF 8326L
-#define ERROR_DS_NO_CHAINING 8327L
-#define ERROR_DS_NO_CHAINED_EVAL 8328L
-#define ERROR_DS_NO_PARENT_OBJECT 8329L
-#define ERROR_DS_PARENT_IS_AN_ALIAS 8330L
-#define ERROR_DS_CANT_MIX_MASTER_AND_REPS 8331L
-#define ERROR_DS_CHILDREN_EXIST 8332L
-#define ERROR_DS_OBJ_NOT_FOUND 8333L
-#define ERROR_DS_ALIASED_OBJ_MISSING 8334L
-#define ERROR_DS_BAD_NAME_SYNTAX 8335L
-#define ERROR_DS_ALIAS_POINTS_TO_ALIAS 8336L
-#define ERROR_DS_CANT_DEREF_ALIAS 8337L
-#define ERROR_DS_OUT_OF_SCOPE 8338L
-#define ERROR_DS_OBJECT_BEING_REMOVED 8339L
-#define ERROR_DS_CANT_DELETE_DSA_OBJ 8340L
-#define ERROR_DS_GENERIC_ERROR 8341L
-#define ERROR_DS_DSA_MUST_BE_INT_MASTER 8342L
-#define ERROR_DS_CLASS_NOT_DSA 8343L
-#define ERROR_DS_INSUFF_ACCESS_RIGHTS 8344L
-#define ERROR_DS_ILLEGAL_SUPERIOR 8345L
-#define ERROR_DS_ATTRIBUTE_OWNED_BY_SAM 8346L
-#define ERROR_DS_NAME_TOO_MANY_PARTS 8347L
-#define ERROR_DS_NAME_TOO_LONG 8348L
-#define ERROR_DS_NAME_VALUE_TOO_LONG 8349L
-#define ERROR_DS_NAME_UNPARSEABLE 8350L
-#define ERROR_DS_NAME_TYPE_UNKNOWN 8351L
-#define ERROR_DS_NOT_AN_OBJECT 8352L
-#define ERROR_DS_SEC_DESC_TOO_SHORT 8353L
-#define ERROR_DS_SEC_DESC_INVALID 8354L
-#define ERROR_DS_NO_DELETED_NAME 8355L
-#define ERROR_DS_SUBREF_MUST_HAVE_PARENT 8356L
-#define ERROR_DS_NCNAME_MUST_BE_NC 8357L
-#define ERROR_DS_CANT_ADD_SYSTEM_ONLY 8358L
-#define ERROR_DS_CLASS_MUST_BE_CONCRETE 8359L
-#define ERROR_DS_INVALID_DMD 8360L
-#define ERROR_DS_OBJ_GUID_EXISTS 8361L
-#define ERROR_DS_NOT_ON_BACKLINK 8362L
-#define ERROR_DS_NO_CROSSREF_FOR_NC 8363L
-#define ERROR_DS_SHUTTING_DOWN 8364L
-#define ERROR_DS_UNKNOWN_OPERATION 8365L
-#define ERROR_DS_INVALID_ROLE_OWNER 8366L
-#define ERROR_DS_COULDNT_CONTACT_FSMO 8367L
-#define ERROR_DS_CROSS_NC_DN_RENAME 8368L
-#define ERROR_DS_CANT_MOD_SYSTEM_ONLY 8369L
-#define ERROR_DS_REPLICATOR_ONLY 8370L
-#define ERROR_DS_OBJ_CLASS_NOT_DEFINED 8371L
-#define ERROR_DS_OBJ_CLASS_NOT_SUBCLASS 8372L
-#define ERROR_DS_NAME_REFERENCE_INVALID 8373L
-#define ERROR_DS_CROSS_REF_EXISTS 8374L
-#define ERROR_DS_CANT_DEL_MASTER_CROSSREF 8375L
-#define ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD 8376L
-#define ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX 8377L
-#define ERROR_DS_DUP_RDN 8378L
-#define ERROR_DS_DUP_OID 8379L
-#define ERROR_DS_DUP_MAPI_ID 8380L
-#define ERROR_DS_DUP_SCHEMA_ID_GUID 8381L
-#define ERROR_DS_DUP_LDAP_DISPLAY_NAME 8382L
-#define ERROR_DS_SEMANTIC_ATT_TEST 8383L
-#define ERROR_DS_SYNTAX_MISMATCH 8384L
-#define ERROR_DS_EXISTS_IN_MUST_HAVE 8385L
-#define ERROR_DS_EXISTS_IN_MAY_HAVE 8386L
-#define ERROR_DS_NONEXISTENT_MAY_HAVE 8387L
-#define ERROR_DS_NONEXISTENT_MUST_HAVE 8388L
-#define ERROR_DS_AUX_CLS_TEST_FAIL 8389L
-#define ERROR_DS_NONEXISTENT_POSS_SUP 8390L
-#define ERROR_DS_SUB_CLS_TEST_FAIL 8391L
-#define ERROR_DS_BAD_RDN_ATT_ID_SYNTAX 8392L
-#define ERROR_DS_EXISTS_IN_AUX_CLS 8393L
-#define ERROR_DS_EXISTS_IN_SUB_CLS 8394L
-#define ERROR_DS_EXISTS_IN_POSS_SUP 8395L
-#define ERROR_DS_RECALCSCHEMA_FAILED 8396L
-#define ERROR_DS_TREE_DELETE_NOT_FINISHED 8397L
-#define ERROR_DS_CANT_DELETE 8398L
-#define ERROR_DS_ATT_SCHEMA_REQ_ID 8399L
-#define ERROR_DS_BAD_ATT_SCHEMA_SYNTAX 8400L
-#define ERROR_DS_CANT_CACHE_ATT 8401L
-#define ERROR_DS_CANT_CACHE_CLASS 8402L
-#define ERROR_DS_CANT_REMOVE_ATT_CACHE 8403L
-#define ERROR_DS_CANT_REMOVE_CLASS_CACHE 8404L
-#define ERROR_DS_CANT_RETRIEVE_DN 8405L
-#define ERROR_DS_MISSING_SUPREF 8406L
-#define ERROR_DS_CANT_RETRIEVE_INSTANCE 8407L
-#define ERROR_DS_CODE_INCONSISTENCY 8408L
-#define ERROR_DS_DATABASE_ERROR 8409L
-#define ERROR_DS_GOVERNSID_MISSING 8410L
-#define ERROR_DS_MISSING_EXPECTED_ATT 8411L
-#define ERROR_DS_NCNAME_MISSING_CR_REF 8412L
-#define ERROR_DS_SECURITY_CHECKING_ERROR 8413L
-#define ERROR_DS_SCHEMA_NOT_LOADED 8414L
-#define ERROR_DS_SCHEMA_ALLOC_FAILED 8415L
-#define ERROR_DS_ATT_SCHEMA_REQ_SYNTAX 8416L
-#define ERROR_DS_GCVERIFY_ERROR 8417L
-#define ERROR_DS_DRA_SCHEMA_MISMATCH 8418L
-#define ERROR_DS_CANT_FIND_DSA_OBJ 8419L
-#define ERROR_DS_CANT_FIND_EXPECTED_NC 8420L
-#define ERROR_DS_CANT_FIND_NC_IN_CACHE 8421L
-#define ERROR_DS_CANT_RETRIEVE_CHILD 8422L
-#define ERROR_DS_SECURITY_ILLEGAL_MODIFY 8423L
-#define ERROR_DS_CANT_REPLACE_HIDDEN_REC 8424L
-#define ERROR_DS_BAD_HIERARCHY_FILE 8425L
-#define ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED 8426L
-#define ERROR_DS_CONFIG_PARAM_MISSING 8427L
-#define ERROR_DS_COUNTING_AB_INDICES_FAILED 8428L
-#define ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED 8429L
-#define ERROR_DS_INTERNAL_FAILURE 8430L
-#define ERROR_DS_UNKNOWN_ERROR 8431L
-#define ERROR_DS_ROOT_REQUIRES_CLASS_TOP 8432L
-#define ERROR_DS_REFUSING_FSMO_ROLES 8433L
-#define ERROR_DS_MISSING_FSMO_SETTINGS 8434L
-#define ERROR_DS_UNABLE_TO_SURRENDER_ROLES 8435L
-#define ERROR_DS_DRA_GENERIC 8436L
-#define ERROR_DS_DRA_INVALID_PARAMETER 8437L
-#define ERROR_DS_DRA_BUSY 8438L
-#define ERROR_DS_DRA_BAD_DN 8439L
-#define ERROR_DS_DRA_BAD_NC 8440L
-#define ERROR_DS_DRA_DN_EXISTS 8441L
-#define ERROR_DS_DRA_INTERNAL_ERROR 8442L
-#define ERROR_DS_DRA_INCONSISTENT_DIT 8443L
-#define ERROR_DS_DRA_CONNECTION_FAILED 8444L
-#define ERROR_DS_DRA_BAD_INSTANCE_TYPE 8445L
-#define ERROR_DS_DRA_OUT_OF_MEM 8446L
-#define ERROR_DS_DRA_MAIL_PROBLEM 8447L
-#define ERROR_DS_DRA_REF_ALREADY_EXISTS 8448L
-#define ERROR_DS_DRA_REF_NOT_FOUND 8449L
-#define ERROR_DS_DRA_OBJ_IS_REP_SOURCE 8450L
-#define ERROR_DS_DRA_DB_ERROR 8451L
-#define ERROR_DS_DRA_NO_REPLICA 8452L
-#define ERROR_DS_DRA_ACCESS_DENIED 8453L
-#define ERROR_DS_DRA_NOT_SUPPORTED 8454L
-#define ERROR_DS_DRA_RPC_CANCELLED 8455L
-#define ERROR_DS_DRA_SOURCE_DISABLED 8456L
-#define ERROR_DS_DRA_SINK_DISABLED 8457L
-#define ERROR_DS_DRA_NAME_COLLISION 8458L
-#define ERROR_DS_DRA_SOURCE_REINSTALLED 8459L
-#define ERROR_DS_DRA_MISSING_PARENT 8460L
-#define ERROR_DS_DRA_PREEMPTED 8461L
-#define ERROR_DS_DRA_ABANDON_SYNC 8462L
-#define ERROR_DS_DRA_SHUTDOWN 8463L
-#define ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET 8464L
-#define ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA 8465L
-#define ERROR_DS_DRA_EXTN_CONNECTION_FAILED 8466L
-#define ERROR_DS_INSTALL_SCHEMA_MISMATCH 8467L
-#define ERROR_DS_DUP_LINK_ID 8468L
-#define ERROR_DS_NAME_ERROR_RESOLVING 8469L
-#define ERROR_DS_NAME_ERROR_NOT_FOUND 8470L
-#define ERROR_DS_NAME_ERROR_NOT_UNIQUE 8471L
-#define ERROR_DS_NAME_ERROR_NO_MAPPING 8472L
-#define ERROR_DS_NAME_ERROR_DOMAIN_ONLY 8473L
-#define ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING 8474L
-#define ERROR_DS_CONSTRUCTED_ATT_MOD 8475L
-#define ERROR_DS_WRONG_OM_OBJ_CLASS 8476L
-#define ERROR_DS_DRA_REPL_PENDING 8477L
-#define ERROR_DS_DS_REQUIRED 8478L
-#define ERROR_DS_INVALID_LDAP_DISPLAY_NAME 8479L
-#define ERROR_DS_NON_BASE_SEARCH 8480L
-#define ERROR_DS_CANT_RETRIEVE_ATTS 8481L
-#define ERROR_DS_BACKLINK_WITHOUT_LINK 8482L
-#define ERROR_DS_EPOCH_MISMATCH 8483L
-#define ERROR_DS_SRC_NAME_MISMATCH 8484L
-#define ERROR_DS_SRC_AND_DST_NC_IDENTICAL 8485L
-#define ERROR_DS_DST_NC_MISMATCH 8486L
-#define ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC 8487L
-#define ERROR_DS_SRC_GUID_MISMATCH 8488L
-#define ERROR_DS_CANT_MOVE_DELETED_OBJECT 8489L
-#define ERROR_DS_PDC_OPERATION_IN_PROGRESS 8490L
-#define ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD 8491L
-#define ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION 8492L
-#define ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS 8493L
-#define ERROR_DS_NC_MUST_HAVE_NC_PARENT 8494L
-#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE 8495L
-#define ERROR_DS_DST_DOMAIN_NOT_NATIVE 8496L
-#define ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER 8497L
-#define ERROR_DS_CANT_MOVE_ACCOUNT_GROUP 8498L
-#define ERROR_DS_CANT_MOVE_RESOURCE_GROUP 8499L
-#define ERROR_DS_INVALID_SEARCH_FLAG 8500L
-#define ERROR_DS_NO_TREE_DELETE_ABOVE_NC 8501L
-#define ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE 8502L
-#define ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE 8503L
-#define ERROR_DS_SAM_INIT_FAILURE 8504L
-#define ERROR_DS_SENSITIVE_GROUP_VIOLATION 8505L
-#define ERROR_DS_CANT_MOD_PRIMARYGROUPID 8506L
-#define ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD 8507L
-#define ERROR_DS_NONSAFE_SCHEMA_CHANGE 8508L
-#define ERROR_DS_SCHEMA_UPDATE_DISALLOWED 8509L
-#define ERROR_DS_CANT_CREATE_UNDER_SCHEMA 8510L
-#define ERROR_DS_INSTALL_NO_SRC_SCH_VERSION 8511L
-#define ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE 8512L
-#define ERROR_DS_INVALID_GROUP_TYPE 8513L
-#define ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN 8514L
-#define ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN 8515L
-#define ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER 8516L
-#define ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER 8517L
-#define ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER 8518L
-#define ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER 8519L
-#define ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER 8520L
-#define ERROR_DS_HAVE_PRIMARY_MEMBERS 8521L
-#define ERROR_DS_STRING_SD_CONVERSION_FAILED 8522L
-#define ERROR_DS_NAMING_MASTER_GC 8523L
-#define ERROR_DS_DNS_LOOKUP_FAILURE 8524L
-#define ERROR_DS_COULDNT_UPDATE_SPNS 8525L
-#define ERROR_DS_CANT_RETRIEVE_SD 8526L
-#define ERROR_DS_KEY_NOT_UNIQUE 8527L
-#define ERROR_DS_WRONG_LINKED_ATT_SYNTAX 8528L
-#define ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD 8529L
-#define ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY 8530L
-#define ERROR_DS_CANT_START 8531L
-#define ERROR_DS_INIT_FAILURE 8532L
-#define ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION 8533L
-#define ERROR_DS_SOURCE_DOMAIN_IN_FOREST 8534L
-#define ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST 8535L
-#define ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED 8536L
-#define ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN 8537L
-#define ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER 8538L
-#define ERROR_DS_SRC_SID_EXISTS_IN_FOREST 8539L
-#define ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH 8540L
-#define ERROR_SAM_INIT_FAILURE 8541L
-#define ERROR_DS_DRA_SCHEMA_INFO_SHIP 8542L
-#define ERROR_DS_DRA_SCHEMA_CONFLICT 8543L
-#define ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT 8544L
-#define ERROR_DS_DRA_OBJ_NC_MISMATCH 8545L
-#define ERROR_DS_NC_STILL_HAS_DSAS 8546L
-#define ERROR_DS_GC_REQUIRED 8547L
-#define ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY 8548L
-#define ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS 8549L
-#define ERROR_DS_CANT_ADD_TO_GC 8550L
-#define ERROR_DS_NO_CHECKPOINT_WITH_PDC 8551L
-#define ERROR_DS_SOURCE_AUDITING_NOT_ENABLED 8552L
-#define ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC 8553L
-#define ERROR_DS_INVALID_NAME_FOR_SPN 8554L
-#define ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS 8555L
-#define ERROR_DS_UNICODEPWD_NOT_IN_QUOTES 8556L
-#define ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED 8557L
-#define ERROR_DS_MUST_BE_RUN_ON_DST_DC 8558L
-#define ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER 8559L
-#define ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ 8560L
-#define ERROR_DS_INIT_FAILURE_CONSOLE 8561L
-#define ERROR_DS_SAM_INIT_FAILURE_CONSOLE 8562L
-#define ERROR_DS_FOREST_VERSION_TOO_HIGH 8563L
-#define ERROR_DS_DOMAIN_VERSION_TOO_HIGH 8564L
-#define ERROR_DS_FOREST_VERSION_TOO_LOW 8565L
-#define ERROR_DS_DOMAIN_VERSION_TOO_LOW 8566L
-#define ERROR_DS_INCOMPATIBLE_VERSION 8567L
-#define ERROR_DS_LOW_DSA_VERSION 8568L
-#define ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN 8569L
-#define ERROR_DS_NOT_SUPPORTED_SORT_ORDER 8570L
-#define ERROR_DS_NAME_NOT_UNIQUE 8571L
-#define ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 8572L
-#define ERROR_DS_OUT_OF_VERSION_STORE 8573L
-#define ERROR_DS_INCOMPATIBLE_CONTROLS_USED 8574L
-#define ERROR_DS_NO_REF_DOMAIN 8575L
-#define ERROR_DS_RESERVED_LINK_ID 8576L
-#define ERROR_DS_LINK_ID_NOT_AVAILABLE 8577L
-#define ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER 8578L
-#define ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE 8579L
-#define ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC 8580L
-#define ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG 8581L
-#define ERROR_DS_MODIFYDN_WRONG_GRANDPARENT 8582L
-#define ERROR_DS_NAME_ERROR_TRUST_REFERRAL 8583L
-#define ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER 8584L
-#define ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD 8585L
-#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2 8586L
-#define ERROR_DS_THREAD_LIMIT_EXCEEDED 8587L
-#define ERROR_DS_NOT_CLOSEST 8588L
-#define ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF 8589L
-#define ERROR_DS_SINGLE_USER_MODE_FAILED 8590L
-#define ERROR_DS_NTDSCRIPT_SYNTAX_ERROR 8591L
-#define ERROR_DS_NTDSCRIPT_PROCESS_ERROR 8592L
-#define ERROR_DS_DIFFERENT_REPL_EPOCHS 8593L
-#define ERROR_DS_DRS_EXTENSIONS_CHANGED 8594L
-#define ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR 8595L
-#define ERROR_DS_NO_MSDS_INTID 8596L
-#define ERROR_DS_DUP_MSDS_INTID 8597L
-#define ERROR_DS_EXISTS_IN_RDNATTID 8598L
-#define ERROR_DS_AUTHORIZATION_FAILED 8599L
-#define ERROR_DS_INVALID_SCRIPT 8600L
-#define ERROR_DS_REMOTE_CROSSREF_OP_FAILED 8601L
-#define ERROR_DS_CROSS_REF_BUSY 8602L
-#define ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN 8603L
-#define ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC 8604L
-#define ERROR_DS_DUPLICATE_ID_FOUND 8605L
-#define ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT 8606L
-#define ERROR_DS_GROUP_CONVERSION_ERROR 8607L
-#define ERROR_DS_CANT_MOVE_APP_BASIC_GROUP 8608L
-#define ERROR_DS_CANT_MOVE_APP_QUERY_GROUP 8609L
-#define ERROR_DS_ROLE_NOT_VERIFIED 8610L
-#define ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL 8611L
-#define ERROR_DS_DOMAIN_RENAME_IN_PROGRESS 8612L
-#define ERROR_DS_EXISTING_AD_CHILD_NC 8613L
-#define ERROR_DS_REPL_LIFETIME_EXCEEDED 8614L
-#define ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER 8615L
-#define ERROR_DS_LDAP_SEND_QUEUE_FULL 8616L
-#define ERROR_DS_DRA_OUT_SCHEDULE_WINDOW 8617L
+#define ERROR_DS_NOT_INSTALLED __MSABI_LONG(8200)
+#define ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY __MSABI_LONG(8201)
+#define ERROR_DS_NO_ATTRIBUTE_OR_VALUE __MSABI_LONG(8202)
+#define ERROR_DS_INVALID_ATTRIBUTE_SYNTAX __MSABI_LONG(8203)
+#define ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED __MSABI_LONG(8204)
+#define ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS __MSABI_LONG(8205)
+#define ERROR_DS_BUSY __MSABI_LONG(8206)
+#define ERROR_DS_UNAVAILABLE __MSABI_LONG(8207)
+#define ERROR_DS_NO_RIDS_ALLOCATED __MSABI_LONG(8208)
+#define ERROR_DS_NO_MORE_RIDS __MSABI_LONG(8209)
+#define ERROR_DS_INCORRECT_ROLE_OWNER __MSABI_LONG(8210)
+#define ERROR_DS_RIDMGR_INIT_ERROR __MSABI_LONG(8211)
+#define ERROR_DS_OBJ_CLASS_VIOLATION __MSABI_LONG(8212)
+#define ERROR_DS_CANT_ON_NON_LEAF __MSABI_LONG(8213)
+#define ERROR_DS_CANT_ON_RDN __MSABI_LONG(8214)
+#define ERROR_DS_CANT_MOD_OBJ_CLASS __MSABI_LONG(8215)
+#define ERROR_DS_CROSS_DOM_MOVE_ERROR __MSABI_LONG(8216)
+#define ERROR_DS_GC_NOT_AVAILABLE __MSABI_LONG(8217)
+#define ERROR_SHARED_POLICY __MSABI_LONG(8218)
+#define ERROR_POLICY_OBJECT_NOT_FOUND __MSABI_LONG(8219)
+#define ERROR_POLICY_ONLY_IN_DS __MSABI_LONG(8220)
+#define ERROR_PROMOTION_ACTIVE __MSABI_LONG(8221)
+#define ERROR_NO_PROMOTION_ACTIVE __MSABI_LONG(8222)
+#define ERROR_DS_OPERATIONS_ERROR __MSABI_LONG(8224)
+#define ERROR_DS_PROTOCOL_ERROR __MSABI_LONG(8225)
+#define ERROR_DS_TIMELIMIT_EXCEEDED __MSABI_LONG(8226)
+#define ERROR_DS_SIZELIMIT_EXCEEDED __MSABI_LONG(8227)
+#define ERROR_DS_ADMIN_LIMIT_EXCEEDED __MSABI_LONG(8228)
+#define ERROR_DS_COMPARE_FALSE __MSABI_LONG(8229)
+#define ERROR_DS_COMPARE_TRUE __MSABI_LONG(8230)
+#define ERROR_DS_AUTH_METHOD_NOT_SUPPORTED __MSABI_LONG(8231)
+#define ERROR_DS_STRONG_AUTH_REQUIRED __MSABI_LONG(8232)
+#define ERROR_DS_INAPPROPRIATE_AUTH __MSABI_LONG(8233)
+#define ERROR_DS_AUTH_UNKNOWN __MSABI_LONG(8234)
+#define ERROR_DS_REFERRAL __MSABI_LONG(8235)
+#define ERROR_DS_UNAVAILABLE_CRIT_EXTENSION __MSABI_LONG(8236)
+#define ERROR_DS_CONFIDENTIALITY_REQUIRED __MSABI_LONG(8237)
+#define ERROR_DS_INAPPROPRIATE_MATCHING __MSABI_LONG(8238)
+#define ERROR_DS_CONSTRAINT_VIOLATION __MSABI_LONG(8239)
+#define ERROR_DS_NO_SUCH_OBJECT __MSABI_LONG(8240)
+#define ERROR_DS_ALIAS_PROBLEM __MSABI_LONG(8241)
+#define ERROR_DS_INVALID_DN_SYNTAX __MSABI_LONG(8242)
+#define ERROR_DS_IS_LEAF __MSABI_LONG(8243)
+#define ERROR_DS_ALIAS_DEREF_PROBLEM __MSABI_LONG(8244)
+#define ERROR_DS_UNWILLING_TO_PERFORM __MSABI_LONG(8245)
+#define ERROR_DS_LOOP_DETECT __MSABI_LONG(8246)
+#define ERROR_DS_NAMING_VIOLATION __MSABI_LONG(8247)
+#define ERROR_DS_OBJECT_RESULTS_TOO_LARGE __MSABI_LONG(8248)
+#define ERROR_DS_AFFECTS_MULTIPLE_DSAS __MSABI_LONG(8249)
+#define ERROR_DS_SERVER_DOWN __MSABI_LONG(8250)
+#define ERROR_DS_LOCAL_ERROR __MSABI_LONG(8251)
+#define ERROR_DS_ENCODING_ERROR __MSABI_LONG(8252)
+#define ERROR_DS_DECODING_ERROR __MSABI_LONG(8253)
+#define ERROR_DS_FILTER_UNKNOWN __MSABI_LONG(8254)
+#define ERROR_DS_PARAM_ERROR __MSABI_LONG(8255)
+#define ERROR_DS_NOT_SUPPORTED __MSABI_LONG(8256)
+#define ERROR_DS_NO_RESULTS_RETURNED __MSABI_LONG(8257)
+#define ERROR_DS_CONTROL_NOT_FOUND __MSABI_LONG(8258)
+#define ERROR_DS_CLIENT_LOOP __MSABI_LONG(8259)
+#define ERROR_DS_REFERRAL_LIMIT_EXCEEDED __MSABI_LONG(8260)
+#define ERROR_DS_SORT_CONTROL_MISSING __MSABI_LONG(8261)
+#define ERROR_DS_OFFSET_RANGE_ERROR __MSABI_LONG(8262)
+#define ERROR_DS_ROOT_MUST_BE_NC __MSABI_LONG(8301)
+#define ERROR_DS_ADD_REPLICA_INHIBITED __MSABI_LONG(8302)
+#define ERROR_DS_ATT_NOT_DEF_IN_SCHEMA __MSABI_LONG(8303)
+#define ERROR_DS_MAX_OBJ_SIZE_EXCEEDED __MSABI_LONG(8304)
+#define ERROR_DS_OBJ_STRING_NAME_EXISTS __MSABI_LONG(8305)
+#define ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA __MSABI_LONG(8306)
+#define ERROR_DS_RDN_DOESNT_MATCH_SCHEMA __MSABI_LONG(8307)
+#define ERROR_DS_NO_REQUESTED_ATTS_FOUND __MSABI_LONG(8308)
+#define ERROR_DS_USER_BUFFER_TO_SMALL __MSABI_LONG(8309)
+#define ERROR_DS_ATT_IS_NOT_ON_OBJ __MSABI_LONG(8310)
+#define ERROR_DS_ILLEGAL_MOD_OPERATION __MSABI_LONG(8311)
+#define ERROR_DS_OBJ_TOO_LARGE __MSABI_LONG(8312)
+#define ERROR_DS_BAD_INSTANCE_TYPE __MSABI_LONG(8313)
+#define ERROR_DS_MASTERDSA_REQUIRED __MSABI_LONG(8314)
+#define ERROR_DS_OBJECT_CLASS_REQUIRED __MSABI_LONG(8315)
+#define ERROR_DS_MISSING_REQUIRED_ATT __MSABI_LONG(8316)
+#define ERROR_DS_ATT_NOT_DEF_FOR_CLASS __MSABI_LONG(8317)
+#define ERROR_DS_ATT_ALREADY_EXISTS __MSABI_LONG(8318)
+#define ERROR_DS_CANT_ADD_ATT_VALUES __MSABI_LONG(8320)
+#define ERROR_DS_SINGLE_VALUE_CONSTRAINT __MSABI_LONG(8321)
+#define ERROR_DS_RANGE_CONSTRAINT __MSABI_LONG(8322)
+#define ERROR_DS_ATT_VAL_ALREADY_EXISTS __MSABI_LONG(8323)
+#define ERROR_DS_CANT_REM_MISSING_ATT __MSABI_LONG(8324)
+#define ERROR_DS_CANT_REM_MISSING_ATT_VAL __MSABI_LONG(8325)
+#define ERROR_DS_ROOT_CANT_BE_SUBREF __MSABI_LONG(8326)
+#define ERROR_DS_NO_CHAINING __MSABI_LONG(8327)
+#define ERROR_DS_NO_CHAINED_EVAL __MSABI_LONG(8328)
+#define ERROR_DS_NO_PARENT_OBJECT __MSABI_LONG(8329)
+#define ERROR_DS_PARENT_IS_AN_ALIAS __MSABI_LONG(8330)
+#define ERROR_DS_CANT_MIX_MASTER_AND_REPS __MSABI_LONG(8331)
+#define ERROR_DS_CHILDREN_EXIST __MSABI_LONG(8332)
+#define ERROR_DS_OBJ_NOT_FOUND __MSABI_LONG(8333)
+#define ERROR_DS_ALIASED_OBJ_MISSING __MSABI_LONG(8334)
+#define ERROR_DS_BAD_NAME_SYNTAX __MSABI_LONG(8335)
+#define ERROR_DS_ALIAS_POINTS_TO_ALIAS __MSABI_LONG(8336)
+#define ERROR_DS_CANT_DEREF_ALIAS __MSABI_LONG(8337)
+#define ERROR_DS_OUT_OF_SCOPE __MSABI_LONG(8338)
+#define ERROR_DS_OBJECT_BEING_REMOVED __MSABI_LONG(8339)
+#define ERROR_DS_CANT_DELETE_DSA_OBJ __MSABI_LONG(8340)
+#define ERROR_DS_GENERIC_ERROR __MSABI_LONG(8341)
+#define ERROR_DS_DSA_MUST_BE_INT_MASTER __MSABI_LONG(8342)
+#define ERROR_DS_CLASS_NOT_DSA __MSABI_LONG(8343)
+#define ERROR_DS_INSUFF_ACCESS_RIGHTS __MSABI_LONG(8344)
+#define ERROR_DS_ILLEGAL_SUPERIOR __MSABI_LONG(8345)
+#define ERROR_DS_ATTRIBUTE_OWNED_BY_SAM __MSABI_LONG(8346)
+#define ERROR_DS_NAME_TOO_MANY_PARTS __MSABI_LONG(8347)
+#define ERROR_DS_NAME_TOO_LONG __MSABI_LONG(8348)
+#define ERROR_DS_NAME_VALUE_TOO_LONG __MSABI_LONG(8349)
+#define ERROR_DS_NAME_UNPARSEABLE __MSABI_LONG(8350)
+#define ERROR_DS_NAME_TYPE_UNKNOWN __MSABI_LONG(8351)
+#define ERROR_DS_NOT_AN_OBJECT __MSABI_LONG(8352)
+#define ERROR_DS_SEC_DESC_TOO_SHORT __MSABI_LONG(8353)
+#define ERROR_DS_SEC_DESC_INVALID __MSABI_LONG(8354)
+#define ERROR_DS_NO_DELETED_NAME __MSABI_LONG(8355)
+#define ERROR_DS_SUBREF_MUST_HAVE_PARENT __MSABI_LONG(8356)
+#define ERROR_DS_NCNAME_MUST_BE_NC __MSABI_LONG(8357)
+#define ERROR_DS_CANT_ADD_SYSTEM_ONLY __MSABI_LONG(8358)
+#define ERROR_DS_CLASS_MUST_BE_CONCRETE __MSABI_LONG(8359)
+#define ERROR_DS_INVALID_DMD __MSABI_LONG(8360)
+#define ERROR_DS_OBJ_GUID_EXISTS __MSABI_LONG(8361)
+#define ERROR_DS_NOT_ON_BACKLINK __MSABI_LONG(8362)
+#define ERROR_DS_NO_CROSSREF_FOR_NC __MSABI_LONG(8363)
+#define ERROR_DS_SHUTTING_DOWN __MSABI_LONG(8364)
+#define ERROR_DS_UNKNOWN_OPERATION __MSABI_LONG(8365)
+#define ERROR_DS_INVALID_ROLE_OWNER __MSABI_LONG(8366)
+#define ERROR_DS_COULDNT_CONTACT_FSMO __MSABI_LONG(8367)
+#define ERROR_DS_CROSS_NC_DN_RENAME __MSABI_LONG(8368)
+#define ERROR_DS_CANT_MOD_SYSTEM_ONLY __MSABI_LONG(8369)
+#define ERROR_DS_REPLICATOR_ONLY __MSABI_LONG(8370)
+#define ERROR_DS_OBJ_CLASS_NOT_DEFINED __MSABI_LONG(8371)
+#define ERROR_DS_OBJ_CLASS_NOT_SUBCLASS __MSABI_LONG(8372)
+#define ERROR_DS_NAME_REFERENCE_INVALID __MSABI_LONG(8373)
+#define ERROR_DS_CROSS_REF_EXISTS __MSABI_LONG(8374)
+#define ERROR_DS_CANT_DEL_MASTER_CROSSREF __MSABI_LONG(8375)
+#define ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD __MSABI_LONG(8376)
+#define ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX __MSABI_LONG(8377)
+#define ERROR_DS_DUP_RDN __MSABI_LONG(8378)
+#define ERROR_DS_DUP_OID __MSABI_LONG(8379)
+#define ERROR_DS_DUP_MAPI_ID __MSABI_LONG(8380)
+#define ERROR_DS_DUP_SCHEMA_ID_GUID __MSABI_LONG(8381)
+#define ERROR_DS_DUP_LDAP_DISPLAY_NAME __MSABI_LONG(8382)
+#define ERROR_DS_SEMANTIC_ATT_TEST __MSABI_LONG(8383)
+#define ERROR_DS_SYNTAX_MISMATCH __MSABI_LONG(8384)
+#define ERROR_DS_EXISTS_IN_MUST_HAVE __MSABI_LONG(8385)
+#define ERROR_DS_EXISTS_IN_MAY_HAVE __MSABI_LONG(8386)
+#define ERROR_DS_NONEXISTENT_MAY_HAVE __MSABI_LONG(8387)
+#define ERROR_DS_NONEXISTENT_MUST_HAVE __MSABI_LONG(8388)
+#define ERROR_DS_AUX_CLS_TEST_FAIL __MSABI_LONG(8389)
+#define ERROR_DS_NONEXISTENT_POSS_SUP __MSABI_LONG(8390)
+#define ERROR_DS_SUB_CLS_TEST_FAIL __MSABI_LONG(8391)
+#define ERROR_DS_BAD_RDN_ATT_ID_SYNTAX __MSABI_LONG(8392)
+#define ERROR_DS_EXISTS_IN_AUX_CLS __MSABI_LONG(8393)
+#define ERROR_DS_EXISTS_IN_SUB_CLS __MSABI_LONG(8394)
+#define ERROR_DS_EXISTS_IN_POSS_SUP __MSABI_LONG(8395)
+#define ERROR_DS_RECALCSCHEMA_FAILED __MSABI_LONG(8396)
+#define ERROR_DS_TREE_DELETE_NOT_FINISHED __MSABI_LONG(8397)
+#define ERROR_DS_CANT_DELETE __MSABI_LONG(8398)
+#define ERROR_DS_ATT_SCHEMA_REQ_ID __MSABI_LONG(8399)
+#define ERROR_DS_BAD_ATT_SCHEMA_SYNTAX __MSABI_LONG(8400)
+#define ERROR_DS_CANT_CACHE_ATT __MSABI_LONG(8401)
+#define ERROR_DS_CANT_CACHE_CLASS __MSABI_LONG(8402)
+#define ERROR_DS_CANT_REMOVE_ATT_CACHE __MSABI_LONG(8403)
+#define ERROR_DS_CANT_REMOVE_CLASS_CACHE __MSABI_LONG(8404)
+#define ERROR_DS_CANT_RETRIEVE_DN __MSABI_LONG(8405)
+#define ERROR_DS_MISSING_SUPREF __MSABI_LONG(8406)
+#define ERROR_DS_CANT_RETRIEVE_INSTANCE __MSABI_LONG(8407)
+#define ERROR_DS_CODE_INCONSISTENCY __MSABI_LONG(8408)
+#define ERROR_DS_DATABASE_ERROR __MSABI_LONG(8409)
+#define ERROR_DS_GOVERNSID_MISSING __MSABI_LONG(8410)
+#define ERROR_DS_MISSING_EXPECTED_ATT __MSABI_LONG(8411)
+#define ERROR_DS_NCNAME_MISSING_CR_REF __MSABI_LONG(8412)
+#define ERROR_DS_SECURITY_CHECKING_ERROR __MSABI_LONG(8413)
+#define ERROR_DS_SCHEMA_NOT_LOADED __MSABI_LONG(8414)
+#define ERROR_DS_SCHEMA_ALLOC_FAILED __MSABI_LONG(8415)
+#define ERROR_DS_ATT_SCHEMA_REQ_SYNTAX __MSABI_LONG(8416)
+#define ERROR_DS_GCVERIFY_ERROR __MSABI_LONG(8417)
+#define ERROR_DS_DRA_SCHEMA_MISMATCH __MSABI_LONG(8418)
+#define ERROR_DS_CANT_FIND_DSA_OBJ __MSABI_LONG(8419)
+#define ERROR_DS_CANT_FIND_EXPECTED_NC __MSABI_LONG(8420)
+#define ERROR_DS_CANT_FIND_NC_IN_CACHE __MSABI_LONG(8421)
+#define ERROR_DS_CANT_RETRIEVE_CHILD __MSABI_LONG(8422)
+#define ERROR_DS_SECURITY_ILLEGAL_MODIFY __MSABI_LONG(8423)
+#define ERROR_DS_CANT_REPLACE_HIDDEN_REC __MSABI_LONG(8424)
+#define ERROR_DS_BAD_HIERARCHY_FILE __MSABI_LONG(8425)
+#define ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED __MSABI_LONG(8426)
+#define ERROR_DS_CONFIG_PARAM_MISSING __MSABI_LONG(8427)
+#define ERROR_DS_COUNTING_AB_INDICES_FAILED __MSABI_LONG(8428)
+#define ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED __MSABI_LONG(8429)
+#define ERROR_DS_INTERNAL_FAILURE __MSABI_LONG(8430)
+#define ERROR_DS_UNKNOWN_ERROR __MSABI_LONG(8431)
+#define ERROR_DS_ROOT_REQUIRES_CLASS_TOP __MSABI_LONG(8432)
+#define ERROR_DS_REFUSING_FSMO_ROLES __MSABI_LONG(8433)
+#define ERROR_DS_MISSING_FSMO_SETTINGS __MSABI_LONG(8434)
+#define ERROR_DS_UNABLE_TO_SURRENDER_ROLES __MSABI_LONG(8435)
+#define ERROR_DS_DRA_GENERIC __MSABI_LONG(8436)
+#define ERROR_DS_DRA_INVALID_PARAMETER __MSABI_LONG(8437)
+#define ERROR_DS_DRA_BUSY __MSABI_LONG(8438)
+#define ERROR_DS_DRA_BAD_DN __MSABI_LONG(8439)
+#define ERROR_DS_DRA_BAD_NC __MSABI_LONG(8440)
+#define ERROR_DS_DRA_DN_EXISTS __MSABI_LONG(8441)
+#define ERROR_DS_DRA_INTERNAL_ERROR __MSABI_LONG(8442)
+#define ERROR_DS_DRA_INCONSISTENT_DIT __MSABI_LONG(8443)
+#define ERROR_DS_DRA_CONNECTION_FAILED __MSABI_LONG(8444)
+#define ERROR_DS_DRA_BAD_INSTANCE_TYPE __MSABI_LONG(8445)
+#define ERROR_DS_DRA_OUT_OF_MEM __MSABI_LONG(8446)
+#define ERROR_DS_DRA_MAIL_PROBLEM __MSABI_LONG(8447)
+#define ERROR_DS_DRA_REF_ALREADY_EXISTS __MSABI_LONG(8448)
+#define ERROR_DS_DRA_REF_NOT_FOUND __MSABI_LONG(8449)
+#define ERROR_DS_DRA_OBJ_IS_REP_SOURCE __MSABI_LONG(8450)
+#define ERROR_DS_DRA_DB_ERROR __MSABI_LONG(8451)
+#define ERROR_DS_DRA_NO_REPLICA __MSABI_LONG(8452)
+#define ERROR_DS_DRA_ACCESS_DENIED __MSABI_LONG(8453)
+#define ERROR_DS_DRA_NOT_SUPPORTED __MSABI_LONG(8454)
+#define ERROR_DS_DRA_RPC_CANCELLED __MSABI_LONG(8455)
+#define ERROR_DS_DRA_SOURCE_DISABLED __MSABI_LONG(8456)
+#define ERROR_DS_DRA_SINK_DISABLED __MSABI_LONG(8457)
+#define ERROR_DS_DRA_NAME_COLLISION __MSABI_LONG(8458)
+#define ERROR_DS_DRA_SOURCE_REINSTALLED __MSABI_LONG(8459)
+#define ERROR_DS_DRA_MISSING_PARENT __MSABI_LONG(8460)
+#define ERROR_DS_DRA_PREEMPTED __MSABI_LONG(8461)
+#define ERROR_DS_DRA_ABANDON_SYNC __MSABI_LONG(8462)
+#define ERROR_DS_DRA_SHUTDOWN __MSABI_LONG(8463)
+#define ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET __MSABI_LONG(8464)
+#define ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA __MSABI_LONG(8465)
+#define ERROR_DS_DRA_EXTN_CONNECTION_FAILED __MSABI_LONG(8466)
+#define ERROR_DS_INSTALL_SCHEMA_MISMATCH __MSABI_LONG(8467)
+#define ERROR_DS_DUP_LINK_ID __MSABI_LONG(8468)
+#define ERROR_DS_NAME_ERROR_RESOLVING __MSABI_LONG(8469)
+#define ERROR_DS_NAME_ERROR_NOT_FOUND __MSABI_LONG(8470)
+#define ERROR_DS_NAME_ERROR_NOT_UNIQUE __MSABI_LONG(8471)
+#define ERROR_DS_NAME_ERROR_NO_MAPPING __MSABI_LONG(8472)
+#define ERROR_DS_NAME_ERROR_DOMAIN_ONLY __MSABI_LONG(8473)
+#define ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING __MSABI_LONG(8474)
+#define ERROR_DS_CONSTRUCTED_ATT_MOD __MSABI_LONG(8475)
+#define ERROR_DS_WRONG_OM_OBJ_CLASS __MSABI_LONG(8476)
+#define ERROR_DS_DRA_REPL_PENDING __MSABI_LONG(8477)
+#define ERROR_DS_DS_REQUIRED __MSABI_LONG(8478)
+#define ERROR_DS_INVALID_LDAP_DISPLAY_NAME __MSABI_LONG(8479)
+#define ERROR_DS_NON_BASE_SEARCH __MSABI_LONG(8480)
+#define ERROR_DS_CANT_RETRIEVE_ATTS __MSABI_LONG(8481)
+#define ERROR_DS_BACKLINK_WITHOUT_LINK __MSABI_LONG(8482)
+#define ERROR_DS_EPOCH_MISMATCH __MSABI_LONG(8483)
+#define ERROR_DS_SRC_NAME_MISMATCH __MSABI_LONG(8484)
+#define ERROR_DS_SRC_AND_DST_NC_IDENTICAL __MSABI_LONG(8485)
+#define ERROR_DS_DST_NC_MISMATCH __MSABI_LONG(8486)
+#define ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC __MSABI_LONG(8487)
+#define ERROR_DS_SRC_GUID_MISMATCH __MSABI_LONG(8488)
+#define ERROR_DS_CANT_MOVE_DELETED_OBJECT __MSABI_LONG(8489)
+#define ERROR_DS_PDC_OPERATION_IN_PROGRESS __MSABI_LONG(8490)
+#define ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD __MSABI_LONG(8491)
+#define ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION __MSABI_LONG(8492)
+#define ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS __MSABI_LONG(8493)
+#define ERROR_DS_NC_MUST_HAVE_NC_PARENT __MSABI_LONG(8494)
+#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE __MSABI_LONG(8495)
+#define ERROR_DS_DST_DOMAIN_NOT_NATIVE __MSABI_LONG(8496)
+#define ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER __MSABI_LONG(8497)
+#define ERROR_DS_CANT_MOVE_ACCOUNT_GROUP __MSABI_LONG(8498)
+#define ERROR_DS_CANT_MOVE_RESOURCE_GROUP __MSABI_LONG(8499)
+#define ERROR_DS_INVALID_SEARCH_FLAG __MSABI_LONG(8500)
+#define ERROR_DS_NO_TREE_DELETE_ABOVE_NC __MSABI_LONG(8501)
+#define ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE __MSABI_LONG(8502)
+#define ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE __MSABI_LONG(8503)
+#define ERROR_DS_SAM_INIT_FAILURE __MSABI_LONG(8504)
+#define ERROR_DS_SENSITIVE_GROUP_VIOLATION __MSABI_LONG(8505)
+#define ERROR_DS_CANT_MOD_PRIMARYGROUPID __MSABI_LONG(8506)
+#define ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD __MSABI_LONG(8507)
+#define ERROR_DS_NONSAFE_SCHEMA_CHANGE __MSABI_LONG(8508)
+#define ERROR_DS_SCHEMA_UPDATE_DISALLOWED __MSABI_LONG(8509)
+#define ERROR_DS_CANT_CREATE_UNDER_SCHEMA __MSABI_LONG(8510)
+#define ERROR_DS_INSTALL_NO_SRC_SCH_VERSION __MSABI_LONG(8511)
+#define ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE __MSABI_LONG(8512)
+#define ERROR_DS_INVALID_GROUP_TYPE __MSABI_LONG(8513)
+#define ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN __MSABI_LONG(8514)
+#define ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN __MSABI_LONG(8515)
+#define ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER __MSABI_LONG(8516)
+#define ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER __MSABI_LONG(8517)
+#define ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER __MSABI_LONG(8518)
+#define ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER __MSABI_LONG(8519)
+#define ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER __MSABI_LONG(8520)
+#define ERROR_DS_HAVE_PRIMARY_MEMBERS __MSABI_LONG(8521)
+#define ERROR_DS_STRING_SD_CONVERSION_FAILED __MSABI_LONG(8522)
+#define ERROR_DS_NAMING_MASTER_GC __MSABI_LONG(8523)
+#define ERROR_DS_DNS_LOOKUP_FAILURE __MSABI_LONG(8524)
+#define ERROR_DS_COULDNT_UPDATE_SPNS __MSABI_LONG(8525)
+#define ERROR_DS_CANT_RETRIEVE_SD __MSABI_LONG(8526)
+#define ERROR_DS_KEY_NOT_UNIQUE __MSABI_LONG(8527)
+#define ERROR_DS_WRONG_LINKED_ATT_SYNTAX __MSABI_LONG(8528)
+#define ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD __MSABI_LONG(8529)
+#define ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY __MSABI_LONG(8530)
+#define ERROR_DS_CANT_START __MSABI_LONG(8531)
+#define ERROR_DS_INIT_FAILURE __MSABI_LONG(8532)
+#define ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION __MSABI_LONG(8533)
+#define ERROR_DS_SOURCE_DOMAIN_IN_FOREST __MSABI_LONG(8534)
+#define ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST __MSABI_LONG(8535)
+#define ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED __MSABI_LONG(8536)
+#define ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN __MSABI_LONG(8537)
+#define ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER __MSABI_LONG(8538)
+#define ERROR_DS_SRC_SID_EXISTS_IN_FOREST __MSABI_LONG(8539)
+#define ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH __MSABI_LONG(8540)
+#define ERROR_SAM_INIT_FAILURE __MSABI_LONG(8541)
+#define ERROR_DS_DRA_SCHEMA_INFO_SHIP __MSABI_LONG(8542)
+#define ERROR_DS_DRA_SCHEMA_CONFLICT __MSABI_LONG(8543)
+#define ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT __MSABI_LONG(8544)
+#define ERROR_DS_DRA_OBJ_NC_MISMATCH __MSABI_LONG(8545)
+#define ERROR_DS_NC_STILL_HAS_DSAS __MSABI_LONG(8546)
+#define ERROR_DS_GC_REQUIRED __MSABI_LONG(8547)
+#define ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY __MSABI_LONG(8548)
+#define ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS __MSABI_LONG(8549)
+#define ERROR_DS_CANT_ADD_TO_GC __MSABI_LONG(8550)
+#define ERROR_DS_NO_CHECKPOINT_WITH_PDC __MSABI_LONG(8551)
+#define ERROR_DS_SOURCE_AUDITING_NOT_ENABLED __MSABI_LONG(8552)
+#define ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC __MSABI_LONG(8553)
+#define ERROR_DS_INVALID_NAME_FOR_SPN __MSABI_LONG(8554)
+#define ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS __MSABI_LONG(8555)
+#define ERROR_DS_UNICODEPWD_NOT_IN_QUOTES __MSABI_LONG(8556)
+#define ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED __MSABI_LONG(8557)
+#define ERROR_DS_MUST_BE_RUN_ON_DST_DC __MSABI_LONG(8558)
+#define ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER __MSABI_LONG(8559)
+#define ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ __MSABI_LONG(8560)
+#define ERROR_DS_INIT_FAILURE_CONSOLE __MSABI_LONG(8561)
+#define ERROR_DS_SAM_INIT_FAILURE_CONSOLE __MSABI_LONG(8562)
+#define ERROR_DS_FOREST_VERSION_TOO_HIGH __MSABI_LONG(8563)
+#define ERROR_DS_DOMAIN_VERSION_TOO_HIGH __MSABI_LONG(8564)
+#define ERROR_DS_FOREST_VERSION_TOO_LOW __MSABI_LONG(8565)
+#define ERROR_DS_DOMAIN_VERSION_TOO_LOW __MSABI_LONG(8566)
+#define ERROR_DS_INCOMPATIBLE_VERSION __MSABI_LONG(8567)
+#define ERROR_DS_LOW_DSA_VERSION __MSABI_LONG(8568)
+#define ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN __MSABI_LONG(8569)
+#define ERROR_DS_NOT_SUPPORTED_SORT_ORDER __MSABI_LONG(8570)
+#define ERROR_DS_NAME_NOT_UNIQUE __MSABI_LONG(8571)
+#define ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 __MSABI_LONG(8572)
+#define ERROR_DS_OUT_OF_VERSION_STORE __MSABI_LONG(8573)
+#define ERROR_DS_INCOMPATIBLE_CONTROLS_USED __MSABI_LONG(8574)
+#define ERROR_DS_NO_REF_DOMAIN __MSABI_LONG(8575)
+#define ERROR_DS_RESERVED_LINK_ID __MSABI_LONG(8576)
+#define ERROR_DS_LINK_ID_NOT_AVAILABLE __MSABI_LONG(8577)
+#define ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER __MSABI_LONG(8578)
+#define ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE __MSABI_LONG(8579)
+#define ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC __MSABI_LONG(8580)
+#define ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG __MSABI_LONG(8581)
+#define ERROR_DS_MODIFYDN_WRONG_GRANDPARENT __MSABI_LONG(8582)
+#define ERROR_DS_NAME_ERROR_TRUST_REFERRAL __MSABI_LONG(8583)
+#define ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER __MSABI_LONG(8584)
+#define ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD __MSABI_LONG(8585)
+#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2 __MSABI_LONG(8586)
+#define ERROR_DS_THREAD_LIMIT_EXCEEDED __MSABI_LONG(8587)
+#define ERROR_DS_NOT_CLOSEST __MSABI_LONG(8588)
+#define ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF __MSABI_LONG(8589)
+#define ERROR_DS_SINGLE_USER_MODE_FAILED __MSABI_LONG(8590)
+#define ERROR_DS_NTDSCRIPT_SYNTAX_ERROR __MSABI_LONG(8591)
+#define ERROR_DS_NTDSCRIPT_PROCESS_ERROR __MSABI_LONG(8592)
+#define ERROR_DS_DIFFERENT_REPL_EPOCHS __MSABI_LONG(8593)
+#define ERROR_DS_DRS_EXTENSIONS_CHANGED __MSABI_LONG(8594)
+#define ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR __MSABI_LONG(8595)
+#define ERROR_DS_NO_MSDS_INTID __MSABI_LONG(8596)
+#define ERROR_DS_DUP_MSDS_INTID __MSABI_LONG(8597)
+#define ERROR_DS_EXISTS_IN_RDNATTID __MSABI_LONG(8598)
+#define ERROR_DS_AUTHORIZATION_FAILED __MSABI_LONG(8599)
+#define ERROR_DS_INVALID_SCRIPT __MSABI_LONG(8600)
+#define ERROR_DS_REMOTE_CROSSREF_OP_FAILED __MSABI_LONG(8601)
+#define ERROR_DS_CROSS_REF_BUSY __MSABI_LONG(8602)
+#define ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN __MSABI_LONG(8603)
+#define ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC __MSABI_LONG(8604)
+#define ERROR_DS_DUPLICATE_ID_FOUND __MSABI_LONG(8605)
+#define ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT __MSABI_LONG(8606)
+#define ERROR_DS_GROUP_CONVERSION_ERROR __MSABI_LONG(8607)
+#define ERROR_DS_CANT_MOVE_APP_BASIC_GROUP __MSABI_LONG(8608)
+#define ERROR_DS_CANT_MOVE_APP_QUERY_GROUP __MSABI_LONG(8609)
+#define ERROR_DS_ROLE_NOT_VERIFIED __MSABI_LONG(8610)
+#define ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL __MSABI_LONG(8611)
+#define ERROR_DS_DOMAIN_RENAME_IN_PROGRESS __MSABI_LONG(8612)
+#define ERROR_DS_EXISTING_AD_CHILD_NC __MSABI_LONG(8613)
+#define ERROR_DS_REPL_LIFETIME_EXCEEDED __MSABI_LONG(8614)
+#define ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER __MSABI_LONG(8615)
+#define ERROR_DS_LDAP_SEND_QUEUE_FULL __MSABI_LONG(8616)
+#define ERROR_DS_DRA_OUT_SCHEDULE_WINDOW __MSABI_LONG(8617)
 #define DNS_ERROR_RESPONSE_CODES_BASE 9000
 #define DNS_ERROR_RCODE_NO_ERROR NO_ERROR
 #define DNS_ERROR_MASK 0x00002328
-#define DNS_ERROR_RCODE_FORMAT_ERROR 9001L
-#define DNS_ERROR_RCODE_SERVER_FAILURE 9002L
-#define DNS_ERROR_RCODE_NAME_ERROR 9003L
-#define DNS_ERROR_RCODE_NOT_IMPLEMENTED 9004L
-#define DNS_ERROR_RCODE_REFUSED 9005L
-#define DNS_ERROR_RCODE_YXDOMAIN 9006L
-#define DNS_ERROR_RCODE_YXRRSET 9007L
-#define DNS_ERROR_RCODE_NXRRSET 9008L
-#define DNS_ERROR_RCODE_NOTAUTH 9009L
-#define DNS_ERROR_RCODE_NOTZONE 9010L
-#define DNS_ERROR_RCODE_BADSIG 9016L
-#define DNS_ERROR_RCODE_BADKEY 9017L
-#define DNS_ERROR_RCODE_BADTIME 9018L
+#define DNS_ERROR_RCODE_FORMAT_ERROR __MSABI_LONG(9001)
+#define DNS_ERROR_RCODE_SERVER_FAILURE __MSABI_LONG(9002)
+#define DNS_ERROR_RCODE_NAME_ERROR __MSABI_LONG(9003)
+#define DNS_ERROR_RCODE_NOT_IMPLEMENTED __MSABI_LONG(9004)
+#define DNS_ERROR_RCODE_REFUSED __MSABI_LONG(9005)
+#define DNS_ERROR_RCODE_YXDOMAIN __MSABI_LONG(9006)
+#define DNS_ERROR_RCODE_YXRRSET __MSABI_LONG(9007)
+#define DNS_ERROR_RCODE_NXRRSET __MSABI_LONG(9008)
+#define DNS_ERROR_RCODE_NOTAUTH __MSABI_LONG(9009)
+#define DNS_ERROR_RCODE_NOTZONE __MSABI_LONG(9010)
+#define DNS_ERROR_RCODE_BADSIG __MSABI_LONG(9016)
+#define DNS_ERROR_RCODE_BADKEY __MSABI_LONG(9017)
+#define DNS_ERROR_RCODE_BADTIME __MSABI_LONG(9018)
 #define DNS_ERROR_RCODE_LAST DNS_ERROR_RCODE_BADTIME
 #define DNS_ERROR_PACKET_FMT_BASE 9500
-#define DNS_INFO_NO_RECORDS 9501L
-#define DNS_ERROR_BAD_PACKET 9502L
-#define DNS_ERROR_NO_PACKET 9503L
-#define DNS_ERROR_RCODE 9504L
-#define DNS_ERROR_UNSECURE_PACKET 9505L
+#define DNS_INFO_NO_RECORDS __MSABI_LONG(9501)
+#define DNS_ERROR_BAD_PACKET __MSABI_LONG(9502)
+#define DNS_ERROR_NO_PACKET __MSABI_LONG(9503)
+#define DNS_ERROR_RCODE __MSABI_LONG(9504)
+#define DNS_ERROR_UNSECURE_PACKET __MSABI_LONG(9505)
 #define DNS_STATUS_PACKET_UNSECURE DNS_ERROR_UNSECURE_PACKET
 #define DNS_ERROR_NO_MEMORY ERROR_OUTOFMEMORY
 #define DNS_ERROR_INVALID_NAME ERROR_INVALID_NAME
 #define DNS_ERROR_INVALID_DATA ERROR_INVALID_DATA
 #define DNS_ERROR_GENERAL_API_BASE 9550
-#define DNS_ERROR_INVALID_TYPE 9551L
-#define DNS_ERROR_INVALID_IP_ADDRESS 9552L
-#define DNS_ERROR_INVALID_PROPERTY 9553L
-#define DNS_ERROR_TRY_AGAIN_LATER 9554L
-#define DNS_ERROR_NOT_UNIQUE 9555L
-#define DNS_ERROR_NON_RFC_NAME 9556L
-#define DNS_STATUS_FQDN 9557L
-#define DNS_STATUS_DOTTED_NAME 9558L
-#define DNS_STATUS_SINGLE_PART_NAME 9559L
-#define DNS_ERROR_INVALID_NAME_CHAR 9560L
-#define DNS_ERROR_NUMERIC_NAME 9561L
-#define DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER 9562L
-#define DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION 9563L
-#define DNS_ERROR_CANNOT_FIND_ROOT_HINTS 9564L
-#define DNS_ERROR_INCONSISTENT_ROOT_HINTS 9565L
+#define DNS_ERROR_INVALID_TYPE __MSABI_LONG(9551)
+#define DNS_ERROR_INVALID_IP_ADDRESS __MSABI_LONG(9552)
+#define DNS_ERROR_INVALID_PROPERTY __MSABI_LONG(9553)
+#define DNS_ERROR_TRY_AGAIN_LATER __MSABI_LONG(9554)
+#define DNS_ERROR_NOT_UNIQUE __MSABI_LONG(9555)
+#define DNS_ERROR_NON_RFC_NAME __MSABI_LONG(9556)
+#define DNS_STATUS_FQDN __MSABI_LONG(9557)
+#define DNS_STATUS_DOTTED_NAME __MSABI_LONG(9558)
+#define DNS_STATUS_SINGLE_PART_NAME __MSABI_LONG(9559)
+#define DNS_ERROR_INVALID_NAME_CHAR __MSABI_LONG(9560)
+#define DNS_ERROR_NUMERIC_NAME __MSABI_LONG(9561)
+#define DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER __MSABI_LONG(9562)
+#define DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION __MSABI_LONG(9563)
+#define DNS_ERROR_CANNOT_FIND_ROOT_HINTS __MSABI_LONG(9564)
+#define DNS_ERROR_INCONSISTENT_ROOT_HINTS __MSABI_LONG(9565)
 #define DNS_ERROR_ZONE_BASE 9600
-#define DNS_ERROR_ZONE_DOES_NOT_EXIST 9601L
-#define DNS_ERROR_NO_ZONE_INFO 9602L
-#define DNS_ERROR_INVALID_ZONE_OPERATION 9603L
-#define DNS_ERROR_ZONE_CONFIGURATION_ERROR 9604L
-#define DNS_ERROR_ZONE_HAS_NO_SOA_RECORD 9605L
-#define DNS_ERROR_ZONE_HAS_NO_NS_RECORDS 9606L
-#define DNS_ERROR_ZONE_LOCKED 9607L
-#define DNS_ERROR_ZONE_CREATION_FAILED 9608L
-#define DNS_ERROR_ZONE_ALREADY_EXISTS 9609L
-#define DNS_ERROR_AUTOZONE_ALREADY_EXISTS 9610L
-#define DNS_ERROR_INVALID_ZONE_TYPE 9611L
-#define DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP 9612L
-#define DNS_ERROR_ZONE_NOT_SECONDARY 9613L
-#define DNS_ERROR_NEED_SECONDARY_ADDRESSES 9614L
-#define DNS_ERROR_WINS_INIT_FAILED 9615L
-#define DNS_ERROR_NEED_WINS_SERVERS 9616L
-#define DNS_ERROR_NBSTAT_INIT_FAILED 9617L
-#define DNS_ERROR_SOA_DELETE_INVALID 9618L
-#define DNS_ERROR_FORWARDER_ALREADY_EXISTS 9619L
-#define DNS_ERROR_ZONE_REQUIRES_MASTER_IP 9620L
-#define DNS_ERROR_ZONE_IS_SHUTDOWN 9621L
+#define DNS_ERROR_ZONE_DOES_NOT_EXIST __MSABI_LONG(9601)
+#define DNS_ERROR_NO_ZONE_INFO __MSABI_LONG(9602)
+#define DNS_ERROR_INVALID_ZONE_OPERATION __MSABI_LONG(9603)
+#define DNS_ERROR_ZONE_CONFIGURATION_ERROR __MSABI_LONG(9604)
+#define DNS_ERROR_ZONE_HAS_NO_SOA_RECORD __MSABI_LONG(9605)
+#define DNS_ERROR_ZONE_HAS_NO_NS_RECORDS __MSABI_LONG(9606)
+#define DNS_ERROR_ZONE_LOCKED __MSABI_LONG(9607)
+#define DNS_ERROR_ZONE_CREATION_FAILED __MSABI_LONG(9608)
+#define DNS_ERROR_ZONE_ALREADY_EXISTS __MSABI_LONG(9609)
+#define DNS_ERROR_AUTOZONE_ALREADY_EXISTS __MSABI_LONG(9610)
+#define DNS_ERROR_INVALID_ZONE_TYPE __MSABI_LONG(9611)
+#define DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP __MSABI_LONG(9612)
+#define DNS_ERROR_ZONE_NOT_SECONDARY __MSABI_LONG(9613)
+#define DNS_ERROR_NEED_SECONDARY_ADDRESSES __MSABI_LONG(9614)
+#define DNS_ERROR_WINS_INIT_FAILED __MSABI_LONG(9615)
+#define DNS_ERROR_NEED_WINS_SERVERS __MSABI_LONG(9616)
+#define DNS_ERROR_NBSTAT_INIT_FAILED __MSABI_LONG(9617)
+#define DNS_ERROR_SOA_DELETE_INVALID __MSABI_LONG(9618)
+#define DNS_ERROR_FORWARDER_ALREADY_EXISTS __MSABI_LONG(9619)
+#define DNS_ERROR_ZONE_REQUIRES_MASTER_IP __MSABI_LONG(9620)
+#define DNS_ERROR_ZONE_IS_SHUTDOWN __MSABI_LONG(9621)
 #define DNS_ERROR_DATAFILE_BASE 9650
-#define DNS_ERROR_PRIMARY_REQUIRES_DATAFILE 9651L
-#define DNS_ERROR_INVALID_DATAFILE_NAME 9652L
-#define DNS_ERROR_DATAFILE_OPEN_FAILURE 9653L
-#define DNS_ERROR_FILE_WRITEBACK_FAILED 9654L
-#define DNS_ERROR_DATAFILE_PARSING 9655L
+#define DNS_ERROR_PRIMARY_REQUIRES_DATAFILE __MSABI_LONG(9651)
+#define DNS_ERROR_INVALID_DATAFILE_NAME __MSABI_LONG(9652)
+#define DNS_ERROR_DATAFILE_OPEN_FAILURE __MSABI_LONG(9653)
+#define DNS_ERROR_FILE_WRITEBACK_FAILED __MSABI_LONG(9654)
+#define DNS_ERROR_DATAFILE_PARSING __MSABI_LONG(9655)
 #define DNS_ERROR_DATABASE_BASE 9700
-#define DNS_ERROR_RECORD_DOES_NOT_EXIST 9701L
-#define DNS_ERROR_RECORD_FORMAT 9702L
-#define DNS_ERROR_NODE_CREATION_FAILED 9703L
-#define DNS_ERROR_UNKNOWN_RECORD_TYPE 9704L
-#define DNS_ERROR_RECORD_TIMED_OUT 9705L
-#define DNS_ERROR_NAME_NOT_IN_ZONE 9706L
-#define DNS_ERROR_CNAME_LOOP 9707L
-#define DNS_ERROR_NODE_IS_CNAME 9708L
-#define DNS_ERROR_CNAME_COLLISION 9709L
-#define DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT 9710L
-#define DNS_ERROR_RECORD_ALREADY_EXISTS 9711L
-#define DNS_ERROR_SECONDARY_DATA 9712L
-#define DNS_ERROR_NO_CREATE_CACHE_DATA 9713L
-#define DNS_ERROR_NAME_DOES_NOT_EXIST 9714L
-#define DNS_WARNING_PTR_CREATE_FAILED 9715L
-#define DNS_WARNING_DOMAIN_UNDELETED 9716L
-#define DNS_ERROR_DS_UNAVAILABLE 9717L
-#define DNS_ERROR_DS_ZONE_ALREADY_EXISTS 9718L
-#define DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE 9719L
+#define DNS_ERROR_RECORD_DOES_NOT_EXIST __MSABI_LONG(9701)
+#define DNS_ERROR_RECORD_FORMAT __MSABI_LONG(9702)
+#define DNS_ERROR_NODE_CREATION_FAILED __MSABI_LONG(9703)
+#define DNS_ERROR_UNKNOWN_RECORD_TYPE __MSABI_LONG(9704)
+#define DNS_ERROR_RECORD_TIMED_OUT __MSABI_LONG(9705)
+#define DNS_ERROR_NAME_NOT_IN_ZONE __MSABI_LONG(9706)
+#define DNS_ERROR_CNAME_LOOP __MSABI_LONG(9707)
+#define DNS_ERROR_NODE_IS_CNAME __MSABI_LONG(9708)
+#define DNS_ERROR_CNAME_COLLISION __MSABI_LONG(9709)
+#define DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT __MSABI_LONG(9710)
+#define DNS_ERROR_RECORD_ALREADY_EXISTS __MSABI_LONG(9711)
+#define DNS_ERROR_SECONDARY_DATA __MSABI_LONG(9712)
+#define DNS_ERROR_NO_CREATE_CACHE_DATA __MSABI_LONG(9713)
+#define DNS_ERROR_NAME_DOES_NOT_EXIST __MSABI_LONG(9714)
+#define DNS_WARNING_PTR_CREATE_FAILED __MSABI_LONG(9715)
+#define DNS_WARNING_DOMAIN_UNDELETED __MSABI_LONG(9716)
+#define DNS_ERROR_DS_UNAVAILABLE __MSABI_LONG(9717)
+#define DNS_ERROR_DS_ZONE_ALREADY_EXISTS __MSABI_LONG(9718)
+#define DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE __MSABI_LONG(9719)
 #define DNS_ERROR_OPERATION_BASE 9750
-#define DNS_INFO_AXFR_COMPLETE 9751L
-#define DNS_ERROR_AXFR 9752L
-#define DNS_INFO_ADDED_LOCAL_WINS 9753L
+#define DNS_INFO_AXFR_COMPLETE __MSABI_LONG(9751)
+#define DNS_ERROR_AXFR __MSABI_LONG(9752)
+#define DNS_INFO_ADDED_LOCAL_WINS __MSABI_LONG(9753)
 #define DNS_ERROR_SECURE_BASE 9800
-#define DNS_STATUS_CONTINUE_NEEDED 9801L
+#define DNS_STATUS_CONTINUE_NEEDED __MSABI_LONG(9801)
 #define DNS_ERROR_SETUP_BASE 9850
-#define DNS_ERROR_NO_TCPIP 9851L
-#define DNS_ERROR_NO_DNS_SERVERS 9852L
+#define DNS_ERROR_NO_TCPIP __MSABI_LONG(9851)
+#define DNS_ERROR_NO_DNS_SERVERS __MSABI_LONG(9852)
 #define DNS_ERROR_DP_BASE 9900
-#define DNS_ERROR_DP_DOES_NOT_EXIST 9901L
-#define DNS_ERROR_DP_ALREADY_EXISTS 9902L
-#define DNS_ERROR_DP_NOT_ENLISTED 9903L
-#define DNS_ERROR_DP_ALREADY_ENLISTED 9904L
-#define DNS_ERROR_DP_NOT_AVAILABLE 9905L
-#define DNS_ERROR_DP_FSMO_ERROR 9906L
+#define DNS_ERROR_DP_DOES_NOT_EXIST __MSABI_LONG(9901)
+#define DNS_ERROR_DP_ALREADY_EXISTS __MSABI_LONG(9902)
+#define DNS_ERROR_DP_NOT_ENLISTED __MSABI_LONG(9903)
+#define DNS_ERROR_DP_ALREADY_ENLISTED __MSABI_LONG(9904)
+#define DNS_ERROR_DP_NOT_AVAILABLE __MSABI_LONG(9905)
+#define DNS_ERROR_DP_FSMO_ERROR __MSABI_LONG(9906)
 
 #ifndef WSABASEERR
 #define WSABASEERR 10000
@@ -1768,195 +1768,195 @@
 #endif
 #endif // WSABASEERR
 
-#define ERROR_SXS_SECTION_NOT_FOUND 14000L
-#define ERROR_SXS_CANT_GEN_ACTCTX 14001L
-#define ERROR_SXS_INVALID_ACTCTXDATA_FORMAT 14002L
-#define ERROR_SXS_ASSEMBLY_NOT_FOUND 14003L
-#define ERROR_SXS_MANIFEST_FORMAT_ERROR 14004L
-#define ERROR_SXS_MANIFEST_PARSE_ERROR 14005L
-#define ERROR_SXS_ACTIVATION_CONTEXT_DISABLED 14006L
-#define ERROR_SXS_KEY_NOT_FOUND 14007L
-#define ERROR_SXS_VERSION_CONFLICT 14008L
-#define ERROR_SXS_WRONG_SECTION_TYPE 14009L
-#define ERROR_SXS_THREAD_QUERIES_DISABLED 14010L
-#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011L
-#define ERROR_SXS_UNKNOWN_ENCODING_GROUP 14012L
-#define ERROR_SXS_UNKNOWN_ENCODING 14013L
-#define ERROR_SXS_INVALID_XML_NAMESPACE_URI 14014L
-#define ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED 14015L
-#define ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED 14016L
-#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE 14017L
-#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE 14018L
-#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE 14019L
-#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT 14020L
-#define ERROR_SXS_DUPLICATE_DLL_NAME 14021L
-#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME 14022L
-#define ERROR_SXS_DUPLICATE_CLSID 14023L
-#define ERROR_SXS_DUPLICATE_IID 14024L
-#define ERROR_SXS_DUPLICATE_TLBID 14025L
-#define ERROR_SXS_DUPLICATE_PROGID 14026L
-#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME 14027L
-#define ERROR_SXS_FILE_HASH_MISMATCH 14028L
-#define ERROR_SXS_POLICY_PARSE_ERROR 14029L
-#define ERROR_SXS_XML_E_MISSINGQUOTE 14030L
-#define ERROR_SXS_XML_E_COMMENTSYNTAX 14031L
-#define ERROR_SXS_XML_E_BADSTARTNAMECHAR 14032L
-#define ERROR_SXS_XML_E_BADNAMECHAR 14033L
-#define ERROR_SXS_XML_E_BADCHARINSTRING 14034L
-#define ERROR_SXS_XML_E_XMLDECLSYNTAX 14035L
-#define ERROR_SXS_XML_E_BADCHARDATA 14036L
-#define ERROR_SXS_XML_E_MISSINGWHITESPACE 14037L
-#define ERROR_SXS_XML_E_EXPECTINGTAGEND 14038L
-#define ERROR_SXS_XML_E_MISSINGSEMICOLON 14039L
-#define ERROR_SXS_XML_E_UNBALANCEDPAREN 14040L
-#define ERROR_SXS_XML_E_INTERNALERROR 14041L
-#define ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE 14042L
-#define ERROR_SXS_XML_E_INCOMPLETE_ENCODING 14043L
-#define ERROR_SXS_XML_E_MISSING_PAREN 14044L
-#define ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE 14045L
-#define ERROR_SXS_XML_E_MULTIPLE_COLONS 14046L
-#define ERROR_SXS_XML_E_INVALID_DECIMAL 14047L
-#define ERROR_SXS_XML_E_INVALID_HEXIDECIMAL 14048L
-#define ERROR_SXS_XML_E_INVALID_UNICODE 14049L
-#define ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK 14050L
-#define ERROR_SXS_XML_E_UNEXPECTEDENDTAG 14051L
-#define ERROR_SXS_XML_E_UNCLOSEDTAG 14052L
-#define ERROR_SXS_XML_E_DUPLICATEATTRIBUTE 14053L
-#define ERROR_SXS_XML_E_MULTIPLEROOTS 14054L
-#define ERROR_SXS_XML_E_INVALIDATROOTLEVEL 14055L
-#define ERROR_SXS_XML_E_BADXMLDECL 14056L
-#define ERROR_SXS_XML_E_MISSINGROOT 14057L
-#define ERROR_SXS_XML_E_UNEXPECTEDEOF 14058L
-#define ERROR_SXS_XML_E_BADPEREFINSUBSET 14059L
-#define ERROR_SXS_XML_E_UNCLOSEDSTARTTAG 14060L
-#define ERROR_SXS_XML_E_UNCLOSEDENDTAG 14061L
-#define ERROR_SXS_XML_E_UNCLOSEDSTRING 14062L
-#define ERROR_SXS_XML_E_UNCLOSEDCOMMENT 14063L
-#define ERROR_SXS_XML_E_UNCLOSEDDECL 14064L
-#define ERROR_SXS_XML_E_UNCLOSEDCDATA 14065L
-#define ERROR_SXS_XML_E_RESERVEDNAMESPACE 14066L
-#define ERROR_SXS_XML_E_INVALIDENCODING 14067L
-#define ERROR_SXS_XML_E_INVALIDSWITCH 14068L
-#define ERROR_SXS_XML_E_BADXMLCASE 14069L
-#define ERROR_SXS_XML_E_INVALID_STANDALONE 14070L
-#define ERROR_SXS_XML_E_UNEXPECTED_STANDALONE 14071L
-#define ERROR_SXS_XML_E_INVALID_VERSION 14072L
-#define ERROR_SXS_XML_E_MISSINGEQUALS 14073L
-#define ERROR_SXS_PROTECTION_RECOVERY_FAILED 14074L
-#define ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT 14075L
-#define ERROR_SXS_PROTECTION_CATALOG_NOT_VALID 14076L
-#define ERROR_SXS_UNTRANSLATABLE_HRESULT 14077L
-#define ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING 14078L
-#define ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE 14079L
-#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME 14080L
-#define ERROR_IPSEC_QM_POLICY_EXISTS 13000L
-#define ERROR_IPSEC_QM_POLICY_NOT_FOUND 13001L
-#define ERROR_IPSEC_QM_POLICY_IN_USE 13002L
-#define ERROR_IPSEC_MM_POLICY_EXISTS 13003L
-#define ERROR_IPSEC_MM_POLICY_NOT_FOUND 13004L
-#define ERROR_IPSEC_MM_POLICY_IN_USE 13005L
-#define ERROR_IPSEC_MM_FILTER_EXISTS 13006L
-#define ERROR_IPSEC_MM_FILTER_NOT_FOUND 13007L
-#define ERROR_IPSEC_TRANSPORT_FILTER_EXISTS 13008L
-#define ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND 13009L
-#define ERROR_IPSEC_MM_AUTH_EXISTS 13010L
-#define ERROR_IPSEC_MM_AUTH_NOT_FOUND 13011L
-#define ERROR_IPSEC_MM_AUTH_IN_USE 13012L
-#define ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND 13013L
-#define ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND 13014L
-#define ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND 13015L
-#define ERROR_IPSEC_TUNNEL_FILTER_EXISTS 13016L
-#define ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND 13017L
-#define ERROR_IPSEC_MM_FILTER_PENDING_DELETION 13018L
-#define ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION 13019L
-#define ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION 13020L
-#define ERROR_IPSEC_MM_POLICY_PENDING_DELETION 13021L
-#define ERROR_IPSEC_MM_AUTH_PENDING_DELETION 13022L
-#define ERROR_IPSEC_QM_POLICY_PENDING_DELETION 13023L
-#define WARNING_IPSEC_MM_POLICY_PRUNED 13024L
-#define WARNING_IPSEC_QM_POLICY_PRUNED 13025L
-#define ERROR_IPSEC_IKE_NEG_STATUS_BEGIN 13800L
-#define ERROR_IPSEC_IKE_AUTH_FAIL 13801L
-#define ERROR_IPSEC_IKE_ATTRIB_FAIL 13802L
-#define ERROR_IPSEC_IKE_NEGOTIATION_PENDING 13803L
-#define ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR 13804L
-#define ERROR_IPSEC_IKE_TIMED_OUT 13805L
-#define ERROR_IPSEC_IKE_NO_CERT 13806L
-#define ERROR_IPSEC_IKE_SA_DELETED 13807L
-#define ERROR_IPSEC_IKE_SA_REAPED 13808L
-#define ERROR_IPSEC_IKE_MM_ACQUIRE_DROP 13809L
-#define ERROR_IPSEC_IKE_QM_ACQUIRE_DROP 13810L
-#define ERROR_IPSEC_IKE_QUEUE_DROP_MM 13811L
-#define ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM 13812L
-#define ERROR_IPSEC_IKE_DROP_NO_RESPONSE 13813L
-#define ERROR_IPSEC_IKE_MM_DELAY_DROP 13814L
-#define ERROR_IPSEC_IKE_QM_DELAY_DROP 13815L
-#define ERROR_IPSEC_IKE_ERROR 13816L
-#define ERROR_IPSEC_IKE_CRL_FAILED 13817L
-#define ERROR_IPSEC_IKE_INVALID_KEY_USAGE 13818L
-#define ERROR_IPSEC_IKE_INVALID_CERT_TYPE 13819L
-#define ERROR_IPSEC_IKE_NO_PRIVATE_KEY 13820L
-#define ERROR_IPSEC_IKE_DH_FAIL 13822L
-#define ERROR_IPSEC_IKE_INVALID_HEADER 13824L
-#define ERROR_IPSEC_IKE_NO_POLICY 13825L
-#define ERROR_IPSEC_IKE_INVALID_SIGNATURE 13826L
-#define ERROR_IPSEC_IKE_KERBEROS_ERROR 13827L
-#define ERROR_IPSEC_IKE_NO_PUBLIC_KEY 13828L
-#define ERROR_IPSEC_IKE_PROCESS_ERR 13829L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_SA 13830L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_PROP 13831L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_TRANS 13832L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_KE 13833L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_ID 13834L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT 13835L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ 13836L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_HASH 13837L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_SIG 13838L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_NONCE 13839L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY 13840L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_DELETE 13841L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR 13842L
-#define ERROR_IPSEC_IKE_INVALID_PAYLOAD 13843L
-#define ERROR_IPSEC_IKE_LOAD_SOFT_SA 13844L
-#define ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN 13845L
-#define ERROR_IPSEC_IKE_INVALID_COOKIE 13846L
-#define ERROR_IPSEC_IKE_NO_PEER_CERT 13847L
-#define ERROR_IPSEC_IKE_PEER_CRL_FAILED 13848L
-#define ERROR_IPSEC_IKE_POLICY_CHANGE 13849L
-#define ERROR_IPSEC_IKE_NO_MM_POLICY 13850L
-#define ERROR_IPSEC_IKE_NOTCBPRIV 13851L
-#define ERROR_IPSEC_IKE_SECLOADFAIL 13852L
-#define ERROR_IPSEC_IKE_FAILSSPINIT 13853L
-#define ERROR_IPSEC_IKE_FAILQUERYSSP 13854L
-#define ERROR_IPSEC_IKE_SRVACQFAIL 13855L
-#define ERROR_IPSEC_IKE_SRVQUERYCRED 13856L
-#define ERROR_IPSEC_IKE_GETSPIFAIL 13857L
-#define ERROR_IPSEC_IKE_INVALID_FILTER 13858L
-#define ERROR_IPSEC_IKE_OUT_OF_MEMORY 13859L
-#define ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED 13860L
-#define ERROR_IPSEC_IKE_INVALID_POLICY 13861L
-#define ERROR_IPSEC_IKE_UNKNOWN_DOI 13862L
-#define ERROR_IPSEC_IKE_INVALID_SITUATION 13863L
-#define ERROR_IPSEC_IKE_DH_FAILURE 13864L
-#define ERROR_IPSEC_IKE_INVALID_GROUP 13865L
-#define ERROR_IPSEC_IKE_ENCRYPT 13866L
-#define ERROR_IPSEC_IKE_DECRYPT 13867L
-#define ERROR_IPSEC_IKE_POLICY_MATCH 13868L
-#define ERROR_IPSEC_IKE_UNSUPPORTED_ID 13869L
-#define ERROR_IPSEC_IKE_INVALID_HASH 13870L
-#define ERROR_IPSEC_IKE_INVALID_HASH_ALG 13871L
-#define ERROR_IPSEC_IKE_INVALID_HASH_SIZE 13872L
-#define ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG 13873L
-#define ERROR_IPSEC_IKE_INVALID_AUTH_ALG 13874L
-#define ERROR_IPSEC_IKE_INVALID_SIG 13875L
-#define ERROR_IPSEC_IKE_LOAD_FAILED 13876L
-#define ERROR_IPSEC_IKE_RPC_DELETE 13877L
-#define ERROR_IPSEC_IKE_BENIGN_REINIT 13878L
-#define ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY 13879L
-#define ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN 13881L
-#define ERROR_IPSEC_IKE_MM_LIMIT 13882L
-#define ERROR_IPSEC_IKE_NEGOTIATION_DISABLED 13883L
-#define ERROR_IPSEC_IKE_NEG_STATUS_END 13884L
+#define ERROR_SXS_SECTION_NOT_FOUND __MSABI_LONG(14000)
+#define ERROR_SXS_CANT_GEN_ACTCTX __MSABI_LONG(14001)
+#define ERROR_SXS_INVALID_ACTCTXDATA_FORMAT __MSABI_LONG(14002)
+#define ERROR_SXS_ASSEMBLY_NOT_FOUND __MSABI_LONG(14003)
+#define ERROR_SXS_MANIFEST_FORMAT_ERROR __MSABI_LONG(14004)
+#define ERROR_SXS_MANIFEST_PARSE_ERROR __MSABI_LONG(14005)
+#define ERROR_SXS_ACTIVATION_CONTEXT_DISABLED __MSABI_LONG(14006)
+#define ERROR_SXS_KEY_NOT_FOUND __MSABI_LONG(14007)
+#define ERROR_SXS_VERSION_CONFLICT __MSABI_LONG(14008)
+#define ERROR_SXS_WRONG_SECTION_TYPE __MSABI_LONG(14009)
+#define ERROR_SXS_THREAD_QUERIES_DISABLED __MSABI_LONG(14010)
+#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET __MSABI_LONG(14011)
+#define ERROR_SXS_UNKNOWN_ENCODING_GROUP __MSABI_LONG(14012)
+#define ERROR_SXS_UNKNOWN_ENCODING __MSABI_LONG(14013)
+#define ERROR_SXS_INVALID_XML_NAMESPACE_URI __MSABI_LONG(14014)
+#define ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED __MSABI_LONG(14015)
+#define ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED __MSABI_LONG(14016)
+#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE __MSABI_LONG(14017)
+#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE __MSABI_LONG(14018)
+#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE __MSABI_LONG(14019)
+#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT __MSABI_LONG(14020)
+#define ERROR_SXS_DUPLICATE_DLL_NAME __MSABI_LONG(14021)
+#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME __MSABI_LONG(14022)
+#define ERROR_SXS_DUPLICATE_CLSID __MSABI_LONG(14023)
+#define ERROR_SXS_DUPLICATE_IID __MSABI_LONG(14024)
+#define ERROR_SXS_DUPLICATE_TLBID __MSABI_LONG(14025)
+#define ERROR_SXS_DUPLICATE_PROGID __MSABI_LONG(14026)
+#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME __MSABI_LONG(14027)
+#define ERROR_SXS_FILE_HASH_MISMATCH __MSABI_LONG(14028)
+#define ERROR_SXS_POLICY_PARSE_ERROR __MSABI_LONG(14029)
+#define ERROR_SXS_XML_E_MISSINGQUOTE __MSABI_LONG(14030)
+#define ERROR_SXS_XML_E_COMMENTSYNTAX __MSABI_LONG(14031)
+#define ERROR_SXS_XML_E_BADSTARTNAMECHAR __MSABI_LONG(14032)
+#define ERROR_SXS_XML_E_BADNAMECHAR __MSABI_LONG(14033)
+#define ERROR_SXS_XML_E_BADCHARINSTRING __MSABI_LONG(14034)
+#define ERROR_SXS_XML_E_XMLDECLSYNTAX __MSABI_LONG(14035)
+#define ERROR_SXS_XML_E_BADCHARDATA __MSABI_LONG(14036)
+#define ERROR_SXS_XML_E_MISSINGWHITESPACE __MSABI_LONG(14037)
+#define ERROR_SXS_XML_E_EXPECTINGTAGEND __MSABI_LONG(14038)
+#define ERROR_SXS_XML_E_MISSINGSEMICOLON __MSABI_LONG(14039)
+#define ERROR_SXS_XML_E_UNBALANCEDPAREN __MSABI_LONG(14040)
+#define ERROR_SXS_XML_E_INTERNALERROR __MSABI_LONG(14041)
+#define ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE __MSABI_LONG(14042)
+#define ERROR_SXS_XML_E_INCOMPLETE_ENCODING __MSABI_LONG(14043)
+#define ERROR_SXS_XML_E_MISSING_PAREN __MSABI_LONG(14044)
+#define ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE __MSABI_LONG(14045)
+#define ERROR_SXS_XML_E_MULTIPLE_COLONS __MSABI_LONG(14046)
+#define ERROR_SXS_XML_E_INVALID_DECIMAL __MSABI_LONG(14047)
+#define ERROR_SXS_XML_E_INVALID_HEXIDECIMAL __MSABI_LONG(14048)
+#define ERROR_SXS_XML_E_INVALID_UNICODE __MSABI_LONG(14049)
+#define ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK __MSABI_LONG(14050)
+#define ERROR_SXS_XML_E_UNEXPECTEDENDTAG __MSABI_LONG(14051)
+#define ERROR_SXS_XML_E_UNCLOSEDTAG __MSABI_LONG(14052)
+#define ERROR_SXS_XML_E_DUPLICATEATTRIBUTE __MSABI_LONG(14053)
+#define ERROR_SXS_XML_E_MULTIPLEROOTS __MSABI_LONG(14054)
+#define ERROR_SXS_XML_E_INVALIDATROOTLEVEL __MSABI_LONG(14055)
+#define ERROR_SXS_XML_E_BADXMLDECL __MSABI_LONG(14056)
+#define ERROR_SXS_XML_E_MISSINGROOT __MSABI_LONG(14057)
+#define ERROR_SXS_XML_E_UNEXPECTEDEOF __MSABI_LONG(14058)
+#define ERROR_SXS_XML_E_BADPEREFINSUBSET __MSABI_LONG(14059)
+#define ERROR_SXS_XML_E_UNCLOSEDSTARTTAG __MSABI_LONG(14060)
+#define ERROR_SXS_XML_E_UNCLOSEDENDTAG __MSABI_LONG(14061)
+#define ERROR_SXS_XML_E_UNCLOSEDSTRING __MSABI_LONG(14062)
+#define ERROR_SXS_XML_E_UNCLOSEDCOMMENT __MSABI_LONG(14063)
+#define ERROR_SXS_XML_E_UNCLOSEDDECL __MSABI_LONG(14064)
+#define ERROR_SXS_XML_E_UNCLOSEDCDATA __MSABI_LONG(14065)
+#define ERROR_SXS_XML_E_RESERVEDNAMESPACE __MSABI_LONG(14066)
+#define ERROR_SXS_XML_E_INVALIDENCODING __MSABI_LONG(14067)
+#define ERROR_SXS_XML_E_INVALIDSWITCH __MSABI_LONG(14068)
+#define ERROR_SXS_XML_E_BADXMLCASE __MSABI_LONG(14069)
+#define ERROR_SXS_XML_E_INVALID_STANDALONE __MSABI_LONG(14070)
+#define ERROR_SXS_XML_E_UNEXPECTED_STANDALONE __MSABI_LONG(14071)
+#define ERROR_SXS_XML_E_INVALID_VERSION __MSABI_LONG(14072)
+#define ERROR_SXS_XML_E_MISSINGEQUALS __MSABI_LONG(14073)
+#define ERROR_SXS_PROTECTION_RECOVERY_FAILED __MSABI_LONG(14074)
+#define ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT __MSABI_LONG(14075)
+#define ERROR_SXS_PROTECTION_CATALOG_NOT_VALID __MSABI_LONG(14076)
+#define ERROR_SXS_UNTRANSLATABLE_HRESULT __MSABI_LONG(14077)
+#define ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING __MSABI_LONG(14078)
+#define ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE __MSABI_LONG(14079)
+#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME __MSABI_LONG(14080)
+#define ERROR_IPSEC_QM_POLICY_EXISTS __MSABI_LONG(13000)
+#define ERROR_IPSEC_QM_POLICY_NOT_FOUND __MSABI_LONG(13001)
+#define ERROR_IPSEC_QM_POLICY_IN_USE __MSABI_LONG(13002)
+#define ERROR_IPSEC_MM_POLICY_EXISTS __MSABI_LONG(13003)
+#define ERROR_IPSEC_MM_POLICY_NOT_FOUND __MSABI_LONG(13004)
+#define ERROR_IPSEC_MM_POLICY_IN_USE __MSABI_LONG(13005)
+#define ERROR_IPSEC_MM_FILTER_EXISTS __MSABI_LONG(13006)
+#define ERROR_IPSEC_MM_FILTER_NOT_FOUND __MSABI_LONG(13007)
+#define ERROR_IPSEC_TRANSPORT_FILTER_EXISTS __MSABI_LONG(13008)
+#define ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND __MSABI_LONG(13009)
+#define ERROR_IPSEC_MM_AUTH_EXISTS __MSABI_LONG(13010)
+#define ERROR_IPSEC_MM_AUTH_NOT_FOUND __MSABI_LONG(13011)
+#define ERROR_IPSEC_MM_AUTH_IN_USE __MSABI_LONG(13012)
+#define ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND __MSABI_LONG(13013)
+#define ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND __MSABI_LONG(13014)
+#define ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND __MSABI_LONG(13015)
+#define ERROR_IPSEC_TUNNEL_FILTER_EXISTS __MSABI_LONG(13016)
+#define ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND __MSABI_LONG(13017)
+#define ERROR_IPSEC_MM_FILTER_PENDING_DELETION __MSABI_LONG(13018)
+#define ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION __MSABI_LONG(13019)
+#define ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION __MSABI_LONG(13020)
+#define ERROR_IPSEC_MM_POLICY_PENDING_DELETION __MSABI_LONG(13021)
+#define ERROR_IPSEC_MM_AUTH_PENDING_DELETION __MSABI_LONG(13022)
+#define ERROR_IPSEC_QM_POLICY_PENDING_DELETION __MSABI_LONG(13023)
+#define WARNING_IPSEC_MM_POLICY_PRUNED __MSABI_LONG(13024)
+#define WARNING_IPSEC_QM_POLICY_PRUNED __MSABI_LONG(13025)
+#define ERROR_IPSEC_IKE_NEG_STATUS_BEGIN __MSABI_LONG(13800)
+#define ERROR_IPSEC_IKE_AUTH_FAIL __MSABI_LONG(13801)
+#define ERROR_IPSEC_IKE_ATTRIB_FAIL __MSABI_LONG(13802)
+#define ERROR_IPSEC_IKE_NEGOTIATION_PENDING __MSABI_LONG(13803)
+#define ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR __MSABI_LONG(13804)
+#define ERROR_IPSEC_IKE_TIMED_OUT __MSABI_LONG(13805)
+#define ERROR_IPSEC_IKE_NO_CERT __MSABI_LONG(13806)
+#define ERROR_IPSEC_IKE_SA_DELETED __MSABI_LONG(13807)
+#define ERROR_IPSEC_IKE_SA_REAPED __MSABI_LONG(13808)
+#define ERROR_IPSEC_IKE_MM_ACQUIRE_DROP __MSABI_LONG(13809)
+#define ERROR_IPSEC_IKE_QM_ACQUIRE_DROP __MSABI_LONG(13810)
+#define ERROR_IPSEC_IKE_QUEUE_DROP_MM __MSABI_LONG(13811)
+#define ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM __MSABI_LONG(13812)
+#define ERROR_IPSEC_IKE_DROP_NO_RESPONSE __MSABI_LONG(13813)
+#define ERROR_IPSEC_IKE_MM_DELAY_DROP __MSABI_LONG(13814)
+#define ERROR_IPSEC_IKE_QM_DELAY_DROP __MSABI_LONG(13815)
+#define ERROR_IPSEC_IKE_ERROR __MSABI_LONG(13816)
+#define ERROR_IPSEC_IKE_CRL_FAILED __MSABI_LONG(13817)
+#define ERROR_IPSEC_IKE_INVALID_KEY_USAGE __MSABI_LONG(13818)
+#define ERROR_IPSEC_IKE_INVALID_CERT_TYPE __MSABI_LONG(13819)
+#define ERROR_IPSEC_IKE_NO_PRIVATE_KEY __MSABI_LONG(13820)
+#define ERROR_IPSEC_IKE_DH_FAIL __MSABI_LONG(13822)
+#define ERROR_IPSEC_IKE_INVALID_HEADER __MSABI_LONG(13824)
+#define ERROR_IPSEC_IKE_NO_POLICY __MSABI_LONG(13825)
+#define ERROR_IPSEC_IKE_INVALID_SIGNATURE __MSABI_LONG(13826)
+#define ERROR_IPSEC_IKE_KERBEROS_ERROR __MSABI_LONG(13827)
+#define ERROR_IPSEC_IKE_NO_PUBLIC_KEY __MSABI_LONG(13828)
+#define ERROR_IPSEC_IKE_PROCESS_ERR __MSABI_LONG(13829)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_SA __MSABI_LONG(13830)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_PROP __MSABI_LONG(13831)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_TRANS __MSABI_LONG(13832)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_KE __MSABI_LONG(13833)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_ID __MSABI_LONG(13834)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT __MSABI_LONG(13835)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ __MSABI_LONG(13836)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_HASH __MSABI_LONG(13837)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_SIG __MSABI_LONG(13838)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_NONCE __MSABI_LONG(13839)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY __MSABI_LONG(13840)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_DELETE __MSABI_LONG(13841)
+#define ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR __MSABI_LONG(13842)
+#define ERROR_IPSEC_IKE_INVALID_PAYLOAD __MSABI_LONG(13843)
+#define ERROR_IPSEC_IKE_LOAD_SOFT_SA __MSABI_LONG(13844)
+#define ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN __MSABI_LONG(13845)
+#define ERROR_IPSEC_IKE_INVALID_COOKIE __MSABI_LONG(13846)
+#define ERROR_IPSEC_IKE_NO_PEER_CERT __MSABI_LONG(13847)
+#define ERROR_IPSEC_IKE_PEER_CRL_FAILED __MSABI_LONG(13848)
+#define ERROR_IPSEC_IKE_POLICY_CHANGE __MSABI_LONG(13849)
+#define ERROR_IPSEC_IKE_NO_MM_POLICY __MSABI_LONG(13850)
+#define ERROR_IPSEC_IKE_NOTCBPRIV __MSABI_LONG(13851)
+#define ERROR_IPSEC_IKE_SECLOADFAIL __MSABI_LONG(13852)
+#define ERROR_IPSEC_IKE_FAILSSPINIT __MSABI_LONG(13853)
+#define ERROR_IPSEC_IKE_FAILQUERYSSP __MSABI_LONG(13854)
+#define ERROR_IPSEC_IKE_SRVACQFAIL __MSABI_LONG(13855)
+#define ERROR_IPSEC_IKE_SRVQUERYCRED __MSABI_LONG(13856)
+#define ERROR_IPSEC_IKE_GETSPIFAIL __MSABI_LONG(13857)
+#define ERROR_IPSEC_IKE_INVALID_FILTER __MSABI_LONG(13858)
+#define ERROR_IPSEC_IKE_OUT_OF_MEMORY __MSABI_LONG(13859)
+#define ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED __MSABI_LONG(13860)
+#define ERROR_IPSEC_IKE_INVALID_POLICY __MSABI_LONG(13861)
+#define ERROR_IPSEC_IKE_UNKNOWN_DOI __MSABI_LONG(13862)
+#define ERROR_IPSEC_IKE_INVALID_SITUATION __MSABI_LONG(13863)
+#define ERROR_IPSEC_IKE_DH_FAILURE __MSABI_LONG(13864)
+#define ERROR_IPSEC_IKE_INVALID_GROUP __MSABI_LONG(13865)
+#define ERROR_IPSEC_IKE_ENCRYPT __MSABI_LONG(13866)
+#define ERROR_IPSEC_IKE_DECRYPT __MSABI_LONG(13867)
+#define ERROR_IPSEC_IKE_POLICY_MATCH __MSABI_LONG(13868)
+#define ERROR_IPSEC_IKE_UNSUPPORTED_ID __MSABI_LONG(13869)
+#define ERROR_IPSEC_IKE_INVALID_HASH __MSABI_LONG(13870)
+#define ERROR_IPSEC_IKE_INVALID_HASH_ALG __MSABI_LONG(13871)
+#define ERROR_IPSEC_IKE_INVALID_HASH_SIZE __MSABI_LONG(13872)
+#define ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG __MSABI_LONG(13873)
+#define ERROR_IPSEC_IKE_INVALID_AUTH_ALG __MSABI_LONG(13874)
+#define ERROR_IPSEC_IKE_INVALID_SIG __MSABI_LONG(13875)
+#define ERROR_IPSEC_IKE_LOAD_FAILED __MSABI_LONG(13876)
+#define ERROR_IPSEC_IKE_RPC_DELETE __MSABI_LONG(13877)
+#define ERROR_IPSEC_IKE_BENIGN_REINIT __MSABI_LONG(13878)
+#define ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY __MSABI_LONG(13879)
+#define ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN __MSABI_LONG(13881)
+#define ERROR_IPSEC_IKE_MM_LIMIT __MSABI_LONG(13882)
+#define ERROR_IPSEC_IKE_NEGOTIATION_DISABLED __MSABI_LONG(13883)
+#define ERROR_IPSEC_IKE_NEG_STATUS_END __MSABI_LONG(13884)
 #define SEVERITY_SUCCESS 0
 #define SEVERITY_ERROR 1
 #define SUCCEEDED(hr) ((HRESULT)(hr) >= 0)
@@ -2081,37 +2081,37 @@
 #define DV_E_DVASPECT _HRESULT_TYPEDEF_(0x8004006B)
 #define DV_E_DVTARGETDEVICE_SIZE _HRESULT_TYPEDEF_(0x8004006C)
 #define DV_E_NOIVIEWOBJECT _HRESULT_TYPEDEF_(0x8004006D)
-#define DRAGDROP_E_FIRST 0x80040100L
-#define DRAGDROP_E_LAST 0x8004010FL
-#define DRAGDROP_S_FIRST 0x00040100L
-#define DRAGDROP_S_LAST 0x0004010FL
+#define DRAGDROP_E_FIRST __MSABI_LONG(0x80040100)
+#define DRAGDROP_E_LAST __MSABI_LONG(0x8004010F)
+#define DRAGDROP_S_FIRST __MSABI_LONG(0x00040100)
+#define DRAGDROP_S_LAST __MSABI_LONG(0x0004010F)
 #define DRAGDROP_E_NOTREGISTERED _HRESULT_TYPEDEF_(0x80040100)
 #define DRAGDROP_E_ALREADYREGISTERED _HRESULT_TYPEDEF_(0x80040101)
 #define DRAGDROP_E_INVALIDHWND _HRESULT_TYPEDEF_(0x80040102)
-#define CLASSFACTORY_E_FIRST 0x80040110L
-#define CLASSFACTORY_E_LAST 0x8004011FL
-#define CLASSFACTORY_S_FIRST 0x00040110L
-#define CLASSFACTORY_S_LAST 0x0004011FL
+#define CLASSFACTORY_E_FIRST __MSABI_LONG(0x80040110)
+#define CLASSFACTORY_E_LAST __MSABI_LONG(0x8004011F)
+#define CLASSFACTORY_S_FIRST __MSABI_LONG(0x00040110)
+#define CLASSFACTORY_S_LAST __MSABI_LONG(0x0004011F)
 #define CLASS_E_NOAGGREGATION _HRESULT_TYPEDEF_(0x80040110)
 #define CLASS_E_CLASSNOTAVAILABLE _HRESULT_TYPEDEF_(0x80040111)
 #define CLASS_E_NOTLICENSED _HRESULT_TYPEDEF_(0x80040112)
-#define MARSHAL_E_FIRST 0x80040120L
-#define MARSHAL_E_LAST 0x8004012FL
-#define MARSHAL_S_FIRST 0x00040120L
-#define MARSHAL_S_LAST 0x0004012FL
-#define DATA_E_FIRST 0x80040130L
-#define DATA_E_LAST 0x8004013FL
-#define DATA_S_FIRST 0x00040130L
-#define DATA_S_LAST 0x0004013FL
-#define VIEW_E_FIRST 0x80040140L
-#define VIEW_E_LAST 0x8004014FL
-#define VIEW_S_FIRST 0x00040140L
-#define VIEW_S_LAST 0x0004014FL
+#define MARSHAL_E_FIRST __MSABI_LONG(0x80040120)
+#define MARSHAL_E_LAST __MSABI_LONG(0x8004012F)
+#define MARSHAL_S_FIRST __MSABI_LONG(0x00040120)
+#define MARSHAL_S_LAST __MSABI_LONG(0x0004012F)
+#define DATA_E_FIRST __MSABI_LONG(0x80040130)
+#define DATA_E_LAST __MSABI_LONG(0x8004013F)
+#define DATA_S_FIRST __MSABI_LONG(0x00040130)
+#define DATA_S_LAST __MSABI_LONG(0x0004013F)
+#define VIEW_E_FIRST __MSABI_LONG(0x80040140)
+#define VIEW_E_LAST __MSABI_LONG(0x8004014F)
+#define VIEW_S_FIRST __MSABI_LONG(0x00040140)
+#define VIEW_S_LAST __MSABI_LONG(0x0004014F)
 #define VIEW_E_DRAW _HRESULT_TYPEDEF_(0x80040140)
-#define REGDB_E_FIRST 0x80040150L
-#define REGDB_E_LAST 0x8004015FL
-#define REGDB_S_FIRST 0x00040150L
-#define REGDB_S_LAST 0x0004015FL
+#define REGDB_E_FIRST __MSABI_LONG(0x80040150)
+#define REGDB_E_LAST __MSABI_LONG(0x8004015F)
+#define REGDB_S_FIRST __MSABI_LONG(0x00040150)
+#define REGDB_S_LAST __MSABI_LONG(0x0004015F)
 #define REGDB_E_READREGDB _HRESULT_TYPEDEF_(0x80040150)
 #define REGDB_E_WRITEREGDB _HRESULT_TYPEDEF_(0x80040151)
 #define REGDB_E_KEYMISSING _HRESULT_TYPEDEF_(0x80040152)
@@ -2119,12 +2119,12 @@
 #define REGDB_E_CLASSNOTREG _HRESULT_TYPEDEF_(0x80040154)
 #define REGDB_E_IIDNOTREG _HRESULT_TYPEDEF_(0x80040155)
 #define REGDB_E_BADTHREADINGMODEL _HRESULT_TYPEDEF_(0x80040156)
-#define CAT_E_FIRST 0x80040160L
-#define CAT_E_LAST 0x80040161L
+#define CAT_E_FIRST __MSABI_LONG(0x80040160)
+#define CAT_E_LAST __MSABI_LONG(0x80040161)
 #define CAT_E_CATIDNOEXIST _HRESULT_TYPEDEF_(0x80040160)
 #define CAT_E_NODESCRIPTION _HRESULT_TYPEDEF_(0x80040161)
-#define CS_E_FIRST 0x80040164L
-#define CS_E_LAST 0x8004016FL
+#define CS_E_FIRST __MSABI_LONG(0x80040164)
+#define CS_E_LAST __MSABI_LONG(0x8004016F)
 #define CS_E_PACKAGE_NOTFOUND _HRESULT_TYPEDEF_(0x80040164)
 #define CS_E_NOT_DELETABLE _HRESULT_TYPEDEF_(0x80040165)
 #define CS_E_CLASS_NOTFOUND _HRESULT_TYPEDEF_(0x80040166)
@@ -2137,35 +2137,35 @@
 #define CS_E_ADMIN_LIMIT_EXCEEDED _HRESULT_TYPEDEF_(0x8004016D)
 #define CS_E_SCHEMA_MISMATCH _HRESULT_TYPEDEF_(0x8004016E)
 #define CS_E_INTERNAL_ERROR _HRESULT_TYPEDEF_(0x8004016F)
-#define CACHE_E_FIRST 0x80040170L
-#define CACHE_E_LAST 0x8004017FL
-#define CACHE_S_FIRST 0x00040170L
-#define CACHE_S_LAST 0x0004017FL
+#define CACHE_E_FIRST __MSABI_LONG(0x80040170)
+#define CACHE_E_LAST __MSABI_LONG(0x8004017F)
+#define CACHE_S_FIRST __MSABI_LONG(0x00040170)
+#define CACHE_S_LAST __MSABI_LONG(0x0004017F)
 #define CACHE_E_NOCACHE_UPDATED _HRESULT_TYPEDEF_(0x80040170)
-#define OLEOBJ_E_FIRST 0x80040180L
-#define OLEOBJ_E_LAST 0x8004018FL
-#define OLEOBJ_S_FIRST 0x00040180L
-#define OLEOBJ_S_LAST 0x0004018FL
+#define OLEOBJ_E_FIRST __MSABI_LONG(0x80040180)
+#define OLEOBJ_E_LAST __MSABI_LONG(0x8004018F)
+#define OLEOBJ_S_FIRST __MSABI_LONG(0x00040180)
+#define OLEOBJ_S_LAST __MSABI_LONG(0x0004018F)
 #define OLEOBJ_E_NOVERBS _HRESULT_TYPEDEF_(0x80040180)
 #define OLEOBJ_E_INVALIDVERB _HRESULT_TYPEDEF_(0x80040181)
-#define CLIENTSITE_E_FIRST 0x80040190L
-#define CLIENTSITE_E_LAST 0x8004019FL
-#define CLIENTSITE_S_FIRST 0x00040190L
-#define CLIENTSITE_S_LAST 0x0004019FL
+#define CLIENTSITE_E_FIRST __MSABI_LONG(0x80040190)
+#define CLIENTSITE_E_LAST __MSABI_LONG(0x8004019F)
+#define CLIENTSITE_S_FIRST __MSABI_LONG(0x00040190)
+#define CLIENTSITE_S_LAST __MSABI_LONG(0x0004019F)
 #define INPLACE_E_NOTUNDOABLE _HRESULT_TYPEDEF_(0x800401A0)
 #define INPLACE_E_NOTOOLSPACE _HRESULT_TYPEDEF_(0x800401A1)
-#define INPLACE_E_FIRST 0x800401A0L
-#define INPLACE_E_LAST 0x800401AFL
-#define INPLACE_S_FIRST 0x000401A0L
-#define INPLACE_S_LAST 0x000401AFL
-#define ENUM_E_FIRST 0x800401B0L
-#define ENUM_E_LAST 0x800401BFL
-#define ENUM_S_FIRST 0x000401B0L
-#define ENUM_S_LAST 0x000401BFL
-#define CONVERT10_E_FIRST 0x800401C0L
-#define CONVERT10_E_LAST 0x800401CFL
-#define CONVERT10_S_FIRST 0x000401C0L
-#define CONVERT10_S_LAST 0x000401CFL
+#define INPLACE_E_FIRST __MSABI_LONG(0x800401A0)
+#define INPLACE_E_LAST __MSABI_LONG(0x800401AF)
+#define INPLACE_S_FIRST __MSABI_LONG(0x000401A0)
+#define INPLACE_S_LAST __MSABI_LONG(0x000401AF)
+#define ENUM_E_FIRST __MSABI_LONG(0x800401B0)
+#define ENUM_E_LAST __MSABI_LONG(0x800401BF)
+#define ENUM_S_FIRST __MSABI_LONG(0x000401B0)
+#define ENUM_S_LAST __MSABI_LONG(0x000401BF)
+#define CONVERT10_E_FIRST __MSABI_LONG(0x800401C0)
+#define CONVERT10_E_LAST __MSABI_LONG(0x800401CF)
+#define CONVERT10_S_FIRST __MSABI_LONG(0x000401C0)
+#define CONVERT10_S_LAST __MSABI_LONG(0x000401CF)
 #define CONVERT10_E_OLESTREAM_GET _HRESULT_TYPEDEF_(0x800401C0)
 #define CONVERT10_E_OLESTREAM_PUT _HRESULT_TYPEDEF_(0x800401C1)
 #define CONVERT10_E_OLESTREAM_FMT _HRESULT_TYPEDEF_(0x800401C2)
@@ -2173,19 +2173,19 @@
 #define CONVERT10_E_STG_FMT _HRESULT_TYPEDEF_(0x800401C4)
 #define CONVERT10_E_STG_NO_STD_STREAM _HRESULT_TYPEDEF_(0x800401C5)
 #define CONVERT10_E_STG_DIB_TO_BITMAP _HRESULT_TYPEDEF_(0x800401C6)
-#define CLIPBRD_E_FIRST 0x800401D0L
-#define CLIPBRD_E_LAST 0x800401DFL
-#define CLIPBRD_S_FIRST 0x000401D0L
-#define CLIPBRD_S_LAST 0x000401DFL
+#define CLIPBRD_E_FIRST __MSABI_LONG(0x800401D0)
+#define CLIPBRD_E_LAST __MSABI_LONG(0x800401DF)
+#define CLIPBRD_S_FIRST __MSABI_LONG(0x000401D0)
+#define CLIPBRD_S_LAST __MSABI_LONG(0x000401DF)
 #define CLIPBRD_E_CANT_OPEN _HRESULT_TYPEDEF_(0x800401D0)
 #define CLIPBRD_E_CANT_EMPTY _HRESULT_TYPEDEF_(0x800401D1)
 #define CLIPBRD_E_CANT_SET _HRESULT_TYPEDEF_(0x800401D2)
 #define CLIPBRD_E_BAD_DATA _HRESULT_TYPEDEF_(0x800401D3)
 #define CLIPBRD_E_CANT_CLOSE _HRESULT_TYPEDEF_(0x800401D4)
-#define MK_E_FIRST 0x800401E0L
-#define MK_E_LAST 0x800401EFL
-#define MK_S_FIRST 0x000401E0L
-#define MK_S_LAST 0x000401EFL
+#define MK_E_FIRST __MSABI_LONG(0x800401E0)
+#define MK_E_LAST __MSABI_LONG(0x800401EF)
+#define MK_S_FIRST __MSABI_LONG(0x000401E0)
+#define MK_S_LAST __MSABI_LONG(0x000401EF)
 #define MK_E_CONNECTMANUALLY _HRESULT_TYPEDEF_(0x800401E0)
 #define MK_E_EXCEEDEDDEADLINE _HRESULT_TYPEDEF_(0x800401E1)
 #define MK_E_NEEDGENERIC _HRESULT_TYPEDEF_(0x800401E2)
@@ -2202,10 +2202,10 @@
 #define MK_E_NOSTORAGE _HRESULT_TYPEDEF_(0x800401ED)
 #define MK_E_NOPREFIX _HRESULT_TYPEDEF_(0x800401EE)
 #define MK_E_ENUMERATION_FAILED _HRESULT_TYPEDEF_(0x800401EF)
-#define CO_E_FIRST 0x800401F0L
-#define CO_E_LAST 0x800401FFL
-#define CO_S_FIRST 0x000401F0L
-#define CO_S_LAST 0x000401FFL
+#define CO_E_FIRST __MSABI_LONG(0x800401F0)
+#define CO_E_LAST __MSABI_LONG(0x800401FF)
+#define CO_S_FIRST __MSABI_LONG(0x000401F0)
+#define CO_S_LAST __MSABI_LONG(0x000401FF)
 #define CO_E_NOTINITIALIZED _HRESULT_TYPEDEF_(0x800401F0)
 #define CO_E_ALREADYINITIALIZED _HRESULT_TYPEDEF_(0x800401F1)
 #define CO_E_CANTDETERMINECLASS _HRESULT_TYPEDEF_(0x800401F2)
@@ -2222,10 +2222,10 @@
 #define CO_E_OBJNOTCONNECTED _HRESULT_TYPEDEF_(0x800401FD)
 #define CO_E_APPDIDNTREG _HRESULT_TYPEDEF_(0x800401FE)
 #define CO_E_RELEASED _HRESULT_TYPEDEF_(0x800401FF)
-#define EVENT_E_FIRST 0x80040200L
-#define EVENT_E_LAST 0x8004021FL
-#define EVENT_S_FIRST 0x00040200L
-#define EVENT_S_LAST 0x0004021FL
+#define EVENT_E_FIRST __MSABI_LONG(0x80040200)
+#define EVENT_E_LAST __MSABI_LONG(0x8004021F)
+#define EVENT_S_FIRST __MSABI_LONG(0x00040200)
+#define EVENT_S_LAST __MSABI_LONG(0x0004021F)
 #define EVENT_S_SOME_SUBSCRIBERS_FAILED _HRESULT_TYPEDEF_(0x00040200)
 #define EVENT_E_ALL_SUBSCRIBERS_FAILED _HRESULT_TYPEDEF_(0x80040201)
 #define EVENT_S_NOSUBSCRIBERS _HRESULT_TYPEDEF_(0x00040202)
@@ -2307,10 +2307,10 @@
 #define XACT_S_SINGLEPHASE _HRESULT_TYPEDEF_(0x0004D009)
 #define XACT_S_LOCALLY_OK _HRESULT_TYPEDEF_(0x0004D00A)
 #define XACT_S_LASTRESOURCEMANAGER _HRESULT_TYPEDEF_(0x0004D010)
-#define CONTEXT_E_FIRST 0x8004E000L
-#define CONTEXT_E_LAST 0x8004E02FL
-#define CONTEXT_S_FIRST 0x0004E000L
-#define CONTEXT_S_LAST 0x0004E02FL
+#define CONTEXT_E_FIRST __MSABI_LONG(0x8004E000)
+#define CONTEXT_E_LAST __MSABI_LONG(0x8004E02F)
+#define CONTEXT_S_FIRST __MSABI_LONG(0x0004E000)
+#define CONTEXT_S_LAST __MSABI_LONG(0x0004E02F)
 #define CONTEXT_E_ABORTED _HRESULT_TYPEDEF_(0x8004E002)
 #define CONTEXT_E_ABORTING _HRESULT_TYPEDEF_(0x8004E003)
 #define CONTEXT_E_NOCONTEXT _HRESULT_TYPEDEF_(0x8004E004)
diff --git a/mingw-w64-headers/include/wingdi.h b/mingw-w64-headers/include/wingdi.h
index 16f4662..6158987 100644
--- a/mingw-w64-headers/include/wingdi.h
+++ b/mingw-w64-headers/include/wingdi.h
@@ -68,7 +68,7 @@
 #define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))
 #endif
 
-#define GDI_ERROR (0xFFFFFFFFL)
+#define GDI_ERROR (__MSABI_LONG(0xFFFFFFFF))
 #define HGDI_ERROR (LongToHandle(0xFFFFFFFF))
 
 #define ERROR 0
@@ -461,9 +461,9 @@
   } RGBQUAD;
   typedef RGBQUAD *LPRGBQUAD;
 
-#define CS_ENABLE 0x00000001L
-#define CS_DISABLE 0x00000002L
-#define CS_DELETE_TRANSFORM 0x00000003L
+#define CS_ENABLE __MSABI_LONG(0x00000001)
+#define CS_DISABLE __MSABI_LONG(0x00000002)
+#define CS_DELETE_TRANSFORM __MSABI_LONG(0x00000003)
 
 #define LCS_SIGNATURE 'PSOC'
 
@@ -471,13 +471,13 @@
 #define LCS_WINDOWS_COLOR_SPACE 'Win '
 
   typedef LONG LCSCSTYPE;
-#define LCS_CALIBRATED_RGB 0x00000000L
+#define LCS_CALIBRATED_RGB __MSABI_LONG(0x00000000)
 
   typedef LONG LCSGAMUTMATCH;
-#define LCS_GM_BUSINESS 0x00000001L
-#define LCS_GM_GRAPHICS 0x00000002L
-#define LCS_GM_IMAGES 0x00000004L
-#define LCS_GM_ABS_COLORIMETRIC 0x00000008L
+#define LCS_GM_BUSINESS __MSABI_LONG(0x00000001)
+#define LCS_GM_GRAPHICS __MSABI_LONG(0x00000002)
+#define LCS_GM_IMAGES __MSABI_LONG(0x00000004)
+#define LCS_GM_ABS_COLORIMETRIC __MSABI_LONG(0x00000008)
 
 #define CM_OUT_OF_GAMUT 255
 #define CM_IN_GAMUT 0
@@ -619,12 +619,12 @@
 #define PROFILE_LINKED 'LINK'
 #define PROFILE_EMBEDDED 'MBED'
 
-#define BI_RGB 0L
-#define BI_RLE8 1L
-#define BI_RLE4 2L
-#define BI_BITFIELDS 3L
-#define BI_JPEG 4L
-#define BI_PNG 5L
+#define BI_RGB __MSABI_LONG(0)
+#define BI_RLE8 __MSABI_LONG(1)
+#define BI_RLE4 __MSABI_LONG(2)
+#define BI_BITFIELDS __MSABI_LONG(3)
+#define BI_JPEG __MSABI_LONG(4)
+#define BI_PNG __MSABI_LONG(5)
 
   typedef struct tagBITMAPINFO {
     BITMAPINFOHEADER bmiHeader;
@@ -803,9 +803,9 @@
   __MINGW_TYPEDEF_AW(LPTEXTMETRIC)
 #endif
 
-#define NTM_REGULAR 0x00000040L
-#define NTM_BOLD 0x00000020L
-#define NTM_ITALIC 0x00000001L
+#define NTM_REGULAR __MSABI_LONG(0x00000040)
+#define NTM_BOLD __MSABI_LONG(0x00000020)
+#define NTM_ITALIC __MSABI_LONG(0x00000001)
 
 #define NTM_NONNEGATIVE_AC 0x00010000
 #define NTM_PS_OPENTYPE 0x00020000
@@ -1084,22 +1084,22 @@
 #define MAC_CHARSET 77
 #define BALTIC_CHARSET 186
 
-#define FS_LATIN1 0x00000001L
-#define FS_LATIN2 0x00000002L
-#define FS_CYRILLIC 0x00000004L
-#define FS_GREEK 0x00000008L
-#define FS_TURKISH 0x00000010L
-#define FS_HEBREW 0x00000020L
-#define FS_ARABIC 0x00000040L
-#define FS_BALTIC 0x00000080L
-#define FS_VIETNAMESE 0x00000100L
-#define FS_THAI 0x00010000L
-#define FS_JISJAPAN 0x00020000L
-#define FS_CHINESESIMP 0x00040000L
-#define FS_WANSUNG 0x00080000L
-#define FS_CHINESETRAD 0x00100000L
-#define FS_JOHAB 0x00200000L
-#define FS_SYMBOL 0x80000000L
+#define FS_LATIN1 __MSABI_LONG(0x00000001)
+#define FS_LATIN2 __MSABI_LONG(0x00000002)
+#define FS_CYRILLIC __MSABI_LONG(0x00000004)
+#define FS_GREEK __MSABI_LONG(0x00000008)
+#define FS_TURKISH __MSABI_LONG(0x00000010)
+#define FS_HEBREW __MSABI_LONG(0x00000020)
+#define FS_ARABIC __MSABI_LONG(0x00000040)
+#define FS_BALTIC __MSABI_LONG(0x00000080)
+#define FS_VIETNAMESE __MSABI_LONG(0x00000100)
+#define FS_THAI __MSABI_LONG(0x00010000)
+#define FS_JISJAPAN __MSABI_LONG(0x00020000)
+#define FS_CHINESESIMP __MSABI_LONG(0x00040000)
+#define FS_WANSUNG __MSABI_LONG(0x00080000)
+#define FS_CHINESETRAD __MSABI_LONG(0x00100000)
+#define FS_JOHAB __MSABI_LONG(0x00200000)
+#define FS_SYMBOL __MSABI_LONG(0x80000000)
 
 #define FF_DONTCARE (0<<4)
 #define FF_ROMAN (1<<4)
@@ -1569,7 +1569,7 @@
 #define SYSPAL_NOSTATIC 2
 #define SYSPAL_NOSTATIC256 3
 
-#define CBM_INIT 0x04L
+#define CBM_INIT __MSABI_LONG(0x04)
 
 #define FLOODFILLBORDER 0
 #define FLOODFILLSURFACE 1
@@ -1683,36 +1683,36 @@
 
 #define DM_SPECVERSION 0x0401
 
-#define DM_ORIENTATION 0x00000001L
-#define DM_PAPERSIZE 0x00000002L
-#define DM_PAPERLENGTH 0x00000004L
-#define DM_PAPERWIDTH 0x00000008L
-#define DM_SCALE 0x00000010L
-#define DM_POSITION 0x00000020L
-#define DM_NUP 0x00000040L
-#define DM_DISPLAYORIENTATION 0x00000080L
-#define DM_COPIES 0x00000100L
-#define DM_DEFAULTSOURCE 0x00000200L
-#define DM_PRINTQUALITY 0x00000400L
-#define DM_COLOR 0x00000800L
-#define DM_DUPLEX 0x00001000L
-#define DM_YRESOLUTION 0x00002000L
-#define DM_TTOPTION 0x00004000L
-#define DM_COLLATE 0x00008000L
-#define DM_FORMNAME 0x00010000L
-#define DM_LOGPIXELS 0x00020000L
-#define DM_BITSPERPEL 0x00040000L
-#define DM_PELSWIDTH 0x00080000L
-#define DM_PELSHEIGHT 0x00100000L
-#define DM_DISPLAYFLAGS 0x00200000L
-#define DM_DISPLAYFREQUENCY 0x00400000L
-#define DM_ICMMETHOD 0x00800000L
-#define DM_ICMINTENT 0x01000000L
-#define DM_MEDIATYPE 0x02000000L
-#define DM_DITHERTYPE 0x04000000L
-#define DM_PANNINGWIDTH 0x08000000L
-#define DM_PANNINGHEIGHT 0x10000000L
-#define DM_DISPLAYFIXEDOUTPUT 0x20000000L
+#define DM_ORIENTATION __MSABI_LONG(0x00000001)
+#define DM_PAPERSIZE __MSABI_LONG(0x00000002)
+#define DM_PAPERLENGTH __MSABI_LONG(0x00000004)
+#define DM_PAPERWIDTH __MSABI_LONG(0x00000008)
+#define DM_SCALE __MSABI_LONG(0x00000010)
+#define DM_POSITION __MSABI_LONG(0x00000020)
+#define DM_NUP __MSABI_LONG(0x00000040)
+#define DM_DISPLAYORIENTATION __MSABI_LONG(0x00000080)
+#define DM_COPIES __MSABI_LONG(0x00000100)
+#define DM_DEFAULTSOURCE __MSABI_LONG(0x00000200)
+#define DM_PRINTQUALITY __MSABI_LONG(0x00000400)
+#define DM_COLOR __MSABI_LONG(0x00000800)
+#define DM_DUPLEX __MSABI_LONG(0x00001000)
+#define DM_YRESOLUTION __MSABI_LONG(0x00002000)
+#define DM_TTOPTION __MSABI_LONG(0x00004000)
+#define DM_COLLATE __MSABI_LONG(0x00008000)
+#define DM_FORMNAME __MSABI_LONG(0x00010000)
+#define DM_LOGPIXELS __MSABI_LONG(0x00020000)
+#define DM_BITSPERPEL __MSABI_LONG(0x00040000)
+#define DM_PELSWIDTH __MSABI_LONG(0x00080000)
+#define DM_PELSHEIGHT __MSABI_LONG(0x00100000)
+#define DM_DISPLAYFLAGS __MSABI_LONG(0x00200000)
+#define DM_DISPLAYFREQUENCY __MSABI_LONG(0x00400000)
+#define DM_ICMMETHOD __MSABI_LONG(0x00800000)
+#define DM_ICMINTENT __MSABI_LONG(0x01000000)
+#define DM_MEDIATYPE __MSABI_LONG(0x02000000)
+#define DM_DITHERTYPE __MSABI_LONG(0x04000000)
+#define DM_PANNINGWIDTH __MSABI_LONG(0x08000000)
+#define DM_PANNINGHEIGHT __MSABI_LONG(0x10000000)
+#define DM_DISPLAYFIXEDOUTPUT __MSABI_LONG(0x20000000)
 
 #define DMORIENT_PORTRAIT 1
 #define DMORIENT_LANDSCAPE 2
@@ -2158,18 +2158,18 @@
 #define GCP_ERROR 0x8000
 #define FLI_MASK 0x103B
 
-#define GCP_JUSTIFY 0x00010000L
+#define GCP_JUSTIFY __MSABI_LONG(0x00010000)
 
-#define FLI_GLYPHS 0x00040000L
-#define GCP_CLASSIN 0x00080000L
-#define GCP_MAXEXTENT 0x00100000L
-#define GCP_JUSTIFYIN 0x00200000L
-#define GCP_DISPLAYZWG 0x00400000L
-#define GCP_SYMSWAPOFF 0x00800000L
-#define GCP_NUMERICOVERRIDE 0x01000000L
-#define GCP_NEUTRALOVERRIDE 0x02000000L
-#define GCP_NUMERICSLATIN 0x04000000L
-#define GCP_NUMERICSLOCAL 0x08000000L
+#define FLI_GLYPHS __MSABI_LONG(0x00040000)
+#define GCP_CLASSIN __MSABI_LONG(0x00080000)
+#define GCP_MAXEXTENT __MSABI_LONG(0x00100000)
+#define GCP_JUSTIFYIN __MSABI_LONG(0x00200000)
+#define GCP_DISPLAYZWG __MSABI_LONG(0x00400000)
+#define GCP_SYMSWAPOFF __MSABI_LONG(0x00800000)
+#define GCP_NUMERICOVERRIDE __MSABI_LONG(0x01000000)
+#define GCP_NEUTRALOVERRIDE __MSABI_LONG(0x02000000)
+#define GCP_NUMERICSLATIN __MSABI_LONG(0x04000000)
+#define GCP_NUMERICSLOCAL __MSABI_LONG(0x08000000)
 
 #define GCPCLASS_LATIN 1
 #define GCPCLASS_HEBREW 2
@@ -2411,10 +2411,10 @@
 #define DC_MEDIATYPENAMES 34
 #define DC_MEDIATYPES 35
 
-#define DCTT_BITMAP 0x0000001L
-#define DCTT_DOWNLOAD 0x0000002L
-#define DCTT_SUBDEV 0x0000004L
-#define DCTT_DOWNLOAD_OUTLINE 0x0000008L
+#define DCTT_BITMAP __MSABI_LONG(0x0000001)
+#define DCTT_DOWNLOAD __MSABI_LONG(0x0000002)
+#define DCTT_SUBDEV __MSABI_LONG(0x0000004)
+#define DCTT_DOWNLOAD_OUTLINE __MSABI_LONG(0x0000008)
 
 #define DCBA_FACEUPNONE 0x0000
 #define DCBA_FACEUPCENTER 0x0001
diff --git a/mingw-w64-headers/include/winioctl.h b/mingw-w64-headers/include/winioctl.h
index c1e84a4..0534972 100644
--- a/mingw-w64-headers/include/winioctl.h
+++ b/mingw-w64-headers/include/winioctl.h
@@ -172,7 +172,7 @@
 
 #define IsDsmActionNonDestructive(x) ((BOOLEAN)(!!((x) & DeviceDsmActionFlag_NonDestructive)))
 
-#define DEVICE_DSM_FLAG_ENTIRE_DATA_SET_RANGE 0x00000001L
+#define DEVICE_DSM_FLAG_ENTIRE_DATA_SET_RANGE __MSABI_LONG(0x00000001)
 
 typedef DWORD DEVICE_DATA_MANAGEMENT_SET_ACTION;
 typedef struct _DEVICE_MANAGE_DATA_SET_ATTRIBUTES {
@@ -249,9 +249,9 @@
     DWORD Operation;
   } TAPE_GET_STATISTICS,*PTAPE_GET_STATISTICS;
 
-#define TAPE_RETURN_STATISTICS 0L
-#define TAPE_RETURN_ENV_INFO 1L
-#define TAPE_RESET_STATISTICS 2L
+#define TAPE_RETURN_STATISTICS __MSABI_LONG(0)
+#define TAPE_RETURN_ENV_INFO __MSABI_LONG(1)
+#define TAPE_RESET_STATISTICS __MSABI_LONG(2)
 
   typedef enum _STORAGE_MEDIA_TYPE {
     DDS_4mm	= 0x20,
diff --git a/mingw-w64-headers/include/winldap.h b/mingw-w64-headers/include/winldap.h
index 8bb82f5..0bbddfb 100644
--- a/mingw-w64-headers/include/winldap.h
+++ b/mingw-w64-headers/include/winldap.h
@@ -40,31 +40,31 @@
 #define LDAP_VERSION3 3
 #define LDAP_VERSION LDAP_VERSION2
 
-#define LDAP_BIND_CMD 0x60L
-#define LDAP_UNBIND_CMD 0x42L
-#define LDAP_SEARCH_CMD 0x63L
-#define LDAP_MODIFY_CMD 0x66L
-#define LDAP_ADD_CMD 0x68L
-#define LDAP_DELETE_CMD 0x4aL
-#define LDAP_MODRDN_CMD 0x6cL
-#define LDAP_COMPARE_CMD 0x6eL
-#define LDAP_ABANDON_CMD 0x50L
-#define LDAP_SESSION_CMD 0x71L
-#define LDAP_EXTENDED_CMD 0x77L
+#define LDAP_BIND_CMD __MSABI_LONG(0x60)
+#define LDAP_UNBIND_CMD __MSABI_LONG(0x42)
+#define LDAP_SEARCH_CMD __MSABI_LONG(0x63)
+#define LDAP_MODIFY_CMD __MSABI_LONG(0x66)
+#define LDAP_ADD_CMD __MSABI_LONG(0x68)
+#define LDAP_DELETE_CMD __MSABI_LONG(0x4a)
+#define LDAP_MODRDN_CMD __MSABI_LONG(0x6c)
+#define LDAP_COMPARE_CMD __MSABI_LONG(0x6e)
+#define LDAP_ABANDON_CMD __MSABI_LONG(0x50)
+#define LDAP_SESSION_CMD __MSABI_LONG(0x71)
+#define LDAP_EXTENDED_CMD __MSABI_LONG(0x77)
 
-#define LDAP_RES_BIND 0x61L
-#define LDAP_RES_SEARCH_ENTRY 0x64L
-#define LDAP_RES_SEARCH_RESULT 0x65L
-#define LDAP_RES_MODIFY 0x67L
-#define LDAP_RES_ADD 0x69L
-#define LDAP_RES_DELETE 0x6bL
-#define LDAP_RES_MODRDN 0x6dL
-#define LDAP_RES_COMPARE 0x6fL
-#define LDAP_RES_SESSION 0x72L
-#define LDAP_RES_REFERRAL 0x73L
-#define LDAP_RES_EXTENDED 0x78L
+#define LDAP_RES_BIND __MSABI_LONG(0x61)
+#define LDAP_RES_SEARCH_ENTRY __MSABI_LONG(0x64)
+#define LDAP_RES_SEARCH_RESULT __MSABI_LONG(0x65)
+#define LDAP_RES_MODIFY __MSABI_LONG(0x67)
+#define LDAP_RES_ADD __MSABI_LONG(0x69)
+#define LDAP_RES_DELETE __MSABI_LONG(0x6b)
+#define LDAP_RES_MODRDN __MSABI_LONG(0x6d)
+#define LDAP_RES_COMPARE __MSABI_LONG(0x6f)
+#define LDAP_RES_SESSION __MSABI_LONG(0x72)
+#define LDAP_RES_REFERRAL __MSABI_LONG(0x73)
+#define LDAP_RES_EXTENDED __MSABI_LONG(0x78)
 
-#define LDAP_RES_ANY (-1L)
+#define LDAP_RES_ANY (__MSABI_LONG(-1))
 
 #define LDAP_INVALID_CMD 0xff
 #define LDAP_INVALID_RES 0xff
@@ -86,9 +86,9 @@
     LDAP_MORE_RESULTS_TO_RETURN = 0x5f,LDAP_CLIENT_LOOP = 0x60,LDAP_REFERRAL_LIMIT_EXCEEDED = 0x61
   } LDAP_RETCODE;
 
-#define LDAP_AUTH_SIMPLE 0x80L
-#define LDAP_AUTH_SASL 0x83L
-#define LDAP_AUTH_OTHERKIND 0x86L
+#define LDAP_AUTH_SIMPLE __MSABI_LONG(0x80)
+#define LDAP_AUTH_SASL __MSABI_LONG(0x83)
+#define LDAP_AUTH_OTHERKIND __MSABI_LONG(0x86)
 #define LDAP_AUTH_SICILY (LDAP_AUTH_OTHERKIND | 0x0200)
 #define LDAP_AUTH_MSN (LDAP_AUTH_OTHERKIND | 0x0800)
 #define LDAP_AUTH_NTLM (LDAP_AUTH_OTHERKIND | 0x1000)
@@ -109,9 +109,9 @@
 #define LDAP_FILTER_APPROX 0xa8
 #define LDAP_FILTER_EXTENSIBLE 0xa9
 
-#define LDAP_SUBSTRING_INITIAL 0x80L
-#define LDAP_SUBSTRING_ANY 0x81L
-#define LDAP_SUBSTRING_FINAL 0x82L
+#define LDAP_SUBSTRING_INITIAL __MSABI_LONG(0x80)
+#define LDAP_SUBSTRING_ANY __MSABI_LONG(0x81)
+#define LDAP_SUBSTRING_FINAL __MSABI_LONG(0x82)
 
 #define LDAP_DEREF_NEVER 0
 #define LDAP_DEREF_SEARCHING 1
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index ba7a768..8f348a2 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -1634,11 +1634,11 @@
 
 #define CONTEXT_AMD64 0x100000
 
-#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L)
-#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L)
-#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L)
-#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x8L)
-#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L)
+#define CONTEXT_CONTROL (CONTEXT_AMD64 | __MSABI_LONG(0x1))
+#define CONTEXT_INTEGER (CONTEXT_AMD64 | __MSABI_LONG(0x2))
+#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | __MSABI_LONG(0x4))
+#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | __MSABI_LONG(0x8))
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | __MSABI_LONG(0x10))
 
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT)
 #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
@@ -1907,12 +1907,12 @@
 #define CONTEXT_i386 0x00010000
 #define CONTEXT_i486 0x00010000
 
-#define CONTEXT_CONTROL (CONTEXT_i386 | 0x00000001L)
-#define CONTEXT_INTEGER (CONTEXT_i386 | 0x00000002L)
-#define CONTEXT_SEGMENTS (CONTEXT_i386 | 0x00000004L)
-#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x00000008L)
-#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x00000010L)
-#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x00000020L)
+#define CONTEXT_CONTROL (CONTEXT_i386 | __MSABI_LONG(0x00000001))
+#define CONTEXT_INTEGER (CONTEXT_i386 | __MSABI_LONG(0x00000002))
+#define CONTEXT_SEGMENTS (CONTEXT_i386 | __MSABI_LONG(0x00000004))
+#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | __MSABI_LONG(0x00000008))
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | __MSABI_LONG(0x00000010))
+#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | __MSABI_LONG(0x00000020))
 
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS)
 
@@ -2094,12 +2094,12 @@
 
 #define CONTEXT_IA64 0x00080000
 
-#define CONTEXT_CONTROL (CONTEXT_IA64 | 0x00000001L)
-#define CONTEXT_LOWER_FLOATING_POINT (CONTEXT_IA64 | 0x00000002L)
-#define CONTEXT_HIGHER_FLOATING_POINT (CONTEXT_IA64 | 0x00000004L)
-#define CONTEXT_INTEGER (CONTEXT_IA64 | 0x00000008L)
-#define CONTEXT_DEBUG (CONTEXT_IA64 | 0x00000010L)
-#define CONTEXT_IA32_CONTROL (CONTEXT_IA64 | 0x00000020L)
+#define CONTEXT_CONTROL (CONTEXT_IA64 | __MSABI_LONG(0x00000001))
+#define CONTEXT_LOWER_FLOATING_POINT (CONTEXT_IA64 | __MSABI_LONG(0x00000002))
+#define CONTEXT_HIGHER_FLOATING_POINT (CONTEXT_IA64 | __MSABI_LONG(0x00000004))
+#define CONTEXT_INTEGER (CONTEXT_IA64 | __MSABI_LONG(0x00000008))
+#define CONTEXT_DEBUG (CONTEXT_IA64 | __MSABI_LONG(0x00000010))
+#define CONTEXT_IA32_CONTROL (CONTEXT_IA64 | __MSABI_LONG(0x00000020))
 
 #define CONTEXT_FLOATING_POINT (CONTEXT_LOWER_FLOATING_POINT | CONTEXT_HIGHER_FLOATING_POINT)
 #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER | CONTEXT_IA32_CONTROL)
@@ -2467,28 +2467,28 @@
     typedef DWORD ACCESS_MASK;
     typedef ACCESS_MASK *PACCESS_MASK;
 
-#define DELETE (0x00010000L)
-#define READ_CONTROL (0x00020000L)
-#define WRITE_DAC (0x00040000L)
-#define WRITE_OWNER (0x00080000L)
-#define SYNCHRONIZE (0x00100000L)
+#define DELETE (__MSABI_LONG(0x00010000))
+#define READ_CONTROL (__MSABI_LONG(0x00020000))
+#define WRITE_DAC (__MSABI_LONG(0x00040000))
+#define WRITE_OWNER (__MSABI_LONG(0x00080000))
+#define SYNCHRONIZE (__MSABI_LONG(0x00100000))
 
-#define STANDARD_RIGHTS_REQUIRED (0x000F0000L)
+#define STANDARD_RIGHTS_REQUIRED (__MSABI_LONG(0x000F0000))
 #define STANDARD_RIGHTS_READ (READ_CONTROL)
 #define STANDARD_RIGHTS_WRITE (READ_CONTROL)
 #define STANDARD_RIGHTS_EXECUTE (READ_CONTROL)
-#define STANDARD_RIGHTS_ALL (0x001F0000L)
+#define STANDARD_RIGHTS_ALL (__MSABI_LONG(0x001F0000))
 
-#define SPECIFIC_RIGHTS_ALL (0x0000FFFFL)
+#define SPECIFIC_RIGHTS_ALL (__MSABI_LONG(0x0000FFFF))
 
-#define ACCESS_SYSTEM_SECURITY (0x01000000L)
+#define ACCESS_SYSTEM_SECURITY (__MSABI_LONG(0x01000000))
 
-#define MAXIMUM_ALLOWED (0x02000000L)
+#define MAXIMUM_ALLOWED (__MSABI_LONG(0x02000000))
 
-#define GENERIC_READ (0x80000000L)
-#define GENERIC_WRITE (0x40000000L)
-#define GENERIC_EXECUTE (0x20000000L)
-#define GENERIC_ALL (0x10000000L)
+#define GENERIC_READ (__MSABI_LONG(0x80000000))
+#define GENERIC_WRITE (__MSABI_LONG(0x40000000))
+#define GENERIC_EXECUTE (__MSABI_LONG(0x20000000))
+#define GENERIC_ALL (__MSABI_LONG(0x10000000))
 
     typedef struct _GENERIC_MAPPING {
       ACCESS_MASK GenericRead;
@@ -2563,120 +2563,120 @@
 #define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4}
 #define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9}
 
-#define SECURITY_NULL_RID (0x00000000L)
-#define SECURITY_WORLD_RID (0x00000000L)
-#define SECURITY_LOCAL_RID (0x00000000L)
+#define SECURITY_NULL_RID (__MSABI_LONG(0x00000000))
+#define SECURITY_WORLD_RID (__MSABI_LONG(0x00000000))
+#define SECURITY_LOCAL_RID (__MSABI_LONG(0x00000000))
 
-#define SECURITY_CREATOR_OWNER_RID (0x00000000L)
-#define SECURITY_CREATOR_GROUP_RID (0x00000001L)
+#define SECURITY_CREATOR_OWNER_RID (__MSABI_LONG(0x00000000))
+#define SECURITY_CREATOR_GROUP_RID (__MSABI_LONG(0x00000001))
 
-#define SECURITY_CREATOR_OWNER_SERVER_RID (0x00000002L)
-#define SECURITY_CREATOR_GROUP_SERVER_RID (0x00000003L)
+#define SECURITY_CREATOR_OWNER_SERVER_RID (__MSABI_LONG(0x00000002))
+#define SECURITY_CREATOR_GROUP_SERVER_RID (__MSABI_LONG(0x00000003))
 
 #define SECURITY_NT_AUTHORITY {0,0,0,0,0,5}
 
-#define SECURITY_DIALUP_RID (0x00000001L)
-#define SECURITY_NETWORK_RID (0x00000002L)
-#define SECURITY_BATCH_RID (0x00000003L)
-#define SECURITY_INTERACTIVE_RID (0x00000004L)
-#define SECURITY_LOGON_IDS_RID (0x00000005L)
-#define SECURITY_LOGON_IDS_RID_COUNT (3L)
-#define SECURITY_SERVICE_RID (0x00000006L)
-#define SECURITY_ANONYMOUS_LOGON_RID (0x00000007L)
-#define SECURITY_PROXY_RID (0x00000008L)
-#define SECURITY_ENTERPRISE_CONTROLLERS_RID (0x00000009L)
+#define SECURITY_DIALUP_RID (__MSABI_LONG(0x00000001))
+#define SECURITY_NETWORK_RID (__MSABI_LONG(0x00000002))
+#define SECURITY_BATCH_RID (__MSABI_LONG(0x00000003))
+#define SECURITY_INTERACTIVE_RID (__MSABI_LONG(0x00000004))
+#define SECURITY_LOGON_IDS_RID (__MSABI_LONG(0x00000005))
+#define SECURITY_LOGON_IDS_RID_COUNT (__MSABI_LONG(3))
+#define SECURITY_SERVICE_RID (__MSABI_LONG(0x00000006))
+#define SECURITY_ANONYMOUS_LOGON_RID (__MSABI_LONG(0x00000007))
+#define SECURITY_PROXY_RID (__MSABI_LONG(0x00000008))
+#define SECURITY_ENTERPRISE_CONTROLLERS_RID (__MSABI_LONG(0x00000009))
 #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID
-#define SECURITY_PRINCIPAL_SELF_RID (0x0000000AL)
-#define SECURITY_AUTHENTICATED_USER_RID (0x0000000BL)
-#define SECURITY_RESTRICTED_CODE_RID (0x0000000CL)
-#define SECURITY_TERMINAL_SERVER_RID (0x0000000DL)
-#define SECURITY_REMOTE_LOGON_RID (0x0000000EL)
-#define SECURITY_THIS_ORGANIZATION_RID (0x0000000FL)
-#define SECURITY_IUSER_RID (0x00000011L)
+#define SECURITY_PRINCIPAL_SELF_RID (__MSABI_LONG(0x0000000A))
+#define SECURITY_AUTHENTICATED_USER_RID (__MSABI_LONG(0x0000000B))
+#define SECURITY_RESTRICTED_CODE_RID (__MSABI_LONG(0x0000000C))
+#define SECURITY_TERMINAL_SERVER_RID (__MSABI_LONG(0x0000000D))
+#define SECURITY_REMOTE_LOGON_RID (__MSABI_LONG(0x0000000E))
+#define SECURITY_THIS_ORGANIZATION_RID (__MSABI_LONG(0x0000000F))
+#define SECURITY_IUSER_RID (__MSABI_LONG(0x00000011))
 
-#define SECURITY_LOCAL_SYSTEM_RID (0x00000012L)
-#define SECURITY_LOCAL_SERVICE_RID (0x00000013L)
-#define SECURITY_NETWORK_SERVICE_RID (0x00000014L)
+#define SECURITY_LOCAL_SYSTEM_RID (__MSABI_LONG(0x00000012))
+#define SECURITY_LOCAL_SERVICE_RID (__MSABI_LONG(0x00000013))
+#define SECURITY_NETWORK_SERVICE_RID (__MSABI_LONG(0x00000014))
 
-#define SECURITY_NT_NON_UNIQUE (0x00000015L)
-#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT (3L)
+#define SECURITY_NT_NON_UNIQUE (__MSABI_LONG(0x00000015))
+#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT (__MSABI_LONG(3))
 
-#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID (0x00000016L)
+#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID (__MSABI_LONG(0x00000016))
 
-#define SECURITY_BUILTIN_DOMAIN_RID (0x00000020L)
-#define SECURITY_WRITE_RESTRICTED_CODE_RID (0x00000021L)
+#define SECURITY_BUILTIN_DOMAIN_RID (__MSABI_LONG(0x00000020))
+#define SECURITY_WRITE_RESTRICTED_CODE_RID (__MSABI_LONG(0x00000021))
 
-#define SECURITY_PACKAGE_BASE_RID (0x00000040L)
-#define SECURITY_PACKAGE_RID_COUNT (2L)
-#define SECURITY_PACKAGE_NTLM_RID (0x0000000AL)
-#define SECURITY_PACKAGE_SCHANNEL_RID (0x0000000EL)
-#define SECURITY_PACKAGE_DIGEST_RID (0x00000015L)
+#define SECURITY_PACKAGE_BASE_RID (__MSABI_LONG(0x00000040))
+#define SECURITY_PACKAGE_RID_COUNT (__MSABI_LONG(2))
+#define SECURITY_PACKAGE_NTLM_RID (__MSABI_LONG(0x0000000A))
+#define SECURITY_PACKAGE_SCHANNEL_RID (__MSABI_LONG(0x0000000E))
+#define SECURITY_PACKAGE_DIGEST_RID (__MSABI_LONG(0x00000015))
 
-#define SECURITY_SERVICE_ID_BASE_RID (0x00000050L)
-#define SECURITY_SERVICE_ID_RID_COUNT (6L)
+#define SECURITY_SERVICE_ID_BASE_RID (__MSABI_LONG(0x00000050))
+#define SECURITY_SERVICE_ID_RID_COUNT (__MSABI_LONG(6))
 
-#define SECURITY_RESERVED_ID_BASE_RID (0x00000051L)
+#define SECURITY_RESERVED_ID_BASE_RID (__MSABI_LONG(0x00000051))
 
-#define SECURITY_MAX_ALWAYS_FILTERED (0x000003E7L)
-#define SECURITY_MIN_NEVER_FILTERED (0x000003E8L)
+#define SECURITY_MAX_ALWAYS_FILTERED (__MSABI_LONG(0x000003E7))
+#define SECURITY_MIN_NEVER_FILTERED (__MSABI_LONG(0x000003E8))
 
-#define SECURITY_OTHER_ORGANIZATION_RID (0x000003E8L)
+#define SECURITY_OTHER_ORGANIZATION_RID (__MSABI_LONG(0x000003E8))
 
-#define FOREST_USER_RID_MAX (0x000001F3L)
+#define FOREST_USER_RID_MAX (__MSABI_LONG(0x000001F3))
 
-#define DOMAIN_USER_RID_ADMIN (0x000001F4L)
-#define DOMAIN_USER_RID_GUEST (0x000001F5L)
-#define DOMAIN_USER_RID_KRBTGT (0x000001F6L)
+#define DOMAIN_USER_RID_ADMIN (__MSABI_LONG(0x000001F4))
+#define DOMAIN_USER_RID_GUEST (__MSABI_LONG(0x000001F5))
+#define DOMAIN_USER_RID_KRBTGT (__MSABI_LONG(0x000001F6))
 
-#define DOMAIN_USER_RID_MAX (0x000003E7L)
+#define DOMAIN_USER_RID_MAX (__MSABI_LONG(0x000003E7))
 
-#define DOMAIN_GROUP_RID_ADMINS (0x00000200L)
-#define DOMAIN_GROUP_RID_USERS (0x00000201L)
-#define DOMAIN_GROUP_RID_GUESTS (0x00000202L)
-#define DOMAIN_GROUP_RID_COMPUTERS (0x00000203L)
-#define DOMAIN_GROUP_RID_CONTROLLERS (0x00000204L)
-#define DOMAIN_GROUP_RID_CERT_ADMINS (0x00000205L)
-#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (0x00000206L)
-#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (0x00000207L)
-#define DOMAIN_GROUP_RID_POLICY_ADMINS (0x00000208L)
-#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS (0x00000209L)
+#define DOMAIN_GROUP_RID_ADMINS (__MSABI_LONG(0x00000200))
+#define DOMAIN_GROUP_RID_USERS (__MSABI_LONG(0x00000201))
+#define DOMAIN_GROUP_RID_GUESTS (__MSABI_LONG(0x00000202))
+#define DOMAIN_GROUP_RID_COMPUTERS (__MSABI_LONG(0x00000203))
+#define DOMAIN_GROUP_RID_CONTROLLERS (__MSABI_LONG(0x00000204))
+#define DOMAIN_GROUP_RID_CERT_ADMINS (__MSABI_LONG(0x00000205))
+#define DOMAIN_GROUP_RID_SCHEMA_ADMINS (__MSABI_LONG(0x00000206))
+#define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS (__MSABI_LONG(0x00000207))
+#define DOMAIN_GROUP_RID_POLICY_ADMINS (__MSABI_LONG(0x00000208))
+#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS (__MSABI_LONG(0x00000209))
 
-#define DOMAIN_ALIAS_RID_ADMINS (0x00000220L)
-#define DOMAIN_ALIAS_RID_USERS (0x00000221L)
-#define DOMAIN_ALIAS_RID_GUESTS (0x00000222L)
-#define DOMAIN_ALIAS_RID_POWER_USERS (0x00000223L)
+#define DOMAIN_ALIAS_RID_ADMINS (__MSABI_LONG(0x00000220))
+#define DOMAIN_ALIAS_RID_USERS (__MSABI_LONG(0x00000221))
+#define DOMAIN_ALIAS_RID_GUESTS (__MSABI_LONG(0x00000222))
+#define DOMAIN_ALIAS_RID_POWER_USERS (__MSABI_LONG(0x00000223))
 
-#define DOMAIN_ALIAS_RID_ACCOUNT_OPS (0x00000224L)
-#define DOMAIN_ALIAS_RID_SYSTEM_OPS (0x00000225L)
-#define DOMAIN_ALIAS_RID_PRINT_OPS (0x00000226L)
-#define DOMAIN_ALIAS_RID_BACKUP_OPS (0x00000227L)
+#define DOMAIN_ALIAS_RID_ACCOUNT_OPS (__MSABI_LONG(0x00000224))
+#define DOMAIN_ALIAS_RID_SYSTEM_OPS (__MSABI_LONG(0x00000225))
+#define DOMAIN_ALIAS_RID_PRINT_OPS (__MSABI_LONG(0x00000226))
+#define DOMAIN_ALIAS_RID_BACKUP_OPS (__MSABI_LONG(0x00000227))
 
-#define DOMAIN_ALIAS_RID_REPLICATOR (0x00000228L)
-#define DOMAIN_ALIAS_RID_RAS_SERVERS (0x00000229L)
-#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS (0x0000022AL)
-#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS (0x0000022BL)
-#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS (0x0000022CL)
-#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS (0x0000022DL)
+#define DOMAIN_ALIAS_RID_REPLICATOR (__MSABI_LONG(0x00000228))
+#define DOMAIN_ALIAS_RID_RAS_SERVERS (__MSABI_LONG(0x00000229))
+#define DOMAIN_ALIAS_RID_PREW2KCOMPACCESS (__MSABI_LONG(0x0000022A))
+#define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS (__MSABI_LONG(0x0000022B))
+#define DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS (__MSABI_LONG(0x0000022C))
+#define DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS (__MSABI_LONG(0x0000022D))
 
-#define DOMAIN_ALIAS_RID_MONITORING_USERS (0x0000022EL)
-#define DOMAIN_ALIAS_RID_LOGGING_USERS (0x0000022FL)
-#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS (0x00000230L)
-#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS (0x00000231L)
-#define DOMAIN_ALIAS_RID_DCOM_USERS (0x00000232L)
+#define DOMAIN_ALIAS_RID_MONITORING_USERS (__MSABI_LONG(0x0000022E))
+#define DOMAIN_ALIAS_RID_LOGGING_USERS (__MSABI_LONG(0x0000022F))
+#define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS (__MSABI_LONG(0x00000230))
+#define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS (__MSABI_LONG(0x00000231))
+#define DOMAIN_ALIAS_RID_DCOM_USERS (__MSABI_LONG(0x00000232))
 
-#define DOMAIN_ALIAS_RID_IUSERS (0x00000238L)
-#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS (0x00000239L)
-#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP (0x0000023BL)
-#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP (0x0000023CL)
-#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP (0x0000023DL)
+#define DOMAIN_ALIAS_RID_IUSERS (__MSABI_LONG(0x00000238))
+#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS (__MSABI_LONG(0x00000239))
+#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP (__MSABI_LONG(0x0000023B))
+#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP (__MSABI_LONG(0x0000023C))
+#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP (__MSABI_LONG(0x0000023D))
 
 #define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16}
-#define SECURITY_MANDATORY_UNTRUSTED_RID (0x00000000L)
-#define SECURITY_MANDATORY_LOW_RID (0x00001000L)
-#define SECURITY_MANDATORY_MEDIUM_RID (0x00002000L)
-#define SECURITY_MANDATORY_HIGH_RID (0x00003000L)
-#define SECURITY_MANDATORY_SYSTEM_RID (0x00004000L)
-#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID (0x00005000L)
+#define SECURITY_MANDATORY_UNTRUSTED_RID (__MSABI_LONG(0x00000000))
+#define SECURITY_MANDATORY_LOW_RID (__MSABI_LONG(0x00001000))
+#define SECURITY_MANDATORY_MEDIUM_RID (__MSABI_LONG(0x00002000))
+#define SECURITY_MANDATORY_HIGH_RID (__MSABI_LONG(0x00003000))
+#define SECURITY_MANDATORY_SYSTEM_RID (__MSABI_LONG(0x00004000))
+#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID (__MSABI_LONG(0x00005000))
 
 #define SECURITY_MANDATORY_MAXIMUM_USER_RID SECURITY_MANDATORY_SYSTEM_RID
 
@@ -2692,15 +2692,15 @@
 #define NETWORKSERVICE_LUID { 0x3e4,0x0 }
 #define IUSER_LUID { 0x3e3, 0x0 }
 
-#define SE_GROUP_MANDATORY (0x00000001L)
-#define SE_GROUP_ENABLED_BY_DEFAULT (0x00000002L)
-#define SE_GROUP_ENABLED (0x00000004L)
-#define SE_GROUP_OWNER (0x00000008L)
-#define SE_GROUP_USE_FOR_DENY_ONLY (0x00000010L)
-#define SE_GROUP_INTEGRITY (0x00000020L)
-#define SE_GROUP_INTEGRITY_ENABLED (0x00000040L)
-#define SE_GROUP_LOGON_ID (0xC0000000L)
-#define SE_GROUP_RESOURCE (0x20000000L)
+#define SE_GROUP_MANDATORY (__MSABI_LONG(0x00000001))
+#define SE_GROUP_ENABLED_BY_DEFAULT (__MSABI_LONG(0x00000002))
+#define SE_GROUP_ENABLED (__MSABI_LONG(0x00000004))
+#define SE_GROUP_OWNER (__MSABI_LONG(0x00000008))
+#define SE_GROUP_USE_FOR_DENY_ONLY (__MSABI_LONG(0x00000010))
+#define SE_GROUP_INTEGRITY (__MSABI_LONG(0x00000020))
+#define SE_GROUP_INTEGRITY_ENABLED (__MSABI_LONG(0x00000040))
+#define SE_GROUP_LOGON_ID (__MSABI_LONG(0xC0000000))
+#define SE_GROUP_RESOURCE (__MSABI_LONG(0x20000000))
 
 #define ACL_REVISION (2)
 #define ACL_REVISION_DS (4)
@@ -3000,10 +3000,10 @@
 #define ACCESS_DS_OBJECT_TYPE_NAME_A "Directory Service Object"
 #define ACCESS_DS_OBJECT_TYPE_NAME_W L"Directory Service Object"
 
-#define SE_PRIVILEGE_ENABLED_BY_DEFAULT (0x00000001L)
-#define SE_PRIVILEGE_ENABLED (0x00000002L)
+#define SE_PRIVILEGE_ENABLED_BY_DEFAULT (__MSABI_LONG(0x00000001))
+#define SE_PRIVILEGE_ENABLED (__MSABI_LONG(0x00000002))
 #define SE_PRIVILEGE_REMOVED (0X00000004L)
-#define SE_PRIVILEGE_USED_FOR_ACCESS (0x80000000L)
+#define SE_PRIVILEGE_USED_FOR_ACCESS (__MSABI_LONG(0x80000000))
 
 #define SE_PRIVILEGE_VALID_ATTRIBUTES (SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_REMOVED | SE_PRIVILEGE_USED_FOR_ACCESS)
 
@@ -3257,16 +3257,16 @@
 
     typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION;
 
-#define OWNER_SECURITY_INFORMATION (0x00000001L)
-#define GROUP_SECURITY_INFORMATION (0x00000002L)
-#define DACL_SECURITY_INFORMATION (0x00000004L)
-#define SACL_SECURITY_INFORMATION (0x00000008L)
-#define LABEL_SECURITY_INFORMATION (0x00000010L)
+#define OWNER_SECURITY_INFORMATION (__MSABI_LONG(0x00000001))
+#define GROUP_SECURITY_INFORMATION (__MSABI_LONG(0x00000002))
+#define DACL_SECURITY_INFORMATION (__MSABI_LONG(0x00000004))
+#define SACL_SECURITY_INFORMATION (__MSABI_LONG(0x00000008))
+#define LABEL_SECURITY_INFORMATION (__MSABI_LONG(0x00000010))
 
-#define PROTECTED_DACL_SECURITY_INFORMATION (0x80000000L)
-#define PROTECTED_SACL_SECURITY_INFORMATION (0x40000000L)
-#define UNPROTECTED_DACL_SECURITY_INFORMATION (0x20000000L)
-#define UNPROTECTED_SACL_SECURITY_INFORMATION (0x10000000L)
+#define PROTECTED_DACL_SECURITY_INFORMATION (__MSABI_LONG(0x80000000))
+#define PROTECTED_SACL_SECURITY_INFORMATION (__MSABI_LONG(0x40000000))
+#define UNPROTECTED_DACL_SECURITY_INFORMATION (__MSABI_LONG(0x20000000))
+#define UNPROTECTED_SACL_SECURITY_INFORMATION (__MSABI_LONG(0x10000000))
 
 #define PROCESS_TERMINATE (0x0001)
 #define PROCESS_CREATE_THREAD (0x0002)
@@ -3877,16 +3877,16 @@
 #define IsReparseTagMicrosoft(_tag) (((_tag) & 0x80000000))
 #define IsReparseTagNameSurrogate(_tag) (((_tag) & 0x20000000))
 
-#define IO_REPARSE_TAG_MOUNT_POINT (0xA0000003L)
-#define IO_REPARSE_TAG_HSM (0xC0000004L)
-#define IO_REPARSE_TAG_HSM2 (0x80000006L)
-#define IO_REPARSE_TAG_SIS (0x80000007L)
-#define IO_REPARSE_TAG_WIM (0x80000008L)
-#define IO_REPARSE_TAG_CSV (0x80000009L)
-#define IO_REPARSE_TAG_DFS (0x8000000AL)
-#define IO_REPARSE_TAG_FILTER_MANAGER (0x8000000BL)
-#define IO_REPARSE_TAG_DFSR (0x80000012L)
-#define IO_REPARSE_TAG_SYMLINK (0xA000000CL)
+#define IO_REPARSE_TAG_MOUNT_POINT (__MSABI_LONG(0xA0000003))
+#define IO_REPARSE_TAG_HSM (__MSABI_LONG(0xC0000004))
+#define IO_REPARSE_TAG_HSM2 (__MSABI_LONG(0x80000006))
+#define IO_REPARSE_TAG_SIS (__MSABI_LONG(0x80000007))
+#define IO_REPARSE_TAG_WIM (__MSABI_LONG(0x80000008))
+#define IO_REPARSE_TAG_CSV (__MSABI_LONG(0x80000009))
+#define IO_REPARSE_TAG_DFS (__MSABI_LONG(0x8000000A))
+#define IO_REPARSE_TAG_FILTER_MANAGER (__MSABI_LONG(0x8000000B))
+#define IO_REPARSE_TAG_DFSR (__MSABI_LONG(0x80000012))
+#define IO_REPARSE_TAG_SYMLINK (__MSABI_LONG(0xA000000C))
 
 #define IO_COMPLETION_MODIFY_STATE 0x0002
 #define IO_COMPLETION_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
@@ -6145,29 +6145,29 @@
 #define KEY_WRITE ((STANDARD_RIGHTS_WRITE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY) & (~SYNCHRONIZE))
 #define KEY_EXECUTE ((KEY_READ) & (~SYNCHRONIZE))
 #define KEY_ALL_ACCESS ((STANDARD_RIGHTS_ALL | KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY | KEY_CREATE_LINK) & (~SYNCHRONIZE))
-#define REG_OPTION_RESERVED (0x00000000L)
+#define REG_OPTION_RESERVED (__MSABI_LONG(0x00000000))
 
-#define REG_OPTION_NON_VOLATILE (0x00000000L)
-#define REG_OPTION_VOLATILE (0x00000001L)
-#define REG_OPTION_CREATE_LINK (0x00000002L)
-#define REG_OPTION_BACKUP_RESTORE (0x00000004L)
-#define REG_OPTION_OPEN_LINK (0x00000008L)
+#define REG_OPTION_NON_VOLATILE (__MSABI_LONG(0x00000000))
+#define REG_OPTION_VOLATILE (__MSABI_LONG(0x00000001))
+#define REG_OPTION_CREATE_LINK (__MSABI_LONG(0x00000002))
+#define REG_OPTION_BACKUP_RESTORE (__MSABI_LONG(0x00000004))
+#define REG_OPTION_OPEN_LINK (__MSABI_LONG(0x00000008))
 #define REG_LEGAL_OPTION (REG_OPTION_RESERVED | REG_OPTION_NON_VOLATILE | REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK | REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK)
-#define REG_CREATED_NEW_KEY (0x00000001L)
-#define REG_OPENED_EXISTING_KEY (0x00000002L)
+#define REG_CREATED_NEW_KEY (__MSABI_LONG(0x00000001))
+#define REG_OPENED_EXISTING_KEY (__MSABI_LONG(0x00000002))
 #define REG_STANDARD_FORMAT 1
 #define REG_LATEST_FORMAT 2
 #define REG_NO_COMPRESSION 4
-#define REG_WHOLE_HIVE_VOLATILE (0x00000001L)
-#define REG_REFRESH_HIVE (0x00000002L)
-#define REG_NO_LAZY_FLUSH (0x00000004L)
-#define REG_FORCE_RESTORE (0x00000008L)
+#define REG_WHOLE_HIVE_VOLATILE (__MSABI_LONG(0x00000001))
+#define REG_REFRESH_HIVE (__MSABI_LONG(0x00000002))
+#define REG_NO_LAZY_FLUSH (__MSABI_LONG(0x00000004))
+#define REG_FORCE_RESTORE (__MSABI_LONG(0x00000008))
 #define REG_FORCE_UNLOAD 1
 
-#define REG_NOTIFY_CHANGE_NAME (0x00000001L)
-#define REG_NOTIFY_CHANGE_ATTRIBUTES (0x00000002L)
-#define REG_NOTIFY_CHANGE_LAST_SET (0x00000004L)
-#define REG_NOTIFY_CHANGE_SECURITY (0x00000008L)
+#define REG_NOTIFY_CHANGE_NAME (__MSABI_LONG(0x00000001))
+#define REG_NOTIFY_CHANGE_ATTRIBUTES (__MSABI_LONG(0x00000002))
+#define REG_NOTIFY_CHANGE_LAST_SET (__MSABI_LONG(0x00000004))
+#define REG_NOTIFY_CHANGE_SECURITY (__MSABI_LONG(0x00000008))
 
 #define REG_LEGAL_CHANGE_FILTER (REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_ATTRIBUTES | REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_SECURITY)
 
@@ -6227,30 +6227,30 @@
       IgnoreError = SERVICE_ERROR_IGNORE,NormalError = SERVICE_ERROR_NORMAL,SevereError = SERVICE_ERROR_SEVERE,CriticalError = SERVICE_ERROR_CRITICAL
     } SERVICE_ERROR_TYPE;
 
-#define TAPE_ERASE_SHORT 0L
-#define TAPE_ERASE_LONG 1L
+#define TAPE_ERASE_SHORT __MSABI_LONG(0)
+#define TAPE_ERASE_LONG __MSABI_LONG(1)
 
     typedef struct _TAPE_ERASE {
       DWORD Type;
       BOOLEAN Immediate;
     } TAPE_ERASE,*PTAPE_ERASE;
 
-#define TAPE_LOAD 0L
-#define TAPE_UNLOAD 1L
-#define TAPE_TENSION 2L
-#define TAPE_LOCK 3L
-#define TAPE_UNLOCK 4L
-#define TAPE_FORMAT 5L
+#define TAPE_LOAD __MSABI_LONG(0)
+#define TAPE_UNLOAD __MSABI_LONG(1)
+#define TAPE_TENSION __MSABI_LONG(2)
+#define TAPE_LOCK __MSABI_LONG(3)
+#define TAPE_UNLOCK __MSABI_LONG(4)
+#define TAPE_FORMAT __MSABI_LONG(5)
 
     typedef struct _TAPE_PREPARE {
       DWORD Operation;
       BOOLEAN Immediate;
     } TAPE_PREPARE,*PTAPE_PREPARE;
 
-#define TAPE_SETMARKS 0L
-#define TAPE_FILEMARKS 1L
-#define TAPE_SHORT_FILEMARKS 2L
-#define TAPE_LONG_FILEMARKS 3L
+#define TAPE_SETMARKS __MSABI_LONG(0)
+#define TAPE_FILEMARKS __MSABI_LONG(1)
+#define TAPE_SHORT_FILEMARKS __MSABI_LONG(2)
+#define TAPE_LONG_FILEMARKS __MSABI_LONG(3)
 
     typedef struct _TAPE_WRITE_MARKS {
       DWORD Type;
@@ -6258,9 +6258,9 @@
       BOOLEAN Immediate;
     } TAPE_WRITE_MARKS,*PTAPE_WRITE_MARKS;
 
-#define TAPE_ABSOLUTE_POSITION 0L
-#define TAPE_LOGICAL_POSITION 1L
-#define TAPE_PSEUDO_LOGICAL_POSITION 2L
+#define TAPE_ABSOLUTE_POSITION __MSABI_LONG(0)
+#define TAPE_LOGICAL_POSITION __MSABI_LONG(1)
+#define TAPE_PSEUDO_LOGICAL_POSITION __MSABI_LONG(2)
 
     typedef struct _TAPE_GET_POSITION {
       DWORD Type;
@@ -6268,16 +6268,16 @@
       LARGE_INTEGER Offset;
     } TAPE_GET_POSITION,*PTAPE_GET_POSITION;
 
-#define TAPE_REWIND 0L
-#define TAPE_ABSOLUTE_BLOCK 1L
-#define TAPE_LOGICAL_BLOCK 2L
-#define TAPE_PSEUDO_LOGICAL_BLOCK 3L
-#define TAPE_SPACE_END_OF_DATA 4L
-#define TAPE_SPACE_RELATIVE_BLOCKS 5L
-#define TAPE_SPACE_FILEMARKS 6L
-#define TAPE_SPACE_SEQUENTIAL_FMKS 7L
-#define TAPE_SPACE_SETMARKS 8L
-#define TAPE_SPACE_SEQUENTIAL_SMKS 9L
+#define TAPE_REWIND __MSABI_LONG(0)
+#define TAPE_ABSOLUTE_BLOCK __MSABI_LONG(1)
+#define TAPE_LOGICAL_BLOCK __MSABI_LONG(2)
+#define TAPE_PSEUDO_LOGICAL_BLOCK __MSABI_LONG(3)
+#define TAPE_SPACE_END_OF_DATA __MSABI_LONG(4)
+#define TAPE_SPACE_RELATIVE_BLOCKS __MSABI_LONG(5)
+#define TAPE_SPACE_FILEMARKS __MSABI_LONG(6)
+#define TAPE_SPACE_SEQUENTIAL_FMKS __MSABI_LONG(7)
+#define TAPE_SPACE_SETMARKS __MSABI_LONG(8)
+#define TAPE_SPACE_SEQUENTIAL_SMKS __MSABI_LONG(9)
 
     typedef struct _TAPE_SET_POSITION {
       DWORD Method;
@@ -6392,9 +6392,9 @@
       DWORD BlockSize;
     } TAPE_SET_MEDIA_PARAMETERS,*PTAPE_SET_MEDIA_PARAMETERS;
 
-#define TAPE_FIXED_PARTITIONS 0L
-#define TAPE_SELECT_PARTITIONS 1L
-#define TAPE_INITIATOR_PARTITIONS 2L
+#define TAPE_FIXED_PARTITIONS __MSABI_LONG(0)
+#define TAPE_SELECT_PARTITIONS __MSABI_LONG(1)
+#define TAPE_INITIATOR_PARTITIONS __MSABI_LONG(2)
 
     typedef struct _TAPE_CREATE_PARTITION {
       DWORD Method;
@@ -6402,11 +6402,11 @@
       DWORD Size;
     } TAPE_CREATE_PARTITION,*PTAPE_CREATE_PARTITION;
 
-#define TAPE_QUERY_DRIVE_PARAMETERS 0L
-#define TAPE_QUERY_MEDIA_CAPACITY 1L
-#define TAPE_CHECK_FOR_DRIVE_PROBLEM 2L
-#define TAPE_QUERY_IO_ERROR_DATA 3L
-#define TAPE_QUERY_DEVICE_ERROR_DATA 4L
+#define TAPE_QUERY_DRIVE_PARAMETERS __MSABI_LONG(0)
+#define TAPE_QUERY_MEDIA_CAPACITY __MSABI_LONG(1)
+#define TAPE_CHECK_FOR_DRIVE_PROBLEM __MSABI_LONG(2)
+#define TAPE_QUERY_IO_ERROR_DATA __MSABI_LONG(3)
+#define TAPE_QUERY_DEVICE_ERROR_DATA __MSABI_LONG(4)
 
     typedef struct _TAPE_WMI_OPERATIONS {
       DWORD Method;
@@ -6536,12 +6536,12 @@
 
 #define WOW64_CONTEXT_i386 0x00010000
 #define WOW64_CONTEXT_i486 0x00010000
-#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | 0x00000001L)
-#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | 0x00000002L)
-#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | 0x00000004L)
-#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | 0x00000008L)
-#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | 0x00000010L)
-#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | 0x00000020L)
+#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001))
+#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002))
+#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004))
+#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008))
+#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010))
+#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020))
 #define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS)
 #define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS)
 #define WOW64_SIZE_OF_80387_REGISTERS 80
diff --git a/mingw-w64-headers/include/winperf.h b/mingw-w64-headers/include/winperf.h
index b73ad72..ce8e0d2 100644
--- a/mingw-w64-headers/include/winperf.h
+++ b/mingw-w64-headers/include/winperf.h
@@ -182,7 +182,7 @@
 typedef DWORD (WINAPI PM_CLOSE_PROC)(void);
 typedef DWORD (WINAPI PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD);
 
-#define MAX_PERF_OBJECTS_IN_QUERY_FUNCTION (64L)
+#define MAX_PERF_OBJECTS_IN_QUERY_FUNCTION (__MSABI_LONG(64))
 
 #define WINPERF_LOG_NONE 0
 #define WINPERF_LOG_USER 1
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 0cee3b8..4b88c22 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -662,17 +662,17 @@
 
 #ifndef NODESKTOP
 
-#define DESKTOP_READOBJECTS 0x0001L
-#define DESKTOP_CREATEWINDOW 0x0002L
-#define DESKTOP_CREATEMENU 0x0004L
-#define DESKTOP_HOOKCONTROL 0x0008L
-#define DESKTOP_JOURNALRECORD 0x0010L
-#define DESKTOP_JOURNALPLAYBACK 0x0020L
-#define DESKTOP_ENUMERATE 0x0040L
-#define DESKTOP_WRITEOBJECTS 0x0080L
-#define DESKTOP_SWITCHDESKTOP 0x0100L
+#define DESKTOP_READOBJECTS __MSABI_LONG(0x0001)
+#define DESKTOP_CREATEWINDOW __MSABI_LONG(0x0002)
+#define DESKTOP_CREATEMENU __MSABI_LONG(0x0004)
+#define DESKTOP_HOOKCONTROL __MSABI_LONG(0x0008)
+#define DESKTOP_JOURNALRECORD __MSABI_LONG(0x0010)
+#define DESKTOP_JOURNALPLAYBACK __MSABI_LONG(0x0020)
+#define DESKTOP_ENUMERATE __MSABI_LONG(0x0040)
+#define DESKTOP_WRITEOBJECTS __MSABI_LONG(0x0080)
+#define DESKTOP_SWITCHDESKTOP __MSABI_LONG(0x0100)
 
-#define DF_ALLOWOTHERACCOUNTHOOK 0x0001L
+#define DF_ALLOWOTHERACCOUNTHOOK __MSABI_LONG(0x0001)
 
 #ifdef _WINGDI_
 #ifndef NOGDI
@@ -699,20 +699,20 @@
 #endif
 
 #ifndef NOWINDOWSTATION
-#define WINSTA_ENUMDESKTOPS 0x0001L
-#define WINSTA_READATTRIBUTES 0x0002L
-#define WINSTA_ACCESSCLIPBOARD 0x0004L
-#define WINSTA_CREATEDESKTOP 0x0008L
-#define WINSTA_WRITEATTRIBUTES 0x0010L
-#define WINSTA_ACCESSGLOBALATOMS 0x0020L
-#define WINSTA_EXITWINDOWS 0x0040L
-#define WINSTA_ENUMERATE 0x0100L
-#define WINSTA_READSCREEN 0x0200L
+#define WINSTA_ENUMDESKTOPS __MSABI_LONG(0x0001)
+#define WINSTA_READATTRIBUTES __MSABI_LONG(0x0002)
+#define WINSTA_ACCESSCLIPBOARD __MSABI_LONG(0x0004)
+#define WINSTA_CREATEDESKTOP __MSABI_LONG(0x0008)
+#define WINSTA_WRITEATTRIBUTES __MSABI_LONG(0x0010)
+#define WINSTA_ACCESSGLOBALATOMS __MSABI_LONG(0x0020)
+#define WINSTA_EXITWINDOWS __MSABI_LONG(0x0040)
+#define WINSTA_ENUMERATE __MSABI_LONG(0x0100)
+#define WINSTA_READSCREEN __MSABI_LONG(0x0200)
 #define WINSTA_ALL_ACCESS (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN)
 
-#define CWF_CREATE_ONLY 0x0001L
+#define CWF_CREATE_ONLY __MSABI_LONG(0x0001)
 
-#define WSF_VISIBLE 0x0001L
+#define WSF_VISIBLE __MSABI_LONG(0x0001)
 
 #define CreateWindowStation __MINGW_NAME_AW(CreateWindowStation)
 #define OpenWindowStation __MINGW_NAME_AW(OpenWindowStation)
@@ -1371,26 +1371,26 @@
 
 #ifndef NOWINSTYLES
 
-#define WS_OVERLAPPED 0x00000000L
-#define WS_POPUP 0x80000000L
-#define WS_CHILD 0x40000000L
-#define WS_MINIMIZE 0x20000000L
-#define WS_VISIBLE 0x10000000L
-#define WS_DISABLED 0x08000000L
-#define WS_CLIPSIBLINGS 0x04000000L
-#define WS_CLIPCHILDREN 0x02000000L
-#define WS_MAXIMIZE 0x01000000L
-#define WS_CAPTION 0x00C00000L
-#define WS_BORDER 0x00800000L
-#define WS_DLGFRAME 0x00400000L
-#define WS_VSCROLL 0x00200000L
-#define WS_HSCROLL 0x00100000L
-#define WS_SYSMENU 0x00080000L
-#define WS_THICKFRAME 0x00040000L
-#define WS_GROUP 0x00020000L
-#define WS_TABSTOP 0x00010000L
-#define WS_MINIMIZEBOX 0x00020000L
-#define WS_MAXIMIZEBOX 0x00010000L
+#define WS_OVERLAPPED __MSABI_LONG(0x00000000)
+#define WS_POPUP __MSABI_LONG(0x80000000)
+#define WS_CHILD __MSABI_LONG(0x40000000)
+#define WS_MINIMIZE __MSABI_LONG(0x20000000)
+#define WS_VISIBLE __MSABI_LONG(0x10000000)
+#define WS_DISABLED __MSABI_LONG(0x08000000)
+#define WS_CLIPSIBLINGS __MSABI_LONG(0x04000000)
+#define WS_CLIPCHILDREN __MSABI_LONG(0x02000000)
+#define WS_MAXIMIZE __MSABI_LONG(0x01000000)
+#define WS_CAPTION __MSABI_LONG(0x00C00000)
+#define WS_BORDER __MSABI_LONG(0x00800000)
+#define WS_DLGFRAME __MSABI_LONG(0x00400000)
+#define WS_VSCROLL __MSABI_LONG(0x00200000)
+#define WS_HSCROLL __MSABI_LONG(0x00100000)
+#define WS_SYSMENU __MSABI_LONG(0x00080000)
+#define WS_THICKFRAME __MSABI_LONG(0x00040000)
+#define WS_GROUP __MSABI_LONG(0x00020000)
+#define WS_TABSTOP __MSABI_LONG(0x00010000)
+#define WS_MINIMIZEBOX __MSABI_LONG(0x00020000)
+#define WS_MAXIMIZEBOX __MSABI_LONG(0x00010000)
 #define WS_TILED WS_OVERLAPPED
 #define WS_ICONIC WS_MINIMIZE
 #define WS_SIZEBOX WS_THICKFRAME
@@ -1399,32 +1399,32 @@
 #define WS_POPUPWINDOW (WS_POPUP | WS_BORDER | WS_SYSMENU)
 #define WS_CHILDWINDOW (WS_CHILD)
 
-#define WS_EX_DLGMODALFRAME 0x00000001L
-#define WS_EX_NOPARENTNOTIFY 0x00000004L
-#define WS_EX_TOPMOST 0x00000008L
-#define WS_EX_ACCEPTFILES 0x00000010L
-#define WS_EX_TRANSPARENT 0x00000020L
-#define WS_EX_MDICHILD 0x00000040L
-#define WS_EX_TOOLWINDOW 0x00000080L
-#define WS_EX_WINDOWEDGE 0x00000100L
-#define WS_EX_CLIENTEDGE 0x00000200L
-#define WS_EX_CONTEXTHELP 0x00000400L
-#define WS_EX_RIGHT 0x00001000L
-#define WS_EX_LEFT 0x00000000L
-#define WS_EX_RTLREADING 0x00002000L
-#define WS_EX_LTRREADING 0x00000000L
-#define WS_EX_LEFTSCROLLBAR 0x00004000L
-#define WS_EX_RIGHTSCROLLBAR 0x00000000L
-#define WS_EX_CONTROLPARENT 0x00010000L
-#define WS_EX_STATICEDGE 0x00020000L
-#define WS_EX_APPWINDOW 0x00040000L
+#define WS_EX_DLGMODALFRAME __MSABI_LONG(0x00000001)
+#define WS_EX_NOPARENTNOTIFY __MSABI_LONG(0x00000004)
+#define WS_EX_TOPMOST __MSABI_LONG(0x00000008)
+#define WS_EX_ACCEPTFILES __MSABI_LONG(0x00000010)
+#define WS_EX_TRANSPARENT __MSABI_LONG(0x00000020)
+#define WS_EX_MDICHILD __MSABI_LONG(0x00000040)
+#define WS_EX_TOOLWINDOW __MSABI_LONG(0x00000080)
+#define WS_EX_WINDOWEDGE __MSABI_LONG(0x00000100)
+#define WS_EX_CLIENTEDGE __MSABI_LONG(0x00000200)
+#define WS_EX_CONTEXTHELP __MSABI_LONG(0x00000400)
+#define WS_EX_RIGHT __MSABI_LONG(0x00001000)
+#define WS_EX_LEFT __MSABI_LONG(0x00000000)
+#define WS_EX_RTLREADING __MSABI_LONG(0x00002000)
+#define WS_EX_LTRREADING __MSABI_LONG(0x00000000)
+#define WS_EX_LEFTSCROLLBAR __MSABI_LONG(0x00004000)
+#define WS_EX_RIGHTSCROLLBAR __MSABI_LONG(0x00000000)
+#define WS_EX_CONTROLPARENT __MSABI_LONG(0x00010000)
+#define WS_EX_STATICEDGE __MSABI_LONG(0x00020000)
+#define WS_EX_APPWINDOW __MSABI_LONG(0x00040000)
 #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE)
 #define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST)
 #define WS_EX_LAYERED 0x00080000
-#define WS_EX_NOINHERITLAYOUT 0x00100000L
-#define WS_EX_LAYOUTRTL 0x00400000L
-#define WS_EX_COMPOSITED 0x02000000L
-#define WS_EX_NOACTIVATE 0x08000000L
+#define WS_EX_NOINHERITLAYOUT __MSABI_LONG(0x00100000)
+#define WS_EX_LAYOUTRTL __MSABI_LONG(0x00400000)
+#define WS_EX_COMPOSITED __MSABI_LONG(0x02000000)
+#define WS_EX_NOACTIVATE __MSABI_LONG(0x08000000)
 
 #define CS_VREDRAW 0x0001
 #define CS_HREDRAW 0x0002
@@ -1441,12 +1441,12 @@
 #define CS_DROPSHADOW 0x00020000
 #endif
 
-#define PRF_CHECKVISIBLE 0x00000001L
-#define PRF_NONCLIENT 0x00000002L
-#define PRF_CLIENT 0x00000004L
-#define PRF_ERASEBKGND 0x00000008L
-#define PRF_CHILDREN 0x00000010L
-#define PRF_OWNED 0x00000020L
+#define PRF_CHECKVISIBLE __MSABI_LONG(0x00000001)
+#define PRF_NONCLIENT __MSABI_LONG(0x00000002)
+#define PRF_CLIENT __MSABI_LONG(0x00000004)
+#define PRF_ERASEBKGND __MSABI_LONG(0x00000008)
+#define PRF_CHILDREN __MSABI_LONG(0x00000010)
+#define PRF_OWNED __MSABI_LONG(0x00000020)
 
 #define BDR_RAISEDOUTER 0x0001
 #define BDR_SUNKENOUTER 0x0002
@@ -2697,34 +2697,34 @@
   WINUSERAPI WINBOOL WINAPI SetMenuItemInfoA(HMENU hmenu,UINT item,WINBOOL fByPositon,LPCMENUITEMINFOA lpmii);
   WINUSERAPI WINBOOL WINAPI SetMenuItemInfoW(HMENU hmenu,UINT item,WINBOOL fByPositon,LPCMENUITEMINFOW lpmii);
 
-#define GMDI_USEDISABLED 0x0001L
-#define GMDI_GOINTOPOPUPS 0x0002L
+#define GMDI_USEDISABLED __MSABI_LONG(0x0001)
+#define GMDI_GOINTOPOPUPS __MSABI_LONG(0x0002)
 
   WINUSERAPI UINT WINAPI GetMenuDefaultItem(HMENU hMenu,UINT fByPos,UINT gmdiFlags);
   WINUSERAPI WINBOOL WINAPI SetMenuDefaultItem(HMENU hMenu,UINT uItem,UINT fByPos);
   WINUSERAPI WINBOOL WINAPI GetMenuItemRect(HWND hWnd,HMENU hMenu,UINT uItem,LPRECT lprcItem);
   WINUSERAPI int WINAPI MenuItemFromPoint(HWND hWnd,HMENU hMenu,POINT ptScreen);
 
-#define TPM_LEFTBUTTON 0x0000L
-#define TPM_RIGHTBUTTON 0x0002L
-#define TPM_LEFTALIGN 0x0000L
-#define TPM_CENTERALIGN 0x0004L
-#define TPM_RIGHTALIGN 0x0008L
-#define TPM_TOPALIGN 0x0000L
-#define TPM_VCENTERALIGN 0x0010L
-#define TPM_BOTTOMALIGN 0x0020L
+#define TPM_LEFTBUTTON __MSABI_LONG(0x0000)
+#define TPM_RIGHTBUTTON __MSABI_LONG(0x0002)
+#define TPM_LEFTALIGN __MSABI_LONG(0x0000)
+#define TPM_CENTERALIGN __MSABI_LONG(0x0004)
+#define TPM_RIGHTALIGN __MSABI_LONG(0x0008)
+#define TPM_TOPALIGN __MSABI_LONG(0x0000)
+#define TPM_VCENTERALIGN __MSABI_LONG(0x0010)
+#define TPM_BOTTOMALIGN __MSABI_LONG(0x0020)
 
-#define TPM_HORIZONTAL 0x0000L
-#define TPM_VERTICAL 0x0040L
-#define TPM_NONOTIFY 0x0080L
-#define TPM_RETURNCMD 0x0100L
-#define TPM_RECURSE 0x0001L
-#define TPM_HORPOSANIMATION 0x0400L
-#define TPM_HORNEGANIMATION 0x0800L
-#define TPM_VERPOSANIMATION 0x1000L
-#define TPM_VERNEGANIMATION 0x2000L
-#define TPM_NOANIMATION 0x4000L
-#define TPM_LAYOUTRTL 0x8000L
+#define TPM_HORIZONTAL __MSABI_LONG(0x0000)
+#define TPM_VERTICAL __MSABI_LONG(0x0040)
+#define TPM_NONOTIFY __MSABI_LONG(0x0080)
+#define TPM_RETURNCMD __MSABI_LONG(0x0100)
+#define TPM_RECURSE __MSABI_LONG(0x0001)
+#define TPM_HORPOSANIMATION __MSABI_LONG(0x0400)
+#define TPM_HORNEGANIMATION __MSABI_LONG(0x0800)
+#define TPM_VERPOSANIMATION __MSABI_LONG(0x1000)
+#define TPM_VERNEGANIMATION __MSABI_LONG(0x2000)
+#define TPM_NOANIMATION __MSABI_LONG(0x4000)
+#define TPM_LAYOUTRTL __MSABI_LONG(0x8000)
 #endif
 
   typedef struct tagDROPSTRUCT {
@@ -2743,8 +2743,8 @@
 #define DOF_PROGMAN 0x0001
 #define DOF_SHELLDATA 0x0002
 
-#define DO_DROPFILE 0x454C4946L
-#define DO_PRINTFILE 0x544E5250L
+#define DO_DROPFILE __MSABI_LONG(0x454C4946)
+#define DO_PRINTFILE __MSABI_LONG(0x544E5250)
 
   WINUSERAPI DWORD WINAPI DragObject(HWND hwndParent,HWND hwndFrom,UINT fmt,ULONG_PTR data,HCURSOR hcur);
   WINUSERAPI WINBOOL WINAPI DragDetect(HWND hwnd,POINT pt);
@@ -2842,19 +2842,19 @@
   WINUSERAPI HDC WINAPI GetDC(HWND hWnd);
   WINUSERAPI HDC WINAPI GetDCEx(HWND hWnd,HRGN hrgnClip,DWORD flags);
 
-#define DCX_WINDOW 0x00000001L
-#define DCX_CACHE 0x00000002L
-#define DCX_NORESETATTRS 0x00000004L
-#define DCX_CLIPCHILDREN 0x00000008L
-#define DCX_CLIPSIBLINGS 0x00000010L
-#define DCX_PARENTCLIP 0x00000020L
-#define DCX_EXCLUDERGN 0x00000040L
-#define DCX_INTERSECTRGN 0x00000080L
-#define DCX_EXCLUDEUPDATE 0x00000100L
-#define DCX_INTERSECTUPDATE 0x00000200L
-#define DCX_LOCKWINDOWUPDATE 0x00000400L
+#define DCX_WINDOW __MSABI_LONG(0x00000001)
+#define DCX_CACHE __MSABI_LONG(0x00000002)
+#define DCX_NORESETATTRS __MSABI_LONG(0x00000004)
+#define DCX_CLIPCHILDREN __MSABI_LONG(0x00000008)
+#define DCX_CLIPSIBLINGS __MSABI_LONG(0x00000010)
+#define DCX_PARENTCLIP __MSABI_LONG(0x00000020)
+#define DCX_EXCLUDERGN __MSABI_LONG(0x00000040)
+#define DCX_INTERSECTRGN __MSABI_LONG(0x00000080)
+#define DCX_EXCLUDEUPDATE __MSABI_LONG(0x00000100)
+#define DCX_INTERSECTUPDATE __MSABI_LONG(0x00000200)
+#define DCX_LOCKWINDOWUPDATE __MSABI_LONG(0x00000400)
 
-#define DCX_VALIDATE 0x00200000L
+#define DCX_VALIDATE __MSABI_LONG(0x00200000)
 
   WINUSERAPI HDC WINAPI GetWindowDC(HWND hWnd);
   WINUSERAPI int WINAPI ReleaseDC(HWND hWnd,HDC hDC);
@@ -2969,43 +2969,43 @@
 
 #ifndef NOMB
 
-#define MB_OK 0x00000000L
-#define MB_OKCANCEL 0x00000001L
-#define MB_ABORTRETRYIGNORE 0x00000002L
-#define MB_YESNOCANCEL 0x00000003L
-#define MB_YESNO 0x00000004L
-#define MB_RETRYCANCEL 0x00000005L
-#define MB_CANCELTRYCONTINUE 0x00000006L
-#define MB_ICONHAND 0x00000010L
-#define MB_ICONQUESTION 0x00000020L
-#define MB_ICONEXCLAMATION 0x00000030L
-#define MB_ICONASTERISK 0x00000040L
-#define MB_USERICON 0x00000080L
+#define MB_OK __MSABI_LONG(0x00000000)
+#define MB_OKCANCEL __MSABI_LONG(0x00000001)
+#define MB_ABORTRETRYIGNORE __MSABI_LONG(0x00000002)
+#define MB_YESNOCANCEL __MSABI_LONG(0x00000003)
+#define MB_YESNO __MSABI_LONG(0x00000004)
+#define MB_RETRYCANCEL __MSABI_LONG(0x00000005)
+#define MB_CANCELTRYCONTINUE __MSABI_LONG(0x00000006)
+#define MB_ICONHAND __MSABI_LONG(0x00000010)
+#define MB_ICONQUESTION __MSABI_LONG(0x00000020)
+#define MB_ICONEXCLAMATION __MSABI_LONG(0x00000030)
+#define MB_ICONASTERISK __MSABI_LONG(0x00000040)
+#define MB_USERICON __MSABI_LONG(0x00000080)
 #define MB_ICONWARNING MB_ICONEXCLAMATION
 #define MB_ICONERROR MB_ICONHAND
 #define MB_ICONINFORMATION MB_ICONASTERISK
 #define MB_ICONSTOP MB_ICONHAND
-#define MB_DEFBUTTON1 0x00000000L
-#define MB_DEFBUTTON2 0x00000100L
-#define MB_DEFBUTTON3 0x00000200L
-#define MB_DEFBUTTON4 0x00000300L
-#define MB_APPLMODAL 0x00000000L
-#define MB_SYSTEMMODAL 0x00001000L
-#define MB_TASKMODAL 0x00002000L
-#define MB_HELP 0x00004000L
-#define MB_NOFOCUS 0x00008000L
-#define MB_SETFOREGROUND 0x00010000L
-#define MB_DEFAULT_DESKTOP_ONLY 0x00020000L
-#define MB_TOPMOST 0x00040000L
-#define MB_RIGHT 0x00080000L
-#define MB_RTLREADING 0x00100000L
-#define MB_SERVICE_NOTIFICATION 0x00200000L
-#define MB_SERVICE_NOTIFICATION_NT3X 0x00040000L
-#define MB_TYPEMASK 0x0000000FL
-#define MB_ICONMASK 0x000000F0L
-#define MB_DEFMASK 0x00000F00L
-#define MB_MODEMASK 0x00003000L
-#define MB_MISCMASK 0x0000C000L
+#define MB_DEFBUTTON1 __MSABI_LONG(0x00000000)
+#define MB_DEFBUTTON2 __MSABI_LONG(0x00000100)
+#define MB_DEFBUTTON3 __MSABI_LONG(0x00000200)
+#define MB_DEFBUTTON4 __MSABI_LONG(0x00000300)
+#define MB_APPLMODAL __MSABI_LONG(0x00000000)
+#define MB_SYSTEMMODAL __MSABI_LONG(0x00001000)
+#define MB_TASKMODAL __MSABI_LONG(0x00002000)
+#define MB_HELP __MSABI_LONG(0x00004000)
+#define MB_NOFOCUS __MSABI_LONG(0x00008000)
+#define MB_SETFOREGROUND __MSABI_LONG(0x00010000)
+#define MB_DEFAULT_DESKTOP_ONLY __MSABI_LONG(0x00020000)
+#define MB_TOPMOST __MSABI_LONG(0x00040000)
+#define MB_RIGHT __MSABI_LONG(0x00080000)
+#define MB_RTLREADING __MSABI_LONG(0x00100000)
+#define MB_SERVICE_NOTIFICATION __MSABI_LONG(0x00200000)
+#define MB_SERVICE_NOTIFICATION_NT3X __MSABI_LONG(0x00040000)
+#define MB_TYPEMASK __MSABI_LONG(0x0000000F)
+#define MB_ICONMASK __MSABI_LONG(0x000000F0)
+#define MB_DEFMASK __MSABI_LONG(0x00000F00)
+#define MB_MODEMASK __MSABI_LONG(0x00003000)
+#define MB_MISCMASK __MSABI_LONG(0x0000C000)
 
 #define MessageBox __MINGW_NAME_AW(MessageBox)
 #define MessageBoxEx __MINGW_NAME_AW(MessageBoxEx)
@@ -3281,46 +3281,46 @@
 
 #ifndef NOMENUS
 
-#define MF_INSERT 0x00000000L
-#define MF_CHANGE 0x00000080L
-#define MF_APPEND 0x00000100L
-#define MF_DELETE 0x00000200L
-#define MF_REMOVE 0x00001000L
-#define MF_BYCOMMAND 0x00000000L
-#define MF_BYPOSITION 0x00000400L
-#define MF_SEPARATOR 0x00000800L
-#define MF_ENABLED 0x00000000L
-#define MF_GRAYED 0x00000001L
-#define MF_DISABLED 0x00000002L
-#define MF_UNCHECKED 0x00000000L
-#define MF_CHECKED 0x00000008L
-#define MF_USECHECKBITMAPS 0x00000200L
-#define MF_STRING 0x00000000L
-#define MF_BITMAP 0x00000004L
-#define MF_OWNERDRAW 0x00000100L
-#define MF_POPUP 0x00000010L
-#define MF_MENUBARBREAK 0x00000020L
-#define MF_MENUBREAK 0x00000040L
-#define MF_UNHILITE 0x00000000L
-#define MF_HILITE 0x00000080L
-#define MF_DEFAULT 0x00001000L
-#define MF_SYSMENU 0x00002000L
-#define MF_HELP 0x00004000L
-#define MF_RIGHTJUSTIFY 0x00004000L
-#define MF_MOUSESELECT 0x00008000L
-#define MF_END 0x00000080L
+#define MF_INSERT __MSABI_LONG(0x00000000)
+#define MF_CHANGE __MSABI_LONG(0x00000080)
+#define MF_APPEND __MSABI_LONG(0x00000100)
+#define MF_DELETE __MSABI_LONG(0x00000200)
+#define MF_REMOVE __MSABI_LONG(0x00001000)
+#define MF_BYCOMMAND __MSABI_LONG(0x00000000)
+#define MF_BYPOSITION __MSABI_LONG(0x00000400)
+#define MF_SEPARATOR __MSABI_LONG(0x00000800)
+#define MF_ENABLED __MSABI_LONG(0x00000000)
+#define MF_GRAYED __MSABI_LONG(0x00000001)
+#define MF_DISABLED __MSABI_LONG(0x00000002)
+#define MF_UNCHECKED __MSABI_LONG(0x00000000)
+#define MF_CHECKED __MSABI_LONG(0x00000008)
+#define MF_USECHECKBITMAPS __MSABI_LONG(0x00000200)
+#define MF_STRING __MSABI_LONG(0x00000000)
+#define MF_BITMAP __MSABI_LONG(0x00000004)
+#define MF_OWNERDRAW __MSABI_LONG(0x00000100)
+#define MF_POPUP __MSABI_LONG(0x00000010)
+#define MF_MENUBARBREAK __MSABI_LONG(0x00000020)
+#define MF_MENUBREAK __MSABI_LONG(0x00000040)
+#define MF_UNHILITE __MSABI_LONG(0x00000000)
+#define MF_HILITE __MSABI_LONG(0x00000080)
+#define MF_DEFAULT __MSABI_LONG(0x00001000)
+#define MF_SYSMENU __MSABI_LONG(0x00002000)
+#define MF_HELP __MSABI_LONG(0x00004000)
+#define MF_RIGHTJUSTIFY __MSABI_LONG(0x00004000)
+#define MF_MOUSESELECT __MSABI_LONG(0x00008000)
+#define MF_END __MSABI_LONG(0x00000080)
 
 #define MFT_STRING MF_STRING
 #define MFT_BITMAP MF_BITMAP
 #define MFT_MENUBARBREAK MF_MENUBARBREAK
 #define MFT_MENUBREAK MF_MENUBREAK
 #define MFT_OWNERDRAW MF_OWNERDRAW
-#define MFT_RADIOCHECK 0x00000200L
+#define MFT_RADIOCHECK __MSABI_LONG(0x00000200)
 #define MFT_SEPARATOR MF_SEPARATOR
-#define MFT_RIGHTORDER 0x00002000L
+#define MFT_RIGHTORDER __MSABI_LONG(0x00002000)
 #define MFT_RIGHTJUSTIFY MF_RIGHTJUSTIFY
 
-#define MFS_GRAYED 0x00000003L
+#define MFS_GRAYED __MSABI_LONG(0x00000003)
 #define MFS_DISABLED MFS_GRAYED
 #define MFS_CHECKED MF_CHECKED
 #define MFS_HILITE MF_HILITE
@@ -3341,7 +3341,7 @@
     WORD mtID;
     WCHAR mtString[1];
   } MENUITEMTEMPLATE,*PMENUITEMTEMPLATE;
-#define MF_END 0x00000080L
+#define MF_END __MSABI_LONG(0x00000080)
 #endif
 
 #ifndef NOSYSCOMMANDS
@@ -3592,20 +3592,20 @@
 #ifndef NOCTLMGR
 
 #ifndef NOWINSTYLES
-#define ES_LEFT 0x0000L
-#define ES_CENTER 0x0001L
-#define ES_RIGHT 0x0002L
-#define ES_MULTILINE 0x0004L
-#define ES_UPPERCASE 0x0008L
-#define ES_LOWERCASE 0x0010L
-#define ES_PASSWORD 0x0020L
-#define ES_AUTOVSCROLL 0x0040L
-#define ES_AUTOHSCROLL 0x0080L
-#define ES_NOHIDESEL 0x0100L
-#define ES_OEMCONVERT 0x0400L
-#define ES_READONLY 0x0800L
-#define ES_WANTRETURN 0x1000L
-#define ES_NUMBER 0x2000L
+#define ES_LEFT __MSABI_LONG(0x0000)
+#define ES_CENTER __MSABI_LONG(0x0001)
+#define ES_RIGHT __MSABI_LONG(0x0002)
+#define ES_MULTILINE __MSABI_LONG(0x0004)
+#define ES_UPPERCASE __MSABI_LONG(0x0008)
+#define ES_LOWERCASE __MSABI_LONG(0x0010)
+#define ES_PASSWORD __MSABI_LONG(0x0020)
+#define ES_AUTOVSCROLL __MSABI_LONG(0x0040)
+#define ES_AUTOHSCROLL __MSABI_LONG(0x0080)
+#define ES_NOHIDESEL __MSABI_LONG(0x0100)
+#define ES_OEMCONVERT __MSABI_LONG(0x0400)
+#define ES_READONLY __MSABI_LONG(0x0800)
+#define ES_WANTRETURN __MSABI_LONG(0x1000)
+#define ES_NUMBER __MSABI_LONG(0x2000)
 #endif
 
 #define EN_SETFOCUS 0x0100
@@ -3676,33 +3676,33 @@
 #define WB_RIGHT 1
 #define WB_ISDELIMITER 2
 
-#define BS_PUSHBUTTON 0x00000000L
-#define BS_DEFPUSHBUTTON 0x00000001L
-#define BS_CHECKBOX 0x00000002L
-#define BS_AUTOCHECKBOX 0x00000003L
-#define BS_RADIOBUTTON 0x00000004L
-#define BS_3STATE 0x00000005L
-#define BS_AUTO3STATE 0x00000006L
-#define BS_GROUPBOX 0x00000007L
-#define BS_USERBUTTON 0x00000008L
-#define BS_AUTORADIOBUTTON 0x00000009L
-#define BS_PUSHBOX 0x0000000AL
-#define BS_OWNERDRAW 0x0000000BL
-#define BS_TYPEMASK 0x0000000FL
-#define BS_LEFTTEXT 0x00000020L
-#define BS_TEXT 0x00000000L
-#define BS_ICON 0x00000040L
-#define BS_BITMAP 0x00000080L
-#define BS_LEFT 0x00000100L
-#define BS_RIGHT 0x00000200L
-#define BS_CENTER 0x00000300L
-#define BS_TOP 0x00000400L
-#define BS_BOTTOM 0x00000800L
-#define BS_VCENTER 0x00000C00L
-#define BS_PUSHLIKE 0x00001000L
-#define BS_MULTILINE 0x00002000L
-#define BS_NOTIFY 0x00004000L
-#define BS_FLAT 0x00008000L
+#define BS_PUSHBUTTON __MSABI_LONG(0x00000000)
+#define BS_DEFPUSHBUTTON __MSABI_LONG(0x00000001)
+#define BS_CHECKBOX __MSABI_LONG(0x00000002)
+#define BS_AUTOCHECKBOX __MSABI_LONG(0x00000003)
+#define BS_RADIOBUTTON __MSABI_LONG(0x00000004)
+#define BS_3STATE __MSABI_LONG(0x00000005)
+#define BS_AUTO3STATE __MSABI_LONG(0x00000006)
+#define BS_GROUPBOX __MSABI_LONG(0x00000007)
+#define BS_USERBUTTON __MSABI_LONG(0x00000008)
+#define BS_AUTORADIOBUTTON __MSABI_LONG(0x00000009)
+#define BS_PUSHBOX __MSABI_LONG(0x0000000A)
+#define BS_OWNERDRAW __MSABI_LONG(0x0000000B)
+#define BS_TYPEMASK __MSABI_LONG(0x0000000F)
+#define BS_LEFTTEXT __MSABI_LONG(0x00000020)
+#define BS_TEXT __MSABI_LONG(0x00000000)
+#define BS_ICON __MSABI_LONG(0x00000040)
+#define BS_BITMAP __MSABI_LONG(0x00000080)
+#define BS_LEFT __MSABI_LONG(0x00000100)
+#define BS_RIGHT __MSABI_LONG(0x00000200)
+#define BS_CENTER __MSABI_LONG(0x00000300)
+#define BS_TOP __MSABI_LONG(0x00000400)
+#define BS_BOTTOM __MSABI_LONG(0x00000800)
+#define BS_VCENTER __MSABI_LONG(0x00000C00)
+#define BS_PUSHLIKE __MSABI_LONG(0x00001000)
+#define BS_MULTILINE __MSABI_LONG(0x00002000)
+#define BS_NOTIFY __MSABI_LONG(0x00004000)
+#define BS_FLAT __MSABI_LONG(0x00008000)
 #define BS_RIGHTBUTTON BS_LEFTTEXT
 
 #define BN_CLICKED 0
@@ -3732,38 +3732,38 @@
 #define BST_PUSHED 0x0004
 #define BST_FOCUS 0x0008
 
-#define SS_LEFT 0x00000000L
-#define SS_CENTER 0x00000001L
-#define SS_RIGHT 0x00000002L
-#define SS_ICON 0x00000003L
-#define SS_BLACKRECT 0x00000004L
-#define SS_GRAYRECT 0x00000005L
-#define SS_WHITERECT 0x00000006L
-#define SS_BLACKFRAME 0x00000007L
-#define SS_GRAYFRAME 0x00000008L
-#define SS_WHITEFRAME 0x00000009L
-#define SS_USERITEM 0x0000000AL
-#define SS_SIMPLE 0x0000000BL
-#define SS_LEFTNOWORDWRAP 0x0000000CL
-#define SS_OWNERDRAW 0x0000000DL
-#define SS_BITMAP 0x0000000EL
-#define SS_ENHMETAFILE 0x0000000FL
-#define SS_ETCHEDHORZ 0x00000010L
-#define SS_ETCHEDVERT 0x00000011L
-#define SS_ETCHEDFRAME 0x00000012L
-#define SS_TYPEMASK 0x0000001FL
-#define SS_REALSIZECONTROL 0x00000040L
-#define SS_NOPREFIX 0x00000080L
-#define SS_NOTIFY 0x00000100L
-#define SS_CENTERIMAGE 0x00000200L
-#define SS_RIGHTJUST 0x00000400L
-#define SS_REALSIZEIMAGE 0x00000800L
-#define SS_SUNKEN 0x00001000L
-#define SS_EDITCONTROL 0x00002000L
-#define SS_ENDELLIPSIS 0x00004000L
-#define SS_PATHELLIPSIS 0x00008000L
-#define SS_WORDELLIPSIS 0x0000C000L
-#define SS_ELLIPSISMASK 0x0000C000L
+#define SS_LEFT __MSABI_LONG(0x00000000)
+#define SS_CENTER __MSABI_LONG(0x00000001)
+#define SS_RIGHT __MSABI_LONG(0x00000002)
+#define SS_ICON __MSABI_LONG(0x00000003)
+#define SS_BLACKRECT __MSABI_LONG(0x00000004)
+#define SS_GRAYRECT __MSABI_LONG(0x00000005)
+#define SS_WHITERECT __MSABI_LONG(0x00000006)
+#define SS_BLACKFRAME __MSABI_LONG(0x00000007)
+#define SS_GRAYFRAME __MSABI_LONG(0x00000008)
+#define SS_WHITEFRAME __MSABI_LONG(0x00000009)
+#define SS_USERITEM __MSABI_LONG(0x0000000A)
+#define SS_SIMPLE __MSABI_LONG(0x0000000B)
+#define SS_LEFTNOWORDWRAP __MSABI_LONG(0x0000000C)
+#define SS_OWNERDRAW __MSABI_LONG(0x0000000D)
+#define SS_BITMAP __MSABI_LONG(0x0000000E)
+#define SS_ENHMETAFILE __MSABI_LONG(0x0000000F)
+#define SS_ETCHEDHORZ __MSABI_LONG(0x00000010)
+#define SS_ETCHEDVERT __MSABI_LONG(0x00000011)
+#define SS_ETCHEDFRAME __MSABI_LONG(0x00000012)
+#define SS_TYPEMASK __MSABI_LONG(0x0000001F)
+#define SS_REALSIZECONTROL __MSABI_LONG(0x00000040)
+#define SS_NOPREFIX __MSABI_LONG(0x00000080)
+#define SS_NOTIFY __MSABI_LONG(0x00000100)
+#define SS_CENTERIMAGE __MSABI_LONG(0x00000200)
+#define SS_RIGHTJUST __MSABI_LONG(0x00000400)
+#define SS_REALSIZEIMAGE __MSABI_LONG(0x00000800)
+#define SS_SUNKEN __MSABI_LONG(0x00001000)
+#define SS_EDITCONTROL __MSABI_LONG(0x00002000)
+#define SS_ENDELLIPSIS __MSABI_LONG(0x00004000)
+#define SS_PATHELLIPSIS __MSABI_LONG(0x00008000)
+#define SS_WORDELLIPSIS __MSABI_LONG(0x0000C000)
+#define SS_ELLIPSISMASK __MSABI_LONG(0x0000C000)
 
 #ifndef NOWINMESSAGES
 
@@ -3830,26 +3830,26 @@
   WINUSERAPI WINBOOL WINAPI DlgDirSelectComboBoxExA(HWND hwndDlg,LPSTR lpString,int cchOut,int idComboBox);
   WINUSERAPI WINBOOL WINAPI DlgDirSelectComboBoxExW(HWND hwndDlg,LPWSTR lpString,int cchOut,int idComboBox);
 
-#define DS_ABSALIGN 0x01L
-#define DS_SYSMODAL 0x02L
-#define DS_LOCALEDIT 0x20L
-#define DS_SETFONT 0x40L
-#define DS_MODALFRAME 0x80L
-#define DS_NOIDLEMSG 0x100L
-#define DS_SETFOREGROUND 0x200L
+#define DS_ABSALIGN __MSABI_LONG(0x01)
+#define DS_SYSMODAL __MSABI_LONG(0x02)
+#define DS_LOCALEDIT __MSABI_LONG(0x20)
+#define DS_SETFONT __MSABI_LONG(0x40)
+#define DS_MODALFRAME __MSABI_LONG(0x80)
+#define DS_NOIDLEMSG __MSABI_LONG(0x100)
+#define DS_SETFOREGROUND __MSABI_LONG(0x200)
 
-#define DS_3DLOOK 0x0004L
-#define DS_FIXEDSYS 0x0008L
-#define DS_NOFAILCREATE 0x0010L
-#define DS_CONTROL 0x0400L
-#define DS_CENTER 0x0800L
-#define DS_CENTERMOUSE 0x1000L
-#define DS_CONTEXTHELP 0x2000L
+#define DS_3DLOOK __MSABI_LONG(0x0004)
+#define DS_FIXEDSYS __MSABI_LONG(0x0008)
+#define DS_NOFAILCREATE __MSABI_LONG(0x0010)
+#define DS_CONTROL __MSABI_LONG(0x0400)
+#define DS_CENTER __MSABI_LONG(0x0800)
+#define DS_CENTERMOUSE __MSABI_LONG(0x1000)
+#define DS_CONTEXTHELP __MSABI_LONG(0x2000)
 
 #define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
 
 #if(_WIN32_WCE >= 0x0500)
-#define DS_USEPIXELS 0x8000L
+#define DS_USEPIXELS __MSABI_LONG(0x8000)
 #endif
 
 #define DM_GETDEFID (WM_USER+0)
@@ -3870,7 +3870,7 @@
 #define DLGC_STATIC 0x0100
 #define DLGC_BUTTON 0x2000
 
-#define LB_CTLCODE 0L
+#define LB_CTLCODE __MSABI_LONG(0)
 
 #define LB_OKAY 0
 #define LB_ERR (-1)
@@ -3934,22 +3934,22 @@
 
 #ifndef NOWINSTYLES
 
-#define LBS_NOTIFY 0x0001L
-#define LBS_SORT 0x0002L
-#define LBS_NOREDRAW 0x0004L
-#define LBS_MULTIPLESEL 0x0008L
-#define LBS_OWNERDRAWFIXED 0x0010L
-#define LBS_OWNERDRAWVARIABLE 0x0020L
-#define LBS_HASSTRINGS 0x0040L
-#define LBS_USETABSTOPS 0x0080L
-#define LBS_NOINTEGRALHEIGHT 0x0100L
-#define LBS_MULTICOLUMN 0x0200L
-#define LBS_WANTKEYBOARDINPUT 0x0400L
-#define LBS_EXTENDEDSEL 0x0800L
-#define LBS_DISABLENOSCROLL 0x1000L
-#define LBS_NODATA 0x2000L
-#define LBS_NOSEL 0x4000L
-#define LBS_COMBOBOX 0x8000L
+#define LBS_NOTIFY __MSABI_LONG(0x0001)
+#define LBS_SORT __MSABI_LONG(0x0002)
+#define LBS_NOREDRAW __MSABI_LONG(0x0004)
+#define LBS_MULTIPLESEL __MSABI_LONG(0x0008)
+#define LBS_OWNERDRAWFIXED __MSABI_LONG(0x0010)
+#define LBS_OWNERDRAWVARIABLE __MSABI_LONG(0x0020)
+#define LBS_HASSTRINGS __MSABI_LONG(0x0040)
+#define LBS_USETABSTOPS __MSABI_LONG(0x0080)
+#define LBS_NOINTEGRALHEIGHT __MSABI_LONG(0x0100)
+#define LBS_MULTICOLUMN __MSABI_LONG(0x0200)
+#define LBS_WANTKEYBOARDINPUT __MSABI_LONG(0x0400)
+#define LBS_EXTENDEDSEL __MSABI_LONG(0x0800)
+#define LBS_DISABLENOSCROLL __MSABI_LONG(0x1000)
+#define LBS_NODATA __MSABI_LONG(0x2000)
+#define LBS_NOSEL __MSABI_LONG(0x4000)
+#define LBS_COMBOBOX __MSABI_LONG(0x8000)
 
 #define LBS_STANDARD (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER)
 #endif
@@ -3972,19 +3972,19 @@
 
 #ifndef NOWINSTYLES
 
-#define CBS_SIMPLE 0x0001L
-#define CBS_DROPDOWN 0x0002L
-#define CBS_DROPDOWNLIST 0x0003L
-#define CBS_OWNERDRAWFIXED 0x0010L
-#define CBS_OWNERDRAWVARIABLE 0x0020L
-#define CBS_AUTOHSCROLL 0x0040L
-#define CBS_OEMCONVERT 0x0080L
-#define CBS_SORT 0x0100L
-#define CBS_HASSTRINGS 0x0200L
-#define CBS_NOINTEGRALHEIGHT 0x0400L
-#define CBS_DISABLENOSCROLL 0x0800L
-#define CBS_UPPERCASE 0x2000L
-#define CBS_LOWERCASE 0x4000L
+#define CBS_SIMPLE __MSABI_LONG(0x0001)
+#define CBS_DROPDOWN __MSABI_LONG(0x0002)
+#define CBS_DROPDOWNLIST __MSABI_LONG(0x0003)
+#define CBS_OWNERDRAWFIXED __MSABI_LONG(0x0010)
+#define CBS_OWNERDRAWVARIABLE __MSABI_LONG(0x0020)
+#define CBS_AUTOHSCROLL __MSABI_LONG(0x0040)
+#define CBS_OEMCONVERT __MSABI_LONG(0x0080)
+#define CBS_SORT __MSABI_LONG(0x0100)
+#define CBS_HASSTRINGS __MSABI_LONG(0x0200)
+#define CBS_NOINTEGRALHEIGHT __MSABI_LONG(0x0400)
+#define CBS_DISABLENOSCROLL __MSABI_LONG(0x0800)
+#define CBS_UPPERCASE __MSABI_LONG(0x2000)
+#define CBS_LOWERCASE __MSABI_LONG(0x4000)
 #endif
 
 #ifndef NOWINMESSAGES
@@ -4031,16 +4031,16 @@
 
 #ifndef NOWINSTYLES
 
-#define SBS_HORZ 0x0000L
-#define SBS_VERT 0x0001L
-#define SBS_TOPALIGN 0x0002L
-#define SBS_LEFTALIGN 0x0002L
-#define SBS_BOTTOMALIGN 0x0004L
-#define SBS_RIGHTALIGN 0x0004L
-#define SBS_SIZEBOXTOPLEFTALIGN 0x0002L
-#define SBS_SIZEBOXBOTTOMRIGHTALIGN 0x0004L
-#define SBS_SIZEBOX 0x0008L
-#define SBS_SIZEGRIP 0x0010L
+#define SBS_HORZ __MSABI_LONG(0x0000)
+#define SBS_VERT __MSABI_LONG(0x0001)
+#define SBS_TOPALIGN __MSABI_LONG(0x0002)
+#define SBS_LEFTALIGN __MSABI_LONG(0x0002)
+#define SBS_BOTTOMALIGN __MSABI_LONG(0x0004)
+#define SBS_RIGHTALIGN __MSABI_LONG(0x0004)
+#define SBS_SIZEBOXTOPLEFTALIGN __MSABI_LONG(0x0002)
+#define SBS_SIZEBOXBOTTOMRIGHTALIGN __MSABI_LONG(0x0004)
+#define SBS_SIZEBOX __MSABI_LONG(0x0008)
+#define SBS_SIZEGRIP __MSABI_LONG(0x0010)
 #endif
 
 #ifndef NOWINMESSAGES
@@ -4500,19 +4500,19 @@
 #endif
 #endif
 
-#define ARW_BOTTOMLEFT 0x0000L
-#define ARW_BOTTOMRIGHT 0x0001L
-#define ARW_TOPLEFT 0x0002L
-#define ARW_TOPRIGHT 0x0003L
-#define ARW_STARTMASK 0x0003L
-#define ARW_STARTRIGHT 0x0001L
-#define ARW_STARTTOP 0x0002L
+#define ARW_BOTTOMLEFT __MSABI_LONG(0x0000)
+#define ARW_BOTTOMRIGHT __MSABI_LONG(0x0001)
+#define ARW_TOPLEFT __MSABI_LONG(0x0002)
+#define ARW_TOPRIGHT __MSABI_LONG(0x0003)
+#define ARW_STARTMASK __MSABI_LONG(0x0003)
+#define ARW_STARTRIGHT __MSABI_LONG(0x0001)
+#define ARW_STARTTOP __MSABI_LONG(0x0002)
 
-#define ARW_LEFT 0x0000L
-#define ARW_RIGHT 0x0000L
-#define ARW_UP 0x0004L
-#define ARW_DOWN 0x0004L
-#define ARW_HIDE 0x0008L
+#define ARW_LEFT __MSABI_LONG(0x0000)
+#define ARW_RIGHT __MSABI_LONG(0x0000)
+#define ARW_UP __MSABI_LONG(0x0004)
+#define ARW_DOWN __MSABI_LONG(0x0004)
+#define ARW_HIDE __MSABI_LONG(0x0008)
 
   typedef struct tagMINIMIZEDMETRICS {
     UINT cbSize;
diff --git a/mingw-w64-headers/include/winver.h b/mingw-w64-headers/include/winver.h
index 5d056b8..cfb1ab6 100644
--- a/mingw-w64-headers/include/winver.h
+++ b/mingw-w64-headers/include/winver.h
@@ -16,61 +16,61 @@
 #define VS_VERSION_INFO 1
 #define VS_USER_DEFINED 100
 
-#define VS_FFI_SIGNATURE 0xFEEF04BDL
-#define VS_FFI_STRUCVERSION 0x00010000L
-#define VS_FFI_FILEFLAGSMASK 0x0000003FL
+#define VS_FFI_SIGNATURE __MSABI_LONG(0xFEEF04BD)
+#define VS_FFI_STRUCVERSION __MSABI_LONG(0x00010000)
+#define VS_FFI_FILEFLAGSMASK __MSABI_LONG(0x0000003F)
 
-#define VS_FF_DEBUG 0x00000001L
-#define VS_FF_PRERELEASE 0x00000002L
-#define VS_FF_PATCHED 0x00000004L
-#define VS_FF_PRIVATEBUILD 0x00000008L
-#define VS_FF_INFOINFERRED 0x00000010L
-#define VS_FF_SPECIALBUILD 0x00000020L
+#define VS_FF_DEBUG __MSABI_LONG(0x00000001)
+#define VS_FF_PRERELEASE __MSABI_LONG(0x00000002)
+#define VS_FF_PATCHED __MSABI_LONG(0x00000004)
+#define VS_FF_PRIVATEBUILD __MSABI_LONG(0x00000008)
+#define VS_FF_INFOINFERRED __MSABI_LONG(0x00000010)
+#define VS_FF_SPECIALBUILD __MSABI_LONG(0x00000020)
 
-#define VOS_UNKNOWN 0x00000000L
-#define VOS_DOS 0x00010000L
-#define VOS_OS216 0x00020000L
-#define VOS_OS232 0x00030000L
-#define VOS_NT 0x00040000L
-#define VOS_WINCE 0x00050000L
+#define VOS_UNKNOWN __MSABI_LONG(0x00000000)
+#define VOS_DOS __MSABI_LONG(0x00010000)
+#define VOS_OS216 __MSABI_LONG(0x00020000)
+#define VOS_OS232 __MSABI_LONG(0x00030000)
+#define VOS_NT __MSABI_LONG(0x00040000)
+#define VOS_WINCE __MSABI_LONG(0x00050000)
 
-#define VOS__BASE 0x00000000L
-#define VOS__WINDOWS16 0x00000001L
-#define VOS__PM16 0x00000002L
-#define VOS__PM32 0x00000003L
-#define VOS__WINDOWS32 0x00000004L
+#define VOS__BASE __MSABI_LONG(0x00000000)
+#define VOS__WINDOWS16 __MSABI_LONG(0x00000001)
+#define VOS__PM16 __MSABI_LONG(0x00000002)
+#define VOS__PM32 __MSABI_LONG(0x00000003)
+#define VOS__WINDOWS32 __MSABI_LONG(0x00000004)
 
-#define VOS_DOS_WINDOWS16 0x00010001L
-#define VOS_DOS_WINDOWS32 0x00010004L
-#define VOS_OS216_PM16 0x00020002L
-#define VOS_OS232_PM32 0x00030003L
-#define VOS_NT_WINDOWS32 0x00040004L
+#define VOS_DOS_WINDOWS16 __MSABI_LONG(0x00010001)
+#define VOS_DOS_WINDOWS32 __MSABI_LONG(0x00010004)
+#define VOS_OS216_PM16 __MSABI_LONG(0x00020002)
+#define VOS_OS232_PM32 __MSABI_LONG(0x00030003)
+#define VOS_NT_WINDOWS32 __MSABI_LONG(0x00040004)
 
-#define VFT_UNKNOWN 0x00000000L
-#define VFT_APP 0x00000001L
-#define VFT_DLL 0x00000002L
-#define VFT_DRV 0x00000003L
-#define VFT_FONT 0x00000004L
-#define VFT_VXD 0x00000005L
-#define VFT_STATIC_LIB 0x00000007L
+#define VFT_UNKNOWN __MSABI_LONG(0x00000000)
+#define VFT_APP __MSABI_LONG(0x00000001)
+#define VFT_DLL __MSABI_LONG(0x00000002)
+#define VFT_DRV __MSABI_LONG(0x00000003)
+#define VFT_FONT __MSABI_LONG(0x00000004)
+#define VFT_VXD __MSABI_LONG(0x00000005)
+#define VFT_STATIC_LIB __MSABI_LONG(0x00000007)
 
-#define VFT2_UNKNOWN 0x00000000L
-#define VFT2_DRV_PRINTER 0x00000001L
-#define VFT2_DRV_KEYBOARD 0x00000002L
-#define VFT2_DRV_LANGUAGE 0x00000003L
-#define VFT2_DRV_DISPLAY 0x00000004L
-#define VFT2_DRV_MOUSE 0x00000005L
-#define VFT2_DRV_NETWORK 0x00000006L
-#define VFT2_DRV_SYSTEM 0x00000007L
-#define VFT2_DRV_INSTALLABLE 0x00000008L
-#define VFT2_DRV_SOUND 0x00000009L
-#define VFT2_DRV_COMM 0x0000000AL
-#define VFT2_DRV_INPUTMETHOD 0x0000000BL
-#define VFT2_DRV_VERSIONED_PRINTER 0x0000000CL
+#define VFT2_UNKNOWN __MSABI_LONG(0x00000000)
+#define VFT2_DRV_PRINTER __MSABI_LONG(0x00000001)
+#define VFT2_DRV_KEYBOARD __MSABI_LONG(0x00000002)
+#define VFT2_DRV_LANGUAGE __MSABI_LONG(0x00000003)
+#define VFT2_DRV_DISPLAY __MSABI_LONG(0x00000004)
+#define VFT2_DRV_MOUSE __MSABI_LONG(0x00000005)
+#define VFT2_DRV_NETWORK __MSABI_LONG(0x00000006)
+#define VFT2_DRV_SYSTEM __MSABI_LONG(0x00000007)
+#define VFT2_DRV_INSTALLABLE __MSABI_LONG(0x00000008)
+#define VFT2_DRV_SOUND __MSABI_LONG(0x00000009)
+#define VFT2_DRV_COMM __MSABI_LONG(0x0000000A)
+#define VFT2_DRV_INPUTMETHOD __MSABI_LONG(0x0000000B)
+#define VFT2_DRV_VERSIONED_PRINTER __MSABI_LONG(0x0000000C)
 
-#define VFT2_FONT_RASTER 0x00000001L
-#define VFT2_FONT_VECTOR 0x00000002L
-#define VFT2_FONT_TRUETYPE 0x00000003L
+#define VFT2_FONT_RASTER __MSABI_LONG(0x00000001)
+#define VFT2_FONT_VECTOR __MSABI_LONG(0x00000002)
+#define VFT2_FONT_TRUETYPE __MSABI_LONG(0x00000003)
 
 #define VFFF_ISSHAREDFILE 0x0001
 
@@ -81,31 +81,31 @@
 #define VIFF_FORCEINSTALL 0x0001
 #define VIFF_DONTDELETEOLD 0x0002
 
-#define VIF_TEMPFILE 0x00000001L
-#define VIF_MISMATCH 0x00000002L
-#define VIF_SRCOLD 0x00000004L
+#define VIF_TEMPFILE __MSABI_LONG(0x00000001)
+#define VIF_MISMATCH __MSABI_LONG(0x00000002)
+#define VIF_SRCOLD __MSABI_LONG(0x00000004)
 
-#define VIF_DIFFLANG 0x00000008L
-#define VIF_DIFFCODEPG 0x00000010L
-#define VIF_DIFFTYPE 0x00000020L
+#define VIF_DIFFLANG __MSABI_LONG(0x00000008)
+#define VIF_DIFFCODEPG __MSABI_LONG(0x00000010)
+#define VIF_DIFFTYPE __MSABI_LONG(0x00000020)
 
-#define VIF_WRITEPROT 0x00000040L
-#define VIF_FILEINUSE 0x00000080L
-#define VIF_OUTOFSPACE 0x00000100L
-#define VIF_ACCESSVIOLATION 0x00000200L
-#define VIF_SHARINGVIOLATION 0x00000400L
-#define VIF_CANNOTCREATE 0x00000800L
-#define VIF_CANNOTDELETE 0x00001000L
-#define VIF_CANNOTRENAME 0x00002000L
-#define VIF_CANNOTDELETECUR 0x00004000L
-#define VIF_OUTOFMEMORY 0x00008000L
+#define VIF_WRITEPROT __MSABI_LONG(0x00000040)
+#define VIF_FILEINUSE __MSABI_LONG(0x00000080)
+#define VIF_OUTOFSPACE __MSABI_LONG(0x00000100)
+#define VIF_ACCESSVIOLATION __MSABI_LONG(0x00000200)
+#define VIF_SHARINGVIOLATION __MSABI_LONG(0x00000400)
+#define VIF_CANNOTCREATE __MSABI_LONG(0x00000800)
+#define VIF_CANNOTDELETE __MSABI_LONG(0x00001000)
+#define VIF_CANNOTRENAME __MSABI_LONG(0x00002000)
+#define VIF_CANNOTDELETECUR __MSABI_LONG(0x00004000)
+#define VIF_OUTOFMEMORY __MSABI_LONG(0x00008000)
 
-#define VIF_CANNOTREADSRC 0x00010000L
-#define VIF_CANNOTREADDST 0x00020000L
+#define VIF_CANNOTREADSRC __MSABI_LONG(0x00010000)
+#define VIF_CANNOTREADDST __MSABI_LONG(0x00020000)
 
-#define VIF_BUFFTOOSMALL 0x00040000L
-#define VIF_CANNOTLOADLZ32 0x00080000L
-#define VIF_CANNOTLOADCABINET 0x00100000L
+#define VIF_BUFFTOOSMALL __MSABI_LONG(0x00040000)
+#define VIF_CANNOTLOADLZ32 __MSABI_LONG(0x00080000)
+#define VIF_CANNOTLOADCABINET __MSABI_LONG(0x00100000)
 
 #ifndef RC_INVOKED
 
diff --git a/mingw-w64-headers/include/wownt16.h b/mingw-w64-headers/include/wownt16.h
index 46d41bc..f481885 100644
--- a/mingw-w64-headers/include/wownt16.h
+++ b/mingw-w64-headers/include/wownt16.h
@@ -16,8 +16,8 @@
   DWORD WINAPI FreeLibrary32W(DWORD hLibModule);
   DWORD CDECL CallProcEx32W(DWORD,DWORD,DWORD,...);
 
-#define CPEX_DEST_STDCALL 0x00000000L
-#define CPEX_DEST_CDECL 0x80000000L
+#define CPEX_DEST_STDCALL __MSABI_LONG(0x00000000)
+#define CPEX_DEST_CDECL __MSABI_LONG(0x80000000)
 
 #ifdef __cplusplus
 }
diff --git a/mingw-w64-headers/include/wpapimsg.h b/mingw-w64-headers/include/wpapimsg.h
index 2f9e2fb..e4728bb 100644
--- a/mingw-w64-headers/include/wpapimsg.h
+++ b/mingw-w64-headers/include/wpapimsg.h
@@ -3,30 +3,30 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define WEBPOST_ERROR_FIRST 0x40042100L
-#define WEBPOST_ERROR_UNKNOWN 0xC0042101L
-#define WEBPOST_ERROR_PROVCLSID_UNKNOWN 0xC0042102L
-#define WEBPOST_ERROR_SITE_CORRUPT 0xC0042103L
-#define WEBPOST_ERROR_PROV_CORRUPT 0xC0042104L
-#define WEBPOST_ERROR_PROV_DLL 0xC0042105L
-#define WEBPOST_ERROR_PROV_EP 0xC0042106L
-#define WEBPOST_ERROR_INIT_FAILED 0xC0042107L
-#define WEBPOST_ERROR_LIST_SITES 0xC0042108L
-#define WEBPOST_ERROR_SITE_EXISTS 0xC0042109L
-#define WEBPOST_ERROR_CREATE_SITE 0xC004210AL
-#define WEBPOST_ERROR_SITE_DOESNOTEXIST 0xC004210BL
-#define WEBPOST_ERROR_DELETE_SITE 0xC004210CL
-#define WEBPOST_ERROR_ENUM_PROVS 0xC004210DL
-#define WEBPOST_ERROR_PROV_QI 0xC004210EL
-#define WEBPOST_ERROR_POST_FILES 0xC004210FL
-#define WEBPOST_ERROR_COCREATE_WIZARD 0xC0042110L
-#define WEBPOST_ERROR_POSTINFO_REQUIRED 0xC0042111L
-#define WEBPOST_ERROR_AUTOBIND_FAILED 0xC0042112L
-#define WEBPOST_ERROR_BAD_PROV_PTR 0xC0042113L
-#define WEBPOST_ERROR_PROV_NOT_IN_POSTINFO 0x80042114L
-#define WEBPOST_ERROR_EXTENDED_ERROR 0xC0042116L
-#define WEBPOST_ERROR_NO_EXT_ERR_INFO 0xC0042117L
-#define WEBPOST_ERROR_INVALID_POSTINFO 0x40042118L
-#define WEBPOST_ERROR_NO_POSTINFO 0x40042119L
-#define WEBPOST_ERROR_HTTP_GET_FAILED 0x4004211AL
-#define WEBPOST_ERROR_LAST 0x400421FFL
+#define WEBPOST_ERROR_FIRST __MSABI_LONG(0x40042100)
+#define WEBPOST_ERROR_UNKNOWN __MSABI_LONG(0xC0042101)
+#define WEBPOST_ERROR_PROVCLSID_UNKNOWN __MSABI_LONG(0xC0042102)
+#define WEBPOST_ERROR_SITE_CORRUPT __MSABI_LONG(0xC0042103)
+#define WEBPOST_ERROR_PROV_CORRUPT __MSABI_LONG(0xC0042104)
+#define WEBPOST_ERROR_PROV_DLL __MSABI_LONG(0xC0042105)
+#define WEBPOST_ERROR_PROV_EP __MSABI_LONG(0xC0042106)
+#define WEBPOST_ERROR_INIT_FAILED __MSABI_LONG(0xC0042107)
+#define WEBPOST_ERROR_LIST_SITES __MSABI_LONG(0xC0042108)
+#define WEBPOST_ERROR_SITE_EXISTS __MSABI_LONG(0xC0042109)
+#define WEBPOST_ERROR_CREATE_SITE __MSABI_LONG(0xC004210A)
+#define WEBPOST_ERROR_SITE_DOESNOTEXIST __MSABI_LONG(0xC004210B)
+#define WEBPOST_ERROR_DELETE_SITE __MSABI_LONG(0xC004210C)
+#define WEBPOST_ERROR_ENUM_PROVS __MSABI_LONG(0xC004210D)
+#define WEBPOST_ERROR_PROV_QI __MSABI_LONG(0xC004210E)
+#define WEBPOST_ERROR_POST_FILES __MSABI_LONG(0xC004210F)
+#define WEBPOST_ERROR_COCREATE_WIZARD __MSABI_LONG(0xC0042110)
+#define WEBPOST_ERROR_POSTINFO_REQUIRED __MSABI_LONG(0xC0042111)
+#define WEBPOST_ERROR_AUTOBIND_FAILED __MSABI_LONG(0xC0042112)
+#define WEBPOST_ERROR_BAD_PROV_PTR __MSABI_LONG(0xC0042113)
+#define WEBPOST_ERROR_PROV_NOT_IN_POSTINFO __MSABI_LONG(0x80042114)
+#define WEBPOST_ERROR_EXTENDED_ERROR __MSABI_LONG(0xC0042116)
+#define WEBPOST_ERROR_NO_EXT_ERR_INFO __MSABI_LONG(0xC0042117)
+#define WEBPOST_ERROR_INVALID_POSTINFO __MSABI_LONG(0x40042118)
+#define WEBPOST_ERROR_NO_POSTINFO __MSABI_LONG(0x40042119)
+#define WEBPOST_ERROR_HTTP_GET_FAILED __MSABI_LONG(0x4004211A)
+#define WEBPOST_ERROR_LAST __MSABI_LONG(0x400421FF)
diff --git a/mingw-w64-headers/include/wpcrsmsg.h b/mingw-w64-headers/include/wpcrsmsg.h
index 0daf6c8..df01538 100644
--- a/mingw-w64-headers/include/wpcrsmsg.h
+++ b/mingw-w64-headers/include/wpcrsmsg.h
@@ -3,14 +3,14 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define CRSWPP_ERROR_FIRST 0x40042200L
-#define CRSWPP_INVALID_POSTINFO_FILE 0xC0042201L
-#define CRSWPP_NO_MATCHING_MAPURL 0xC0042202L
-#define CRSWPP_SECURITY_PACKAGE 0xC0042203L
-#define CRSWPP_SECURITY_PACKAGE_NOT_FOUND 0xC0042204L
-#define CRSWPP_PROJECT_BINDING_INCOMPLETE 0xC0042205L
-#define CRSWPP_SERVER_BINDING_INCOMPLETE 0xC0042206L
-#define CRSWPP_SERVER_NOT_RESPONDING 0xC0042207L
-#define CRSWPP_FAILED_AUTH 0xC0042208L
-#define CRSWPP_POSTINFO_NEEDED 0x40042209L
-#define CRSWPP_BIND_FAILED 0xC004220AL
+#define CRSWPP_ERROR_FIRST __MSABI_LONG(0x40042200)
+#define CRSWPP_INVALID_POSTINFO_FILE __MSABI_LONG(0xC0042201)
+#define CRSWPP_NO_MATCHING_MAPURL __MSABI_LONG(0xC0042202)
+#define CRSWPP_SECURITY_PACKAGE __MSABI_LONG(0xC0042203)
+#define CRSWPP_SECURITY_PACKAGE_NOT_FOUND __MSABI_LONG(0xC0042204)
+#define CRSWPP_PROJECT_BINDING_INCOMPLETE __MSABI_LONG(0xC0042205)
+#define CRSWPP_SERVER_BINDING_INCOMPLETE __MSABI_LONG(0xC0042206)
+#define CRSWPP_SERVER_NOT_RESPONDING __MSABI_LONG(0xC0042207)
+#define CRSWPP_FAILED_AUTH __MSABI_LONG(0xC0042208)
+#define CRSWPP_POSTINFO_NEEDED __MSABI_LONG(0x40042209)
+#define CRSWPP_BIND_FAILED __MSABI_LONG(0xC004220A)
diff --git a/mingw-w64-headers/include/wpftpmsg.h b/mingw-w64-headers/include/wpftpmsg.h
index cab957d..b2e0f9c 100644
--- a/mingw-w64-headers/include/wpftpmsg.h
+++ b/mingw-w64-headers/include/wpftpmsg.h
@@ -3,7 +3,7 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define FTPWPP_ERROR_FIRST 0x40042300L
-#define FTPWPP_ERROR_INETOPEN_FAILED 0xC0042301L
-#define FTPWPP_ERROR_AUTHENTICATION_FAILED 0xC0042302L
-#define FTPWPP_ERROR_LAST 0x400423FFL
+#define FTPWPP_ERROR_FIRST __MSABI_LONG(0x40042300)
+#define FTPWPP_ERROR_INETOPEN_FAILED __MSABI_LONG(0xC0042301)
+#define FTPWPP_ERROR_AUTHENTICATION_FAILED __MSABI_LONG(0xC0042302)
+#define FTPWPP_ERROR_LAST __MSABI_LONG(0x400423FF)
diff --git a/mingw-w64-headers/include/wppstmsg.h b/mingw-w64-headers/include/wppstmsg.h
index d97ab70..dd56ab3 100644
--- a/mingw-w64-headers/include/wppstmsg.h
+++ b/mingw-w64-headers/include/wppstmsg.h
@@ -3,8 +3,8 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define WPP_ERROR_FIRST 0x40042380L
-#define WPP_POST_POSTING_URL_ERROR 0xC0042381L
-#define WPP_POST_POSTING_SERVER_ERROR 0xC0042382L
-#define WPP_POST_POSTING_NO_RESPONSE_ERROR 0xC0042383L
-#define WPP_ERROR_LAST 0x400423FFL
+#define WPP_ERROR_FIRST __MSABI_LONG(0x40042380)
+#define WPP_POST_POSTING_URL_ERROR __MSABI_LONG(0xC0042381)
+#define WPP_POST_POSTING_SERVER_ERROR __MSABI_LONG(0xC0042382)
+#define WPP_POST_POSTING_NO_RESPONSE_ERROR __MSABI_LONG(0xC0042383)
+#define WPP_ERROR_LAST __MSABI_LONG(0x400423FF)
diff --git a/mingw-w64-headers/include/wpwizmsg.h b/mingw-w64-headers/include/wpwizmsg.h
index 6ba863e..7194bb4 100644
--- a/mingw-w64-headers/include/wpwizmsg.h
+++ b/mingw-w64-headers/include/wpwizmsg.h
@@ -3,15 +3,15 @@
  * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#define WPWIZ_ERROR_FIRST 0x40042000L
-#define WPWIZ_ERROR_UNKNOWN 0xC0042001L
-#define WPWIZ_ERROR_PROV_QI 0xC0042002L
-#define WPWIZ_ERROR_INIT_FAILED 0xC0042003L
-#define WPWIZ_ERROR_COCREATE_WEBPOST 0xC0042004L
-#define WPWIZ_ERROR_NO_PROVIDERS 0xC0042005L
-#define WPWIZ_ERROR_STATE_PTR 0xC0042006L
-#define WPWIZ_ERROR_WEBPOST_PTR 0xC0042007L
-#define WPWIZ_ERROR_FILE_NOT_FOUND 0xC0042008L
-#define WPWIZ_ERROR_PROPSHEET_ERROR 0xC0042009L
-#define WPWIZ_ERROR_OUTOFMEMORY 0xC004200AL
-#define WPWIZ_ERROR_LAST 0x400420FFL
+#define WPWIZ_ERROR_FIRST __MSABI_LONG(0x40042000)
+#define WPWIZ_ERROR_UNKNOWN __MSABI_LONG(0xC0042001)
+#define WPWIZ_ERROR_PROV_QI __MSABI_LONG(0xC0042002)
+#define WPWIZ_ERROR_INIT_FAILED __MSABI_LONG(0xC0042003)
+#define WPWIZ_ERROR_COCREATE_WEBPOST __MSABI_LONG(0xC0042004)
+#define WPWIZ_ERROR_NO_PROVIDERS __MSABI_LONG(0xC0042005)
+#define WPWIZ_ERROR_STATE_PTR __MSABI_LONG(0xC0042006)
+#define WPWIZ_ERROR_WEBPOST_PTR __MSABI_LONG(0xC0042007)
+#define WPWIZ_ERROR_FILE_NOT_FOUND __MSABI_LONG(0xC0042008)
+#define WPWIZ_ERROR_PROPSHEET_ERROR __MSABI_LONG(0xC0042009)
+#define WPWIZ_ERROR_OUTOFMEMORY __MSABI_LONG(0xC004200A)
+#define WPWIZ_ERROR_LAST __MSABI_LONG(0x400420FF)
diff --git a/mingw-w64-headers/include/ws2spi.h b/mingw-w64-headers/include/ws2spi.h
index d8f55d2..4956e7a 100644
--- a/mingw-w64-headers/include/ws2spi.h
+++ b/mingw-w64-headers/include/ws2spi.h
@@ -14,7 +14,7 @@
 
 #define WSPDESCRIPTION_LEN 255
 
-#define WSS_OPERATION_IN_PROGRESS 0x00000103L
+#define WSS_OPERATION_IN_PROGRESS __MSABI_LONG(0x00000103)
 
 typedef struct WSPData {
   WORD wVersion;
diff --git a/mingw-w64-headers/include/xa.h b/mingw-w64-headers/include/xa.h
index d60cc3a..76efd7d 100644
--- a/mingw-w64-headers/include/xa.h
+++ b/mingw-w64-headers/include/xa.h
@@ -57,23 +57,23 @@
 typedef struct xa_switch_t xa_switch_t;
 #endif
 
-#define TMNOFLAGS 0x00000000L
-#define TMREGISTER 0x00000001L
-#define TMNOMIGRATE 0x00000002L
-#define TMUSEASYNC 0x00000004L
+#define TMNOFLAGS __MSABI_LONG(0x00000000)
+#define TMREGISTER __MSABI_LONG(0x00000001)
+#define TMNOMIGRATE __MSABI_LONG(0x00000002)
+#define TMUSEASYNC __MSABI_LONG(0x00000004)
 
-#define TMASYNC 0x80000000L
-#define TMONEPHASE 0x40000000L
-#define TMFAIL 0x20000000L
-#define TMNOWAIT 0x10000000L
-#define TMRESUME 0x08000000L
-#define TMSUCCESS 0x04000000L
-#define TMSUSPEND 0x02000000L
-#define TMSTARTRSCAN 0x01000000L
-#define TMENDRSCAN 0x00800000L
-#define TMMULTIPLE 0x00400000L
-#define TMJOIN 0x00200000L
-#define TMMIGRATE 0x00100000L
+#define TMASYNC __MSABI_LONG(0x80000000)
+#define TMONEPHASE __MSABI_LONG(0x40000000)
+#define TMFAIL __MSABI_LONG(0x20000000)
+#define TMNOWAIT __MSABI_LONG(0x10000000)
+#define TMRESUME __MSABI_LONG(0x08000000)
+#define TMSUCCESS __MSABI_LONG(0x04000000)
+#define TMSUSPEND __MSABI_LONG(0x02000000)
+#define TMSTARTRSCAN __MSABI_LONG(0x01000000)
+#define TMENDRSCAN __MSABI_LONG(0x00800000)
+#define TMMULTIPLE __MSABI_LONG(0x00400000)
+#define TMJOIN __MSABI_LONG(0x00200000)
+#define TMMIGRATE __MSABI_LONG(0x00100000)
 
 #define TM_JOIN 2
 #define TM_RESUME 1