system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed error message and return value in case of bogus 'open all' mci

Browse source 
string command. Minor 32/16 optimizations and cosmetic fixes.
This commit is contained in:
Eric Pouech 2001-08-15 17:40:03 +00:00 committed by Alexandre Julliard
parent 542f775343
commit 7321bfa006
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/winmm/mci.c
View file

@ -511,11 +511,18 @@ static DWORD MCI_LoadMciDriver(LPWINE_MM_IDATA iData, LPCSTR _strDevTyp,
modp.lpstrParams = NULL;
if (!MCI_OpenMciDriver(wmd, strDevTyp, (LPARAM)&modp)) {
FIXME("Couldn't load driver for type %s.\n"
"If you don't have a windows installation accessible from Wine,\n"
"you perhaps forgot to create a [mci] section in system.ini\n",
strDevTyp);
dwRet = MCIERR_DEVICE_NOT_INSTALLED;
/* silence warning if all is used... some bogus program use commands like
* 'open all'...
*/
if (strcasecmp(strDevTyp, "all") != 0) {
dwRet = MCIERR_CANNOT_USE_ALL;
} else {
FIXME("Couldn't load driver for type %s.\n"
"If you don't have a windows installation accessible from Wine,\n"
"you perhaps forgot to create a [mci] section in system.ini\n",
strDevTyp);
dwRet = MCIERR_DEVICE_NOT_INSTALLED;
}
goto errCleanUp;
}
@ -690,7 +697,7 @@ static DWORD MCI_ParseOptArgs(LPDWORD data, int _offset, LPCSTR lpCmd,
flg = *(LPDWORD)lmem;
eid = *(LPWORD)(lmem + sizeof(DWORD));
lmem += sizeof(DWORD) + sizeof(WORD);
/* EPP TRACE("\tcmd='%s' inCst=%s\n", str, inCst ? "Y" : "N"); */
/* EPP TRACE("\tcmd='%s' inCst=%c eid=%04x\n", str, inCst ? 'Y' : 'N', eid); */
switch (eid) {
case MCI_CONSTANT:
@ -1077,7 +1084,7 @@ DWORD WINAPI mciExecute(LPCSTR lpstrCommand)
TRACE("(%s)!\n", lpstrCommand);
ret = mciSendString16(lpstrCommand, strRet, sizeof(strRet), 0);
ret = mciSendStringA(lpstrCommand, strRet, sizeof(strRet), 0);
if (ret != 0) {
if (!mciGetErrorStringA(ret, strRet, sizeof(strRet))) {
sprintf(strRet, "Unknown MCI error (%ld)", ret);
@ -1193,7 +1200,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable)
{
TRACE("(%08x)!\n", uTable);
return mciFreeCommandResource16(uTable);
return MCI_DeleteCommandTable(uTable);
}
/**************************************************************************