Matteo Bruni : d3dx9: Cleanup header includes.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 15 10:12:16 CDT 2016
Module: wine
Branch: master
Commit: 4d1192ad893bdbdf2e394c3f9c2b31e02cade758
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1192ad893bdbdf2e394c3f9c2b31e02cade758
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue Mar 15 04:03:22 2016 +0100
d3dx9: Cleanup header includes.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dx9_36/animation.c | 6 ++++--
dlls/d3dx9_36/core.c | 12 +++---------
dlls/d3dx9_36/d3dx9_36_main.c | 11 ++---------
dlls/d3dx9_36/{d3dx9_36_private.h => d3dx9_private.h} | 12 +++++-------
dlls/d3dx9_36/effect.c | 7 +------
dlls/d3dx9_36/font.c | 3 +--
dlls/d3dx9_36/line.c | 6 ++++--
dlls/d3dx9_36/math.c | 8 +-------
dlls/d3dx9_36/mesh.c | 9 ++-------
dlls/d3dx9_36/render.c | 6 ++++--
dlls/d3dx9_36/shader.c | 7 +------
dlls/d3dx9_36/skin.c | 6 ++++--
dlls/d3dx9_36/sprite.c | 6 ++++--
dlls/d3dx9_36/surface.c | 7 ++++---
dlls/d3dx9_36/texture.c | 7 ++++---
dlls/d3dx9_36/util.c | 6 ++++--
dlls/d3dx9_36/volume.c | 6 ++++--
dlls/d3dx9_36/xfile.c | 6 +++---
18 files changed, 55 insertions(+), 76 deletions(-)
diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c
index 9a8f8b5..818bd7a 100644
--- a/dlls/d3dx9_36/animation.c
+++ b/dlls/d3dx9_36/animation.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c
index 1b767e3..1eb289e 100644
--- a/dlls/d3dx9_36/core.c
+++ b/dlls/d3dx9_36/core.c
@@ -17,16 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <stdarg.h>
+#include "config.h"
+#include "wine/port.h"
-#define COBJMACROS
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-#include "d3dx9_36_private.h"
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c
index 4a94b28..04c1877 100644
--- a/dlls/d3dx9_36/d3dx9_36_main.c
+++ b/dlls/d3dx9_36/d3dx9_36_main.c
@@ -22,16 +22,9 @@
#include "config.h"
#include "wine/port.h"
-#include "initguid.h"
-
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-
-#include "d3dx9.h"
+#include "initguid.h"
+#include "d3dx9_private.h"
/***********************************************************************
* DllMain.
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_private.h
similarity index 96%
rename from dlls/d3dx9_36/d3dx9_36_private.h
rename to dlls/d3dx9_36/d3dx9_private.h
index 79f3b76..bc9581d 100644
--- a/dlls/d3dx9_36/d3dx9_36_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -19,15 +19,13 @@
*
*/
-#ifndef __WINE_D3DX9_36_PRIVATE_H
-#define __WINE_D3DX9_36_PRIVATE_H
+#ifndef __WINE_D3DX9_PRIVATE_H
+#define __WINE_D3DX9_PRIVATE_H
-#include <stdarg.h>
+#define NONAMELESSUNION
+#include "wine/debug.h"
#define COBJMACROS
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
#include "d3dx9.h"
#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
@@ -110,4 +108,4 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
-#endif /* __WINE_D3DX9_36_PRIVATE_H */
+#endif /* __WINE_D3DX9_PRIVATE_H */
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index fef0245..8f82784 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -19,13 +19,8 @@
#include "config.h"
#include "wine/port.h"
-#define NONAMELESSUNION
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9_36_private.h"
+#include "d3dx9_private.h"
#include "d3dcompiler.h"
/* Constants for special INT/FLOAT conversation */
diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
index dd1243e..5522dea 100644
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -20,9 +20,8 @@
#include "config.h"
#include "wine/port.h"
-#include "wine/debug.h"
+#include "d3dx9_private.h"
#include "wine/unicode.h"
-#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c
index 5de44f4..356d54f 100644
--- a/dlls/d3dx9_36/line.c
+++ b/dlls/d3dx9_36/line.c
@@ -17,8 +17,10 @@
*
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
index 123bd2f..da33074 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -22,16 +22,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define NONAMELESSUNION
-
#include "config.h"
#include "wine/port.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9_36_private.h"
-
-#include "wine/debug.h"
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index b2dbd27..3204ea7 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -27,23 +27,18 @@
#include "config.h"
#include "wine/port.h"
-#define COBJMACROS
-#define NONAMELESSUNION
#include <assert.h>
#ifdef HAVE_FLOAT_H
# include <float.h>
#endif
-#include "windef.h"
-#include "wingdi.h"
-#include "d3dx9.h"
+
+#include "d3dx9_private.h"
#undef MAKE_DDHRESULT
#include "dxfile.h"
#include "rmxfguid.h"
#include "rmxftmpl.h"
-#include "wine/debug.h"
#include "wine/unicode.h"
#include "wine/list.h"
-#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c
index cca6b44..ad83307 100644
--- a/dlls/d3dx9_36/render.c
+++ b/dlls/d3dx9_36/render.c
@@ -17,8 +17,10 @@
*
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index e25480d..9723aa4 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -21,14 +21,9 @@
#include "config.h"
#include "wine/port.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "windef.h"
-#include "wingdi.h"
-#include "objbase.h"
+#include "d3dx9_private.h"
#include "d3dcommon.h"
#include "d3dcompiler.h"
-#include "d3dx9_36_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
index 9b93af6..f197d33 100644
--- a/dlls/d3dx9_36/skin.c
+++ b/dlls/d3dx9_36/skin.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
index 8fbabc3..4a7437f 100644
--- a/dlls/d3dx9_36/sprite.c
+++ b/dlls/d3dx9_36/sprite.c
@@ -17,8 +17,10 @@
*
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 4fa2a76..1bfe75a 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -18,9 +18,10 @@
*
*/
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
#include "initguid.h"
#include "ole2.h"
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 27f08ad..1d13c08 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -19,9 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/unicode.h"
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c
index 94899cf..d8cd43a 100644
--- a/dlls/d3dx9_36/util.c
+++ b/dlls/d3dx9_36/util.c
@@ -17,8 +17,10 @@
*
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c
index fae8542..5a006ef 100644
--- a/dlls/d3dx9_36/volume.c
+++ b/dlls/d3dx9_36/volume.c
@@ -16,8 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "wine/debug.h"
-#include "d3dx9_36_private.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include "d3dx9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c
index eda0d7e..1575454 100644
--- a/dlls/d3dx9_36/xfile.c
+++ b/dlls/d3dx9_36/xfile.c
@@ -17,10 +17,10 @@
*
*/
-#include "wine/debug.h"
+#include "config.h"
+#include "wine/port.h"
-#define COBJMACROS
-#include "d3dx9.h"
+#include "d3dx9_private.h"
#include "d3dx9xof.h"
#undef MAKE_DDHRESULT
#include "dxfile.h"
More information about the wine-cvs
mailing list