[ros-diffs] [akhaldi] 61335: [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 t...

Author: akhaldi
Date: Sun Dec 22 16:59:08 2013
New Revision: 61335

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

Modified:
    trunk/reactos/dll/directx/wine/qedit/main.c
    trunk/reactos/dll/directx/wine/qedit/mediadet.c
    trunk/reactos/dll/directx/wine/qedit/qedit_private.h
    trunk/reactos/dll/directx/wine/qedit/samplegrabber.c

Modified: trunk/reactos/dll/directx/wine/qedit/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/mai…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/main.c	[iso-8859-1] Sun Dec 22 16:59:08 2013
@@ -19,9 +19,6 @@
 
 #include "qedit_private.h"
 #include <rpcproxy.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static HINSTANCE instance;
 

Modified: trunk/reactos/dll/directx/wine/qedit/mediadet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/med…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/mediadet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/mediadet.c	[iso-8859-1] Sun Dec 22 16:59:08 2013
@@ -17,20 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "qedit_private.h"
 #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);
 
 typedef struct MediaDetImpl {
     IUnknown IUnknown_inner;

Modified: trunk/reactos/dll/directx/wine/qedit/qedit_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/qed…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/qedit_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/qedit_private.h	[iso-8859-1] Sun Dec 22 16:59:08
2013
@@ -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;
 

Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam…
==============================================================================
--- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c	[iso-8859-1] Sun Dec 22 16:59:08
2013
@@ -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 };