ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include: Pack structures to 4-bytes alignment on x86 in D3D headers.

This commit is contained in:
Matteo Bruni 2015-03-10 19:29:36 +01:00 committed by Alexandre Julliard
parent 144056bce0
commit 6dfcb29664
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/d3d8caps.h
View File

@ -19,6 +19,10 @@
#ifndef __WINE_D3D8CAPS_H #ifndef __WINE_D3D8CAPS_H
#define __WINE_D3D8CAPS_H #define __WINE_D3D8CAPS_H
#ifdef __i386__
#include <pshpack4.h>
#endif
/* /*
* Definitions * Definitions
*/ */
@ -283,4 +287,8 @@ typedef struct _D3DCAPS8 {
float MaxPixelShaderValue; float MaxPixelShaderValue;
} D3DCAPS8; } D3DCAPS8;
#ifdef __i386__
#include <poppack.h>
#endif
#endif /* __WINE_D3D8CAPS_H */ #endif /* __WINE_D3D8CAPS_H */

7
include/d3d8types.h
View File

@ -19,6 +19,9 @@
#ifndef __WINE_D3D8TYPES_H #ifndef __WINE_D3D8TYPES_H
#define __WINE_D3D8TYPES_H #define __WINE_D3D8TYPES_H
#ifdef __i386__
#include <pshpack4.h>
#endif
/***************************************************************************** /*****************************************************************************
* Direct 3D v8 #defines * Direct 3D v8 #defines
@ -1210,4 +1213,8 @@ typedef struct _D3DVOLUME_DESC {
UINT Depth; UINT Depth;
} D3DVOLUME_DESC; } D3DVOLUME_DESC;
#ifdef __i386__
#include <poppack.h>
#endif
#endif /* __WINE_D3D8TYPES_H */ #endif /* __WINE_D3D8TYPES_H */

8
include/d3dcaps.h
View File

@ -21,6 +21,10 @@
#include <ddraw.h> #include <ddraw.h>
#ifdef __i386__
#include <pshpack4.h>
#endif
typedef struct _D3DTRANSFORMCAPS { typedef struct _D3DTRANSFORMCAPS {
DWORD dwSize; DWORD dwSize;
DWORD dwCaps; DWORD dwCaps;
@ -428,6 +432,8 @@ typedef struct _D3DDEVINFO_TEXTURING {
DWORD dwNumGetDCs; DWORD dwNumGetDCs;
} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING; } D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING;
#ifdef __i386__
#include <poppack.h>
#endif
#endif #endif

8
include/d3dtypes.h
View File

@ -29,6 +29,10 @@
#include <float.h> #include <float.h>
#include <ddraw.h> #include <ddraw.h>
#ifdef __i386__
#include <pshpack4.h>
#endif
#define D3DVALP(val, prec) ((float)(val)) #define D3DVALP(val, prec) ((float)(val))
#define D3DVAL(val) ((float)(val)) #define D3DVAL(val) ((float)(val))
#define D3DDivide(a, b) (float)((double) (a) / (double) (b)) #define D3DDivide(a, b) (float)((double) (a) / (double) (b))
@ -1356,4 +1360,8 @@ typedef enum _D3DTEXTURETRANSFORMFLAGS {
#define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE4(CoordIndex) (D3DFVF_TEXTUREFORMAT4 << (CoordIndex*2 + 16))
#define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16))
#ifdef __i386__
#include <poppack.h>
#endif
#endif #endif