[akhaldi] 61326: [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 t...

Author: akhaldi
Date: Sat Dec 21 17:31:51 2013
New Revision: 61326

URL: http://svn.reactos.org/svn/reactos?rev=61326&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/directx/wine/ddraw/clipper.c
    trunk/reactos/dll/directx/wine/ddraw/ddraw.c
    trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h
    trunk/reactos/dll/directx/wine/ddraw/device.c
    trunk/reactos/dll/directx/wine/ddraw/executebuffer.c
    trunk/reactos/dll/directx/wine/ddraw/light.c
    trunk/reactos/dll/directx/wine/ddraw/main.c
    trunk/reactos/dll/directx/wine/ddraw/material.c
    trunk/reactos/dll/directx/wine/ddraw/palette.c
    trunk/reactos/dll/directx/wine/ddraw/surface.c
    trunk/reactos/dll/directx/wine/ddraw/utils.c
    trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c
    trunk/reactos/dll/directx/wine/ddraw/viewport.c

Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/clipper.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/clipper.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -19,12 +19,7 @@
  * 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)
 {

Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/ddraw.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/ddraw.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -21,12 +21,7 @@
  * 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;

Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h	[iso-8859-1] Sat Dec 21 17:31:51
2013
@@ -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 <initguid.h>
 #include <d3d.h>
-//#include "ddraw.h"
-#ifdef DDRAW_INIT_GUID
-#include <initguid.h>
-#endif
+
 #include <wine/list.h>
 #include <wine/wined3d.h>
 

Modified: trunk/reactos/dll/directx/wine/ddraw/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/device.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/device.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -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 */

Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/executebuffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/executebuffer.c	[iso-8859-1] Sat Dec 21 17:31:51
2013
@@ -20,12 +20,7 @@
  * 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

Modified: trunk/reactos/dll/directx/wine/ddraw/light.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/light.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/light.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -19,12 +19,7 @@
  * 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

Modified: trunk/reactos/dll/directx/wine/ddraw/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/main.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -24,17 +24,11 @@
  * 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);
 

Modified: trunk/reactos/dll/directx/wine/ddraw/material.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/material.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/material.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -19,12 +19,7 @@
  * 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)
 {

Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/palette.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/palette.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -16,12 +16,7 @@
  * 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

Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/surface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/surface.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -21,12 +21,7 @@
  * 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);

Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/utils.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -21,12 +21,7 @@
  * 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);
 

Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c	[iso-8859-1] Sat Dec 21 17:31:51
2013
@@ -19,12 +19,7 @@
  * 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)
 {

Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/viewport.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/viewport.c	[iso-8859-1] Sat Dec 21 17:31:51 2013
@@ -19,12 +19,7 @@
  * 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