system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 20:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs in MCI string parsing.

Browse source
This commit is contained in:
Eric Pouech 2005-11-29 11:24:55 +01:00 committed by Alexandre Julliard
parent 1cb1183037
commit f01baaa9ab
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/winmm/mci.c
View file

@ -555,7 +555,7 @@ static DWORD MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2,
/**************************************************************************
* MCI_GetDevTypeFromFileName [internal]
*/
static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPCWSTR buf, UINT len)
static DWORD MCI_GetDevTypeFromFileName(LPCWSTR fileName, LPWSTR buf, UINT len)
{
LPCWSTR tmp;
HKEY hKey;
@ -1031,7 +1031,6 @@ static DWORD MCI_GetString(LPWSTR* str, LPWSTR* args)
if (ptr[-1] == '\\') TRACE("Ooops: un-escaped \"\n");
*ptr++ = '\0'; /* remove trailing " */
if (*ptr != ' ' && *ptr != '\0') return MCIERR_EXTRA_CHARACTERS;
*ptr++ = '\0';
} else {
ptr = strchrW(ptr, ' ');
@ -1093,7 +1092,7 @@ static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCWSTR lpCmd,
}
if (strncmpiW(args, str, len) == 0 &&
(args[len] == 0 || args[len] == ' ')) {
((eid == MCI_STRING && len == 0) || args[len] == 0 || args[len] == ' ')) {
/* store good values into data[] */
args += len;
while (*args == ' ') args++;