[STRMBASE]

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

svn path=/trunk/; revision=61962

diff --git a/reactos/lib/3rdparty/strmbase/dispatch.c b/reactos/lib/3rdparty/strmbase/dispatch.c
index 97b04e5..a9ed159 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/dispatch.c
+++ b/reactos/lib/3rdparty/strmbase/dispatch.c
@@ -20,6 +20,8 @@
 
 #include "strmbase_private.h"
 
+#include <oleauto.h>
+
 HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
 {
     HRESULT hr = E_FAIL;

diff --git a/reactos/lib/3rdparty/strmbase/outputqueue.c b/reactos/lib/3rdparty/strmbase/outputqueue.c
index ac54365..64392cc 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/outputqueue.c
+++ b/reactos/lib/3rdparty/strmbase/outputqueue.c
@@ -20,6 +20,8 @@
 
 #include "strmbase_private.h"
 
+#include <wine/list.h>
+
 enum {SAMPLE_PACKET, EOS_PACKET};
 
 typedef struct tagQueuedEvent {

diff --git a/reactos/lib/3rdparty/strmbase/strmbase_private.h b/reactos/lib/3rdparty/strmbase/strmbase_private.h
index 02d75cf..7eb5c97 100644 (file)
--- a/reactos/lib/3rdparty/strmbase/strmbase_private.h
+++ b/reactos/lib/3rdparty/strmbase/strmbase_private.h
@@ -18,24 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#include <wine/config.h>
 
 #include <assert.h>
+#include <stdarg.h>
 
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define WIN32_LEAN_AND_MEAN
 
 #define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
 
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
 #include <dshow.h>
 
-#include <wine/list.h>
+#include <wine/debug.h>
 #include <wine/strmbase.h>
 #include <wine/unicode.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 
 /* Quality Control */