Updated headers imported from wine (includes __MSABI_LONG macro) git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4570 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/_mingw_mac.h b/mingw-w64-headers/crt/_mingw_mac.h index 54441e8..504c429 100644 --- a/mingw-w64-headers/crt/_mingw_mac.h +++ b/mingw-w64-headers/crt/_mingw_mac.h
@@ -151,5 +151,9 @@ __IFACE##_layout_has_not_been_verified_and_its_declaration_is_most_likely_incorrect #endif +#ifndef __MSABI_LONG +#define __MSABI_LONG(x) x ## l +#endif + #endif /* _INC_CRTDEFS_MACRO */
diff --git a/mingw-w64-headers/direct-x/include/d3d.h b/mingw-w64-headers/direct-x/include/d3d.h index ce74cc8..1cc57a8 100644 --- a/mingw-w64-headers/direct-x/include/d3d.h +++ b/mingw-w64-headers/direct-x/include/d3d.h
@@ -184,15 +184,15 @@ /* ******************************************************************** Enums ******************************************************************** */ -#define D3DNEXT_NEXT 0x01l -#define D3DNEXT_HEAD 0x02l -#define D3DNEXT_TAIL 0x04l +#define D3DNEXT_NEXT __MSABI_LONG(0x01) +#define D3DNEXT_HEAD __MSABI_LONG(0x02) +#define D3DNEXT_TAIL __MSABI_LONG(0x04) -#define D3DDP_WAIT 0x00000001l -#define D3DDP_OUTOFORDER 0x00000002l -#define D3DDP_DONOTCLIP 0x00000004l -#define D3DDP_DONOTUPDATEEXTENTS 0x00000008l -#define D3DDP_DONOTLIGHT 0x00000010l +#define D3DDP_WAIT __MSABI_LONG(0x00000001) +#define D3DDP_OUTOFORDER __MSABI_LONG(0x00000002) +#define D3DDP_DONOTCLIP __MSABI_LONG(0x00000004) +#define D3DDP_DONOTUPDATEEXTENTS __MSABI_LONG(0x00000008) +#define D3DDP_DONOTLIGHT __MSABI_LONG(0x00000010) /* ******************************************************************** Types and structures
diff --git a/mingw-w64-headers/direct-x/include/d3d8.h b/mingw-w64-headers/direct-x/include/d3d8.h index 16d1cbb..932cb63 100644 --- a/mingw-w64-headers/direct-x/include/d3d8.h +++ b/mingw-w64-headers/direct-x/include/d3d8.h
@@ -39,17 +39,17 @@ /***************************************************************************** * Behavior Flags for IDirect3D8::CreateDevice */ -#define D3DCREATE_FPU_PRESERVE 0x00000002L -#define D3DCREATE_MULTITHREADED 0x00000004L -#define D3DCREATE_PUREDEVICE 0x00000010L -#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020L -#define D3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040L -#define D3DCREATE_MIXED_VERTEXPROCESSING 0x00000080L +#define D3DCREATE_FPU_PRESERVE __MSABI_LONG(0x00000002) +#define D3DCREATE_MULTITHREADED __MSABI_LONG(0x00000004) +#define D3DCREATE_PUREDEVICE __MSABI_LONG(0x00000010) +#define D3DCREATE_SOFTWARE_VERTEXPROCESSING __MSABI_LONG(0x00000020) +#define D3DCREATE_HARDWARE_VERTEXPROCESSING __MSABI_LONG(0x00000040) +#define D3DCREATE_MIXED_VERTEXPROCESSING __MSABI_LONG(0x00000080) /***************************************************************************** * Flags for SetPrivateData */ -#define D3DSPD_IUNKNOWN 0x00000001L +#define D3DSPD_IUNKNOWN __MSABI_LONG(0x00000001) /***************************************************************************** * #defines and error codes
diff --git a/mingw-w64-headers/direct-x/include/d3d8types.h b/mingw-w64-headers/direct-x/include/d3d8types.h index 9d82cd8..c70fea9 100644 --- a/mingw-w64-headers/direct-x/include/d3d8types.h +++ b/mingw-w64-headers/direct-x/include/d3d8types.h
@@ -142,10 +142,10 @@ #define D3DTA_ALPHAREPLICATE 0x00000020 #define D3DTA_TEMP 0x00000005 -#define D3DCOLORWRITEENABLE_RED (1L<<0) -#define D3DCOLORWRITEENABLE_GREEN (1L<<1) -#define D3DCOLORWRITEENABLE_BLUE (1L<<2) -#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) +#define D3DCOLORWRITEENABLE_RED (__MSABI_LONG(1)<<0) +#define D3DCOLORWRITEENABLE_GREEN (__MSABI_LONG(1)<<1) +#define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2) +#define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3) #ifndef MAKEFOURCC
diff --git a/mingw-w64-headers/direct-x/include/d3d9.h b/mingw-w64-headers/direct-x/include/d3d9.h index fba2746..a26fac5 100644 --- a/mingw-w64-headers/direct-x/include/d3d9.h +++ b/mingw-w64-headers/direct-x/include/d3d9.h
@@ -40,19 +40,19 @@ /***************************************************************************** * Behavior Flags for IDirect3D8::CreateDevice */ -#define D3DCREATE_FPU_PRESERVE 0x00000002L -#define D3DCREATE_MULTITHREADED 0x00000004L -#define D3DCREATE_PUREDEVICE 0x00000010L -#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020L -#define D3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040L -#define D3DCREATE_MIXED_VERTEXPROCESSING 0x00000080L -#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100L -#define D3DCREATE_ADAPTERGROUP_DEVICE 0x00000200L +#define D3DCREATE_FPU_PRESERVE __MSABI_LONG(0x00000002) +#define D3DCREATE_MULTITHREADED __MSABI_LONG(0x00000004) +#define D3DCREATE_PUREDEVICE __MSABI_LONG(0x00000010) +#define D3DCREATE_SOFTWARE_VERTEXPROCESSING __MSABI_LONG(0x00000020) +#define D3DCREATE_HARDWARE_VERTEXPROCESSING __MSABI_LONG(0x00000040) +#define D3DCREATE_MIXED_VERTEXPROCESSING __MSABI_LONG(0x00000080) +#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT __MSABI_LONG(0x00000100) +#define D3DCREATE_ADAPTERGROUP_DEVICE __MSABI_LONG(0x00000200) /***************************************************************************** * Flags for SetPrivateData */ -#define D3DSPD_IUNKNOWN 0x00000001L +#define D3DSPD_IUNKNOWN __MSABI_LONG(0x00000001) /***************************************************************************** @@ -60,10 +60,10 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL 0x00000002L -#define D3DPRESENT_BACK_BUFFERS_MAX 3L -#define D3DSGR_NO_CALIBRATION 0x00000000L -#define D3DSGR_CALIBRATE 0x00000001L +#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) +#define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code )
diff --git a/mingw-w64-headers/direct-x/include/d3d9caps.h b/mingw-w64-headers/direct-x/include/d3d9caps.h index 8ed6598..838e1f3 100644 --- a/mingw-w64-headers/direct-x/include/d3d9caps.h +++ b/mingw-w64-headers/direct-x/include/d3d9caps.h
@@ -29,13 +29,13 @@ #define D3DCURSORCAPS_LOWRES 2 -#define D3DDEVCAPS2_STREAMOFFSET 0x00000001L -#define D3DDEVCAPS2_DMAPNPATCH 0x00000002L -#define D3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004L -#define D3DDEVCAPS2_ADAPTIVETESSNPATCH 0x00000008L -#define D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES 0x00000010L -#define D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH 0x00000020L -#define D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET 0x00000040L +#define D3DDEVCAPS2_STREAMOFFSET __MSABI_LONG(0x00000001) +#define D3DDEVCAPS2_DMAPNPATCH __MSABI_LONG(0x00000002) +#define D3DDEVCAPS2_ADAPTIVETESSRTPATCH __MSABI_LONG(0x00000004) +#define D3DDEVCAPS2_ADAPTIVETESSNPATCH __MSABI_LONG(0x00000008) +#define D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES __MSABI_LONG(0x00000010) +#define D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH __MSABI_LONG(0x00000020) +#define D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET __MSABI_LONG(0x00000040) #define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x0000010 #define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x0000020 @@ -93,45 +93,45 @@ #define D3DPCMPCAPS_GREATEREQUAL 0x40 #define D3DPCMPCAPS_ALWAYS 0x80 -#define D3DPMISCCAPS_MASKZ 0x00000002L -#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004L -#define D3DPMISCCAPS_CULLNONE 0x00000010L -#define D3DPMISCCAPS_CULLCW 0x00000020L -#define D3DPMISCCAPS_CULLCCW 0x00000040L -#define D3DPMISCCAPS_COLORWRITEENABLE 0x00000080L -#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100L -#define D3DPMISCCAPS_CLIPTLVERTS 0x00000200L -#define D3DPMISCCAPS_TSSARGTEMP 0x00000400L -#define D3DPMISCCAPS_BLENDOP 0x00000800L -#define D3DPMISCCAPS_NULLREFERENCE 0x00001000L -#define D3DPMISCCAPS_INDEPENDENTWRITEMASKS 0x00004000L -#define D3DPMISCCAPS_PERSTAGECONSTANT 0x00008000L -#define D3DPMISCCAPS_FOGANDSPECULARALPHA 0x00010000L -#define D3DPMISCCAPS_SEPARATEALPHABLEND 0x00020000L -#define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000L -#define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000L -#define D3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000L +#define D3DPMISCCAPS_MASKZ __MSABI_LONG(0x00000002) +#define D3DPMISCCAPS_LINEPATTERNREP __MSABI_LONG(0x00000004) +#define D3DPMISCCAPS_CULLNONE __MSABI_LONG(0x00000010) +#define D3DPMISCCAPS_CULLCW __MSABI_LONG(0x00000020) +#define D3DPMISCCAPS_CULLCCW __MSABI_LONG(0x00000040) +#define D3DPMISCCAPS_COLORWRITEENABLE __MSABI_LONG(0x00000080) +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS __MSABI_LONG(0x00000100) +#define D3DPMISCCAPS_CLIPTLVERTS __MSABI_LONG(0x00000200) +#define D3DPMISCCAPS_TSSARGTEMP __MSABI_LONG(0x00000400) +#define D3DPMISCCAPS_BLENDOP __MSABI_LONG(0x00000800) +#define D3DPMISCCAPS_NULLREFERENCE __MSABI_LONG(0x00001000) +#define D3DPMISCCAPS_INDEPENDENTWRITEMASKS __MSABI_LONG(0x00004000) +#define D3DPMISCCAPS_PERSTAGECONSTANT __MSABI_LONG(0x00008000) +#define D3DPMISCCAPS_FOGANDSPECULARALPHA __MSABI_LONG(0x00010000) +#define D3DPMISCCAPS_SEPARATEALPHABLEND __MSABI_LONG(0x00020000) +#define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS __MSABI_LONG(0x00040000) +#define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING __MSABI_LONG(0x00080000) +#define D3DPMISCCAPS_FOGVERTEXCLAMPED __MSABI_LONG(0x00100000) -#define D3DPRASTERCAPS_DITHER 0x00000001L -#define D3DPRASTERCAPS_PAT 0x00000008L -#define D3DPRASTERCAPS_ZTEST 0x00000010L -#define D3DPRASTERCAPS_FOGVERTEX 0x00000080L -#define D3DPRASTERCAPS_FOGTABLE 0x00000100L -#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000L -#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000L -#define D3DPRASTERCAPS_ZBIAS 0x00004000L -#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000L -#define D3DPRASTERCAPS_FOGRANGE 0x00010000L -#define D3DPRASTERCAPS_ANISOTROPY 0x00020000L -#define D3DPRASTERCAPS_WBUFFER 0x00040000L -#define D3DPRASTERCAPS_WFOG 0x00100000L -#define D3DPRASTERCAPS_ZFOG 0x00200000L -#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000L -#define D3DPRASTERCAPS_SCISSORTEST 0x01000000L -#define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS 0x02000000L -#define D3DPRASTERCAPS_DEPTHBIAS 0x04000000L -#define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE 0x08000000L +#define D3DPRASTERCAPS_DITHER __MSABI_LONG(0x00000001) +#define D3DPRASTERCAPS_PAT __MSABI_LONG(0x00000008) +#define D3DPRASTERCAPS_ZTEST __MSABI_LONG(0x00000010) +#define D3DPRASTERCAPS_FOGVERTEX __MSABI_LONG(0x00000080) +#define D3DPRASTERCAPS_FOGTABLE __MSABI_LONG(0x00000100) +#define D3DPRASTERCAPS_ANTIALIASEDGES __MSABI_LONG(0x00001000) +#define D3DPRASTERCAPS_MIPMAPLODBIAS __MSABI_LONG(0x00002000) +#define D3DPRASTERCAPS_ZBIAS __MSABI_LONG(0x00004000) +#define D3DPRASTERCAPS_ZBUFFERLESSHSR __MSABI_LONG(0x00008000) +#define D3DPRASTERCAPS_FOGRANGE __MSABI_LONG(0x00010000) +#define D3DPRASTERCAPS_ANISOTROPY __MSABI_LONG(0x00020000) +#define D3DPRASTERCAPS_WBUFFER __MSABI_LONG(0x00040000) +#define D3DPRASTERCAPS_WFOG __MSABI_LONG(0x00100000) +#define D3DPRASTERCAPS_ZFOG __MSABI_LONG(0x00200000) +#define D3DPRASTERCAPS_COLORPERSPECTIVE __MSABI_LONG(0x00400000) +#define D3DPRASTERCAPS_SCISSORTEST __MSABI_LONG(0x01000000) +#define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS __MSABI_LONG(0x02000000) +#define D3DPRASTERCAPS_DEPTHBIAS __MSABI_LONG(0x04000000) +#define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE __MSABI_LONG(0x08000000) #define D3DPRESENT_INTERVAL_DEFAULT 0x00000000 #define D3DPRESENT_INTERVAL_ONE 0x00000001 @@ -152,22 +152,22 @@ #define D3DPTADDRESSCAPS_INDEPENDENTUV 0x10 #define D3DPTADDRESSCAPS_MIRRORONCE 0x20 -#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001L -#define D3DPTEXTURECAPS_POW2 0x00000002L -#define D3DPTEXTURECAPS_ALPHA 0x00000004L -#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020L -#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040L -#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080L -#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L -#define D3DPTEXTURECAPS_PROJECTED 0x00000400L -#define D3DPTEXTURECAPS_CUBEMAP 0x00000800L -#define D3DPTEXTURECAPS_VOLUMEMAP 0x00002000L -#define D3DPTEXTURECAPS_MIPMAP 0x00004000L -#define D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000L -#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000L -#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000L -#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000L -#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000L +#define D3DPTEXTURECAPS_PERSPECTIVE __MSABI_LONG(0x00000001) +#define D3DPTEXTURECAPS_POW2 __MSABI_LONG(0x00000002) +#define D3DPTEXTURECAPS_ALPHA __MSABI_LONG(0x00000004) +#define D3DPTEXTURECAPS_SQUAREONLY __MSABI_LONG(0x00000020) +#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE __MSABI_LONG(0x00000040) +#define D3DPTEXTURECAPS_ALPHAPALETTE __MSABI_LONG(0x00000080) +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL __MSABI_LONG(0x00000100) +#define D3DPTEXTURECAPS_PROJECTED __MSABI_LONG(0x00000400) +#define D3DPTEXTURECAPS_CUBEMAP __MSABI_LONG(0x00000800) +#define D3DPTEXTURECAPS_VOLUMEMAP __MSABI_LONG(0x00002000) +#define D3DPTEXTURECAPS_MIPMAP __MSABI_LONG(0x00004000) +#define D3DPTEXTURECAPS_MIPVOLUMEMAP __MSABI_LONG(0x00008000) +#define D3DPTEXTURECAPS_MIPCUBEMAP __MSABI_LONG(0x00010000) +#define D3DPTEXTURECAPS_CUBEMAP_POW2 __MSABI_LONG(0x00020000) +#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 __MSABI_LONG(0x00040000) +#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV __MSABI_LONG(0x00200000) #define D3DPTFILTERCAPS_MINFPOINT 0x00000100 #define D3DPTFILTERCAPS_MINFLINEAR 0x00000200 @@ -219,40 +219,40 @@ #define D3DTEXOPCAPS_MULTIPLYADD 0x1000000 #define D3DTEXOPCAPS_LERP 0x2000000 -#define D3DVTXPCAPS_TEXGEN 0x00000001L -#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002L -#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008L -#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010L -#define D3DVTXPCAPS_LOCALVIEWER 0x00000020L -#define D3DVTXPCAPS_TWEENING 0x00000040L -#define D3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100L -#define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200L +#define D3DVTXPCAPS_TEXGEN __MSABI_LONG(0x00000001) +#define D3DVTXPCAPS_MATERIALSOURCE7 __MSABI_LONG(0x00000002) +#define D3DVTXPCAPS_DIRECTIONALLIGHTS __MSABI_LONG(0x00000008) +#define D3DVTXPCAPS_POSITIONALLIGHTS __MSABI_LONG(0x00000010) +#define D3DVTXPCAPS_LOCALVIEWER __MSABI_LONG(0x00000020) +#define D3DVTXPCAPS_TWEENING __MSABI_LONG(0x00000040) +#define D3DVTXPCAPS_TEXGEN_SPHEREMAP __MSABI_LONG(0x00000100) +#define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER __MSABI_LONG(0x00000200) -#define D3DDTCAPS_UBYTE4 0x00000001L -#define D3DDTCAPS_UBYTE4N 0x00000002L -#define D3DDTCAPS_SHORT2N 0x00000004L -#define D3DDTCAPS_SHORT4N 0x00000008L -#define D3DDTCAPS_USHORT2N 0x00000010L -#define D3DDTCAPS_USHORT4N 0x00000020L -#define D3DDTCAPS_UDEC3 0x00000040L -#define D3DDTCAPS_DEC3N 0x00000080L -#define D3DDTCAPS_FLOAT16_2 0x00000100L -#define D3DDTCAPS_FLOAT16_4 0x00000200L +#define D3DDTCAPS_UBYTE4 __MSABI_LONG(0x00000001) +#define D3DDTCAPS_UBYTE4N __MSABI_LONG(0x00000002) +#define D3DDTCAPS_SHORT2N __MSABI_LONG(0x00000004) +#define D3DDTCAPS_SHORT4N __MSABI_LONG(0x00000008) +#define D3DDTCAPS_USHORT2N __MSABI_LONG(0x00000010) +#define D3DDTCAPS_USHORT4N __MSABI_LONG(0x00000020) +#define D3DDTCAPS_UDEC3 __MSABI_LONG(0x00000040) +#define D3DDTCAPS_DEC3N __MSABI_LONG(0x00000080) +#define D3DDTCAPS_FLOAT16_2 __MSABI_LONG(0x00000100) +#define D3DDTCAPS_FLOAT16_4 __MSABI_LONG(0x00000200) -#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L -#define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080L -#define D3DCAPS3_COPY_TO_VIDMEM 0x00000100L -#define D3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200L -#define D3DCAPS3_RESERVED 0x8000001FL +#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD __MSABI_LONG(0x00000020) +#define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION __MSABI_LONG(0x00000080) +#define D3DCAPS3_COPY_TO_VIDMEM __MSABI_LONG(0x00000100) +#define D3DCAPS3_COPY_TO_SYSTEMMEM __MSABI_LONG(0x00000200) +#define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F) -#define D3DCAPS2_NO2DDURING3DSCENE 0x00000002L -#define D3DCAPS2_FULLSCREENGAMMA 0x00020000L -#define D3DCAPS2_CANRENDERWINDOWED 0x00080000L -#define D3DCAPS2_CANCALIBRATEGAMMA 0x00100000L -#define D3DCAPS2_RESERVED 0x02000000L -#define D3DCAPS2_CANMANAGERESOURCE 0x10000000L -#define D3DCAPS2_DYNAMICTEXTURES 0x20000000L -#define D3DCAPS2_CANAUTOGENMIPMAP 0x40000000L +#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002) +#define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000) +#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000) +#define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000) +#define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000) +#define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000) +#define D3DCAPS2_DYNAMICTEXTURES __MSABI_LONG(0x20000000) +#define D3DCAPS2_CANAUTOGENMIPMAP __MSABI_LONG(0x40000000) #define D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH 24
diff --git a/mingw-w64-headers/direct-x/include/d3d9types.h b/mingw-w64-headers/direct-x/include/d3d9types.h index c953282..09cae7d 100644 --- a/mingw-w64-headers/direct-x/include/d3d9types.h +++ b/mingw-w64-headers/direct-x/include/d3d9types.h
@@ -24,9 +24,9 @@ /***************************************************************************** * Direct 3D v9 #defines */ -#define D3DCLEAR_TARGET 0x00000001L -#define D3DCLEAR_ZBUFFER 0x00000002L -#define D3DCLEAR_STENCIL 0x00000004L +#define D3DCLEAR_TARGET __MSABI_LONG(0x00000001) +#define D3DCLEAR_ZBUFFER __MSABI_LONG(0x00000002) +#define D3DCLEAR_STENCIL __MSABI_LONG(0x00000004) #define D3DCLIPPLANE0 (1 << 0) #define D3DCLIPPLANE1 (1 << 1) @@ -42,19 +42,19 @@ #define D3DCOLOR_XYUV(y,u,v) D3DCOLOR_ARGB(0xFF,y,u,v) #define D3DCOLOR_AYUV(a,y,u,v) D3DCOLOR_ARGB(a,y,u,v) -#define D3DCS_LEFT 0x001L -#define D3DCS_RIGHT 0x002L -#define D3DCS_TOP 0x004L -#define D3DCS_BOTTOM 0x008L -#define D3DCS_FRONT 0x010L -#define D3DCS_BACK 0x020L -#define D3DCS_PLANE0 0x040L -#define D3DCS_PLANE1 0x080L -#define D3DCS_PLANE2 0x100L -#define D3DCS_PLANE3 0x200L -#define D3DCS_PLANE4 0x400L -#define D3DCS_PLANE5 0x800L -#define D3DCS_ALL 0xFFFL +#define D3DCS_LEFT __MSABI_LONG(0x001) +#define D3DCS_RIGHT __MSABI_LONG(0x002) +#define D3DCS_TOP __MSABI_LONG(0x004) +#define D3DCS_BOTTOM __MSABI_LONG(0x008) +#define D3DCS_FRONT __MSABI_LONG(0x010) +#define D3DCS_BACK __MSABI_LONG(0x020) +#define D3DCS_PLANE0 __MSABI_LONG(0x040) +#define D3DCS_PLANE1 __MSABI_LONG(0x080) +#define D3DCS_PLANE2 __MSABI_LONG(0x100) +#define D3DCS_PLANE3 __MSABI_LONG(0x200) +#define D3DCS_PLANE4 __MSABI_LONG(0x400) +#define D3DCS_PLANE5 __MSABI_LONG(0x800) +#define D3DCS_ALL __MSABI_LONG(0xFFF) #define D3DFVF_TEXTUREFORMAT1 3 #define D3DFVF_TEXTUREFORMAT2 0 @@ -81,7 +81,7 @@ #define D3DCLIPPLANE5 (1 << 5) -#define D3DRENDERSTATE_WRAPBIAS 128UL +#define D3DRENDERSTATE_WRAPBIAS __MSABI_LONG(128U) /* MSDN has this in d3d9caps.h, but it should be here */ #define D3DTSS_TCI_PASSTHRU 0x00000 @@ -97,25 +97,25 @@ #define D3DTS_WORLD3 D3DTS_WORLDMATRIX(3) #define D3DTS_WORLDMATRIX(index) (D3DTRANSFORMSTATETYPE)(index + 256) -#define D3DUSAGE_RENDERTARGET 0x00000001L -#define D3DUSAGE_DEPTHSTENCIL 0x00000002L -#define D3DUSAGE_WRITEONLY 0x00000008L -#define D3DUSAGE_SOFTWAREPROCESSING 0x00000010L -#define D3DUSAGE_DONOTCLIP 0x00000020L -#define D3DUSAGE_POINTS 0x00000040L -#define D3DUSAGE_RTPATCHES 0x00000080L -#define D3DUSAGE_NPATCHES 0x00000100L -#define D3DUSAGE_DYNAMIC 0x00000200L -#define D3DUSAGE_AUTOGENMIPMAP 0x00000400L -#define D3DUSAGE_DMAP 0x00004000L +#define D3DUSAGE_RENDERTARGET __MSABI_LONG(0x00000001) +#define D3DUSAGE_DEPTHSTENCIL __MSABI_LONG(0x00000002) +#define D3DUSAGE_WRITEONLY __MSABI_LONG(0x00000008) +#define D3DUSAGE_SOFTWAREPROCESSING __MSABI_LONG(0x00000010) +#define D3DUSAGE_DONOTCLIP __MSABI_LONG(0x00000020) +#define D3DUSAGE_POINTS __MSABI_LONG(0x00000040) +#define D3DUSAGE_RTPATCHES __MSABI_LONG(0x00000080) +#define D3DUSAGE_NPATCHES __MSABI_LONG(0x00000100) +#define D3DUSAGE_DYNAMIC __MSABI_LONG(0x00000200) +#define D3DUSAGE_AUTOGENMIPMAP __MSABI_LONG(0x00000400) +#define D3DUSAGE_DMAP __MSABI_LONG(0x00004000) -#define D3DUSAGE_QUERY_FILTER 0x00020000L -#define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L -#define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING 0x00080000L -#define D3DUSAGE_QUERY_SRGBREAD 0x00010000L -#define D3DUSAGE_QUERY_SRGBWRITE 0x00040000L -#define D3DUSAGE_QUERY_VERTEXTEXTURE 0x00100000L -#define D3DUSAGE_QUERY_WRAPANDMIP 0x00200000L +#define D3DUSAGE_QUERY_FILTER __MSABI_LONG(0x00020000) +#define D3DUSAGE_QUERY_LEGACYBUMPMAP __MSABI_LONG(0x00008000) +#define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING __MSABI_LONG(0x00080000) +#define D3DUSAGE_QUERY_SRGBREAD __MSABI_LONG(0x00010000) +#define D3DUSAGE_QUERY_SRGBWRITE __MSABI_LONG(0x00040000) +#define D3DUSAGE_QUERY_VERTEXTEXTURE __MSABI_LONG(0x00100000) +#define D3DUSAGE_QUERY_WRAPANDMIP __MSABI_LONG(0x00200000) #define D3DWRAP_U 1 #define D3DWRAP_V 2 @@ -167,10 +167,10 @@ #define D3DTA_COMPLEMENT 0x00000010 #define D3DTA_ALPHAREPLICATE 0x00000020 -#define D3DCOLORWRITEENABLE_RED (1L<<0) -#define D3DCOLORWRITEENABLE_GREEN (1L<<1) -#define D3DCOLORWRITEENABLE_BLUE (1L<<2) -#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) +#define D3DCOLORWRITEENABLE_RED (__MSABI_LONG(1)<<0) +#define D3DCOLORWRITEENABLE_GREEN (__MSABI_LONG(1)<<1) +#define D3DCOLORWRITEENABLE_BLUE (__MSABI_LONG(1)<<2) +#define D3DCOLORWRITEENABLE_ALPHA (__MSABI_LONG(1)<<3) #define D3DPV_DONOTCOPYDATA (1 << 0) @@ -206,7 +206,7 @@ #define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 /* d3d9ex, ignore display rotation */ #define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 /* d3d9ex, specify invalid display modes */ -#define D3DPRESENT_BACK_BUFFERS_MAX 3L +#define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) #define D3DPRESENT_RATE_DEFAULT 0x00000000 /**************************** @@ -643,7 +643,7 @@ D3DBACKBUFFER_TYPE_FORCE_DWORD = 0x7fffffff } D3DBACKBUFFER_TYPE; -#define D3DPRESENT_BACK_BUFFER_MAX 3L +#define D3DPRESENT_BACK_BUFFER_MAX __MSABI_LONG(3) typedef enum _D3DBASISTYPE { D3DBASIS_BEZIER = 0,
diff --git a/mingw-w64-headers/direct-x/include/d3dcaps.h b/mingw-w64-headers/direct-x/include/d3dcaps.h index b4cd8a6..2aa45a7 100644 --- a/mingw-w64-headers/direct-x/include/d3dcaps.h +++ b/mingw-w64-headers/direct-x/include/d3dcaps.h
@@ -26,7 +26,7 @@ DWORD dwCaps; } D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS; -#define D3DTRANSFORMCAPS_CLIP 0x00000001L +#define D3DTRANSFORMCAPS_CLIP __MSABI_LONG(0x00000001) typedef struct _D3DLIGHTINGCAPS { DWORD dwSize; @@ -148,7 +148,7 @@ #define D3DPTEXTURECAPS_SQUAREONLY 0x00000020 #define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040 #define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080 -#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL __MSABI_LONG(0x00000100) /* yes actually 0x00000200 is unused - or at least unreleased */ #define D3DPTEXTURECAPS_PROJECTED 0x00000400 #define D3DPTEXTURECAPS_CUBEMAP 0x00000800
diff --git a/mingw-w64-headers/direct-x/include/d3drmdef.h b/mingw-w64-headers/direct-x/include/d3drmdef.h index fde4791..e83869f 100644 --- a/mingw-w64-headers/direct-x/include/d3drmdef.h +++ b/mingw-w64-headers/direct-x/include/d3drmdef.h
@@ -339,21 +339,21 @@ typedef DWORD D3DRMLOADOPTIONS; -#define D3DRMLOAD_FROMFILE 0x000L -#define D3DRMLOAD_FROMRESOURCE 0x001L -#define D3DRMLOAD_FROMMEMORY 0x002L -#define D3DRMLOAD_FROMSTREAM 0x004L -#define D3DRMLOAD_FROMURL 0x008L +#define D3DRMLOAD_FROMFILE __MSABI_LONG(0x000) +#define D3DRMLOAD_FROMRESOURCE __MSABI_LONG(0x001) +#define D3DRMLOAD_FROMMEMORY __MSABI_LONG(0x002) +#define D3DRMLOAD_FROMSTREAM __MSABI_LONG(0x004) +#define D3DRMLOAD_FROMURL __MSABI_LONG(0x008) -#define D3DRMLOAD_BYNAME 0x010L -#define D3DRMLOAD_BYPOSITION 0x020L -#define D3DRMLOAD_BYGUID 0x040L -#define D3DRMLOAD_FIRST 0x080L +#define D3DRMLOAD_BYNAME __MSABI_LONG(0x010) +#define D3DRMLOAD_BYPOSITION __MSABI_LONG(0x020) +#define D3DRMLOAD_BYGUID __MSABI_LONG(0x040) +#define D3DRMLOAD_FIRST __MSABI_LONG(0x080) -#define D3DRMLOAD_INSTANCEBYREFERENCE 0x100L -#define D3DRMLOAD_INSTANCEBYCOPYING 0x200L +#define D3DRMLOAD_INSTANCEBYREFERENCE __MSABI_LONG(0x100) +#define D3DRMLOAD_INSTANCEBYCOPYING __MSABI_LONG(0x200) -#define D3DRMLOAD_ASYNCHRONOUS 0x400L +#define D3DRMLOAD_ASYNCHRONOUS __MSABI_LONG(0x400) typedef struct _D3DRMLOADRESOURCE { HMODULE hModule;
diff --git a/mingw-w64-headers/direct-x/include/d3dtypes.h b/mingw-w64-headers/direct-x/include/d3dtypes.h index e0e22ab..c475820 100644 --- a/mingw-w64-headers/direct-x/include/d3dtypes.h +++ b/mingw-w64-headers/direct-x/include/d3dtypes.h
@@ -959,14 +959,14 @@ } D3DMATERIALCOLORSOURCE; #define D3DRENDERSTATE_BLENDENABLE D3DRENDERSTATE_ALPHABLENDENABLE -#define D3DRENDERSTATE_WRAPBIAS 128UL -#define D3DWRAP_U 0x00000001L -#define D3DWRAP_V 0x00000002L +#define D3DRENDERSTATE_WRAPBIAS __MSABI_LONG(128U) +#define D3DWRAP_U __MSABI_LONG(0x00000001) +#define D3DWRAP_V __MSABI_LONG(0x00000002) -#define D3DWRAPCOORD_0 0x00000001L -#define D3DWRAPCOORD_1 0x00000002L -#define D3DWRAPCOORD_2 0x00000004L -#define D3DWRAPCOORD_3 0x00000008L +#define D3DWRAPCOORD_0 __MSABI_LONG(0x00000001) +#define D3DWRAPCOORD_1 __MSABI_LONG(0x00000002) +#define D3DWRAPCOORD_2 __MSABI_LONG(0x00000004) +#define D3DWRAPCOORD_3 __MSABI_LONG(0x00000008) #define D3DRENDERSTATE_STIPPLEPATTERN(y) (D3DRENDERSTATE_STIPPLEPATTERN00 + (y)) @@ -1001,13 +1001,13 @@ DWORD dwReserved; } D3DPROCESSVERTICES, *LPD3DPROCESSVERTICES; -#define D3DPROCESSVERTICES_TRANSFORMLIGHT 0x00000000L -#define D3DPROCESSVERTICES_TRANSFORM 0x00000001L -#define D3DPROCESSVERTICES_COPY 0x00000002L -#define D3DPROCESSVERTICES_OPMASK 0x00000007L +#define D3DPROCESSVERTICES_TRANSFORMLIGHT __MSABI_LONG(0x00000000) +#define D3DPROCESSVERTICES_TRANSFORM __MSABI_LONG(0x00000001) +#define D3DPROCESSVERTICES_COPY __MSABI_LONG(0x00000002) +#define D3DPROCESSVERTICES_OPMASK __MSABI_LONG(0x00000007) -#define D3DPROCESSVERTICES_UPDATEEXTENTS 0x00000008L -#define D3DPROCESSVERTICES_NOCOLOR 0x00000010L +#define D3DPROCESSVERTICES_UPDATEEXTENTS __MSABI_LONG(0x00000008) +#define D3DPROCESSVERTICES_NOCOLOR __MSABI_LONG(0x00000010) typedef enum _D3DTEXTURESTAGESTATETYPE { @@ -1113,14 +1113,14 @@ D3DTFP_FORCE_DWORD = 0x7fffffff } D3DTEXTUREMIPFILTER; -#define D3DTRIFLAG_START 0x00000000L +#define D3DTRIFLAG_START __MSABI_LONG(0x00000000) #define D3DTRIFLAG_STARTFLAT(len) (len) -#define D3DTRIFLAG_ODD 0x0000001eL -#define D3DTRIFLAG_EVEN 0x0000001fL +#define D3DTRIFLAG_ODD __MSABI_LONG(0x0000001e) +#define D3DTRIFLAG_EVEN __MSABI_LONG(0x0000001f) -#define D3DTRIFLAG_EDGEENABLE1 0x00000100L -#define D3DTRIFLAG_EDGEENABLE2 0x00000200L -#define D3DTRIFLAG_EDGEENABLE3 0x00000400L +#define D3DTRIFLAG_EDGEENABLE1 __MSABI_LONG(0x00000100) +#define D3DTRIFLAG_EDGEENABLE2 __MSABI_LONG(0x00000200) +#define D3DTRIFLAG_EDGEENABLE3 __MSABI_LONG(0x00000400) #define D3DTRIFLAG_EDGEENABLETRIANGLE \ (D3DTRIFLAG_EDGEENABLE1 | D3DTRIFLAG_EDGEENABLE2 | D3DTRIFLAG_EDGEENABLE3) @@ -1174,8 +1174,8 @@ D3DRECT drExtent; } D3DSTATUS, *LPD3DSTATUS; -#define D3DSETSTATUS_STATUS 0x00000001L -#define D3DSETSTATUS_EXTENTS 0x00000002L +#define D3DSETSTATUS_STATUS __MSABI_LONG(0x00000001) +#define D3DSETSTATUS_EXTENTS __MSABI_LONG(0x00000002) #define D3DSETSTATUS_ALL (D3DSETSTATUS_STATUS | D3DSETSTATUS_EXTENTS) typedef struct _D3DCLIPSTATUS { @@ -1186,9 +1186,9 @@ float minz, maxz; } D3DCLIPSTATUS, *LPD3DCLIPSTATUS; -#define D3DCLIPSTATUS_STATUS 0x00000001L -#define D3DCLIPSTATUS_EXTENTS2 0x00000002L -#define D3DCLIPSTATUS_EXTENTS3 0x00000004L +#define D3DCLIPSTATUS_STATUS __MSABI_LONG(0x00000001) +#define D3DCLIPSTATUS_EXTENTS2 __MSABI_LONG(0x00000002) +#define D3DCLIPSTATUS_EXTENTS3 __MSABI_LONG(0x00000004) typedef struct { DWORD dwSize; @@ -1199,8 +1199,8 @@ DWORD dwVerticesProcessed; } D3DSTATS, *LPD3DSTATS; -#define D3DEXECUTE_CLIPPED 0x00000001l -#define D3DEXECUTE_UNCLIPPED 0x00000002l +#define D3DEXECUTE_CLIPPED __MSABI_LONG(0x00000001) +#define D3DEXECUTE_UNCLIPPED __MSABI_LONG(0x00000002) typedef struct _D3DEXECUTEDATA { DWORD dwSize; @@ -1223,10 +1223,10 @@ DWORD dwNumVertices; } D3DVERTEXBUFFERDESC, *LPD3DVERTEXBUFFERDESC; -#define D3DVBCAPS_SYSTEMMEMORY 0x00000800l -#define D3DVBCAPS_WRITEONLY 0x00010000l -#define D3DVBCAPS_OPTIMIZED 0x80000000l -#define D3DVBCAPS_DONOTCLIP 0x00000001l +#define D3DVBCAPS_SYSTEMMEMORY __MSABI_LONG(0x00000800) +#define D3DVBCAPS_WRITEONLY __MSABI_LONG(0x00010000) +#define D3DVBCAPS_OPTIMIZED __MSABI_LONG(0x80000000) +#define D3DVBCAPS_DONOTCLIP __MSABI_LONG(0x00000001) #define D3DVOP_LIGHT (1 << 10) #define D3DVOP_TRANSFORM (1 << 0)