xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43660Signed-off-by: Roger Zoellner <zoellner.roger@gmail.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

xaudio2: Don't return XAudio28 interface for XAudio2[0..7] objects in QueryInterface().
a303f9cd · Roger Zoellner · Alexandre Julliard · b02cdd36 · a303f9cd · a303f9cd
Commit a303f9cd authored Oct 12, 2018 by Roger Zoellner Committed by Alexandre Julliard Oct 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

xaudio2.c dlls/xaudio2_7/tests/xaudio2.c +3 -0

xaudio_dll.c dlls/xaudio2_7/xaudio_dll.c +2 -0

No files found.
--- a/dlls/xaudio2_7/tests/xaudio2.c
+++ b/dlls/xaudio2_7/tests/xaudio2.c
@@ -1273,6 +1273,9 @@ START_TEST(xaudio2)
    if(hr == S_OK){
        xaudio27 = TRUE;

+        hr = IXAudio27_QueryInterface(xa27, &IID_IXAudio28, (void**) &xa);
+        ok(hr != S_OK, "QueryInterface with IID_IXAudio28 on IXAudio27 object returned success. Expected to fail\n");
+
        hr = IXAudio27_Initialize(xa27, 0, XAUDIO2_ANY_PROCESSOR);
        ok(hr == S_OK, "Initialize failed: %08x\n", hr);


--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1262,7 +1262,9 @@ static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid,
    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);

    if(IsEqualGUID(riid, &IID_IUnknown) ||
+#if XAUDIO2_VER == 8
            IsEqualGUID(riid, &IID_IXAudio28) ||
+#endif
            IsEqualGUID(riid, &IID_IXAudio2))
        *ppvObject = &This->IXAudio2_iface;
    else if(IsEqualGUID(riid, &IID_IXAudio27)){