Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/strmbase/audio.c | 9 +-------- dlls/strmbase/dispatch.c | 8 +------- dlls/strmbase/dllfunc.c | 19 +------------------ dlls/strmbase/enumpins.c | 6 +----- dlls/strmbase/filter.c | 8 +------- dlls/strmbase/outputqueue.c | 10 +--------- dlls/strmbase/pin.c | 9 +-------- dlls/strmbase/pospass.c | 10 +--------- dlls/strmbase/qualitycontrol.c | 9 --------- dlls/strmbase/renderer.c | 7 ------- dlls/strmbase/seeking.c | 10 +--------- dlls/strmbase/strmbase_private.h | 32 ++++++++++++++++++++++++++++++++ dlls/strmbase/transform.c | 15 --------------- dlls/strmbase/video.c | 9 +-------- dlls/strmbase/window.c | 9 +-------- include/wine/strmbase.h | 13 ------------- 16 files changed, 43 insertions(+), 140 deletions(-)
diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index 260e5edffc..6ad64610f0 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -18,14 +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/strmbase.h" - +#include "strmbase_private.h"
static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) { diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 697618527a..e91b65a94a 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COBJMACROS - -#include "dshow.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/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index da4f450412..842bee6121 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#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/debug.h" -#include "wine/strmbase.h" +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index abfaf6917d..65a11bd34e 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -19,11 +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" +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index f133f1ca78..50340cd9b5 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -18,13 +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/strmbase.h" -#include "uuids.h" -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index ba61c1f7b5..e3515c0e31 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -18,15 +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/list.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 3075207614..8ae909850a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -19,14 +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/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 45eb23482d..f8321324a8 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -20,15 +20,7 @@ */ /* FIXME: critical sections */
-#define COBJMACROS - -#include "dshow.h" -#include "uuids.h" - -#include "wine/debug.h" -#include "wine/strmbase.h" - -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 456ef83c5e..d6a91a7133 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -23,17 +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);
#define XTIME_FMT "%u.%03u" diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0649d34464..43d7c70d45 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -18,13 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" #include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index c31699c209..8a773b51d5 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -20,15 +20,7 @@ */ /* FIXME: critical sections */
-#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" - -#include "uuids.h" -#include "wine/debug.h" - -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4e5a25a937..f3367f88c5 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
+#ifndef __WINE_STRMBASE_PRIVATE_H +#define __WINE_STRMBASE_PRIVATE_H + +#include <assert.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define COBJMACROS +#include "dshow.h" +#include "uuids.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/strmbase.h" +#include "wine/unicode.h" + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; @@ -48,3 +62,21 @@ HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sam void QualityControlRender_DoQOS(QualityControlImpl *priv); void QualityControlRender_BeginRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This); + +HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin pfn_get_pin, + BaseFilter_GetPinCount pfn_get_pin_count, BaseFilter_GetPinVersion pfn_get_pin_version, + IEnumPins **enum_pins); + +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); + +HRESULT WINAPI BaseDispatch_Init(BaseDispatch *disp, REFIID iid); +HRESULT WINAPI BaseDispatch_Destroy(BaseDispatch *disp); +HRESULT WINAPI BaseDispatchImpl_GetIDsOfNames(BaseDispatch *disp, REFIID iid, + WCHAR **names, UINT count, LCID lcid, DISPID *ids); +HRESULT WINAPI BaseDispatchImpl_GetTypeInfo(BaseDispatch *disp, REFIID iid, + UINT index, LCID lcid, ITypeInfo **typeinfo); +HRESULT WINAPI BaseDispatchImpl_GetTypeInfoCount(BaseDispatch *disp, UINT *count); + +#endif /* __WINE_STRMBASE_PRIVATE_H */ diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index d741e928d0..c942e92c5c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -19,21 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#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/debug.h" -#include "wine/strmbase.h" #include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index f5366418a0..2857932a05 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -18,14 +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/strmbase.h" +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 64e9bc1d02..d0105bdfbd 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -18,14 +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/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cfd8027559..6429d864fd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,8 +204,6 @@ HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);
-HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum); - /* Transform Filter */ typedef struct TransformFilter { @@ -303,11 +301,6 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll);
-/* PosPassThru */ -HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); -HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); -HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); - HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru); HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru);
@@ -419,12 +412,6 @@ typedef struct{ ITypeInfo *pTypeInfo; } BaseDispatch;
-HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid); -HRESULT WINAPI BaseDispatch_Destroy(BaseDispatch *This); -HRESULT WINAPI BaseDispatchImpl_GetIDsOfNames(BaseDispatch *This, REFIID riid, OLECHAR **rgszNames, UINT cNames, LCID lcid, DISPID *rgdispid); -HRESULT WINAPI BaseDispatchImpl_GetTypeInfo(BaseDispatch *This, REFIID riid, UINT itinfo, LCID lcid, ITypeInfo **pptinfo); -HRESULT WINAPI BaseDispatchImpl_GetTypeInfoCount(BaseDispatch *This, UINT *pctinfo); - #ifdef __IVideoWindow_FWD_DEFINED__ typedef struct tagBaseControlWindow {