Christian Costa : amstream: Simplify declaration of VTable members.
Alexandre Julliard
julliard at winehq.org
Thu Jan 14 11:33:34 CST 2010
Module: wine
Branch: master
Commit: d32ada8fa595d05d8af4f0050ff5390751d626e3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32ada8fa595d05d8af4f0050ff5390751d626e3
Author: Christian Costa <titan.costa at wanadoo.fr>
Date: Tue Jan 12 09:55:36 2010 +0100
amstream: Simplify declaration of VTable members.
---
dlls/amstream/amstream.c | 4 ++--
dlls/amstream/mediastream.c | 8 ++++----
dlls/amstream/mediastreamfilter.c | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c
index 81584d6..f8ae2a6 100644
--- a/dlls/amstream/amstream.c
+++ b/dlls/amstream/amstream.c
@@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- IAMMultiMediaStream lpVtbl;
+ const IAMMultiMediaStreamVtbl *lpVtbl;
LONG ref;
IGraphBuilder* pFilterGraph;
IPin* ipin;
@@ -63,7 +63,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &AM_Vtbl;
+ object->lpVtbl = &AM_Vtbl;
object->ref = 1;
*ppObj = object;
diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c
index 697b03b..dc4ec64 100644
--- a/dlls/amstream/mediastream.c
+++ b/dlls/amstream/mediastream.c
@@ -36,7 +36,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- IMediaStream lpVtbl;
+ const IMediaStreamVtbl *lpVtbl;
LONG ref;
IMultiMediaStream* Parent;
MSPID PurposeId;
@@ -44,7 +44,7 @@ typedef struct {
} IMediaStreamImpl;
typedef struct {
- IDirectDrawMediaStream lpVtbl;
+ const IDirectDrawMediaStreamVtbl *lpVtbl;
LONG ref;
IMultiMediaStream* Parent;
MSPID PurposeId;
@@ -67,7 +67,7 @@ HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, S
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &MediaStream_Vtbl;
+ object->lpVtbl = &MediaStream_Vtbl;
object->ref = 1;
object->Parent = Parent;
@@ -207,7 +207,7 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &DirectDrawMediaStream_Vtbl;
+ object->lpVtbl = &DirectDrawMediaStream_Vtbl;
object->ref = 1;
object->Parent = Parent;
diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c
index af335fd..4a4d712 100644
--- a/dlls/amstream/mediastreamfilter.c
+++ b/dlls/amstream/mediastreamfilter.c
@@ -36,7 +36,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(amstream);
typedef struct {
- IMediaStreamFilter lpVtbl;
+ const IMediaStreamFilterVtbl *lpVtbl;
LONG ref;
CRITICAL_SECTION csFilter;
FILTER_STATE state;
@@ -63,7 +63,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj)
return E_OUTOFMEMORY;
}
- object->lpVtbl.lpVtbl = &MediaStreamFilter_Vtbl;
+ object->lpVtbl = &MediaStreamFilter_Vtbl;
object->ref = 1;
*ppObj = object;
@@ -120,7 +120,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter * iface)
if (!refCount)
{
- This->lpVtbl.lpVtbl = NULL;
+ This->lpVtbl = NULL;
HeapFree(GetProcessHeap(), 0, This);
}
More information about the wine-cvs
mailing list