[PATCH 0/3] MR8748: Some audio changes in preparation to adding more mmdevapi tests.

[Giovanni Mascellani (＠giomasce)]

Currently the first commits in !8653, but submitted independently to avoid making an overly long MR.

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

[PATCH 1/3] mmdevapi/tests: Do not test QueryInterface() with a NULL output pointer.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

This segfaults on my Windows 11 system. It's not a particularly
useful test anyway.
---
 dlls/mmdevapi/tests/capture.c | 3 ---
 dlls/mmdevapi/tests/render.c  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c
index f5c16dc838d..e4f8eea5556 100644
--- a/dlls/mmdevapi/tests/capture.c
+++ b/dlls/mmdevapi/tests/capture.c
@@ -435,9 +435,6 @@ static void test_audioclient(void)
 
     handle = CreateEventW(NULL, FALSE, FALSE, NULL);
 
-    hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL);
-    ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr);
-
     unk = (void*)(LONG_PTR)0x12345678;
     hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk);
     ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr);
diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 8772d6e3828..3febeb4c4fb 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -196,9 +196,6 @@ static void test_audioclient(void)
 
     handle = CreateEventW(NULL, FALSE, FALSE, NULL);
 
-    hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL);
-    ok(hr == E_POINTER, "QueryInterface(NULL) returned %08lx\n", hr);
-
     unk = (void*)(LONG_PTR)0x12345678;
     hr = IAudioClient_QueryInterface(ac, &IID_NULL, (void**)&unk);
     ok(hr == E_NOINTERFACE, "QueryInterface(IID_NULL) returned %08lx\n", hr);
-- 
GitLab


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

[PATCH 2/3] winepulse.drv: Allow 32-bit PCM audio samples.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

They're already allowed on the ALSA and CoreAudio drivers.
---
 dlls/winepulse.drv/pulse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index 4b287578e8b..9a218e75c1b 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -962,6 +962,8 @@ static HRESULT pulse_spec_from_waveformat(struct pulse_stream *stream, const WAV
             stream->ss.format = PA_SAMPLE_U8;
         else if (fmt->wBitsPerSample == 16)
             stream->ss.format = PA_SAMPLE_S16LE;
+        else if (fmt->wBitsPerSample == 32)
+            stream->ss.format = PA_SAMPLE_S32LE;
         else
             return AUDCLNT_E_UNSUPPORTED_FORMAT;
         pa_channel_map_init_auto(&stream->map, fmt->nChannels, PA_CHANNEL_MAP_ALSA);
-- 
GitLab


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

[PATCH 3/3] winecoreaudio.drv: Do not spam fixmes for unknown channels.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

---
 dlls/winecoreaudio.drv/coreaudio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index 6b81a7d1d5c..ced8f3838fb 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -853,6 +853,7 @@ static UINT ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout)
         switch (layout->mChannelDescriptions[i].mChannelLabel) {
             default: FIXME("Unhandled channel 0x%x\n",
                            (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break;
+            case kAudioChannelLabel_Unknown: break;
             case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break;
             case kAudioChannelLabel_Mono:
             case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break;
-- 
GitLab

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

[PATCH 0/3] MR8748: Some audio changes in preparation to adding more mmdevapi tests. - approved

[Huw Davies (＠huw)]

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