From 8d2caa099b40364dee67b977593031cfa11c7ab8 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 22 Dec 2013 16:51:58 +0000
Subject: [PATCH] [STRMBASE] * 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=61333
---
 reactos/lib/3rdparty/strmbase/audio.c         | 10 +-------
 reactos/lib/3rdparty/strmbase/dispatch.c      |  9 +-------
 reactos/lib/3rdparty/strmbase/dllfunc.c       | 23 +------------------
 reactos/lib/3rdparty/strmbase/enumpins.c      |  8 +------
 reactos/lib/3rdparty/strmbase/filter.c        | 11 +--------
 reactos/lib/3rdparty/strmbase/mediatype.c     |  9 +-------
 reactos/lib/3rdparty/strmbase/outputqueue.c   | 13 +----------
 reactos/lib/3rdparty/strmbase/pin.c           | 12 +---------
 reactos/lib/3rdparty/strmbase/pospass.c       | 12 +---------
 .../lib/3rdparty/strmbase/qualitycontrol.c    | 11 ---------
 reactos/lib/3rdparty/strmbase/renderer.c      | 10 --------
 reactos/lib/3rdparty/strmbase/seeking.c       | 12 +---------
 .../lib/3rdparty/strmbase/strmbase_private.h  | 20 ++++++++++++++++
 reactos/lib/3rdparty/strmbase/transform.c     | 18 ---------------
 reactos/lib/3rdparty/strmbase/video.c         | 12 +---------
 reactos/lib/3rdparty/strmbase/window.c        | 12 +---------
 16 files changed, 32 insertions(+), 170 deletions(-)

diff --git a/reactos/lib/3rdparty/strmbase/audio.c b/reactos/lib/3rdparty/strmbase/audio.c
index e167a794019..a2718c08c42 100644
--- a/reactos/lib/3rdparty/strmbase/audio.c
+++ b/reactos/lib/3rdparty/strmbase/audio.c
@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include <assert.h>
-#include "dshow.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-
+#include "strmbase_private.h"
 
 static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface)
 {
diff --git a/reactos/lib/3rdparty/strmbase/dispatch.c b/reactos/lib/3rdparty/strmbase/dispatch.c
index 8f7aa058b17..97b04e57652 100644
--- a/reactos/lib/3rdparty/strmbase/dispatch.c
+++ b/reactos/lib/3rdparty/strmbase/dispatch.c
@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
+#include "strmbase_private.h"
 
 HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
 {
diff --git a/reactos/lib/3rdparty/strmbase/dllfunc.c b/reactos/lib/3rdparty/strmbase/dllfunc.c
index cd351a9a527..4a210e1facc 100644
--- a/reactos/lib/3rdparty/strmbase/dllfunc.c
+++ b/reactos/lib/3rdparty/strmbase/dllfunc.c
@@ -18,29 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include "config.h"
 
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSSTRUCT
-#define NONAMELESSUNION
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winerror.h"
-#include "winreg.h"
-#include "objbase.h"
-#include "uuids.h"
-#include "strmif.h"
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 extern const int g_cTemplates;
 extern const FactoryTemplate g_Templates[];
diff --git a/reactos/lib/3rdparty/strmbase/enumpins.c b/reactos/lib/3rdparty/strmbase/enumpins.c
index 6993bae601d..57f0a4f3c6d 100644
--- a/reactos/lib/3rdparty/strmbase/enumpins.c
+++ b/reactos/lib/3rdparty/strmbase/enumpins.c
@@ -19,13 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/strmbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 typedef struct IEnumPinsImpl
 {
diff --git a/reactos/lib/3rdparty/strmbase/filter.c b/reactos/lib/3rdparty/strmbase/filter.c
index 67f7c9ff226..456a47c417a 100644
--- a/reactos/lib/3rdparty/strmbase/filter.c
+++ b/reactos/lib/3rdparty/strmbase/filter.c
@@ -18,16 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface)
 {
diff --git a/reactos/lib/3rdparty/strmbase/mediatype.c b/reactos/lib/3rdparty/strmbase/mediatype.c
index d100cc9e8c9..d032ff72915 100644
--- a/reactos/lib/3rdparty/strmbase/mediatype.c
+++ b/reactos/lib/3rdparty/strmbase/mediatype.c
@@ -18,15 +18,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <stdarg.h>
 
-#define COBJMACROS
-#include "dshow.h"
-
-#include "wine/strmbase.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src)
 {
diff --git a/reactos/lib/3rdparty/strmbase/outputqueue.c b/reactos/lib/3rdparty/strmbase/outputqueue.c
index cbcd9640766..ac54365153a 100644
--- a/reactos/lib/3rdparty/strmbase/outputqueue.c
+++ b/reactos/lib/3rdparty/strmbase/outputqueue.c
@@ -18,18 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/list.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 enum {SAMPLE_PACKET, EOS_PACKET};
 
diff --git a/reactos/lib/3rdparty/strmbase/pin.c b/reactos/lib/3rdparty/strmbase/pin.c
index 750752e733e..07741fd54b1 100644
--- a/reactos/lib/3rdparty/strmbase/pin.c
+++ b/reactos/lib/3rdparty/strmbase/pin.c
@@ -19,17 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static const IPinVtbl InputPin_Vtbl;
 static const IPinVtbl OutputPin_Vtbl;
diff --git a/reactos/lib/3rdparty/strmbase/pospass.c b/reactos/lib/3rdparty/strmbase/pospass.c
index 71c1dc67d17..c56a317ec86 100644
--- a/reactos/lib/3rdparty/strmbase/pospass.c
+++ b/reactos/lib/3rdparty/strmbase/pospass.c
@@ -20,17 +20,7 @@
  */
 /* FIXME: critical sections */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "uuids.h"
-
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static const IMediaSeekingVtbl IMediaSeekingPassThru_Vtbl;
 static const IMediaPositionVtbl IMediaPositionPassThru_Vtbl;
diff --git a/reactos/lib/3rdparty/strmbase/qualitycontrol.c b/reactos/lib/3rdparty/strmbase/qualitycontrol.c
index f96ed64a2a2..1048592190b 100644
--- a/reactos/lib/3rdparty/strmbase/qualitycontrol.c
+++ b/reactos/lib/3rdparty/strmbase/qualitycontrol.c
@@ -23,19 +23,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/strmbase.h"
 #include "strmbase_private.h"
 
-#include "uuids.h"
-#include "wine/debug.h"
-
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc);
-
 HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) {
     QualityControlImpl *This;
     *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl));
diff --git a/reactos/lib/3rdparty/strmbase/renderer.c b/reactos/lib/3rdparty/strmbase/renderer.c
index 8bbb1f81130..1815f0fd4c5 100644
--- a/reactos/lib/3rdparty/strmbase/renderer.c
+++ b/reactos/lib/3rdparty/strmbase/renderer.c
@@ -18,18 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
 #include "strmbase_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
-
 static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
 static const WCHAR wcsAltInputPinName[] = {'I','n',0};
 
diff --git a/reactos/lib/3rdparty/strmbase/seeking.c b/reactos/lib/3rdparty/strmbase/seeking.c
index c31699c2099..a9f760d31f3 100644
--- a/reactos/lib/3rdparty/strmbase/seeking.c
+++ b/reactos/lib/3rdparty/strmbase/seeking.c
@@ -20,17 +20,7 @@
  */
 /* FIXME: critical sections */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/strmbase.h"
-
-#include "uuids.h"
-#include "wine/debug.h"
-
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface)
 {
diff --git a/reactos/lib/3rdparty/strmbase/strmbase_private.h b/reactos/lib/3rdparty/strmbase/strmbase_private.h
index 6363bf5307d..02d75cf0314 100644
--- a/reactos/lib/3rdparty/strmbase/strmbase_private.h
+++ b/reactos/lib/3rdparty/strmbase/strmbase_private.h
@@ -18,6 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <assert.h>
+
+#define WIN32_NO_STATUS
+#define WIN32_LEAN_AND_MEAN
+
+#define COBJMACROS
+#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+
+#include <dshow.h>
+
+#include <wine/list.h>
+#include <wine/strmbase.h>
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+
 /* Quality Control */
 typedef struct QualityControlImpl {
     IQualityControl IQualityControl_iface;
diff --git a/reactos/lib/3rdparty/strmbase/transform.c b/reactos/lib/3rdparty/strmbase/transform.c
index df72d999b4f..7ca5db9c46e 100644
--- a/reactos/lib/3rdparty/strmbase/transform.c
+++ b/reactos/lib/3rdparty/strmbase/transform.c
@@ -18,27 +18,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include "config.h"
-#include <stdarg.h>
 
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "dshow.h"
-#include "amvideo.h"
-#include "strmif.h"
-#include "vfw.h"
-
-#include <assert.h>
-
-#include "wine/unicode.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
 #include "strmbase_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
-
 static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0};
 static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0};
 
diff --git a/reactos/lib/3rdparty/strmbase/video.c b/reactos/lib/3rdparty/strmbase/video.c
index 1c4f3606f67..376c73a6f8c 100644
--- a/reactos/lib/3rdparty/strmbase/video.c
+++ b/reactos/lib/3rdparty/strmbase/video.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include <assert.h>
-#include "dshow.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static inline BaseControlVideo *impl_from_IBasicVideo(IBasicVideo *iface)
 {
diff --git a/reactos/lib/3rdparty/strmbase/window.c b/reactos/lib/3rdparty/strmbase/window.c
index cb448e347b1..c948e8a04d5 100644
--- a/reactos/lib/3rdparty/strmbase/window.c
+++ b/reactos/lib/3rdparty/strmbase/window.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
+#include "strmbase_private.h"
 
 static inline BaseControlWindow *impl_from_IVideoWindow( IVideoWindow *iface)
 {