ChangeSet ID: 21535 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/29 05:07:01 Modified files: dlls/winmm : mci.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fixed some bugs in MCI string parsing. Patch: http://cvs.winehq.org/patch.py?id=21535 Old revision New revision Changes Path 1.66 1.67 +2 -3 wine/dlls/winmm/mci.c Index: wine/dlls/winmm/mci.c diff -u -p wine/dlls/winmm/mci.c:1.66 wine/dlls/winmm/mci.c:1.67 --- wine/dlls/winmm/mci.c:1.66 29 Nov 2005 11: 7: 1 -0000 +++ wine/dlls/winmm/mci.c 29 Nov 2005 11: 7: 1 -0000 @@ -555,7 +555,7 @@ static DWORD MCI_UnmapMsgAtoW(UINT msg, /************************************************************************** * 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, 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 da } 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++;