Francois Gouget : dsound: Remove mmErr(). It is not used anymore.

Alexandre Julliard julliard at winehq.org
Tue Dec 6 15:46:20 CST 2011


Module: wine
Branch: master
Commit: c64ce9d0ffc3342f141a77cbb17d458d726cae7a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c64ce9d0ffc3342f141a77cbb17d458d726cae7a

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Dec  6 17:37:19 2011 +0100

dsound: Remove mmErr(). It is not used anymore.

---

 dlls/dsound/dsound_main.c    |   27 ---------------------------
 dlls/dsound/dsound_private.h |    1 -
 2 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 81e3627..8bbfb7c 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -101,33 +101,6 @@ static HANDLE g_devenum_thread;
 
 WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
 
-HRESULT mmErr(UINT err)
-{
-	switch(err) {
-	case MMSYSERR_NOERROR:
-		return DS_OK;
-	case MMSYSERR_ALLOCATED:
-		return DSERR_ALLOCATED;
-	case MMSYSERR_ERROR:
-	case MMSYSERR_INVALHANDLE:
-	case WAVERR_STILLPLAYING:
-		return DSERR_GENERIC; /* FIXME */
-	case MMSYSERR_NODRIVER:
-		return DSERR_NODRIVER;
-	case MMSYSERR_NOMEM:
-		return DSERR_OUTOFMEMORY;
-	case MMSYSERR_INVALPARAM:
-	case WAVERR_BADFORMAT:
-	case WAVERR_UNPREPARED:
-		return DSERR_INVALIDPARAM;
-	case MMSYSERR_NOTSUPPORTED:
-		return DSERR_UNSUPPORTED;
-	default:
-		FIXME("Unknown MMSYS error %d\n",err);
-		return DSERR_GENERIC;
-	}
-}
-
 /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
 int ds_hel_buflen = 32768 * 2;
 int ds_snd_queue_max = 10;
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 3abfb97..77dcf9a 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -383,7 +383,6 @@ extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS] DECLSPEC_HIDDEN;
 
 extern WCHAR wine_vxd_drv[] DECLSPEC_HIDDEN;
 
-HRESULT mmErr(UINT err) DECLSPEC_HIDDEN;
 void setup_dsound_options(void) DECLSPEC_HIDDEN;
 const char * dumpCooperativeLevel(DWORD level) DECLSPEC_HIDDEN;
 




More information about the wine-cvs mailing list