[2/4] winmm: Revert "Handle playing of files containing a '+' as part of the filename."
Alexander Puzankov
alxpnv at gmail.com
Mon Nov 29 14:46:55 CST 2010
-------------- next part --------------
From 80d13b2d6e5b14bfea055263ee719b52fd79cb86 Mon Sep 17 00:00:00 2001
From: Alexander Puzankov <alxpnv at gmail.com>
Date: Mon, 29 Nov 2010 21:15:16 +0300
Subject: winmm: Revert "Handle playing of files containing a '+' as part of the filename."
This reverts commit ed593fdf2f5e7851cb59aa5a2253f43e33d2f14f. It's
causing the issues from bug #23723.
---
dlls/winmm/mmio.c | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index 3f0790d..0ebebf1 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -383,39 +383,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 first '.' before '+' */
+ extStart = extEnd - 1;
+ while (*extStart != '.') {
+ if (extStart == szFileName) {
+ ERR("No extension in szFileName: %s\n", debugstr_a(szFileName));
+ return ret;
+ }
+ extStart--;
+ }
+ }
- /* 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));
- 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));
- } else {
- /* No + so just an extension */
- if (strlen(extStart) > 4) {
- WARN("Extension length > 4\n");
- }
- lstrcpynA(ext, extStart + 1, 5);
- }
- TRACE("Got extension: %s\n", debugstr_a(ext));
+ /* FOURCC codes identifying file-extensions must be uppercase */
+ ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER);
- /* FOURCC codes identifying file-extensions must be uppercase */
- ret = mmioStringToFOURCCA(ext, MMIO_TOUPPER);
- }
return ret;
}
--
1.7.1
More information about the wine-patches
mailing list