Mark Harmstone : dsound: NOP on SetSpeakerConfig.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a48c7fe408bdf5b28fcdcaa2709718c2a02d1e02
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a48c7fe408bdf5b28fcdcaa2709718c2a02d1e02

Author: Mark Harmstone <hellas at burntcomma.com>
Date:   Wed Dec 31 18:53:06 2014 +0000

dsound: NOP on SetSpeakerConfig.

---

 dlls/dsound/dsound.c        | 4 ++--
 dlls/dsound/tests/dsound.c  | 6 +++---
 dlls/dsound/tests/dsound8.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 986168b..66c9d91 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -386,8 +386,8 @@ static HRESULT WINAPI IDirectSound8Impl_SetSpeakerConfig(IDirectSound8 *iface, D
         return DSERR_UNINITIALIZED;
     }
 
-    This->device->speaker_config = config;
-    WARN("not fully functional\n");
+    /* NOP on Vista and above */
+
     return DS_OK;
 }
 
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index e5a9110..f93e137 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -158,10 +158,10 @@ static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized,
     if (rc==DS_OK) {
         rc=IDirectSound_GetSpeakerConfig(dso,&new_speaker_config);
         ok(rc==DS_OK,"IDirectSound_GetSpeakerConfig() failed: %08x\n", rc);
-        if (rc==DS_OK && speaker_config!=new_speaker_config)
+        if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config)
                trace("IDirectSound_GetSpeakerConfig() failed to set speaker "
-               "config: expected 0x%08x, got 0x%08x\n",
-               speaker_config,new_speaker_config);
+               "config: expected 0x%08x or 0x%08x, got 0x%08x\n",
+               speaker_config,ref_speaker_config,new_speaker_config);
         IDirectSound_SetSpeakerConfig(dso,ref_speaker_config);
     }
 
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
index 64b9f62..ad16ea7 100644
--- a/dlls/dsound/tests/dsound8.c
+++ b/dlls/dsound/tests/dsound8.c
@@ -171,10 +171,10 @@ static void IDirectSound8_test(LPDIRECTSOUND8 dso, BOOL initialized,
     if (rc==DS_OK) {
         rc=IDirectSound8_GetSpeakerConfig(dso,&new_speaker_config);
         ok(rc==DS_OK,"IDirectSound8_GetSpeakerConfig() failed: %08x\n", rc);
-        if (rc==DS_OK && speaker_config!=new_speaker_config)
+        if (rc==DS_OK && speaker_config!=new_speaker_config && ref_speaker_config!=new_speaker_config)
                trace("IDirectSound8_GetSpeakerConfig() failed to set speaker "
-               "config: expected 0x%08x, got 0x%08x\n",
-               speaker_config,new_speaker_config);
+               "config: expected 0x%08x or 0x%08x, got 0x%08x\n",
+               speaker_config,ref_speaker_config,new_speaker_config);
         IDirectSound8_SetSpeakerConfig(dso,ref_speaker_config);
     }