ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winmm: Handle DRV_QUERYMAPPABLE in waveXxxMessage.

This commit is contained in:
Andrew Eikum 2011-10-04 08:24:27 -05:00 committed by Alexandre Julliard
parent 17af6e394a
commit e19be58e90
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/winmm/tests/wave.c
View File

@ -30,6 +30,7 @@
#include "winnls.h" #include "winnls.h"
#include "mmsystem.h" #include "mmsystem.h"
#define NOBITMAP #define NOBITMAP
#include "mmddk.h"
#include "mmreg.h" #include "mmreg.h"
#include "ks.h" #include "ks.h"
#include "ksguid.h" #include "ksguid.h"
@ -891,6 +892,11 @@ static void wave_out_test_device(UINT_PTR device)
"waveOutGetDevCapsW(%s): unexpected return value %s\n", "waveOutGetDevCapsW(%s): unexpected return value %s\n",
dev_name(device),wave_out_error(rc)); dev_name(device),wave_out_error(rc));
rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYMAPPABLE, 0, 0);
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED,
"DRV_QUERYMAPPABLE(%s): unexpected return value %s\n",
dev_name(device),wave_out_error(rc));
nameA=NULL; nameA=NULL;
rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE, rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE,
(DWORD_PTR)&size, 0); (DWORD_PTR)&size, 0);

4
dlls/winmm/waveform.c
View File

@ -2780,6 +2780,8 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage,
(DWORD_PTR*)dwParam1, TRUE); (DWORD_PTR*)dwParam1, TRUE);
case DRV_QUERYFUNCTIONINSTANCEID: case DRV_QUERYFUNCTIONINSTANCEID:
return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE);
case DRV_QUERYMAPPABLE:
return MMSYSERR_NOERROR;
} }
return MMSYSERR_NOTSUPPORTED; return MMSYSERR_NOTSUPPORTED;
@ -3152,6 +3154,8 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage,
(DWORD_PTR*)dwParam1, FALSE); (DWORD_PTR*)dwParam1, FALSE);
case DRV_QUERYFUNCTIONINSTANCEID: case DRV_QUERYFUNCTIONINSTANCEID:
return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE);
case DRV_QUERYMAPPABLE:
return MMSYSERR_NOERROR;
} }
return MMSYSERR_NOTSUPPORTED; return MMSYSERR_NOTSUPPORTED;