February 2023 - Wine-commits

Francois Gouget : riched20/tests: Fix the EM_GETSELTEXT tests in Hindi on Windows.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 37cd13abdf5d91c7b3f25b39fa14976bc3a3e3a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/37cd13abdf5d91c7b3f25b39fa1497… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 24 02:03:41 2023 +0100 riched20/tests: Fix the EM_GETSELTEXT tests in Hindi on Windows. On Windows EM_GETSELTEXT fails with an invalid parameter error in the Hindi locale but works in most other locales, including UTF-8 ones. So check for this issue and adjust the expected results accordingly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54559 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54565 --- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++---- dlls/riched20/tests/richole.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e7e79db1805..f282c64f39c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1891,20 +1891,41 @@ static void test_EM_GETSELTEXT(void) const char * expect = "bar\rfoo"; char buffer[1024] = {0}; LRESULT result; + BOOL bad_getsel; + DWORD gle; + + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"a"); + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SetLastError(0xdeadbeef); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); + gle = GetLastError(); + ok((result > 0 && gle == 0xdeadbeef) || + broken(result == 0 && gle == ERROR_INVALID_PARAMETER /* Hindi */), + "EM_GETSELTEXT returned %Id gle=%lu\n", result, gle); + bad_getsel = (gle != 0xdeadbeef); + if (bad_getsel) + trace("EM_GETSELTEXT is broken, some tests will be ignored\n"); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); + SetLastError(0xdeadbeef); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETSELTEXT returned %Id\n", result); - ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); + gle = GetLastError(); + ok(result == 7 || broken(bad_getsel && result == 0), + "EM_GETSELTEXT returned %Id gle=%lu\n", result, gle); + ok(!strcmp(expect, buffer) || broken(bad_getsel && !*buffer), + "EM_GETSELTEXT filled %s gle=%lu\n", buffer, gle); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 4, 11); + SetLastError(0xdeadbeef); result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer); - ok(result == 7, "EM_GETSELTEXT returned %Id\n", result); - ok(!strcmp(expect, buffer), "EM_GETSELTEXT filled %s\n", buffer); + ok(result == 7 || broken(bad_getsel && result == 0), + "EM_GETSELTEXT returned %Id gle=%lu\n", result, gle); + ok(!strcmp(expect, buffer) || broken(bad_getsel && !*buffer), + "EM_GETSELTEXT filled %s gle=%lu\n", buffer, gle); /* Test with multibyte character */ if (!is_lang_japanese) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7ec6036fea6..7402541ed6e 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3881,6 +3881,8 @@ static void subtest_InsertObject(struct reolecb_obj *callback) struct testoleobj *testobj; IOleClientSite *clientsite; REOBJECT reobj; + BOOL bad_getsel; + DWORD gle; create_interfaces(&hwnd, &reole, &doc, &selection); if (callback) @@ -3889,6 +3891,19 @@ static void subtest_InsertObject(struct reolecb_obj *callback) ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"a"); + SendMessageA(hwnd, EM_SETSEL, 0, -1); + *bufferA = '\0'; + SetLastError(0xdeadbeef); + result = SendMessageA(hwnd, EM_GETSELTEXT, 0, (LPARAM)bufferA); + gle = GetLastError(); + ok((result > 0 && gle == 0xdeadbeef) || + broken(result == 0 && gle == ERROR_INVALID_PARAMETER /* Hindi */), + "EM_GETSELTEXT returned %ld gle=%lu\n", result, gle); + bad_getsel = (gle != 0xdeadbeef); + if (bad_getsel) + trace("EM_GETSELTEXT is broken, some tests will be ignored\n"); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -4068,9 +4083,13 @@ static void subtest_InsertObject(struct reolecb_obj *callback) expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1); + SetLastError(0xdeadbeef); result = SendMessageA(hwnd, EM_GETSELTEXT, 0, (LPARAM)bufferA); - ok(result == strlen(expected_stringA), "Got wrong length: %ld.\n", result); - ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + gle = GetLastError(); + ok(result == strlen(expected_stringA) || broken(bad_getsel && result == 0), + "Got wrong length: %ld (gle %lu)\n", result, gle); + ok(!strcmp(bufferA, expected_stringA) || broken(bad_getsel && !*bufferA), + "Got wrong content: %s (gle %lu)\n", bufferA, gle); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA; @@ -4151,9 +4170,13 @@ static void subtest_InsertObject(struct reolecb_obj *callback) expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1); + SetLastError(0xdeadbeef); result = SendMessageA(hwnd, EM_GETSELTEXT, 0, (LPARAM)bufferA); - ok(result == strlen(expected_stringA), "Got wrong length: %ld.\n", result); - ok(!strcmp(bufferA, expected_stringA), "Got wrong content: %s.\n", bufferA); + gle = GetLastError(); + ok(result == strlen(expected_stringA) || broken(bad_getsel && result == 0), + "Got wrong length: %ld (gle %lu)\n", result, gle); + ok(!strcmp(bufferA, expected_stringA) || broken(bad_getsel && !*bufferA), + "Got wrong content: %s (gle %lu)\n", bufferA, gle); memset(bufferA, 0, sizeof(bufferA)); textrange.lpstrText = bufferA;

1 0

Jinoh Kang : riched20/tests: Test for word movement across paragraph boundary.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 21d25b17c2cae8eb2d2376ce42b76e3f61eb0bba URL: https://gitlab.winehq.org/wine/wine/-/commit/21d25b17c2cae8eb2d2376ce42b76e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Feb 25 21:43:31 2023 +0900 riched20/tests: Test for word movement across paragraph boundary. --- dlls/riched20/tests/editor.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f282c64f39c..b3784b23908 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7322,6 +7322,54 @@ static void test_word_movement(void) DestroyWindow(hwnd); } +static void test_word_movement_multiline(void) +{ + DWORD sel_start, sel_end; + LRESULT result; + HWND hwnd; + + /* multi-line control inserts CR normally */ + hwnd = new_richedit(NULL); + + result = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Lorem ipsum\rdolor sit\rnamet"); + ok(result == TRUE, "WM_SETTEXT returned %Iu.\n", result); + SendMessageA(hwnd, EM_SETSEL, 0, 0); + /* [|Lorem ipsum] [dolor sit] [amet] */ + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem |ipsum] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + ok(sel_start == 6, "expected sel_start to be %u, got %lu.\n", 6, sel_start); + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem ipsum|] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); + + send_ctrl_key(hwnd, VK_RIGHT); + /* [Lorem ipsum] [|dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 12, "expected sel_start to be %u, got %lu.\n", 12, sel_start); + + send_ctrl_key(hwnd, VK_LEFT); + /* [Lorem ipsum|] [dolor sit] [amet] */ + sel_start = sel_end = 0xdeadbeefUL; + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); + todo_wine + ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); + + DestroyWindow(hwnd); +} + static void test_EM_CHARFROMPOS(void) { HWND hwnd; @@ -9230,6 +9278,7 @@ START_TEST( editor ) test_eventMask(); test_undo_coalescing(); test_word_movement(); + test_word_movement_multiline(); test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); test_word_wrap();

1 0

Jinoh Kang : riched20: Don't set para unless committing cursor move in ME_MoveCursorWords.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 7e28fa5c558f1417f8f033cb843424778bbfb8b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e28fa5c558f1417f8f033cb843424… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Feb 25 02:14:36 2023 +0900 riched20: Don't set para unless committing cursor move in ME_MoveCursorWords. Introduce a temporary variable, `other_para`, so that we don't end up returning incorrect para (with stale run) inside the output cursor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54564 --- dlls/riched20/caret.c | 11 +++++++---- dlls/riched20/tests/editor.c | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index c9fd327e87e..f89770ccc75 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -802,15 +802,18 @@ ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) } else { - para = para_next( para ); - if (!para_next( para )) + ME_Paragraph *other_para = para_next( para ); + if (!para_next( other_para )) { if (cursor->run == run) return FALSE; nOffset = 0; break; } - if (para->nFlags & MEPF_ROWSTART) para = para_next( para ); - if (cursor->run == run) run = para_first_run( para ); + if (other_para->nFlags & MEPF_ROWSTART) other_para = para_next( other_para ); + if (cursor->run == run) { + para = other_para; + run = para_first_run( para ); + } nOffset = 0; break; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b3784b23908..e3801d5a611 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7348,7 +7348,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); send_ctrl_key(hwnd, VK_RIGHT); @@ -7356,7 +7355,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 12, "expected sel_start to be %u, got %lu.\n", 12, sel_start); send_ctrl_key(hwnd, VK_LEFT); @@ -7364,7 +7362,6 @@ static void test_word_movement_multiline(void) sel_start = sel_end = 0xdeadbeefUL; SendMessageA(hwnd, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == sel_end, "expected sel length to be 0, got %lu.\n", sel_end - sel_start); - todo_wine ok(sel_start == 11, "expected sel_start to be %u, got %lu.\n", 11, sel_start); DestroyWindow(hwnd);

1 0

Alexandre Julliard : ntdll: Update the IOSB status in NtCreateNamedPipeFile().
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: b0d57e5f911553d812235a33124da30b422ee200 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0d57e5f911553d812235a33124da3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 09:47:41 2023 +0100 ntdll: Update the IOSB status in NtCreateNamedPipeFile(). --- dlls/ntdll/tests/om.c | 4 ++++ dlls/ntdll/unix/file.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index fb6deb19fa9..d663ebcb00f 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -379,6 +379,7 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); + ok( iosb.Status == STATUS_SUCCESS, "wrong status %08lx\n", status); ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); pNtClose( h ); @@ -388,6 +389,7 @@ static void test_name_collisions(void) FILE_CREATE, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); + ok( iosb.Status == STATUS_SUCCESS, "wrong status %08lx\n", status); ok( iosb.Information == FILE_CREATED, "wrong info %Ix\n", iosb.Information ); memset( &iosb, 0xcc, sizeof(iosb) ); @@ -396,6 +398,7 @@ static void test_name_collisions(void) FILE_OPEN, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); + ok( iosb.Status == STATUS_SUCCESS, "wrong status %08lx\n", status); ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); @@ -405,6 +408,7 @@ static void test_name_collisions(void) FILE_OPEN_IF, FILE_PIPE_FULL_DUPLEX, FALSE, FALSE, FALSE, 10, 256, 256, &timeout ); ok(status == STATUS_SUCCESS, "failed to create pipe %08lx\n", status); + ok( iosb.Status == STATUS_SUCCESS, "wrong status %08lx\n", status); ok( iosb.Information == FILE_OPENED, "wrong info %Ix\n", iosb.Information ); pNtClose(h1); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 4daf1a5335c..7a724c87025 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4153,7 +4153,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR SERVER_END_REQ; free( objattr ); - return status; + return io->u.Status = status; }

1 0

Alexandre Julliard : ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: a3ff624bcc2822b36e46c14e12c122505f890246 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3ff624bcc2822b36e46c14e12c122… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 09:48:01 2023 +0100 ntdll: Skip dependency only for the actually loaded ntdll and kernel32, instead of matching by name. --- dlls/ntdll/loader.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d0d9bae7f0b..a0ac61d8156 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1404,14 +1404,9 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { dep_after = wm->ldr.DdagNode->Dependencies.Tail; if (!import_dll( wm->ldr.DllBase, &imports[i], load_path, &imp )) - { - imp = NULL; status = STATUS_DLL_NOT_FOUND; - } - else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] )) - { + else if (imp && imp->ldr.DdagNode != node_ntdll && imp->ldr.DdagNode != node_kernel32) add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); - } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Alexandre Julliard : ntdll: Also check for data execution on x86-64.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 3c3cf47a1922f901be71d7e5901ec822346b330a URL: https://gitlab.winehq.org/wine/wine/-/commit/3c3cf47a1922f901be71d7e5901ec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 15:06:21 2023 +0100 ntdll: Also check for data execution on x86-64. It can still be disabled from Wow64. --- dlls/ntdll/unix/signal_x86_64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9cb5d8199d7..07ffb269d19 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2010,6 +2010,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) leave_handler( ucontext ); return; } + if (rec.ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + rec.ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) + { + ULONG flags; + NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &flags, sizeof(flags), NULL ); + /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ + if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) rec.ExceptionInformation[0] = EXCEPTION_READ_FAULT; + } break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ if (EFL_sig(ucontext) & 0x00040000)

1 0

Alexandre Julliard : wow64: Call the 32-bit KiRaiseUserExceptionDispatcher for invalid handle exceptions.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 5d3c0cf01d5c90703a4101b1147db323ce38a3d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d3c0cf01d5c90703a4101b1147db3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 28 15:07:23 2023 +0100 wow64: Call the 32-bit KiRaiseUserExceptionDispatcher for invalid handle exceptions. --- dlls/wow64/syscall.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8caf06ec013..6f4f3a2dc81 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -100,6 +100,7 @@ static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); +static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); void *dummy = RtlUnwind; @@ -248,6 +249,40 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32 } +/********************************************************************** + * call_raise_user_exception_dispatcher + */ +static void call_raise_user_exception_dispatcher( ULONG code ) +{ + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); + + teb32->ExceptionCode = code; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + I386_CONTEXT ctx = { CONTEXT_I386_ALL }; + + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Eip = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + } + break; + + case IMAGE_FILE_MACHINE_ARMNT: + { + ARM_CONTEXT ctx = { CONTEXT_ARM_ALL }; + + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Pc = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + } + break; + } +} + + /* based on RtlRaiseException: call NtRaiseException with context setup to return to caller */ void WINAPI raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) DECLSPEC_HIDDEN; #ifdef __x86_64__ @@ -731,6 +766,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex init_syscall_table( module, 0, &ntdll_syscall_table ); *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); + GET_PTR( KiRaiseUserExceptionDispatcher ); init_file_redirects(); return TRUE; @@ -817,7 +853,7 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) switch (ptrs->ExceptionRecord->ExceptionCode) { case STATUS_INVALID_HANDLE: - Wow64PassExceptionToGuest( ptrs ); + call_raise_user_exception_dispatcher( ptrs->ExceptionRecord->ExceptionCode ); break; } return EXCEPTION_EXECUTE_HANDLER; @@ -847,7 +883,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { status = GetExceptionCode(); } - __ENDTRY; + __ENDTRY free_temp_data(); return status; }

1 0

Francois Gouget : mmdevapi/tests: WoW64 processes can read the properties from the registry.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: 1833dc0b2daf89bdf21adf1f943771f01b4c43ec URL: https://gitlab.winehq.org/wine/wine/-/commit/1833dc0b2daf89bdf21adf1f943771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 04:26:13 2023 +0100 mmdevapi/tests: WoW64 processes can read the properties from the registry. Since Windows 10 2004 so consider the old limitation to be broken. --- dlls/mmdevapi/tests/propstore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 89eaada5fd7..bbefd5a9ead 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -183,7 +183,9 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* should NOT find the key in 32-bit view */ ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_renderW, 0, KEY_READ, &root); - ok(ret == ERROR_FILE_NOT_FOUND, "Wrong error when opening mmdevices Render key: %lu\n", ret); + todo_wine + ok(ret == 0 || broken(ret == ERROR_FILE_NOT_FOUND /* win10 < 2004 */), + "Wrong error when opening mmdevices Render key: %lu\n", ret); } START_TEST(propstore)

1 0

Akihiro Sagawa : msado15: Free recordset filter on close.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: wine Branch: master Commit: e8bba58431f25da90b179f9acd5583f880adcc92 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8bba58431f25da90b179f9acd5583… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 25 20:57:45 2023 +0900 msado15: Free recordset filter on close. Introduced by commit 669107f6c5e54f520a846caec9649163675784a4. --- dlls/msado15/recordset.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index c9309336cb6..c22b2460147 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1205,6 +1205,8 @@ static void close_recordset( struct recordset *recordset ) if ( recordset->row_set ) IRowset_Release( recordset->row_set ); recordset->row_set = NULL; + VariantClear( &recordset->filter ); + if (!recordset->fields) return; col_count = get_column_count( recordset );

1 0

Zebediah Figura : tests: Add more tests for pack_matrix pragmas.
by Alexandre Julliard 28 Feb '23

28 Feb '23

Module: vkd3d Branch: master Commit: 2a412670eeaa24bb8ed1a7e3ba86bdd8b193de84 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a412670eeaa24bb8ed1a7e3ba86b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 17:39:34 2022 -0500 tests: Add more tests for pack_matrix pragmas. --- tests/hlsl-majority-pragma.shader_test | 131 +++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/hlsl-majority-pragma.shader_test b/tests/hlsl-majority-pragma.shader_test index d269e859..da1b1ff3 100644 --- a/tests/hlsl-majority-pragma.shader_test +++ b/tests/hlsl-majority-pragma.shader_test @@ -20,6 +20,51 @@ uniform 12 float4 0.2 0.4 0.0 0.0 draw quad probe all rgba (0.17, 0.39, 0.17, 0.39) 1 + +%% Test with a struct. + +[pixel shader] +#pragma pack_matrix(row_major) +struct apple +{ + float2x2 m; +}; +#pragma pack_matrix(column_major) +uniform struct apple a; + +float4 main() : sv_target +{ + return float4(a.m[0], a.m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) + + +%% Test with an array. + +[pixel shader] +#pragma pack_matrix(row_major) +uniform float2x2 m[2]; +#pragma pack_matrix(column_major) + +float4 main() : sv_target +{ + return float4(m[1][0], m[1][1]); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.5 0.6 0.0 0.0 +uniform 12 float4 0.7 0.8 0.0 0.0 +draw quad +probe all rgba (0.5, 0.6, 0.7, 0.8) + + % The documentation claims these strings are subject to macro expansion. % They are not. @@ -47,3 +92,89 @@ uniform 0 float4 0.1 0.2 0.0 0.0 uniform 4 float4 0.3 0.4 0.0 0.0 draw quad probe all rgba (0.23, 0.34, 0.5, 0.5) 1 + + +% The majority that applies to a typedef is the latent majority at the time +% that typedef was declared. + +[pixel shader] +#pragma pack_matrix(row_major) +typedef float2x2 mat_t; +#pragma pack_matrix(column_major) +uniform mat_t m; + +float4 main() : sv_target +{ + return float4(m[0], m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) + + +% In fact, it's illegal to specify a contradictory majority. + +[pixel shader fail todo] +#pragma pack_matrix(row_major) +typedef float2x2 mat_t; +uniform column_major mat_t m; + +float4 main() : sv_target +{ + return 0; +} + + +% However, if no pack_matrix directive has been used yet, a typedef has no +% defined majority, and the majority can be overwritten, including by a +% subsequent pragma. + +[pixel shader] +typedef float2x2 mat_t; +#pragma pack_matrix(row_major) +uniform mat_t m; + +uniform row_major mat_t r; +uniform column_major mat_t c; + +float4 main() : sv_target +{ + return float4(m[0], m[1]); +} + +[test] +uniform 0 float4 0.1 0.2 0.0 0.0 +uniform 4 float4 0.3 0.4 0.0 0.0 +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4) + + +% This does not apply recursively to struct or array members, however. Members +% defined while there is no latent majority are always column-major, even if +% the type is later used after a pack_matrix(row_major) directive. + +% Note that the majority of the struct or array type cannot itself be +% overwritten with modifiers; those are only valid on matrix types. + +[pixel shader] +struct apple +{ + float2x2 m; +}; +#pragma pack_matrix(row_major) +typedef struct apple apple_t; +uniform apple_t a; + +float4 main() : sv_target +{ + return float4(a.m[0], a.m[1]); +} + +[test] +uniform 0 float4 0.2 0.4 0.0 0.0 +uniform 4 float4 0.3 0.5 0.0 0.0 +draw quad +probe all rgba (0.2, 0.3, 0.4, 0.5)

1 0