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

diff --git a/modules/rostests/winetests/winmm/mci.c b/modules/rostests/winetests/winmm/mci.c
index 52790c8..7c8aee8 100644 (file)
--- a/modules/rostests/winetests/winmm/mci.c
+++ b/modules/rostests/winetests/winmm/mci.c
@@ -848,7 +848,7 @@ static void test_playWAVE(HWND hwnd)
     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));
 
-    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);
 
     err = mciSendStringA("status mysound mode", buf, sizeof(buf), hwnd);

diff --git a/modules/rostests/winetests/winmm/midi.c b/modules/rostests/winetests/winmm/midi.c
index bf2682a..3417aee 100644 (file)
--- a/modules/rostests/winetests/winmm/midi.c
+++ b/modules/rostests/winetests/winmm/midi.c
@@ -24,6 +24,7 @@
 #include <stddef.h>
 #include "windows.h"
 #include "mmsystem.h"
+#include "objbase.h"
 #include "wine/test.h"
 
 extern const char* mmsys_error(MMRESULT error); /* from wave.c */

diff --git a/modules/rostests/winetests/winmm/wave.c b/modules/rostests/winetests/winmm/wave.c
index 45c0377..d498558 100644 (file)
--- a/modules/rostests/winetests/winmm/wave.c
+++ b/modules/rostests/winetests/winmm/wave.c
@@ -32,15 +32,18 @@
 #define NOBITMAP
 #include "mmddk.h"
 #include "mmreg.h"
-//#include "ks.h"
-//#include "ksguid.h"
-//#include "ksmedia.h"
+#include "ks.h"
+#include "ksguid.h"
+#ifndef __REACTOS__
+#include "ksmedia.h"
+#endif
 
 #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_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+#endif
 
 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",
        dev_name(device),wave_out_error(rc));
     if (rc!=MMSYSERR_NOERROR)
+    {
+        HeapFree(GetProcessHeap(), 0, nameA);
         return;
+    }
 
     trace("  %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,
           (nameA?nameA:"failed"),capsA.vDriverVersion >> 8,