dsound: Standardize the COM usage in duplex.c.
Alexandre Julliard
julliard at winehq.org
Thu Dec 9 06:14:58 CST 2010
Michael Stefaniuc <mstefani at redhat.de> writes:
> ---
> dlls/dsound/duplex.c | 86 ++++++++++++++++++++++++++++++-------------------
> 1 files changed, 53 insertions(+), 33 deletions(-)
>
> diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c
> index 4a1fbd2..2fcf64c 100644
> --- a/dlls/dsound/duplex.c
> +++ b/dlls/dsound/duplex.c
> @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound);
> typedef struct IDirectSoundFullDuplexImpl
> {
> /* IUnknown fields */
> - const IDirectSoundFullDuplexVtbl *lpVtbl;
> + IDirectSoundFullDuplex IDirectSoundFullDuplex_iface;
> LONG ref;
>
> /* IDirectSoundFullDuplexImpl fields */
> @@ -57,23 +57,43 @@ typedef struct IDirectSoundFullDuplexImpl
> } IDirectSoundFullDuplexImpl;
>
> typedef struct IDirectSoundFullDuplex_IUnknown {
> - const IUnknownVtbl *lpVtbl;
> + IUnknown IUnknown_iface;
> LONG ref;
> IDirectSoundFullDuplexImpl *pdsfd;
> } IDirectSoundFullDuplex_IUnknown;
>
> typedef struct IDirectSoundFullDuplex_IDirectSound8 {
> - const IDirectSound8Vtbl *lpVtbl;
> + IDirectSound8 IDirectSound8_iface;
> LONG ref;
> IDirectSoundFullDuplexImpl *pdsfd;
> } IDirectSoundFullDuplex_IDirectSound8;
>
> typedef struct IDirectSoundFullDuplex_IDirectSoundCapture {
> - const IDirectSoundCaptureVtbl *lpVtbl;
> + IDirectSoundCapture IDirectSoundCapture_iface;
> LONG ref;
> IDirectSoundFullDuplexImpl *pdsfd;
> } IDirectSoundFullDuplex_IDirectSoundCapture;
All these objects are redundant, they should be merged.
--
Alexandre Julliard
julliard at winehq.org
More information about the wine-devel
mailing list