Module: wine Branch: master Commit: 6a6e1bd50ea1bbef09b62f4593794959abff1a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6e1bd50ea1bbef09b62f4593...
Author: Andrew Eikum aeikum@codeweavers.com Date: Tue Mar 27 12:41:04 2012 -0500
winmm: Support DRVM_MAPPER_PREFERRED_GET in waveXxxMessage.
---
dlls/winmm/tests/capture.c | 10 ++++++++++ dlls/winmm/tests/wave.c | 9 +++++++++ dlls/winmm/waveform.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 50a34c2..32deb28 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "mmddk.h" #include "mmsystem.h" #define NOBITMAP #include "mmreg.h" @@ -639,11 +640,20 @@ static void wave_in_tests(void) WAVEFORMATEX format; HWAVEIN win; MMRESULT rc; + DWORD preferred, status; UINT ndev,d;
ndev=waveInGetNumDevs(); trace("found %d WaveIn devices\n",ndev);
+ rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&preferred, (DWORD_PTR)&status); + ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a96d088..8a070b3 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1378,11 +1378,20 @@ static void wave_out_tests(void) WAVEFORMATEX format; HWAVEOUT wout; MMRESULT rc; + DWORD preferred, status; UINT ndev,d;
ndev=waveOutGetNumDevs(); trace("found %d WaveOut devices\n",ndev);
+ rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)&preferred, (DWORD_PTR)&status); + ok((ndev == 0 && rc == MMSYSERR_NODRIVER) || + rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d7d2be6..3ca087e 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2797,6 +2797,20 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; + case DRVM_MAPPER_PREFERRED_GET: + if(dwParam1) { + if(g_outmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + } + + if(dwParam2) + /* Status flags */ + *(DWORD *)dwParam2 = 0; + + return MMSYSERR_NOERROR; }
TRACE("Message not supported: %u\n", uMessage); @@ -3173,6 +3187,20 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; + case DRVM_MAPPER_PREFERRED_GET: + if(dwParam1) { + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + } + + if(dwParam2) + /* Status flags */ + *(DWORD *)dwParam2 = 0; + + return MMSYSERR_NOERROR; }
TRACE("Message not supported: %u\n", uMessage);
-
Alexandre Julliard