[STRMBASE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 16:51:58 +0000 (16:51 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 22 Dec 2013 16:51:58 +0000 (16:51 +0000)
* 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

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

index e167a79..a2718c0 100644 (file)
  * 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)
 {
index 8f7aa05..97b04e5 100644 (file)
  * 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)
 {
index cd351a9..4a210e1 100644 (file)
  * 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[];
index 6993bae..57f0a4f 100644 (file)
  * 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
 {
index 67f7c9f..456a47c 100644 (file)
  * 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)
 {
index d100cc9..d032ff7 100644 (file)
  * 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)
 {
index cbcd964..ac54365 100644 (file)
  * 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};
 
index 750752e..07741fd 100644 (file)
  * 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;
index 71c1dc6..c56a317 100644 (file)
  */
 /* 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;
index f96ed64..1048592 100644 (file)
  * 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));
index 8bbb1f8..1815f0f 100644 (file)
  * 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};
 
index c31699c..a9f760d 100644 (file)
  */
 /* 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)
 {
index 6363bf5..02d75cf 100644 (file)
  * 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;
index df72d99..7ca5db9 100644 (file)
  * 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};
 
index 1c4f360..376c73a 100644 (file)
  * 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)
 {
index cb448e3..c948e8a 100644 (file)
  * 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)
 {