[PATCH 5/7] include: Make "long" numeric constants LP64/LLP64 proof (d3d*.h)
Michael Stefaniuc
mstefani at redhat.de
Wed Oct 26 16:57:18 CDT 2011
---
include/d3d.h | 18 +++++++-------
include/d3d8.h | 14 ++++++------
include/d3d8types.h | 8 +++---
include/d3dcaps.h | 4 +-
include/d3drmdef.h | 24 ++++++++++----------
include/d3dtypes.h | 60 +++++++++++++++++++++++++-------------------------
6 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/include/d3d.h b/include/d3d.h
index 409be1b..0528900 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -183,15 +183,15 @@ typedef struct IDirect3DVertexBuffer7 *LPDIRECT3DVERTEXBUFFER7;
/* ********************************************************************
Enums
******************************************************************** */
-#define D3DNEXT_NEXT 0x01l
-#define D3DNEXT_HEAD 0x02l
-#define D3DNEXT_TAIL 0x04l
-
-#define D3DDP_WAIT 0x00000001l
-#define D3DDP_OUTOFORDER 0x00000002l
-#define D3DDP_DONOTCLIP 0x00000004l
-#define D3DDP_DONOTUPDATEEXTENTS 0x00000008l
-#define D3DDP_DONOTLIGHT 0x00000010l
+#define D3DNEXT_NEXT __MSABI_LONG(0x01)
+#define D3DNEXT_HEAD __MSABI_LONG(0x02)
+#define D3DNEXT_TAIL __MSABI_LONG(0x04)
+
+#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/include/d3d8.h b/include/d3d8.h
index 88da40d..e98c369 100644
--- a/include/d3d8.h
+++ b/include/d3d8.h
@@ -38,17 +38,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/include/d3d8types.h b/include/d3d8types.h
index 745f248..e848a45 100644
--- a/include/d3d8types.h
+++ b/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/include/d3dcaps.h b/include/d3dcaps.h
index b44c49d..6474518 100644
--- a/include/d3dcaps.h
+++ b/include/d3dcaps.h
@@ -26,7 +26,7 @@ typedef struct _D3DTRANSFORMCAPS {
DWORD dwCaps;
} D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS;
-#define D3DTRANSFORMCAPS_CLIP 0x00000001L
+#define D3DTRANSFORMCAPS_CLIP __MSABI_LONG(0x00000001)
typedef struct _D3DLIGHTINGCAPS {
DWORD dwSize;
@@ -148,7 +148,7 @@ typedef struct _D3dPrimCaps {
#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/include/d3drmdef.h b/include/d3drmdef.h
index fde4791..e83869f 100644
--- a/include/d3drmdef.h
+++ b/include/d3drmdef.h
@@ -339,21 +339,21 @@ typedef DWORD D3DRMINTERPOLATIONOPTIONS;
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/include/d3dtypes.h b/include/d3dtypes.h
index ab06b5e..a4030e6 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -959,14 +959,14 @@ typedef enum _D3DMATERIALCOLORSOURCE
} 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 @@ typedef struct _D3DPROCESSVERTICES {
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 @@ typedef enum _D3DTEXTUREMIPFILTER
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 @@ typedef struct _D3DSTATUS {
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 @@ typedef struct _D3DCLIPSTATUS {
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 @@ typedef struct {
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 @@ typedef struct _D3DVERTEXBUFFERDESC {
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)
--
1.7.6.4
More information about the wine-patches
mailing list