December 2015 - Wine-Commits

Sebastian Lackner : wineboot: Remove unused declaration for __wine_make_process_system.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: d38b334babdb536da85b59b5f1fc5525a338b0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38b334babdb536da85b59b5f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:28:04 2015 +0100 wineboot: Remove unused declaration for __wine_make_process_system. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1477287..ee5b8d4 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1152,7 +1152,6 @@ static const struct option long_options[] = int main( int argc, char *argv[] ) { - extern HANDLE CDECL __wine_make_process_system(void); static const WCHAR RunW[] = {'R','u','n',0}; static const WCHAR RunOnceW[] = {'R','u','n','O','n','c','e',0}; static const WCHAR RunServicesW[] = {'R','u','n','S','e','r','v','i','c','e','s',0};

1 0

Sebastian Lackner : server: Check winstation visibility in server to avoid race-conditions.
by Alexandre Julliard Dec. 4, 2015

Dec. 4, 2015

Module: wine Branch: master Commit: 6bfa3896fcbfca7a2ab51bcac463c0750d6e9272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfa3896fcbfca7a2ab51bcac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:17:50 2015 +0100 server: Check winstation visibility in server to avoid race-conditions. GetDesktopWindow incorrectly assumes, that the process window station is still the same one, which was used earlier when changing the desktop. By moving the visibility check to wineserver we can also avoid wineserver roundtrip for invisible desktops. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 72 +++++++++++++++++++++++++------------------------------ server/window.c | 8 +++++-- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b81c22d..360834e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2033,45 +2033,39 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->top_window) { - USEROBJECTFLAGS flags; - if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, - sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) - { - static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; - static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - WCHAR windir[MAX_PATH]; - WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; - WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; - void *redir; - - memset( &si, 0, sizeof(si) ); - si.cb = sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = 0; - si.hStdOutput = 0; - si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - - GetSystemDirectoryW( windir, MAX_PATH ); - strcpyW( app, windir ); - strcatW( app, explorer ); - strcpyW( cmdline, app ); - strcatW( cmdline, args ); - - Wow64DisableWow64FsRedirection( &redir ); - if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, windir, &si, &pi )) - { - TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); - WaitForInputIdle( pi.hProcess, 10000 ); - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - } - else WARN( "failed to start explorer, err %d\n", GetLastError() ); - Wow64RevertWow64FsRedirection( redir ); - } - else TRACE( "not starting explorer since winstation is not visible\n" ); + static const WCHAR explorer[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',0}; + static const WCHAR args[] = {' ','/','d','e','s','k','t','o','p',0}; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR windir[MAX_PATH]; + WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + void *redir; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + GetSystemDirectoryW( windir, MAX_PATH ); + strcpyW( app, windir ); + strcatW( app, explorer ); + strcpyW( cmdline, app ); + strcatW( cmdline, args ); + + Wow64DisableWow64FsRedirection( &redir ); + if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, windir, &si, &pi )) + { + TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); + WaitForInputIdle( pi.hProcess, 10000 ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + } + else WARN( "failed to start explorer, err %d\n", GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); SERVER_START_REQ( get_desktop_window ) { diff --git a/server/window.c b/server/window.c index d089149..5f32f1e 100644 --- a/server/window.c +++ b/server/window.c @@ -1953,10 +1953,14 @@ DECL_HANDLER(destroy_window) DECL_HANDLER(get_desktop_window) { struct desktop *desktop = get_thread_desktop( current, 0 ); + int force; if (!desktop) return; - if (!desktop->top_window && req->force) /* create it */ + /* if winstation is invisible, then avoid roundtrip */ + force = req->force || !(desktop->winstation->flags & WSF_VISIBLE); + + if (!desktop->top_window && force) /* create it */ { if ((desktop->top_window = create_window( NULL, NULL, DESKTOP_ATOM, 0 ))) { @@ -1965,7 +1969,7 @@ DECL_HANDLER(get_desktop_window) } } - if (!desktop->msg_window && req->force) /* create it */ + if (!desktop->msg_window && force) /* create it */ { static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; static const struct unicode_str name = { messageW, sizeof(messageW) };

1 0

Olivier F. R. Dierick : shlwapi/tests: Test SHFreeShared with NULL handle.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 71bbd8da87109161448c7c6d7f6fcfa721b6c746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71bbd8da87109161448c7c6d7… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Dec 2 00:44:20 2015 +0100 shlwapi/tests: Test SHFreeShared with NULL handle. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 68526cd..bd3d46a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -516,6 +516,11 @@ static void test_alloc_shared(int argc, char **argv) ret = pSHFreeShared(hmem2, procid); ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } + + SetLastError(0xdeadbeef); + ret = pSHFreeShared(NULL, procid); + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "last error should not have changed, got %u\n", GetLastError()); } static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)

1 0

Olivier F. R. Dierick : shlwapi: SHFreeShared returns TRUE when passed NULL handle.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: de0d8719d2b32b01261a2b93cb92a2f52c8b24cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0d8719d2b32b01261a2b93c… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Dec 2 00:39:12 2015 +0100 shlwapi: SHFreeShared returns TRUE when passed NULL handle. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3c8af5c..699fcc6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -259,6 +259,9 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); + if (!hShared) + return TRUE; + /* Get a copy of the handle for our process, closing the source handle */ hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE);

1 0

Jacek Caban : ieframe: Fixed tests on some VMs.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: d5bbf847ade5667ba90cfd5881852c53cc0bbf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bbf847ade5667ba90cfd588… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 11:46:58 2015 +0100 ieframe: Fixed tests on some VMs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1cd8f75..3201499 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2877,7 +2877,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD|DWL_REFRESH)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2946,7 +2946,7 @@ static void test_download(DWORD flags) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); - else if(flags & DWL_FROM_GOFORWARD) + else if(flags & (DWL_FROM_GOFORWARD|DWL_REFRESH)) CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ if(flags & DWL_EXPECT_BEFORE_NAVIGATE) {

1 0

Michael Müller : winedbg: Print windows version in system info.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: a78efe16f7b0ca9475d153d98f4c2053cde0ca62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78efe16f7b0ca9475d153d98… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Dec 3 00:20:25 2015 +0100 winedbg: Print windows version in system info. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 989e433..07edccc 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -678,6 +678,63 @@ static HANDLE create_temp_file(void) NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); } +static const struct +{ + int type; + int platform; + int major; + int minor; + const char *str; +} +version_table[] = +{ + { 0, VER_PLATFORM_WIN32s, 2, 0, "2.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 0, "3.0" }, + { 0, VER_PLATFORM_WIN32s, 3, 10, "3.1" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 0, "95" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 10, "98" }, + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 90, "ME" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 3, 51, "NT 3.51" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 4, 0, "NT 4.0" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 0, "2000" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 1, "XP" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 2, "XP" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 5, 2, "Server 2003" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 0, "Vista" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 0, "Server 2008" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 1, "7" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 1, "Server 2008 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 2, "8" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 2, "Server 2012" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 3, "8.1" }, + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 3, "Server 2012 R2" }, + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 10, 0, "10" }, +}; + +static const char *get_windows_version(void) +{ + OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; + static char str[64]; + int i; + + GetVersionExW( (OSVERSIONINFOW *)&info ); + + for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) + { + if (version_table[i].type == info.wProductType && + version_table[i].platform == info.dwPlatformId && + version_table[i].major == info.dwMajorVersion && + version_table[i].minor == info.dwMinorVersion) + { + return version_table[i].str; + } + } + + snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, + info.dwMinorVersion, info.wProductType ); + return str; +} + static void output_system_info(void) { #ifdef __i386__ @@ -705,6 +762,7 @@ static void output_system_info(void) dbg_printf( "System information:\n" ); if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); + dbg_printf( " Version: Windows %s\n", get_windows_version() ); if (wine_get_host_version) { const char *sysname, *release;

1 0

Sebastian Lackner : oleaut32/tests: Add test for calling method with coclass argument.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 3690fa04015174de9b015eaa5a5c584c29070eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3690fa04015174de9b015eaa5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 3 00:49:35 2015 +0100 oleaut32/tests: Add test for calling method with coclass argument. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 29 ++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 3 +++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 4a990af..d2b8dc9 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -598,7 +598,7 @@ static HRESULT WINAPI Widget_CloneCoclass( ApplicationObject2 **ppVal) { trace("CloneCoclass()\n"); - return S_OK; + return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } static HRESULT WINAPI Widget_Value( @@ -909,6 +909,14 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run( return S_OK; } +static HRESULT WINAPI Widget_Coclass( + IWidget *iface, ApplicationObject2 *param) +{ + trace("Coclass(%p)\n", param); + ok(param == (ApplicationObject2 *)iface, "expected param == %p, got %p\n", iface, param); + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -948,7 +956,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_pos_restrict, Widget_neg_restrict, Widget_VarArg_Run, - Widget_VarArg_Ref_Run + Widget_VarArg_Ref_Run, + Widget_Coclass, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1494,8 +1503,22 @@ static void test_typelibmarshal(void) excepinfo.wCode, excepinfo.scode); ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of VT_DISPATCH\n", V_VT(&varresult)); - ok(!V_DISPATCH(&varresult), "V_DISPATCH(&varresult) should be NULL instead of %p\n", V_DISPATCH(&varresult)); + ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) != NULL\n"); + + /* call Coclass with VT_DISPATCH type */ + vararg[0] = varresult; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + todo_wine ok_ole_success(hr, IDispatch_Invoke); + ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, + "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", + excepinfo.wCode, excepinfo.scode); VariantClear(&varresult); + VariantClear(&vararg[0]); /* call Value with a VT_VARIANT|VT_BYREF type */ V_VT(&vararg[0]) = VT_VARIANT|VT_BYREF; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 680f4b4..12c0bd5 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -185,6 +185,9 @@ library TestTypelib [id(DISPID_TM_VARARG_REF_RUN), vararg] HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out, retval] VARIANT *result); + + [id(DISPID_TM_COCLASS)] + HRESULT Coclass([in] ApplicationObject2 *param); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index dfca216..26f4027 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -46,6 +46,7 @@ #define DISPID_TM_TESTSECONDIFACE 27 #define DISPID_TM_VARARG_RUN 28 #define DISPID_TM_VARARG_REF_RUN 29 +#define DISPID_TM_COCLASS 30 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2

1 0

Qian Hong : ntdll/tests: Add SIMD exception test for floating point invalid operation fault.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 6a03e618df280dcfd8fce1223a871fbd89b227cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a03e618df280dcfd8fce1223… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:06:50 2015 +0800 ntdll/tests: Add SIMD exception test for floating point invalid operation fault. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 57 +++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 8477988..221d86a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1015,22 +1015,25 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R context->Eip += 3; /* skip addps */ return ExceptionContinueExecution; } - - /* stage 2 - divide by zero fault */ - if( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) - skip("system doesn't support SIMD exceptions\n"); - else { - ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, - "exception code: %#x, should be %#x\n", - rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); - ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), - "# of params: %i, should be 1\n", - rec->NumberParameters); - if( rec->NumberParameters == 1 ) - ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + else if ( *stage == 2 || *stage == 3 ) { + /* stage 2 - divide by zero fault */ + /* stage 3 - invalid operation fault */ + if( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) + skip("system doesn't support SIMD exceptions\n"); + else { + ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, + "exception code: %#x, should be %#x\n", + rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); + ok( rec->NumberParameters == 1 || broken(is_wow64 && rec->NumberParameters == 2), + "# of params: %i, should be 1\n", + rec->NumberParameters); + if( rec->NumberParameters == 1 ) + ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + } + context->Eip += 3; /* skip divps */ } - - context->Eip += 3; /* skip divps */ + else + ok(FALSE, "unexpected stage %x\n", *stage); return ExceptionContinueExecution; } @@ -1054,6 +1057,21 @@ static const BYTE simd_exception_test[] = { 0xc3, /* ret */ }; +static const BYTE simd_exception_test2[] = { + 0x83, 0xec, 0x4, /* sub $0x4, %esp */ + 0x0f, 0xae, 0x1c, 0x24, /* stmxcsr (%esp) */ + 0x8b, 0x04, 0x24, /* mov (%esp),%eax * store mxcsr */ + 0x66, 0x81, 0x24, 0x24, 0x7f, 0xff, /* andw $0xff7f,(%esp) * enable invalid */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) * operation exceptions */ + 0x0f, 0x57, 0xc9, /* xorps %xmm1,%xmm1 * clear dividend */ + 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 * clear divisor */ + 0x0f, 0x5e, 0xc8, /* divps %xmm0,%xmm1 * generate fault */ + 0x89, 0x04, 0x24, /* mov %eax,(%esp) * restore to old mxcsr */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) */ + 0x83, 0xc4, 0x04, /* add $0x4,%esp */ + 0xc3, /* ret */ +}; + static const BYTE sse_check[] = { 0x0f, 0x58, 0xc8, /* addps %xmm0,%xmm1 */ 0xc3, /* ret */ @@ -1077,7 +1095,14 @@ static void test_simd_exceptions(void) got_exception = 0; run_exception_test(simd_fault_handler, &stage, simd_exception_test, sizeof(simd_exception_test), 0); - ok( got_exception == 1, "got exception: %i, should be 1\n", got_exception); + ok(got_exception == 1, "got exception: %i, should be 1\n", got_exception); + + /* generate a SIMD exception, test FPE_FLTINV */ + stage = 3; + got_exception = 0; + run_exception_test(simd_fault_handler, &stage, simd_exception_test2, + sizeof(simd_exception_test2), 0); + ok(got_exception == 1, "got exception: %i, should be 1\n", got_exception); } struct fpu_exception_info

1 0

Qian Hong : ntdll: Silence useless fixme message when handling SIMD floating point invalid operation exception.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: 10d080aa8dfeea22384df3440b8c05e1d8be61c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d080aa8dfeea22384df3440… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:07:18 2015 +0800 ntdll: Silence useless fixme message when handling SIMD floating point invalid operation exception. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5582299..a3abbff 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2163,7 +2163,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) /* TODO: * Behaviour only tested for divide-by-zero exceptions * Check for other SIMD exceptions as well */ - if(siginfo->si_code != FPE_FLTDIV) + if(siginfo->si_code != FPE_FLTDIV && siginfo->si_code != FPE_FLTINV) FIXME("untested SIMD exception: %#x. Might not work correctly\n", siginfo->si_code);

1 0

Qian Hong : ntdll/tests: Restore old value in a more context independent way.
by Alexandre Julliard Dec. 3, 2015

Dec. 3, 2015

Module: wine Branch: master Commit: b4172c08dd2200afe53e165c821f29bffd92dd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4172c08dd2200afe53e165c8… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Dec 3 00:07:36 2015 +0800 ntdll/tests: Restore old value in a more context independent way. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 221d86a..a368997 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1041,6 +1041,7 @@ static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_R static const BYTE simd_exception_test[] = { 0x83, 0xec, 0x4, /* sub $0x4, %esp */ 0x0f, 0xae, 0x1c, 0x24, /* stmxcsr (%esp) */ + 0x8b, 0x04, 0x24, /* mov (%esp),%eax * store mxcsr */ 0x66, 0x81, 0x24, 0x24, 0xff, 0xfd, /* andw $0xfdff,(%esp) * enable divide by */ 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) * zero exceptions */ 0x6a, 0x01, /* push $0x1 */ @@ -1051,7 +1052,7 @@ static const BYTE simd_exception_test[] = { 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 * clear divisor */ 0x0f, 0x5e, 0xc8, /* divps %xmm0,%xmm1 * generate fault */ 0x83, 0xc4, 0x10, /* add $0x10,%esp */ - 0x66, 0x81, 0x0c, 0x24, 0x00, 0x02, /* orw $0x200,(%esp) * disable exceptions */ + 0x89, 0x04, 0x24, /* mov %eax,(%esp) * restore to old mxcsr */ 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) */ 0x83, 0xc4, 0x04, /* add $0x4,%esp */ 0xc3, /* ret */

1 0