[QEDIT]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61725

diff --git a/reactos/dll/directx/wine/qedit/main.c b/reactos/dll/directx/wine/qedit/main.c
index 6753d5b..d8e475a 100644 (file)
--- a/reactos/dll/directx/wine/qedit/main.c
+++ b/reactos/dll/directx/wine/qedit/main.c
@@ -18,6 +18,7 @@
  */
 
 #include "qedit_private.h"
+
 #include <rpcproxy.h>
 
 static HINSTANCE instance;

diff --git a/reactos/dll/directx/wine/qedit/mediadet.c b/reactos/dll/directx/wine/qedit/mediadet.c
index 6f57f90..c0978e3 100644 (file)
--- a/reactos/dll/directx/wine/qedit/mediadet.c
+++ b/reactos/dll/directx/wine/qedit/mediadet.c
@@ -18,7 +18,9 @@
  */
 
 #include "qedit_private.h"
+
 #include <assert.h>
+#include <oleauto.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 4172a70..db7237e 100644 (file)
--- a/reactos/dll/directx/wine/qedit/qedit_private.h
+++ b/reactos/dll/directx/wine/qedit/qedit_private.h
@@ -22,20 +22,16 @@
 
 #include <stdarg.h>
 
-#define COBJMACROS
+#define WIN32_LEAN_AND_MEAN
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
-//#include "wtypes.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-
 #include <objbase.h>
-#include <oleauto.h>
-
 #include <dshow.h>
 #define __WINE_DDRAW_H /* ROS HACK */
 #include <qedit.h>