d3d8: Redefine D3DVSD_MAKETOKENTYPE to avoid shift overflow (warnings).

Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d8: Redefine D3DVSD_MAKETOKENTYPE to avoid shift overflow (warnings).
a0991fc7 · Gerald Pfeifer · Alexandre Julliard · 0ad7a0df · a0991fc7
Commit a0991fc7 authored Oct 25, 2015 by Gerald Pfeifer Committed by Alexandre Julliard Oct 26, 2015
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

d3d8types.h include/d3d8types.h +1 -1

No files found.
--- a/include/d3d8types.h
+++ b/include/d3d8types.h
@@ -267,7 +267,7 @@ typedef enum _D3DVSDT_TYPE {


 #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))