[QEDIT]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 16:59:08 +0000 (16:59 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 16:59:08 +0000 (16:59 +0000)
* 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
reactos/dll/directx/wine/qedit/mediadet.c
reactos/dll/directx/wine/qedit/qedit_private.h
reactos/dll/directx/wine/qedit/samplegrabber.c

index 0834510..6753d5b 100644 (file)
@@ -19,9 +19,6 @@
 
 #include "qedit_private.h"
 #include <rpcproxy.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(qedit);
 
 static HINSTANCE instance;
 
index 7ffa991..6f57f90 100644 (file)
  * 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;
index ea1230c..4172a70 100644 (file)
@@ -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;
 
index cadde76..edae0ae 100644 (file)
  * 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 };