Michael Stefaniuc : amstream: Avoid a forward declaration of the IMediaStreamFilter vtbl.
Alexandre Julliard
julliard at winehq.org
Mon Aug 22 13:29:05 CDT 2011
Module: wine
Branch: master
Commit: 8d8843e563172cb6521188cb7543d6540558ddcd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8843e563172cb6521188cb7543d6540558ddcd
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Aug 11 00:14:30 2011 +0200
amstream: Avoid a forward declaration of the IMediaStreamFilter vtbl.
---
dlls/amstream/mediastreamfilter.c | 50 +++++++++++++++++-------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index 725278e..8874136 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -50,32 +50,6 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF
return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface);
}
-static const struct IMediaStreamFilterVtbl MediaStreamFilter_Vtbl;
-
-HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj)
-{
- IMediaStreamFilterImpl* object;
-
- TRACE("(%p,%p)\n", pUnkOuter, ppObj);
-
- if( pUnkOuter )
- return CLASS_E_NOAGGREGATION;
-
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl));
- if (!object)
- {
- ERR("Out of memory\n");
- return E_OUTOFMEMORY;
- }
-
- object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl;
- object->ref = 1;
-
- *ppObj = object;
-
- return S_OK;
-}
-
/*** IUnknown methods ***/
static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid,
@@ -314,3 +288,27 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl =
MediaStreamFilterImpl_Flush,
MediaStreamFilterImpl_EndOfStream
};
+
+HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj)
+{
+ IMediaStreamFilterImpl* object;
+
+ TRACE("(%p,%p)\n", pUnkOuter, ppObj);
+
+ if( pUnkOuter )
+ return CLASS_E_NOAGGREGATION;
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl));
+ if (!object)
+ {
+ ERR("Out of memory\n");
+ return E_OUTOFMEMORY;
+ }
+
+ object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl;
+ object->ref = 1;
+
+ *ppObj = object;
+
+ return S_OK;
+}
More information about the wine-cvs
mailing list