[PATCH 0/3] MR10262: {mmdevapi,winmm}/tests: Fix some test failures.

[Giovanni Mascellani (＠giomasce)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10262

[PATCH 1/3] winmm/tests: Skip format tests if there is no available audio device.

[Giovanni Mascellani]

From: Giovanni Mascellani <[e-mail]>

---
 dlls/winmm/tests/wave.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index acf8599ce72..70966d5f7aa 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -2445,6 +2445,11 @@ static void test_formats(void)
     };
     unsigned int i;
 
+    if(waveOutGetNumDevs() == 0) {
+        skip("No output devices available\n");
+        return;
+    }
+
     fill_wave_formats(&base_fmt);
 
     for (i = 0; i < wave_format_count; ++i)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10262

[PATCH 2/3] mmdevapi/tests: Drop some corner-case tests.

[Giovanni Mascellani]

From: Giovanni Mascellani <[e-mail]>

They fail on some test configurations.
---
 dlls/mmdevapi/tests/render.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 790a33a73a8..ca1844021a5 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -644,7 +644,6 @@ void fill_wave_formats(const WAVEFORMATEXTENSIBLE *base_fmt)
         {WAVE_FORMAT_PCM, 32, 32},
         {WAVE_FORMAT_PCM, 64, 64},
         {WAVE_FORMAT_PCM, 96, 96},
-        {WAVE_FORMAT_PCM, 100, 100},
 
         {WAVE_FORMAT_IEEE_FLOAT, 0, 0},
         {WAVE_FORMAT_IEEE_FLOAT, 1, 1},
@@ -701,7 +700,6 @@ void fill_wave_formats(const WAVEFORMATEXTENSIBLE *base_fmt)
         48000,
         96000,
         192000,
-        384000,
     };
 
     WAVEFORMATEXTENSIBLE *fmt;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10262

[PATCH 3/3] winmm/tests: Drop some corner-case tests.

[Giovanni Mascellani]

From: Giovanni Mascellani <[e-mail]>

They fail on some test configurations.
---
 dlls/winmm/tests/wave.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 70966d5f7aa..c4dc7c6c381 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -2283,7 +2283,6 @@ void fill_wave_formats(const WAVEFORMATEXTENSIBLE *base_fmt)
         {WAVE_FORMAT_PCM, 32, 32},
         {WAVE_FORMAT_PCM, 64, 64},
         {WAVE_FORMAT_PCM, 96, 96},
-        {WAVE_FORMAT_PCM, 100, 100},
 
         {WAVE_FORMAT_IEEE_FLOAT, 0, 0},
         {WAVE_FORMAT_IEEE_FLOAT, 1, 1},
@@ -2340,7 +2339,6 @@ void fill_wave_formats(const WAVEFORMATEXTENSIBLE *base_fmt)
         48000,
         96000,
         192000,
-        384000,
     };
 
     WAVEFORMATEXTENSIBLE *fmt;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10262

[PATCH 0/3] MR10262: {mmdevapi,winmm}/tests: Fix some test failures. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10262