From cd74723d2f3ec5ebd3626341aec1e1ddb999c7ba Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 21 Dec 2013 17:31:51 +0000
Subject: [PATCH] [DDRAW] * Move some inclusions to the main header. * Set the
 default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header. CORE-7716

svn path=/trunk/; revision=61326
---
 reactos/dll/directx/wine/ddraw/clipper.c       |  5 -----
 reactos/dll/directx/wine/ddraw/ddraw.c         |  5 -----
 reactos/dll/directx/wine/ddraw/ddraw_private.h | 11 +++++++----
 reactos/dll/directx/wine/ddraw/device.c        |  4 ----
 reactos/dll/directx/wine/ddraw/executebuffer.c |  5 -----
 reactos/dll/directx/wine/ddraw/light.c         |  5 -----
 reactos/dll/directx/wine/ddraw/main.c          |  6 ------
 reactos/dll/directx/wine/ddraw/material.c      |  5 -----
 reactos/dll/directx/wine/ddraw/palette.c       |  5 -----
 reactos/dll/directx/wine/ddraw/surface.c       |  5 -----
 reactos/dll/directx/wine/ddraw/utils.c         |  5 -----
 reactos/dll/directx/wine/ddraw/vertexbuffer.c  |  5 -----
 reactos/dll/directx/wine/ddraw/viewport.c      |  5 -----
 13 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/reactos/dll/directx/wine/ddraw/clipper.c b/reactos/dll/directx/wine/ddraw/clipper.c
index 7703fd0c495..f1fadd429a7 100644
--- a/reactos/dll/directx/wine/ddraw/clipper.c
+++ b/reactos/dll/directx/wine/ddraw/clipper.c
@@ -19,13 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static inline struct ddraw_clipper *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface)
 {
     return CONTAINING_RECORD(iface, struct ddraw_clipper, IDirectDrawClipper_iface);
diff --git a/reactos/dll/directx/wine/ddraw/ddraw.c b/reactos/dll/directx/wine/ddraw/ddraw.c
index 3f903771047..e1587a4e23a 100644
--- a/reactos/dll/directx/wine/ddraw/ddraw.c
+++ b/reactos/dll/directx/wine/ddraw/ddraw.c
@@ -21,13 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static struct wined3d_display_mode original_mode;
 static const struct ddraw *exclusive_ddraw;
 static BOOL restore_mode;
diff --git a/reactos/dll/directx/wine/ddraw/ddraw_private.h b/reactos/dll/directx/wine/ddraw/ddraw_private.h
index 63b05322b36..e9f5acf6fa1 100644
--- a/reactos/dll/directx/wine/ddraw/ddraw_private.h
+++ b/reactos/dll/directx/wine/ddraw/ddraw_private.h
@@ -19,6 +19,9 @@
 #ifndef __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
 #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H
 
+#include <config.h>
+#include <wine/port.h>
+
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
@@ -26,17 +29,17 @@
 #define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
+
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
 
-#include <d3d.h>
-//#include "ddraw.h"
-#ifdef DDRAW_INIT_GUID
 #include <initguid.h>
-#endif
+#include <d3d.h>
+
 #include <wine/list.h>
 #include <wine/wined3d.h>
 
diff --git a/reactos/dll/directx/wine/ddraw/device.c b/reactos/dll/directx/wine/ddraw/device.c
index 8b8006c782d..baa0b774ada 100644
--- a/reactos/dll/directx/wine/ddraw/device.c
+++ b/reactos/dll/directx/wine/ddraw/device.c
@@ -27,12 +27,8 @@
  *
  */
 
-#include <config.h>
-#include <wine/port.h>
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 WINE_DECLARE_DEBUG_CHANNEL(winediag);
 
 /* The device ID */
diff --git a/reactos/dll/directx/wine/ddraw/executebuffer.c b/reactos/dll/directx/wine/ddraw/executebuffer.c
index 696db492a60..4109d7a13eb 100644
--- a/reactos/dll/directx/wine/ddraw/executebuffer.c
+++ b/reactos/dll/directx/wine/ddraw/executebuffer.c
@@ -20,13 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 /*****************************************************************************
  * _dump_executedata
  * _dump_D3DEXECUTEBUFFERDESC
diff --git a/reactos/dll/directx/wine/ddraw/light.c b/reactos/dll/directx/wine/ddraw/light.c
index 19e49845163..26790fbb1a7 100644
--- a/reactos/dll/directx/wine/ddraw/light.c
+++ b/reactos/dll/directx/wine/ddraw/light.c
@@ -19,13 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 /*****************************************************************************
  * light_update
  *
diff --git a/reactos/dll/directx/wine/ddraw/main.c b/reactos/dll/directx/wine/ddraw/main.c
index 6778b2fd87d..525365e72d3 100644
--- a/reactos/dll/directx/wine/ddraw/main.c
+++ b/reactos/dll/directx/wine/ddraw/main.c
@@ -24,18 +24,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#define DDRAW_INIT_GUID
 #include "ddraw_private.h"
 #include <rpcproxy.h>
 
 #include <wine/exception.h>
 #include <winreg.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);
 
 static HINSTANCE instance;
diff --git a/reactos/dll/directx/wine/ddraw/material.c b/reactos/dll/directx/wine/ddraw/material.c
index e3459103c8d..23cff205098 100644
--- a/reactos/dll/directx/wine/ddraw/material.c
+++ b/reactos/dll/directx/wine/ddraw/material.c
@@ -19,13 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static void dump_material(const D3DMATERIAL *mat)
 {
     TRACE("  dwSize : %d\n", mat->dwSize);
diff --git a/reactos/dll/directx/wine/ddraw/palette.c b/reactos/dll/directx/wine/ddraw/palette.c
index eb5ac2fff43..cd43e82812a 100644
--- a/reactos/dll/directx/wine/ddraw/palette.c
+++ b/reactos/dll/directx/wine/ddraw/palette.c
@@ -16,13 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 /*****************************************************************************
  * IDirectDrawPalette::QueryInterface
  *
diff --git a/reactos/dll/directx/wine/ddraw/surface.c b/reactos/dll/directx/wine/ddraw/surface.c
index fb8beb081c4..b13708d8d19 100644
--- a/reactos/dll/directx/wine/ddraw/surface.c
+++ b/reactos/dll/directx/wine/ddraw/surface.c
@@ -21,13 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface);
 static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface);
 
diff --git a/reactos/dll/directx/wine/ddraw/utils.c b/reactos/dll/directx/wine/ddraw/utils.c
index 6308ee5c25f..6f9dd9c5059 100644
--- a/reactos/dll/directx/wine/ddraw/utils.c
+++ b/reactos/dll/directx/wine/ddraw/utils.c
@@ -21,13 +21,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static void DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf);
 
 void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_format_id wined3d_format)
diff --git a/reactos/dll/directx/wine/ddraw/vertexbuffer.c b/reactos/dll/directx/wine/ddraw/vertexbuffer.c
index 3dcadf13c92..4c0569808d0 100644
--- a/reactos/dll/directx/wine/ddraw/vertexbuffer.c
+++ b/reactos/dll/directx/wine/ddraw/vertexbuffer.c
@@ -19,13 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 static inline struct d3d_vertex_buffer *impl_from_IDirect3DVertexBuffer(IDirect3DVertexBuffer *iface)
 {
     return CONTAINING_RECORD(iface, struct d3d_vertex_buffer, IDirect3DVertexBuffer_iface);
diff --git a/reactos/dll/directx/wine/ddraw/viewport.c b/reactos/dll/directx/wine/ddraw/viewport.c
index 38bd21d33c8..373a1808460 100644
--- a/reactos/dll/directx/wine/ddraw/viewport.c
+++ b/reactos/dll/directx/wine/ddraw/viewport.c
@@ -19,13 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "ddraw_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
-
 /*****************************************************************************
  * Helper functions
  *****************************************************************************/