[PATCH] d3dx9: Cleanup header includes.
Matteo Bruni
mbruni at codeweavers.com
Mon Mar 14 22:03:22 CDT 2016
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
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 | 113 ---------------------------------------
dlls/d3dx9_36/d3dx9_private.h | 111 ++++++++++++++++++++++++++++++++++++++
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 +--
19 files changed, 161 insertions(+), 182 deletions(-)
delete mode 100644 dlls/d3dx9_36/d3dx9_36_private.h
create mode 100644 dlls/d3dx9_36/d3dx9_private.h
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_36_private.h
deleted file mode 100644
index 79f3b76..0000000
--- a/dlls/d3dx9_36/d3dx9_36_private.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2002 Raphael Junqueira
- * Copyright (C) 2008 David Adam
- * Copyright (C) 2008 Tony Wasserka
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#ifndef __WINE_D3DX9_36_PRIVATE_H
-#define __WINE_D3DX9_36_PRIVATE_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "d3dx9.h"
-
-#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
-
-struct vec4
-{
- float x, y, z, w;
-};
-
-struct volume
-{
- UINT width;
- UINT height;
- UINT depth;
-};
-
-/* for internal use */
-enum format_type {
- FORMAT_ARGB, /* unsigned */
- FORMAT_ARGBF16,/* float 16 */
- FORMAT_ARGBF, /* float */
- FORMAT_DXT,
- FORMAT_INDEX,
- FORMAT_UNKNOWN
-};
-
-struct pixel_format_desc {
- D3DFORMAT format;
- BYTE bits[4];
- BYTE shift[4];
- UINT bytes_per_pixel;
- UINT block_width;
- UINT block_height;
- UINT block_byte_count;
- enum format_type type;
- void (*from_rgba)(const struct vec4 *src, struct vec4 *dst);
- void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette);
-};
-
-HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
-HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
-
-HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN;
-
-const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN;
-const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN;
-
-void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
- BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size,
- const struct pixel_format_desc *format) DECLSPEC_HIDDEN;
-void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
- const struct volume *src_size, const struct pixel_format_desc *src_format,
- BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size,
- const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN;
-void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
- const struct volume *src_size, const struct pixel_format_desc *src_format,
- BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size,
- const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN;
-
-HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette,
- DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels,
- unsigned int *loaded_miplevels) DECLSPEC_HIDDEN;
-HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data,
- const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
-HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
- const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
- const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
-HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data,
- const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
-
-unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
-float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
-
-/* debug helpers */
-const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN;
-const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN;
-const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
-
-/* parameter type conversion helpers */
-void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
- const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
-
-#endif /* __WINE_D3DX9_36_PRIVATE_H */
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
new file mode 100644
index 0000000..bc9581d
--- /dev/null
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2002 Raphael Junqueira
+ * Copyright (C) 2008 David Adam
+ * Copyright (C) 2008 Tony Wasserka
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#ifndef __WINE_D3DX9_PRIVATE_H
+#define __WINE_D3DX9_PRIVATE_H
+
+#define NONAMELESSUNION
+#include "wine/debug.h"
+
+#define COBJMACROS
+#include "d3dx9.h"
+
+#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array))
+
+struct vec4
+{
+ float x, y, z, w;
+};
+
+struct volume
+{
+ UINT width;
+ UINT height;
+ UINT depth;
+};
+
+/* for internal use */
+enum format_type {
+ FORMAT_ARGB, /* unsigned */
+ FORMAT_ARGBF16,/* float 16 */
+ FORMAT_ARGBF, /* float */
+ FORMAT_DXT,
+ FORMAT_INDEX,
+ FORMAT_UNKNOWN
+};
+
+struct pixel_format_desc {
+ D3DFORMAT format;
+ BYTE bits[4];
+ BYTE shift[4];
+ UINT bytes_per_pixel;
+ UINT block_width;
+ UINT block_height;
+ UINT block_byte_count;
+ enum format_type type;
+ void (*from_rgba)(const struct vec4 *src, struct vec4 *dst);
+ void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette);
+};
+
+HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
+HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN;
+
+HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN;
+
+const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN;
+const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN;
+
+void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
+ BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size,
+ const struct pixel_format_desc *format) DECLSPEC_HIDDEN;
+void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
+ const struct volume *src_size, const struct pixel_format_desc *src_format,
+ BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size,
+ const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN;
+void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch,
+ const struct volume *src_size, const struct pixel_format_desc *src_format,
+ BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size,
+ const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN;
+
+HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette,
+ DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels,
+ unsigned int *loaded_miplevels) DECLSPEC_HIDDEN;
+HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data,
+ const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
+HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
+ const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
+ const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
+HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data,
+ const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN;
+
+unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN;
+float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN;
+
+/* debug helpers */
+const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN;
+const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN;
+const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN;
+
+/* parameter type conversion helpers */
+void set_number(void *outdata, D3DXPARAMETER_TYPE outtype,
+ const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN;
+
+#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 f7bd1a3..b4efeac 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"
--
2.4.10
More information about the wine-patches
mailing list