Akihiro Sagawa : winmm: Add .wav extension when searching for PlaySound.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 25 09:57:00 CST 2015
Module: wine
Branch: master
Commit: 563a4ff08ba9137dda4803a83d8937b3037fa25e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=563a4ff08ba9137dda4803a83d8937b3037fa25e
Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date: Wed Feb 25 01:38:47 2015 +0900
winmm: Add .wav extension when searching for PlaySound.
---
dlls/winmm/playsound.c | 3 ++-
dlls/winmm/tests/wave.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index f8bd91f..88a4c48 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -55,11 +55,12 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName)
HMMIO ret;
WCHAR buf[256];
LPWSTR dummy;
+ static const WCHAR dotwav[] = {'.','w','a','v',0};
ret = mmioOpenW((LPWSTR)lpszName, NULL,
MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
if (ret != 0) return ret;
- if (SearchPathW(NULL, lpszName, NULL, sizeof(buf)/sizeof(buf[0]), buf, &dummy))
+ if (SearchPathW(NULL, lpszName, dotwav, sizeof(buf)/sizeof(buf[0]), buf, &dummy))
{
return mmioOpenW(buf, NULL,
MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 2ffbe17..e0232e7 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -1676,7 +1676,7 @@ static void test_PlaySound(void)
/* no extensions */
*exts = '\0';
br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT);
- todo_wine ok(br, "PlaySound failed, got %d\n", br);
+ ok(br, "PlaySound failed, got %d\n", br);
/* ends with a dot */
strcpy(exts, ".");
More information about the wine-cvs
mailing list