strmbase: Move some internal definitions to strmbase_private.h.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/strmbase/audio.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include <assert.h>
-#include "dshow.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "wine/strmbase.h"
-
 
 static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface)
 {

dlls/strmbase/dispatch.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
 
 HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid)
 {

dlls/strmbase/dllfunc.c

@@ -19,24 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "strmbase_private.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"
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/enumpins.c

@@ -19,11 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/strmbase.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/filter.c

@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/outputqueue.c

@@ -18,15 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/pin.c

@@ -19,14 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/pospass.c

@@ -20,15 +20,7 @@
  */
 /* FIXME: critical sections */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "uuids.h"
-
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

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"

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);

dlls/strmbase/seeking.c

@@ -20,15 +20,7 @@
  */
 /* FIXME: critical sections */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/strmbase.h"
-
-#include "uuids.h"
-#include "wine/debug.h"
-
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

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 */

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);

dlls/strmbase/video.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include <assert.h>
-#include "dshow.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

dlls/strmbase/window.c

@@ -18,14 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
+#include "strmbase_private.h"
-
-#include "dshow.h"
-#include "wine/debug.h"
-#include "wine/strmbase.h"
-#include "uuids.h"
-#include "vfwmsgs.h"
-#include <assert.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
 

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
 {