Alexandre Julliard : dsound:
Make the virtual table functions static where possible.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Jun 10 06:25:51 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: bbeeea4b8825af6615273ad959cf6d76301bf073
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbeeea4b8825af6615273ad959cf6d76301bf073
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Jun 10 11:57:48 2006 +0200
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 c03d4aa..b1cef59 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_Initial
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 a847c3b..7d72145 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 e97e49d..5059075 100644
--- a/dlls/dsound/duplex.c
+++ b/dlls/dsound/duplex.c
@@ -82,7 +82,7 @@ static const IUnknownVtbl DirectSoundFul
IDirectSoundFullDuplex_IUnknown_Release
};
-HRESULT IDirectSoundFullDuplex_IUnknown_Create(
+static HRESULT IDirectSoundFullDuplex_IUnknown_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd,
LPUNKNOWN * ppunk)
{
@@ -241,7 +241,7 @@ static const IDirectSoundVtbl DirectSoun
IDirectSoundFullDuplex_IDirectSound_Initialize
};
-HRESULT IDirectSoundFullDuplex_IDirectSound_Create(
+static HRESULT IDirectSoundFullDuplex_IDirectSound_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd,
LPDIRECTSOUND * ppds)
{
@@ -406,7 +406,7 @@ static const IDirectSound8Vtbl DirectSou
IDirectSoundFullDuplex_IDirectSound8_Initialize
};
-HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
+static HRESULT IDirectSoundFullDuplex_IDirectSound8_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd,
LPDIRECTSOUND8 * ppds8)
{
@@ -520,7 +520,7 @@ static const IDirectSoundCaptureVtbl Dir
IDirectSoundFullDuplex_IDirectSoundCapture_Initialize
};
-HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
+static HRESULT IDirectSoundFullDuplex_IDirectSoundCapture_Create(
LPDIRECTSOUNDFULLDUPLEX pdsfd,
LPDIRECTSOUNDCAPTURE8 * ppdsc8)
{
More information about the wine-cvs
mailing list