From 96c3ffb73862205f225da036678a683f8b3e6275 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Dec 2013 16:59:08 +0000
Subject: [PATCH] [QEDIT] * 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=61335
---
 reactos/dll/directx/wine/qedit/main.c          |  3 ---
 reactos/dll/directx/wine/qedit/mediadet.c      | 14 +-------------
 reactos/dll/directx/wine/qedit/qedit_private.h |  3 +++
 reactos/dll/directx/wine/qedit/samplegrabber.c | 13 -------------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/reactos/dll/directx/wine/qedit/main.c b/reactos/dll/directx/wine/qedit/main.c
index 083451071ff..6753d5b6642 100644
--- a/reactos/dll/directx/wine/qedit/main.c
+++ b/reactos/dll/directx/wine/qedit/main.c
@@ -19,9 +19,6 @@
 
 #include "qedit_private.h"
 #include <rpcproxy.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static HINSTANCE instance;
 
diff --git a/reactos/dll/directx/wine/qedit/mediadet.c b/reactos/dll/directx/wine/qedit/mediadet.c
index 7ffa99173f8..6f57f9092a8 100644
--- a/reactos/dll/directx/wine/qedit/mediadet.c
+++ b/reactos/dll/directx/wine/qedit/mediadet.c
@@ -17,20 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "ole2.h"
-
 #include "qedit_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+#include <assert.h>
 
 typedef struct MediaDetImpl {
     IUnknown IUnknown_inner;
diff --git a/reactos/dll/directx/wine/qedit/qedit_private.h b/reactos/dll/directx/wine/qedit/qedit_private.h
index ea1230ca357..4172a70cfa8 100644
--- a/reactos/dll/directx/wine/qedit/qedit_private.h
+++ b/reactos/dll/directx/wine/qedit/qedit_private.h
@@ -40,6 +40,9 @@
 #define __WINE_DDRAW_H /* ROS HACK */
 #include <qedit.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(qedit);
+
 HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
 
diff --git a/reactos/dll/directx/wine/qedit/samplegrabber.c b/reactos/dll/directx/wine/qedit/samplegrabber.c
index cadde7645e6..edae0ae27da 100644
--- a/reactos/dll/directx/wine/qedit/samplegrabber.c
+++ b/reactos/dll/directx/wine/qedit/samplegrabber.c
@@ -17,20 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <assert.h>
-//#include <stdarg.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "ole2.h"
-
 #include "qedit_private.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static const WCHAR vendor_name[] = { 'W', 'i', 'n', 'e', 0 };
 static const WCHAR pin_in_name[] = { 'I', 'n', 0 };