April 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Fix _get/ _set_invalid_parameter_handler implementation.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: abb746002b8b0f60fe7e5b865aedd97a770a0086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb746002b8b0f60fe7e5b865… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:40:22 2010 +0200 msvcrt: Fix _get/_set_invalid_parameter_handler implementation. --- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 25 ------------------------- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/errno.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++++- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 541cf68..b48656e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -470,7 +470,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ cdecl _get_invalid_parameter_handler() msvcr90._get_invalid_parameter_handler +@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_osplatform @ stub _get_osver @@ -533,7 +533,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ extern _invalid_parameter msvcrt._invalid_parameter +@ stub _invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -873,7 +873,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ cdecl _set_invalid_parameter_handler(ptr) msvcr90._set_invalid_parameter_handler +@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index a1994d8..c3515ee 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); typedef int (CDECL *_INITTERM_E_FN)(void); -typedef void (__cdecl *_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, unsigned*); /********************************************************************* * DllMain (MSVCR90.@) @@ -78,30 +77,6 @@ void * CDECL _encoded_null(void) } /********************************************************************* - * _get_invalid_parameter_handler (MSVCR90.@) - */ -_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) -{ - TRACE("\n"); - return *((_invalid_parameter_handler*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_invalid_parameter")); -} - -/********************************************************************* - * _set_invalid_parameter_handler (MSVCR90.@) - */ -_invalid_parameter_handler CDECL _set_invalid_parameter_handler(_invalid_parameter_handler handler) -{ - _invalid_parameter_handler *ptr = (_invalid_parameter_handler*)GetProcAddress( - GetModuleHandleA("msvcrt.dll"), "_invalid_parameter"); - _invalid_parameter_handler old = *ptr; - - TRACE("(%p)\n", handler); - - *ptr = handler; - return old; -} - -/********************************************************************* * _initterm_e (MSVCR90.@) * * call an array of application initialization functions and report the return value diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 296466a..fd6c8df 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -462,7 +462,7 @@ @ stub _get_errno @ stub _get_fmode @ stub _get_heap_handle -@ cdecl _get_invalid_parameter_handler() +@ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @ stub _get_output_format @ stub _get_pgmptr @@ -521,7 +521,7 @@ @ stub _inp @ stub _inpd @ stub _inpw -@ extern _invalid_parameter msvcrt._invalid_parameter +@ stub _invalid_parameter @ stub _invalid_parameter_noinfo @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -859,7 +859,7 @@ @ stub _set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ stub _set_fmode -@ cdecl _set_invalid_parameter_handler(ptr) +@ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format @ stub _set_printf_count_output diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index c4c8618..80dcab6 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -286,3 +286,22 @@ void CDECL _seterrormode(int mode) { SetErrorMode( mode ); } + +/* _get_invalid_parameter_handler - not exported in native msvcrt, added in msvcr80 */ +MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) +{ + TRACE("\n"); + return MSVCRT_invalid_parameter; +} + +/* _set_invalid_parameter_handler - not exproted in native msvcrt, added in msvcr80 */ +MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( + MSVCRT_invalid_parameter_handler handler) +{ + MSVCRT_invalid_parameter_handler old = MSVCRT_invalid_parameter; + + TRACE("(%p)\n", handler); + + MSVCRT_invalid_parameter = handler; + return old; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b6be16..762563e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -479,7 +479,7 @@ @ stub _inp #(long) -i386 @ stub _inpd #(long) -i386 @ stub _inpw #(long) -i386 -@ extern _invalid_parameter MSVCRT_invalid_parameter +@ stub _invalid_parameter @ extern _iob MSVCRT__iob # stub _isalnum_l # stub _isalpha_l @@ -1409,3 +1409,7 @@ # stub wprintf_s @ varargs wscanf(wstr) MSVCRT_wscanf # stub wscanf_s + +# Functions not exported in native dll: +@ cdecl _get_invalid_parameter_handler() +@ cdecl _set_invalid_parameter_handler(ptr)

1 0

Piotr Caban : msvcrt: Added implementation of _controlfp_s.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: bfd0866be888d4f4e5e731615bad14aaa8a83616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd0866be888d4f4e5e731615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:41:06 2010 +0200 msvcrt: Added implementation of _controlfp_s. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b48656e..b8876a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -327,7 +327,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fd6c8df..dfb951c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -319,7 +319,7 @@ @ stub _configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp -@ stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign( double double ) msvcrt._copysign @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 317c8eb..fb2cd86 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -702,6 +702,27 @@ unsigned int CDECL _controlfp(unsigned int newval, unsigned int mask) } /********************************************************************* + * _controlfp_s (MSVCRT.@) + */ +int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) +{ + unsigned int flags; +#ifdef __i386__ + FIXME("(%p %u %u) semi-stub\n", cur, newval, mask); + + flags = _control87( newval, mask & ~MSVCRT__EM_DENORMAL ); + + if(cur) + *cur = flags; + + return 0; +#else + FIXME(":Not Implemented!\n"); + return 0; +#endif +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL _copysign(double num, double sign) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 762563e..7205bd6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -299,7 +299,7 @@ @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) -# stub _controlfp_s +@ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) @ varargs _cprintf(str) # stub _cprintf_l

1 0

Alexandre Julliard : server: Set a proper error code when dup_fd_object fails.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 7d1d002d4c547570e0835a9c5714363b58203490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1d002d4c547570e0835a9c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 15:40:23 2010 +0200 server: Set a proper error code when dup_fd_object fails. --- server/fd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index e26ce04..ca317c4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1628,6 +1628,7 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha if (!closed) goto failed; if ((fd->unix_fd = dup( orig->unix_fd )) == -1) { + file_set_error(); free( closed ); goto failed; } @@ -1637,8 +1638,11 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha fd->inode = (struct inode *)grab_object( orig->inode ); list_add_head( &fd->inode->open, &fd->inode_entry ); } - else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) goto failed; - + else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) + { + file_set_error(); + goto failed; + } return fd; failed:

1 0

Huw Davies : oleaut32: Only oleautomation interfaces as well as all dispinterfaces should be registered .
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: adeba6ee8058f4b21256c175ceff76c30af95257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adeba6ee8058f4b21256c175c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 1 13:02:17 2010 +0100 oleaut32: Only oleautomation interfaces as well as all dispinterfaces should be registered. --- .gitignore | 3 + dlls/oleaut32/tests/Makefile.in | 5 +- dlls/oleaut32/tests/test_reg.idl | 130 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.rc | 3 + dlls/oleaut32/tests/typelib.c | 115 ++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 5 +- 6 files changed, 256 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adeba6ee8058f4b21256c…

1 0

Huw Davies : oleaut32: Only unregister those types that were registered.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: fbaaedd967d041a1d395dc427b24b651a60df5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbaaedd967d041a1d395dc427… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 1 13:07:58 2010 +0100 oleaut32: Only unregister those types that were registered. --- dlls/oleaut32/typelib.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cbf68b5..468f001 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -835,19 +835,23 @@ HRESULT WINAPI UnRegisterTypeLib( goto enddeleteloop; } - /* the path to the type */ - get_interface_key( &typeAttr->guid, subKeyName ); + if ((kind == TKIND_INTERFACE && (typeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || + kind == TKIND_DISPATCH) + { + /* the path to the type */ + get_interface_key( &typeAttr->guid, subKeyName ); - /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) { - goto enddeleteloop; + /* Delete its bits */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) + goto enddeleteloop; + + RegDeleteKeyW(subKey, ProxyStubClsidW); + RegDeleteKeyW(subKey, ProxyStubClsid32W); + RegDeleteKeyW(subKey, TypeLibW); + RegCloseKey(subKey); + subKey = NULL; + RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); } - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); - RegCloseKey(subKey); - subKey = NULL; - RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); enddeleteloop: if (typeAttr) ITypeInfo_ReleaseTypeAttr(typeInfo, typeAttr);

1 0

Jörg Höhle : winmm: Improve MCI's Sysinfo command .
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f70b2f54935d6aff2b5464131e3f4a004f42aa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70b2f54935d6aff2b5464131… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 17 22:07:55 2009 +0100 winmm: Improve MCI's Sysinfo command. --- dlls/winmm/mci.c | 55 +++++++++++++++++++++++++++++++++++++++-------- dlls/winmm/tests/mci.c | 6 ++-- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 54e9e19..4fbb9a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1733,10 +1733,16 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm TRACE("(%08x, %08X, %p[num=%d, wDevTyp=%u])\n", uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); + if ((WORD)MCI_ALL_DEVICE_ID == LOWORD(uDevID)) + uDevID = MCI_ALL_DEVICE_ID; /* Be compatible with Win9x */ - switch (dwFlags & ~MCI_SYSINFO_OPEN) { + switch (dwFlags & ~(MCI_SYSINFO_OPEN|MCI_NOTIFY|MCI_WAIT)) { case MCI_SYSINFO_QUANTITY: - if (lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) { + if (lpParms->dwRetSize < sizeof(DWORD)) + return MCIERR_PARAM_OVERFLOW; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + if (uDevID == MCI_ALL_DEVICE_ID) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ if (dwFlags & MCI_SYSINFO_OPEN) { TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers\n"); EnterCriticalSection(&WINMM_cs); @@ -1756,14 +1762,14 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } else { if (dwFlags & MCI_SYSINFO_OPEN) { - TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of open MCI drivers of type %d\n", lpParms->wDeviceType); EnterCriticalSection(&WINMM_cs); for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { if (wmd->wType == lpParms->wDeviceType) cnt++; } LeaveCriticalSection(&WINMM_cs); } else { - TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %u\n", lpParms->wDeviceType); + TRACE("MCI_SYSINFO_QUANTITY: # of installed MCI drivers of type %d\n", lpParms->wDeviceType); FIXME("Don't know how to get # of MCI devices of a given type\n"); cnt = 1; } @@ -1771,6 +1777,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm *(DWORD*)lpParms->lpstrReturn = cnt; TRACE("(%d) => '%d'\n", lpParms->dwNumber, *(DWORD*)lpParms->lpstrReturn); ret = MCI_INTEGER_RETURNED; + /* return ret; Only Win9x sends a notification in this case. */ break; case MCI_SYSINFO_INSTALLNAME: TRACE("MCI_SYSINFO_INSTALLNAME\n"); @@ -1784,12 +1791,27 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; case MCI_SYSINFO_NAME: - TRACE("MCI_SYSINFO_NAME\n"); + s = NULL; if (dwFlags & MCI_SYSINFO_OPEN) { - FIXME("Don't handle MCI_SYSINFO_NAME|MCI_SYSINFO_OPEN (yet)\n"); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } else { - s = NULL; + /* Win9x returns 0 for 0 < uDevID < (UINT16)MCI_ALL_DEVICE_ID */ + TRACE("MCI_SYSINFO_NAME: nth alias of type %d\n", + uDevID == MCI_ALL_DEVICE_ID ? MCI_ALL_DEVICE_ID : lpParms->wDeviceType); + EnterCriticalSection(&WINMM_cs); + for (wmd = MciDrivers; wmd; wmd = wmd->lpNext) { + /* wDeviceType == MCI_ALL_DEVICE_ID is not recognized. */ + if (uDevID == MCI_ALL_DEVICE_ID || + lpParms->wDeviceType == wmd->wType) { + cnt++; + if (cnt == lpParms->dwNumber) { + s = wmd->lpstrAlias; + break; + } + } + } + LeaveCriticalSection(&WINMM_cs); + ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + } else if (MCI_ALL_DEVICE_ID == uDevID) { + TRACE("MCI_SYSINFO_NAME: device #%d\n", lpParms->dwNumber); if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, wszHklmMci, 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) { if (RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, @@ -1814,13 +1836,26 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm } } ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR), s) : MCIERR_OUTOFRANGE; + } else { + FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType); + /* Cheating: what is asked for is the nth device from the registry. */ + if (1 != lpParms->dwNumber || /* Handle only one of each kind. */ + lpParms->wDeviceType < MCI_DEVTYPE_FIRST || lpParms->wDeviceType > MCI_DEVTYPE_LAST) + ret = MCIERR_OUTOFRANGE; + else { + LoadStringW(hWinMM32Instance, LOWORD(lpParms->wDeviceType), + lpParms->lpstrReturn, lpParms->dwRetSize / sizeof(WCHAR)); + ret = 0; + } } TRACE("(%d) => %s\n", lpParms->dwNumber, debugstr_w(lpParms->lpstrReturn)); break; default: TRACE("Unsupported flag value=%08x\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; + ret = MCIERR_UNRECOGNIZED_KEYWORD; } + if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) + mciDriverNotify((HWND)lpParms->dwCallback, uDevID, MCI_NOTIFY_SUCCESSFUL); return ret; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6bdfefe..a289fd6 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -230,7 +230,7 @@ static void test_openCloseWAVE(HWND hwnd) memset(buf, 0, sizeof(buf)); err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL); ok(!err,"mci %s returned %s\n", command_sysinfo, dbg_mcierr(err)); - todo_wine ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); + ok(buf[0] == '0' && buf[1] == 0, "mci %s, expected output buffer '0', got: '%s'\n", command_sysinfo, buf); err = mciSendString("open new type waveaudio", buf, sizeof(buf), NULL); ok(err==MCIERR_NEW_REQUIRES_ALIAS,"mci open new without alias returned %s\n", dbg_mcierr(err)); @@ -724,7 +724,7 @@ static void test_AutoOpenWAVE(HWND hwnd) err = mciSendString("sysinfo waveaudio quantity open", buf, sizeof(buf), NULL); ok(!err,"mci sysinfo waveaudio quantity open returned %s\n", dbg_mcierr(err)); - if(!err) todo_wine ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); + if(!err) ok(!strcmp(buf,"0"), "sysinfo quantity open expected 0, got: %s, some more tests will fail.\n", buf); /* Who knows why some machines pass all tests but return MCIERR_HARDWARE here? */ err = mciSendString("sound NoSuchSoundDefined wait", NULL, 0, NULL); @@ -736,7 +736,7 @@ static void test_AutoOpenWAVE(HWND hwnd) buf[0]=0; err = mciSendString("sysinfo waveaudio name 1 open", buf, sizeof(buf), NULL); - todo_wine ok(err==MCIERR_OUTOFRANGE,"sysinfo waveaudio name 1 returned %s\n", dbg_mcierr(err)); + ok(err==MCIERR_OUTOFRANGE,"sysinfo waveaudio name 1 returned %s\n", dbg_mcierr(err)); if(!err) trace("sysinfo dangling open alias: %s\n", buf); err = mciSendString("play no-such-file-exists.wav notify", buf, sizeof(buf), NULL);

1 0

Jörg Höhle : winmm: Improve MCI' s Sysinfo string command.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 4ed308f452b537bdcbb96f165fd34b6e4994883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed308f452b537bdcbb96f165… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Nov 18 00:58:17 2009 +0100 winmm: Improve MCI's Sysinfo string command. --- dlls/winmm/mci.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 4fbb9a0..cde8c88 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1233,6 +1233,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; + static const WCHAR wszSysinfo[] = {'s','y','s','i','n','f','o',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1326,6 +1327,20 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, MCI_UnLoadMciDriver(wmd); goto errCleanUp; } + } else if (!strcmpW(verb, wszSysinfo)) { + /* System commands are not subject to auto-open. */ + /* It's too early to handle Sysinfo here because the + * requirements on dev depend on the flags: + * alias with INSTALLNAME, name like "waveaudio" + * with QUANTITY and NAME. */ + data[4] = MCI_ALL_DEVICE_ID; + if (MCI_ALL_DEVICE_ID != uDevID) { + /* FIXME: Map device name like waveaudio to MCI_DEVTYPE_xyz */ + uDevID = mciGetDeviceIDW(dev); + wmd = MCI_GetDriver(uDevID); + if (wmd) + data[4] = wmd->wType; + } } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0};

1 0

Jörg Höhle : mciwave: MCI Set Input|Output allows to select wave device.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: e8157bf50bd43ad9dad55d8383332ff9f266adec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8157bf50bd43ad9dad55d838… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Nov 20 20:55:22 2009 +0100 mciwave: MCI Set Input|Output allows to select wave device. --- dlls/mciwave/mciwave.c | 83 ++++++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 37 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 24e75ee..85aae0d 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -47,6 +47,8 @@ typedef struct { WAVEFORMATEX wfxRef; LPWAVEFORMATEX lpWaveFormat; /* Points to wfxRef until set by OPEN or RECORD */ BOOL fInput; /* FALSE = Output, TRUE = Input */ + WORD wInput; /* wave input device */ + WORD wOutput; /* wave output device */ volatile WORD dwStatus; /* one from MCI_MODE_xxxx */ DWORD dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */ DWORD dwPosition; /* position in bytes in chunk */ @@ -529,6 +531,7 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P wmw->nUseCount++; + wmw->wInput = wmw->wOutput = WAVE_MAPPER; wmw->fInput = FALSE; wmw->hWave = 0; wmw->dwStatus = MCI_MODE_NOT_READY; @@ -831,8 +834,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, */ mmioSeek(wmw->hFile, wmw->ckWaveData.dwDataOffset + wmw->dwPosition, SEEK_SET); /* >= 0 */ - /* FIXME: how to choose between several output channels ? here mapper is forced */ - dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, + dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, wmw->wOutput, wmw->lpWaveFormat, (DWORD_PTR)WAVE_mciPlayCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != 0) { @@ -1064,11 +1066,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt */ mmioSeek(wmw->hFile, wmw->ckWaveData.dwDataOffset + wmw->dwPosition, SEEK_SET); /* >= 0 */ - /* By default the device will be opened for output, the MCI_CUE function is there to - * change from output to input and back - */ - /* FIXME: how to choose between several output channels ? here mapper is forced */ - dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, + dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, wmw->wInput, wmw->lpWaveFormat, (DWORD_PTR)WAVE_mciRecordCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { @@ -1279,7 +1277,7 @@ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lp /************************************************************************** * WAVE_mciSet [internal] */ -static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) +static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS lpParms) { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); @@ -1337,44 +1335,64 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpPa default: WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } - if (dwFlags & MCI_WAVE_INPUT) - TRACE("MCI_WAVE_INPUT !\n"); - if (dwFlags & MCI_WAVE_OUTPUT) - TRACE("MCI_WAVE_OUTPUT !\n"); - if (dwFlags & MCI_WAVE_SET_ANYINPUT) - TRACE("MCI_WAVE_SET_ANYINPUT !\n"); - if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) - TRACE("MCI_WAVE_SET_ANYOUTPUT !\n"); + if (dwFlags & MCI_WAVE_INPUT) { + TRACE("MCI_WAVE_INPUT = %d\n", lpParms->wInput); + if (lpParms->wInput >= waveInGetNumDevs()) + return MCIERR_OUTOFRANGE; + if (wmw->wInput != (WORD)lpParms->wInput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wInput = lpParms->wInput; + } + if (dwFlags & MCI_WAVE_OUTPUT) { + TRACE("MCI_WAVE_OUTPUT = %d\n", lpParms->wOutput); + if (lpParms->wOutput >= waveOutGetNumDevs()) + return MCIERR_OUTOFRANGE; + if (wmw->wOutput != (WORD)lpParms->wOutput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wOutput = lpParms->wOutput; + } + if (dwFlags & MCI_WAVE_SET_ANYINPUT) { + TRACE("MCI_WAVE_SET_ANYINPUT\n"); + if (wmw->wInput != (WORD)lpParms->wInput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wInput = WAVE_MAPPER; + } + if (dwFlags & MCI_WAVE_SET_ANYOUTPUT) { + TRACE("MCI_WAVE_SET_ANYOUTPUT\n"); + if (wmw->wOutput != (WORD)lpParms->wOutput) + WAVE_mciStop(wDevID, MCI_WAIT, NULL); + wmw->wOutput = WAVE_MAPPER; + } /* Set wave format parameters is refused after Open or Record.*/ if (dwFlags & MCI_WAVE_SET_FORMATTAG) { - TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", ((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag); + TRACE("MCI_WAVE_SET_FORMATTAG = %d\n", lpParms->wFormatTag); if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - if (((LPMCI_WAVE_SET_PARMS)lpParms)->wFormatTag != WAVE_FORMAT_PCM) + if (lpParms->wFormatTag != WAVE_FORMAT_PCM) return MCIERR_OUTOFRANGE; } if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nAvgBytesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nAvgBytesPerSec; + wmw->wfxRef.nAvgBytesPerSec = lpParms->nAvgBytesPerSec; TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); } if (dwFlags & MCI_WAVE_SET_BITSPERSAMPLE) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.wBitsPerSample = ((LPMCI_WAVE_SET_PARMS)lpParms)->wBitsPerSample; + wmw->wfxRef.wBitsPerSample = lpParms->wBitsPerSample; TRACE("MCI_WAVE_SET_BITSPERSAMPLE = %d\n", wmw->wfxRef.wBitsPerSample); } if (dwFlags & MCI_WAVE_SET_BLOCKALIGN) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nBlockAlign = ((LPMCI_WAVE_SET_PARMS)lpParms)->nBlockAlign; + wmw->wfxRef.nBlockAlign = lpParms->nBlockAlign; TRACE("MCI_WAVE_SET_BLOCKALIGN = %d\n", wmw->wfxRef.nBlockAlign); } if (dwFlags & MCI_WAVE_SET_CHANNELS) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nChannels = ((LPMCI_WAVE_SET_PARMS)lpParms)->nChannels; + wmw->wfxRef.nChannels = lpParms->nChannels; TRACE("MCI_WAVE_SET_CHANNELS = %d\n", wmw->wfxRef.nChannels); } if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; - wmw->wfxRef.nSamplesPerSec = ((LPMCI_WAVE_SET_PARMS)lpParms)->nSamplesPerSec; + wmw->wfxRef.nSamplesPerSec = lpParms->nSamplesPerSec; TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); } if (dwFlags & MCI_NOTIFY) @@ -1500,21 +1518,12 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_INPUT: - TRACE("MCI_WAVE_INPUT !\n"); - lpParms->dwReturn = 0; - ret = MCIERR_WAVE_INPUTUNSPECIFIED; + lpParms->dwReturn = wmw->wInput; + TRACE("MCI_WAVE_INPUT => %d\n", (signed)wmw->wInput); break; case MCI_WAVE_OUTPUT: - TRACE("MCI_WAVE_OUTPUT !\n"); - { - UINT id; - if (waveOutGetID(wmw->hWave, &id) == MMSYSERR_NOERROR) { - lpParms->dwReturn = id; - } else { - lpParms->dwReturn = 0; - ret = MCIERR_WAVE_OUTPUTUNSPECIFIED; - } - } + lpParms->dwReturn = wmw->wOutput; + TRACE("MCI_WAVE_OUTPUT => %d\n", (signed)wmw->wOutput); break; /* It is always ok to query wave format parameters, * except on auto-open yield MCIERR_UNSUPPORTED_FUNCTION. */ @@ -1705,7 +1714,7 @@ LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return WAVE_mciPlay (dwDevID, dwParam1, dwParam2, NULL); case MCI_RECORD: return WAVE_mciRecord (dwDevID, dwParam1, dwParam2, NULL); case MCI_STOP: return WAVE_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_SET_PARMS) dwParam2); + case MCI_SET: return WAVE_mciSet (dwDevID, dwParam1, (LPMCI_WAVE_SET_PARMS) dwParam2); case MCI_PAUSE: return WAVE_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_RESUME: return WAVE_mciResume (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return WAVE_mciStatus (dwDevID, dwParam1, (LPMCI_STATUS_PARMS) dwParam2);

1 0

Jörg Höhle : mciwave: MCI Status returns string resource when appropriate.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f0baaff46a8a0c0f127ca2a917049a8fec52e5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0baaff46a8a0c0f127ca2a91… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Nov 21 09:24:07 2009 +0100 mciwave: MCI Status returns string resource when appropriate. --- dlls/mciwave/mciwave.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 85aae0d..87dc260 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1518,15 +1518,34 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_INPUT: - lpParms->dwReturn = wmw->wInput; + if (wmw->wInput != (WORD)WAVE_MAPPER) + lpParms->dwReturn = wmw->wInput; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_MAPPER, WAVE_MAPPER_S); + ret = MCI_RESOURCE_RETURNED; + } TRACE("MCI_WAVE_INPUT => %d\n", (signed)wmw->wInput); break; case MCI_WAVE_OUTPUT: - lpParms->dwReturn = wmw->wOutput; + if (wmw->wOutput != (WORD)WAVE_MAPPER) + lpParms->dwReturn = wmw->wOutput; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_MAPPER, WAVE_MAPPER_S); + ret = MCI_RESOURCE_RETURNED; + } TRACE("MCI_WAVE_OUTPUT => %d\n", (signed)wmw->wOutput); break; /* It is always ok to query wave format parameters, * except on auto-open yield MCIERR_UNSUPPORTED_FUNCTION. */ + case MCI_WAVE_STATUS_FORMATTAG: + if (wmw->lpWaveFormat->wFormatTag != WAVE_FORMAT_PCM) + lpParms->dwReturn = wmw->lpWaveFormat->wFormatTag; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_FORMAT_PCM, WAVE_FORMAT_PCM_S); + ret = MCI_RESOURCE_RETURNED; + } + TRACE("MCI_WAVE_FORMATTAG => %lu\n", lpParms->dwReturn); + break; case MCI_WAVE_STATUS_AVGBYTESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nAvgBytesPerSec; TRACE("MCI_WAVE_STATUS_AVGBYTESPERSEC => %lu\n", lpParms->dwReturn); @@ -1543,10 +1562,6 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM lpParms->dwReturn = wmw->lpWaveFormat->nChannels; TRACE("MCI_WAVE_STATUS_CHANNELS => %lu\n", lpParms->dwReturn); break; - case MCI_WAVE_STATUS_FORMATTAG: - lpParms->dwReturn = wmw->lpWaveFormat->wFormatTag; - TRACE("MCI_WAVE_FORMATTAG => %lu\n", lpParms->dwReturn); - break; case MCI_WAVE_STATUS_SAMPLESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nSamplesPerSec; TRACE("MCI_WAVE_STATUS_SAMPLESPERSEC => %lu\n", lpParms->dwReturn);

1 0

Jörg Höhle : winmm/tests: Add more MCI tests.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: c31bdb98f935aabc68a4fb83caefd0ed753bb710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31bdb98f935aabc68a4fb83c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 29 15:53:02 2010 +0200 winmm/tests: Add more MCI tests. --- dlls/winmm/tests/mci.c | 111 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 102 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c31bdb98f935aabc68a4f…

1 0