[akhaldi] 61962: [STRMBASE] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Feb  3 17:28:51 2014
New Revision: 61962

URL: http://svn.reactos.org/svn/reactos?rev=61962&view=rev
Log:
[STRMBASE]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/lib/3rdparty/strmbase/dispatch.c
    trunk/reactos/lib/3rdparty/strmbase/outputqueue.c
    trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h

Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dispa...
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/dispatch.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c	[iso-8859-1] Mon Feb  3 17:28:51 2014
@@ -19,6 +19,8 @@
  */

#include "strmbase_private.h"
+
+#include <oleauto.h>

HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outpu...
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c	[iso-8859-1] Mon Feb  3 17:28:51 2014
@@ -19,6 +19,8 @@
  */

#include "strmbase_private.h"
+
+#include <wine/list.h>

enum {SAMPLE_PACKET, EOS_PACKET};

Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strmb...
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h	[iso-8859-1] Mon Feb  3 17:28:51 2014
@@ -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 */