wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

Sebastian Lackner : user32/tests: Add test to check ObjectNameInformation for desktop objects.
by Alexandre Julliard 04 Dec '15

04 Dec '15

Module: wine Branch: master Commit: 8c4a785daf4b833561054e3556e094ab2ba6bf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a785daf4b833561054e355… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 4 01:18:51 2015 +0100 user32/tests: Add test to check ObjectNameInformation for desktop objects. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 30c56c3..db82026 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -23,6 +23,9 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "winternl.h" + +static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); #define DESKTOP_ALL_ACCESS 0x01ff @@ -388,12 +391,14 @@ static void test_enumdesktops(void) static void test_getuserobjectinformation(void) { - HDESK desk; - WCHAR bufferW[20]; - char buffer[20]; - WCHAR foobarTestW[] = {'f','o','o','b','a','r','T','e','s','t',0}; + WCHAR foobarTestW[] = {'\\','f','o','o','b','a','r','T','e','s','t',0}; WCHAR DesktopW[] = {'D','e','s','k','t','o','p',0}; + OBJECT_NAME_INFORMATION *name_info; + WCHAR bufferW[20]; + char buffer[64]; + NTSTATUS status; DWORD size; + HDESK desk; BOOL ret; desk = CreateDesktopA("foobarTest", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); @@ -440,9 +445,16 @@ static void test_getuserobjectinformation(void) ok(ret, "GetUserObjectInformationW returned %x\n", ret); ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); - ok(lstrcmpW(bufferW, foobarTestW) == 0, "Buffer is not set to 'foobarTest'\n"); + ok(lstrcmpW(bufferW, foobarTestW + 1) == 0, "Buffer is not set to 'foobarTest'\n"); ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + /* ObjectNameInformation does not return the full desktop name */ + name_info = (OBJECT_NAME_INFORMATION *)buffer; + status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + todo_wine ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, + "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); + /** Tests for UOI_TYPE **/ /* Get size, test size and return value/error code */ @@ -935,6 +947,9 @@ static void test_foregroundwindow(void) START_TEST(winstation) { + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); + pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); + /* Check whether this platform supports WindowStation calls */ SetLastError( 0xdeadbeef );

1 0

Sebastian Lackner : server: Check winstation visibility in server to avoid race-conditions.
by Alexandre Julliard 04 Dec '15

04 Dec '15

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 03 Dec '15

03 Dec '15

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 03 Dec '15

03 Dec '15

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

Boyuan Yang : po: Update Simplified Chinese translation.
by Alexandre Julliard 03 Dec '15

03 Dec '15

Module: wine Branch: master Commit: 454168ace66527241538d57ad8932660ce17910f URL: http://source.winehq.org/git/wine.git/?a=commit;h=454168ace66527241538d57ad… Author: Boyuan Yang <073plan(a)gmail.com> Date: Thu Nov 26 17:38:54 2015 +0800 po: Update Simplified Chinese translation. Signed-off-by: Boyuan Yang <073plan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 957 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 464 insertions(+), 493 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=454168ace66527241538d…

1 0

Jacek Caban : ieframe: Fixed tests on some VMs.
by Alexandre Julliard 03 Dec '15

03 Dec '15

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

Austin English : iexplore: Add ' HKCR\Applications\iexplore.exe\shell\open\command' key.
by Alexandre Julliard 03 Dec '15

03 Dec '15

Module: wine Branch: master Commit: 0e40a9bed7f502361d554280cece4cc94a1e8a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e40a9bed7f502361d554280c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 2 12:38:19 2015 -0600 iexplore: Add 'HKCR\Applications\iexplore.exe\shell\open\command' key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/iexplore.inf | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 41622b1..a8538d8 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -27,6 +27,7 @@ HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" +HKCR,"Applications\iexplore.exe\shell\open\command",,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;"

1 0

Qian Hong : ntdll/tests: Restore old value in a more context independent way.
by Alexandre Julliard 03 Dec '15

03 Dec '15

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

Qian Hong : ntdll: Silence useless fixme message when handling SIMD floating point invalid operation exception.
by Alexandre Julliard 03 Dec '15

03 Dec '15

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: Add SIMD exception test for floating point invalid operation fault.
by Alexandre Julliard 03 Dec '15

03 Dec '15

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2015