Michael Stefaniuc : amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl.
Alexandre Julliard
julliard at winehq.org
Mon Aug 22 13:29:06 CDT 2011
Module: wine
Branch: master
Commit: 2b55b5b6632a40d1eee63720b7439cd568bdea09
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b55b5b6632a40d1eee63720b7439cd568bdea09
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Aug 16 10:13:31 2011 +0200
amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl.
---
dlls/amstream/mediastream.c | 52 +++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index 0444cc2..f41b944 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -52,7 +52,6 @@ typedef struct {
} IDirectDrawMediaStreamImpl;
static const struct IMediaStreamVtbl MediaStream_Vtbl;
-static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl;
HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream)
{
@@ -194,31 +193,6 @@ static const struct IMediaStreamVtbl MediaStream_Vtbl =
IMediaStreamImpl_SendEndOfStream
};
-HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream)
-{
- IDirectDrawMediaStreamImpl* object;
-
- TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
-
- object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
- if (!object)
- {
- ERR("Out of memory\n");
- return E_OUTOFMEMORY;
- }
-
- object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl;
- object->ref = 1;
-
- object->Parent = Parent;
- object->PurposeId = *pPurposeId;
- object->StreamType = StreamType;
-
- *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface;
-
- return S_OK;
-}
-
static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface)
{
return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface);
@@ -322,3 +296,29 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl =
IDirectDrawMediaStreamImpl_GetTimePerFrame
};
#undef XCAST
+
+HRESULT DirectDrawMediaStream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId,
+ STREAM_TYPE StreamType, IMediaStream **ppMediaStream)
+{
+ IDirectDrawMediaStreamImpl *object;
+
+ TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl));
+ if (!object)
+ {
+ ERR("Out of memory\n");
+ return E_OUTOFMEMORY;
+ }
+
+ object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl;
+ object->ref = 1;
+
+ object->Parent = Parent;
+ object->PurposeId = *pPurposeId;
+ object->StreamType = StreamType;
+
+ *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface;
+
+ return S_OK;
+}
More information about the wine-cvs
mailing list