[akhaldi] 61333: [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 i...

Author: akhaldi
Date: Sun Dec 22 16:51:58 2013
New Revision: 61333

URL: http://svn.reactos.org/svn/reactos?rev=61333&view=rev
Log:
[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

Modified:
    trunk/reactos/lib/3rdparty/strmbase/audio.c
    trunk/reactos/lib/3rdparty/strmbase/dispatch.c
    trunk/reactos/lib/3rdparty/strmbase/dllfunc.c
    trunk/reactos/lib/3rdparty/strmbase/enumpins.c
    trunk/reactos/lib/3rdparty/strmbase/filter.c
    trunk/reactos/lib/3rdparty/strmbase/mediatype.c
    trunk/reactos/lib/3rdparty/strmbase/outputqueue.c
    trunk/reactos/lib/3rdparty/strmbase/pin.c
    trunk/reactos/lib/3rdparty/strmbase/pospass.c
    trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c
    trunk/reactos/lib/3rdparty/strmbase/renderer.c
    trunk/reactos/lib/3rdparty/strmbase/seeking.c
    trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h
    trunk/reactos/lib/3rdparty/strmbase/transform.c
    trunk/reactos/lib/3rdparty/strmbase/video.c
    trunk/reactos/lib/3rdparty/strmbase/window.c

Modified: trunk/reactos/lib/3rdparty/strmbase/audio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/audi…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/audio.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/audio.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/disp…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/dispatch.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/dispatch.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/dllfunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/dllf…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/dllfunc.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/dllfunc.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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[];

Modified: trunk/reactos/lib/3rdparty/strmbase/enumpins.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/enum…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/enumpins.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/enumpins.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filt…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/filter.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/filter.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/mediatype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/medi…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/mediatype.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/mediatype.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/outputqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/outp…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/outputqueue.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/outputqueue.c	[iso-8859-1] Sun Dec 22 16:51:58
2013
@@ -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};
 

Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/pin.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/pin.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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;

Modified: trunk/reactos/lib/3rdparty/strmbase/pospass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/posp…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/pospass.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/pospass.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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;

Modified: trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/qual…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/qualitycontrol.c	[iso-8859-1] Sun Dec 22 16:51:58
2013
@@ -23,18 +23,7 @@
  * 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;

Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/renderer.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/renderer.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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 "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};

Modified: trunk/reactos/lib/3rdparty/strmbase/seeking.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/seek…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/seeking.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/seeking.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/strm…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/strmbase_private.h	[iso-8859-1] Sun Dec 22
16:51:58 2013
@@ -17,6 +17,26 @@
  * 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 <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 {

Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/transform.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/transform.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -18,26 +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>
-
-#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};

Modified: trunk/reactos/lib/3rdparty/strmbase/video.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/vide…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/video.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/video.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {

Modified: trunk/reactos/lib/3rdparty/strmbase/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/wind…
==============================================================================
--- trunk/reactos/lib/3rdparty/strmbase/window.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/strmbase/window.c	[iso-8859-1] Sun Dec 22 16:51:58 2013
@@ -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)
 {