From: Aric Stewart <aric@codeweavers.com>
Subject: winmm: sndPlaySound can play resource sounds
Message-Id: <55082649.1030509@codeweavers.com>
Date: Tue, 17 Mar 2015 08:04:09 -0500


despite what MSDN says, SND_RESOURCE is valid for sndPlaySound and it plays the sounds.
Manual testing was done to confirm sound playing in addition to the successfully return
codes on all OS versions other than Vista64 and w2008s64
---
 dlls/winmm/playsound.c       |   4 ++--
 dlls/winmm/tests/Makefile.in |   2 ++
 dlls/winmm/tests/bing.wav    | Bin 0 -> 8418 bytes
 dlls/winmm/tests/resource.rc |  24 ++++++++++++++++++++++++
 dlls/winmm/tests/wave.c      |   8 ++++++++
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 dlls/winmm/tests/bing.wav
 create mode 100644 dlls/winmm/tests/resource.rc

diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index 88a4c48..5d9aed0 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -566,7 +566,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound)
  */
 BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags)
 {
-    uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC;
+    uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC;
     return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE);
 }
 
@@ -575,7 +575,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags)
  */
 BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags)
 {
-    uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC;
+    uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC;
     return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE);
 }
 
diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in
index 5d81e38..1ebbbf9 100644
--- a/dlls/winmm/tests/Makefile.in
+++ b/dlls/winmm/tests/Makefile.in
@@ -12,3 +12,5 @@ C_SRCS = \
 	mmio.c \
 	timer.c \
 	wave.c
+
+RC_SRCS = resource.rc
diff --git a/dlls/winmm/tests/bing.wav b/dlls/winmm/tests/bing.wav
new file mode 100644
index 0000000000000000000000000000000000000000..06360597a9d5448baef37efb23419a3c89ed57c5
GIT binary patch
literal 8418
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
G-24Y!=Q-T~

literal 0
HcmV?d00001

diff --git a/dlls/winmm/tests/resource.rc b/dlls/winmm/tests/resource.rc
new file mode 100644
index 0000000..e0dd689
--- /dev/null
+++ b/dlls/winmm/tests/resource.rc
@@ -0,0 +1,24 @@
+/*
+ * Resources for winmm test suite.
+ *
+ * Copyright 2015 Aric Stewart
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "windef.h"
+
+/* @makedep: bing.wav */
+1 WAVE bing.wav
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index e0232e7..ca95693 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -1519,6 +1519,10 @@ static void test_sndPlaySound(void)
 
     br = sndPlaySoundW(not_existW, SND_FILENAME|SND_SYNC);
     ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br);
+
+    /* Test playing from a resource */
+    br = sndPlaySoundA(0x001, SND_RESOURCE|SND_SYNC);
+    ok(br == TRUE || broken(br == FALSE), "sndPlaySound gave strange return: %u\n", br);
 }
 
 static void test_fragmentsize(void)
@@ -1684,6 +1688,10 @@ static void test_PlaySound(void)
     ok(!br || broken(br), "PlaySound succeeded, got %d\n", br);
 
     DeleteFileA(test_file);
+
+    /* Test playing from a resource */
+    br = PlaySoundA(0x001, NULL, SND_RESOURCE | SND_NODEFAULT);
+    ok(br, "PlaySound failed, got %d\n", br);
 }
 
 START_TEST(wave)