[akhaldi] 61323: [D3D9] * 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 th...

Author: akhaldi
Date: Sat Dec 21 15:33:19 2013
New Revision: 61323

URL: http://svn.reactos.org/svn/reactos?rev=61323&view=rev
Log:
[D3D9]
* 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/d3d9/buffer.c
    trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c
    trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h
    trunk/reactos/dll/directx/wine/d3d9/device.c
    trunk/reactos/dll/directx/wine/d3d9/directx.c
    trunk/reactos/dll/directx/wine/d3d9/query.c
    trunk/reactos/dll/directx/wine/d3d9/shader.c
    trunk/reactos/dll/directx/wine/d3d9/stateblock.c
    trunk/reactos/dll/directx/wine/d3d9/surface.c
    trunk/reactos/dll/directx/wine/d3d9/swapchain.c
    trunk/reactos/dll/directx/wine/d3d9/texture.c
    trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c
    trunk/reactos/dll/directx/wine/d3d9/volume.c

Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/buffer.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/buffer.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_vertexbuffer
*impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -21,11 +21,7 @@
  *
  */
 
-#include <config.h>
-#include <initguid.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static int D3DPERF_event_level = 0;
 

Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h	[iso-8859-1] Sat Dec 21 15:33:19
2013
@@ -23,6 +23,8 @@
 #ifndef __WINE_D3D9_PRIVATE_H
 #define __WINE_D3D9_PRIVATE_H
 
+#include <config.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -36,10 +38,11 @@
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-//#include "winuser.h"
+
 #include <wine/debug.h>
-//#include "wine/unicode.h"
-
+WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
+
+#include <initguid.h>
 #include <d3d9.h>
 #include <wine/wined3d.h>
 

Modified: trunk/reactos/dll/directx/wine/d3d9/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/device.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/device.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -20,10 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {}
 

Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/directx.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/directx.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9 *impl_from_IDirect3D9Ex(IDirect3D9Ex *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/query.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/query.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -20,10 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/shader.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/shader.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -17,10 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_vertexshader
*impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/stateblock.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/stateblock.c	[iso-8859-1] Sat Dec 21 15:33:19
2013
@@ -20,10 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_stateblock *impl_from_IDirect3DStateBlock9(IDirect3DStateBlock9
*iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/surface.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/surface.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_surface *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/swapchain.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/swapchain.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -20,10 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_swapchain *impl_from_IDirect3DSwapChain9(IDirect3DSwapChain9
*iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/texture.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/texture.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_texture *impl_from_IDirect3DTexture9(IDirect3DTexture9 *iface)
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c	[iso-8859-1] Sat Dec 21
15:33:19 2013
@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static const struct
 {

Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/volume.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/volume.c	[iso-8859-1] Sat Dec 21 15:33:19 2013
@@ -19,10 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
 #include "d3d9_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
 static inline struct d3d9_volume *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface)
 {