[PATCH 3/7] include: Make "long" numeric constants LP64/LLP64 proof (d3d9caps.h)
Michael Stefaniuc
mstefani at redhat.de
Wed Oct 26 16:47:59 CDT 2011
---
include/d3d9caps.h | 182 ++++++++++++++++++++++++++--------------------------
1 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 8ed6598..838e1f3 100644
--- a/include/d3d9caps.h
+++ b/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 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 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 __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 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 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 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 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 __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 __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 __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
--
1.7.6.4
More information about the wine-patches
mailing list