Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINMM] Revert "Handle playing of files containing a '+' as part of the filename."

Browse source 
Wine commit: cc5f2b2c766bbe4975d7ee4a7c3b269650cbf874

author: Alexander Puzankov <alxpnv@gmail.com>
Mon, 29 Nov 2010 18:15:16 +0000 (21:15 +0300)

committer: Alexandre Julliard <julliard@winehq.org>
Wed, 1 Dec 2010 16:16:20 +0000 (17:16 +0100)
This commit is contained in:
Thamatip Chitpong 2023-02-06 22:47:21 +07:00 committed by Victor Perevertkin
parent 09dde2cff9
commit d27e2b0b23
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dll/win32/winmm/mmio.c
View file

@ -369,39 +369,40 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName)
LPSTR extEnd;
LPSTR extStart;
CHAR ext[5];
TRACE("(%s)\n", debugstr_a(szFileName));
if (!szFileName)
return ret;
/* Find the last '.' */
extStart = strrchr(szFileName,'.');
/* Find the last '+' */
extEnd = strrchr(szFileName,'+');
if (!extStart) {
ERR("No . in szFileName: %s\n", debugstr_a(szFileName));
if (!extEnd) {
/* No + so just an extension */
return ret;
} else {
CHAR ext[5];
/* Find the '+' afterwards */
extEnd = strchr(extStart,'+');
if (extEnd) {
if (extEnd - extStart - 1 > 4)
WARN("Extension length > 4\n");
lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5));
} else {
/* No + so just an extension */
if (strlen(extStart) > 4) {
WARN("Extension length > 4\n");
/* Find the first '.' before '+' */
extStart = extEnd - 1;
while (*extStart != '.') {
if (extStart == szFileName) {
ERR("No extension in szFileName: %s\n", debugstr_a(szFileName));
return ret;
}
lstrcpynA(ext, extStart + 1, 5);
extStart--;
}
TRACE("Got extension: %s\n", debugstr_a(ext));
/* FOURCC codes identifying file-extensions must be uppercase */
ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER);
}
if (extEnd - extStart - 1 > 4)
WARN("Extension length > 4\n");
lstrcpynA(ext, extStart + 1, min(extEnd-extStart,5));
TRACE("Got extension: %s\n", debugstr_a(ext));
/* FOURCC codes identifying file-extensions must be uppercase */
ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER);
return ret;
}