Matteo Bruni : d3d9: Pack structures to 4-bytes alignment on x86.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 2 08:51:50 CST 2015
Module: wine
Branch: master
Commit: 41556170f231aa6ae6a5e227d8e030cf941817e0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=41556170f231aa6ae6a5e227d8e030cf941817e0
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Feb 27 13:18:23 2015 +0100
d3d9: Pack structures to 4-bytes alignment on x86.
Reported by Christoph von Wittich.
---
include/d3d9caps.h | 8 ++++++++
include/d3d9types.h | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/include/d3d9caps.h b/include/d3d9caps.h
index 838e1f3..5cc757b 100644
--- a/include/d3d9caps.h
+++ b/include/d3d9caps.h
@@ -20,6 +20,10 @@
#ifndef __WINE_D3D9CAPS_H
#define __WINE_D3D9CAPS_H
+#ifdef __i386__
+#include <pshpack4.h>
+#endif
+
/*
* Definitions
*/
@@ -392,4 +396,8 @@ typedef struct _D3DCAPS9 {
} D3DCAPS9;
+#ifdef __i386__
+#include <poppack.h>
+#endif
+
#endif
diff --git a/include/d3d9types.h b/include/d3d9types.h
index fd7c4ce..3afcf89 100644
--- a/include/d3d9types.h
+++ b/include/d3d9types.h
@@ -21,6 +21,10 @@
#ifndef __WINE_D3D9TYPES_H
#define __WINE_D3D9TYPES_H
+#ifdef __i386__
+#include <pshpack4.h>
+#endif
+
/*****************************************************************************
* Direct 3D v9 #defines
*/
@@ -1580,4 +1584,8 @@ typedef enum _D3DSHADER_COMPARISON
D3DSPC_RESERVED1,
} D3DSHADER_COMPARISON;
+#ifdef __i386__
+#include <poppack.h>
+#endif
+
#endif /* __WINE_D3D9TYPES_H */
More information about the wine-cvs
mailing list