From bbeeea4b8825af6615273ad959cf6d76301bf073 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 10 Jun 2006 11:57:48 +0200 Subject: [PATCH] dsound: Make the virtual table functions static where possible. --- dlls/dsound/capture.c | 4 +++- dlls/dsound/dsound_private.h | 20 -------------------- dlls/dsound/duplex.c | 8 ++++---- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c03d4aa74c9..b1cef594fd0 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS]; +static HRESULT DirectSoundCaptureDevice_Create(DirectSoundCaptureDevice ** ppDevice); + static const char * captureStateString[] = { "STATE_STOPPED", "STATE_STARTING", @@ -1605,7 +1607,7 @@ HRESULT DirectSoundCaptureDevice_Initialize( return err; } -HRESULT DirectSoundCaptureDevice_Create( +static HRESULT DirectSoundCaptureDevice_Create( DirectSoundCaptureDevice ** ppDevice) { DirectSoundCaptureDevice * device; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index a847c3b4682..7d72145ecea 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -361,13 +361,9 @@ struct DirectSoundCaptureDevice CRITICAL_SECTION lock; }; -HRESULT DirectSoundCaptureDevice_Create( - DirectSoundCaptureDevice ** ppDevice); HRESULT DirectSoundCaptureDevice_Initialize( DirectSoundCaptureDevice ** ppDevice, LPCGUID lpcGUID); -ULONG DirectSoundCaptureDevice_AddRef( - DirectSoundCaptureDevice * device); ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device); @@ -426,40 +422,24 @@ struct IDirectSoundFullDuplex_IUnknown { IDirectSoundFullDuplexImpl *pdsfd; }; -HRESULT IDirectSoundFullDuplex_IUnknown_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, - LPUNKNOWN * ppunk); - struct IDirectSoundFullDuplex_IDirectSound { const IDirectSoundVtbl *lpVtbl; LONG ref; IDirectSoundFullDuplexImpl *pdsfd; }; -HRESULT IDirectSoundFullDuplex_IDirectSound_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, - LPDIRECTSOUND * ppds); - struct IDirectSoundFullDuplex_IDirectSound8 { const IDirectSound8Vtbl *lpVtbl; LONG ref; IDirectSoundFullDuplexImpl *pdsfd; }; -HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, - LPDIRECTSOUND8 * ppds8); - struct IDirectSoundFullDuplex_IDirectSoundCapture { const IDirectSoundCaptureVtbl *lpVtbl; LONG ref; IDirectSoundFullDuplexImpl *pdsfd; }; -HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( - LPDIRECTSOUNDFULLDUPLEX pdsfd, - LPDIRECTSOUNDCAPTURE8 * ppdsc8); - /***************************************************************************** * IDirectSoundNotify implementation structure */ diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index e97e49dbe23..5059075fd42 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -82,7 +82,7 @@ static const IUnknownVtbl DirectSoundFullDuplex_Unknown_Vtbl = IDirectSoundFullDuplex_IUnknown_Release }; -HRESULT IDirectSoundFullDuplex_IUnknown_Create( +static HRESULT IDirectSoundFullDuplex_IUnknown_Create( LPDIRECTSOUNDFULLDUPLEX pdsfd, LPUNKNOWN * ppunk) { @@ -241,7 +241,7 @@ static const IDirectSoundVtbl DirectSoundFullDuplex_DirectSound_Vtbl = IDirectSoundFullDuplex_IDirectSound_Initialize }; -HRESULT IDirectSoundFullDuplex_IDirectSound_Create( +static HRESULT IDirectSoundFullDuplex_IDirectSound_Create( LPDIRECTSOUNDFULLDUPLEX pdsfd, LPDIRECTSOUND * ppds) { @@ -406,7 +406,7 @@ static const IDirectSound8Vtbl DirectSoundFullDuplex_DirectSound8_Vtbl = IDirectSoundFullDuplex_IDirectSound8_Initialize }; -HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( +static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create( LPDIRECTSOUNDFULLDUPLEX pdsfd, LPDIRECTSOUND8 * ppds8) { @@ -520,7 +520,7 @@ static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vt IDirectSoundFullDuplex_IDirectSoundCapture_Initialize }; -HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( +static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create( LPDIRECTSOUNDFULLDUPLEX pdsfd, LPDIRECTSOUNDCAPTURE8 * ppdsc8) {