Author: akhaldi Date: Sun Nov 29 19:38:09 2015 New Revision: 70211
URL: http://svn.reactos.org/svn/reactos?rev=70211&view=rev Log: [PSDK] Update d3d8types.h. CORE-10536
Modified: trunk/reactos/include/psdk/d3d8types.h
Modified: trunk/reactos/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8types.h?re... ============================================================================== --- trunk/reactos/include/psdk/d3d8types.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d8types.h [iso-8859-1] Sun Nov 29 19:38:09 2015 @@ -19,6 +19,9 @@ #ifndef __WINE_D3D8TYPES_H #define __WINE_D3D8TYPES_H
+#ifdef __i386__ +#include <pshpack4.h> +#endif
/***************************************************************************** * Direct 3D v8 #defines @@ -35,7 +38,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5)
-#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b) @@ -260,11 +263,11 @@ #define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) #define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) #define D3DVSD_STREAMTESSMASK (0x1 << D3DVSD_STREAMTESSSHIFT) -#define D3DVSD_TOKENTYPEMASK (0x7 << D3DVSD_TOKENTYPESHIFT) +#define D3DVSD_TOKENTYPEMASK (0x7u << D3DVSD_TOKENTYPESHIFT)
#define D3DVSD_MAKETOKENTYPE(TokenType) \ - ((TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK) + (((unsigned)TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK)
#define D3DVSD_CONST(ConstantAddress, Count) \ (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_CONSTMEM) | ((Count) << D3DVSD_CONSTCOUNTSHIFT) | (ConstantAddress)) @@ -1210,4 +1213,8 @@ UINT Depth; } D3DVOLUME_DESC;
+#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D8TYPES_H */