Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-25 20:18:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINMM_WINETEST] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-04-03 13:50:40 +01:00
parent d558fc75a2
commit 1c6244081e
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/rostests/winetests/winmm/mci.c
View file

@ -848,7 +848,7 @@ static void test_playWAVE(HWND hwnd)
err = mciSendStringA("play mysound from 250 to 0", NULL, 0, NULL); err = mciSendStringA("play mysound from 250 to 0", NULL, 0, NULL);
ok(err==MCIERR_OUTOFRANGE,"mci play from 250 to 0 returned %s\n", dbg_mcierr(err)); ok(err==MCIERR_OUTOFRANGE,"mci play from 250 to 0 returned %s\n", dbg_mcierr(err));
Sleep(50); /* Give play from 0 to 0 time to finish. */ Sleep(100); /* Give play from 0 to 0 time to finish. */
todo_wine test_notification(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL); todo_wine test_notification(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL);
err = mciSendStringA("status mysound mode", buf, sizeof(buf), hwnd); err = mciSendStringA("status mysound mode", buf, sizeof(buf), hwnd);

1
modules/rostests/winetests/winmm/midi.c
View file

@ -24,6 +24,7 @@
#include <stddef.h> #include <stddef.h>
#include "windows.h" #include "windows.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "objbase.h"
#include "wine/test.h" #include "wine/test.h"
extern const char* mmsys_error(MMRESULT error); /* from wave.c */ extern const char* mmsys_error(MMRESULT error); /* from wave.c */

14
modules/rostests/winetests/winmm/wave.c
View file

@ -32,15 +32,18 @@
#define NOBITMAP #define NOBITMAP
#include "mmddk.h" #include "mmddk.h"
#include "mmreg.h" #include "mmreg.h"
//#include "ks.h" #include "ks.h"
//#include "ksguid.h" #include "ksguid.h"
//#include "ksmedia.h" #ifndef __REACTOS__
#include "ksmedia.h"
#endif
#include "winmm_test.h" #include "winmm_test.h"
/* FIXME */ #ifdef __REACTOS__ /* FIXME */
DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
#endif
static DWORD g_tid; static DWORD g_tid;
@ -981,7 +984,10 @@ static void wave_out_test_device(UINT_PTR device)
"waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n",
dev_name(device),wave_out_error(rc)); dev_name(device),wave_out_error(rc));
if (rc!=MMSYSERR_NOERROR) if (rc!=MMSYSERR_NOERROR)
{
HeapFree(GetProcessHeap(), 0, nameA);
return; return;
}
trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname, trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,
(nameA?nameA:"failed"),capsA.vDriverVersion >> 8, (nameA?nameA:"failed"),capsA.vDriverVersion >> 8,