February 2023 - Wine-Commits

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

Feb. 28, 2023

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

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

Feb. 28, 2023

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

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

Feb. 28, 2023

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

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

Feb. 28, 2023

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

Francois Gouget : riched20/tests: EM_GETSELTEXT's wparam is not used and should be 0.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: baa41970647a7e548701a72bea2e4aa2a61ca27e URL: https://gitlab.winehq.org/wine/wine/-/commit/baa41970647a7e548701a72bea2e4a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 17:27:01 2023 +0100 riched20/tests: EM_GETSELTEXT's wparam is not used and should be 0. --- dlls/riched20/tests/editor.c | 4 ++-- dlls/riched20/tests/richole.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7c959680e84..e7e79db1805 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5094,7 +5094,7 @@ static void test_EM_EXSETSEL(void) cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); ok(result == 8, "EM_EXSETSEL return %Id expected 8\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)bufA); ok(!strcmp(bufA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %ld expected 4\n", cr.cpMin); @@ -5169,7 +5169,7 @@ static void test_EM_SETSEL(void) /* 012345 6 78901 */ result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); ok(result == 8, "EM_SETSEL return %Id expected 8\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(!strcmp(buffA, "ef\x8e\xf0g"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 1c19d36dc0d..7ec6036fea6 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4068,7 +4068,7 @@ static void subtest_InsertObject(struct reolecb_obj *callback) expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1); - result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + 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); @@ -4151,7 +4151,7 @@ static void subtest_InsertObject(struct reolecb_obj *callback) expected_stringA = "abc d efg"; memset(bufferA, 0, sizeof(bufferA)); SendMessageA(hwnd, EM_SETSEL, 0, -1); - result = SendMessageA(hwnd, EM_GETSELTEXT, (WPARAM)sizeof(bufferA), (LPARAM)bufferA); + 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);

1 0

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

Feb. 28, 2023

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

Francois Gouget : riched32/tests: EM_GETSELTEXT's wparam is not used and should be 0.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: 002860d6b3620a75bc60b5b12c9ca2d0b47cdd22 URL: https://gitlab.winehq.org/wine/wine/-/commit/002860d6b3620a75bc60b5b12c9ca2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 23 17:29:29 2023 +0100 riched32/tests: EM_GETSELTEXT's wparam is not used and should be 0. --- dlls/riched32/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index b8b00352f26..7782ed78338 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1361,7 +1361,7 @@ static void test_EM_EXSETSEL(void) cr.cpMin = 4; cr.cpMax = 8; result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); todo_wine ok(result == 7, "EM_EXSETSEL return %Id expected 7\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(bufA), (LPARAM)bufA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)bufA); ok(!strcmp(bufA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); SendMessageA(hwndRichEdit, EM_EXGETSEL, 0, (LPARAM)&cr); ok(cr.cpMin == 4, "Selection start incorrectly: %ld expected 4\n", cr.cpMin); @@ -1420,7 +1420,7 @@ static void test_EM_SETSEL(void) /* 012345 6 7 8901 */ result = SendMessageA(hwndRichEdit, EM_SETSEL, 4, 8); todo_wine ok(result == 7, "EM_SETSEL return %Id expected 7\n", result); - result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, sizeof(buffA), (LPARAM)buffA); + result = SendMessageA(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffA); ok(!strcmp(buffA, "ef\x8e\xf0"), "EM_GETSELTEXT return incorrect string\n"); result = SendMessageA(hwndRichEdit, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); ok(sel_start == 4, "Selection start incorrectly: %d expected 4\n", sel_start);

1 0

Alex Henrie : shell32: Add support for Program Manager icons with arguments.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: wine Branch: master Commit: aa21d1acb28839177e8d7e74bab65bf1886d6596 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa21d1acb28839177e8d7e74bab65b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 19:55:12 2023 -0700 shell32: Add support for Program Manager icons with arguments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 --- dlls/shell32/dde.c | 21 +++++++++++++++------ dlls/shell32/tests/progman_dde.c | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 24294d69fe2..c390f8e3186 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -261,7 +261,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } else if (!wcsicmp(command, L"AddItem")) { - WCHAR *path, *name; + WCHAR *target, *space = NULL, *path, *name; IShellLinkW *link; IPersistFile *file; HRESULT hres; @@ -272,15 +272,24 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) &IID_IShellLinkW, (void **)&link); if (FAILED(hres)) return DDE_FNOTPROCESSED; - len = SearchPathW(NULL, argv[0], L".exe", 0, NULL, NULL); - if (len == 0) + target = wcsdup(argv[0]); + while (!(len = SearchPathW(NULL, target, L".exe", 0, NULL, NULL))) { - IShellLinkW_Release(link); - return DDE_FNOTPROCESSED; + /* progressively remove words from the end of the command line until we get a valid file name */ + space = wcsrchr(target, ' '); + if (!space) + { + IShellLinkW_Release(link); + free(target); + return DDE_FNOTPROCESSED; + } + *space = 0; } path = malloc(len * sizeof(WCHAR)); - SearchPathW(NULL, argv[0], L".exe", len, path, NULL); + SearchPathW(NULL, target, L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); + if (space) IShellLinkW_SetArguments(link, argv[0] + (space - target) + 1); + free(target); free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5a7e8c912e5..b15295c5a21 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -231,10 +231,25 @@ static void test_parser(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foobar.lnk"), "link not created\n"); - error = dde_execute(instance, hConv, "[AddItem(notepad,foo bar)]"); + error = dde_execute(instance, hConv, "[AddItem(notepad\tfoo.txt,foo)]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt,foo)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/foo.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(notepad foo.txt bar.txt,foo bar)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("test/foo bar.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe,IE)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/IE.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[AddItem(C:\\Program Files\\Internet Explorer\\iexplore.exe https://www.winehq.org/,WineHQ)"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("test/WineHQ.lnk"), "link not created\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,a[b,c]d)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);

1 0

Akihiro Sagawa : msado15: Free recordset filter on close.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

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 : vkd3d-shader/hlsl: Do not set an initial latent matrix majority.
by Alexandre Julliard Feb. 28, 2023

Feb. 28, 2023

Module: vkd3d Branch: master Commit: 322963add80271e59e46ac61559d4408c153d4bc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/322963add80271e59e46ac61559d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 29 18:55:42 2022 -0500 vkd3d-shader/hlsl: Do not set an initial latent matrix majority. This change does nothing by itself. --- libs/vkd3d-shader/hlsl.c | 2 -- libs/vkd3d-shader/hlsl.y | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3cf3e6d0..24822e97 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2973,8 +2973,6 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const char *source_name, ctx->location.line = ctx->location.column = 1; vkd3d_string_buffer_cache_init(&ctx->string_buffers); - ctx->matrix_majority = HLSL_MODIFIER_COLUMN_MAJOR; - list_init(&ctx->scopes); if (!(ctx->dummy_scope = hlsl_new_scope(ctx, NULL))) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c072362c..6162423c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -886,7 +886,8 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ && !(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK) && type->type == HLSL_CLASS_MATRIX) { - default_majority = ctx->matrix_majority; + if (!(default_majority = ctx->matrix_majority)) + default_majority = HLSL_MODIFIER_COLUMN_MAJOR; } else if (type->type != HLSL_CLASS_MATRIX) {

1 0