March 2023 - Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d: Mention the correct mutex in a comment.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: vkd3d Branch: master Commit: ef8d272507295c4c7fc3d0a1db6ae848b9c711f5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef8d272507295c4c7fc3d0a1db6ae… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 24 16:02:08 2023 +0100 vkd3d: Mention the correct mutex in a comment. --- libs/vkd3d/command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 158d0d9f..2d3007cf 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -670,8 +670,9 @@ static HRESULT d3d12_device_flush_blocked_queues_once(struct d3d12_device *devic vkd3d_mutex_lock(&device->blocked_queues_mutex); - /* Flush any ops unblocked by a new pending value. These cannot be flushed - * with the device locked, so move the queue pointers to a local array. */ + /* Flush any ops unblocked by a new pending value. These cannot be + * flushed while holding blocked_queue_mutex, so move the queue + * pointers to a local array. */ blocked_queue_count = device->blocked_queue_count; memcpy(blocked_queues, device->blocked_queues, blocked_queue_count * sizeof(blocked_queues[0])); device->blocked_queue_count = 0;

1 0

Rémi Bernon : imm32/tests: Test ImmGetDescription with the installed IME.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: d0cc3ded0854c5140612d858b854404e70ef7470 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0cc3ded0854c5140612d858b85440… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 19:19:06 2023 +0100 imm32/tests: Test ImmGetDescription with the installed IME. --- dlls/imm32/tests/imm32.c | 136 ++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 56 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 91f5a61065f..e259c8b2e22 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1194,61 +1194,6 @@ static void test_ImmGetContext(void) ok(ImmReleaseContext(hwnd, himc), "ImmReleaseContext failed\n"); } -static void test_ImmGetDescription(void) -{ - HKL hkl; - WCHAR descW[100]; - CHAR descA[100]; - UINT ret, lret; - - /* FIXME: invalid keyboard layouts should not pass */ - ret = ImmGetDescriptionW(NULL, NULL, 0); - ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); - ret = ImmGetDescriptionA(NULL, NULL, 0); - ok(!ret, "ImmGetDescriptionA failed, expected 0 received %d.\n", ret); - - /* load a language with valid IMM descriptions */ - hkl = GetKeyboardLayout(0); - ok(hkl != 0, "GetKeyboardLayout failed, expected != 0.\n"); - - ret = ImmGetDescriptionW(hkl, NULL, 0); - if(!ret) - { - win_skip("ImmGetDescriptionW is not working for current loaded keyboard.\n"); - return; - } - - SetLastError(0xdeadcafe); - ret = ImmGetDescriptionW(0, NULL, 100); - ok (ret == 0, "ImmGetDescriptionW with 0 hkl should return 0\n"); - ret = GetLastError(); - ok (ret == 0xdeadcafe, "Last Error should remain unchanged\n"); - - ret = ImmGetDescriptionW(hkl, descW, 0); - ok(ret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); - - lret = ImmGetDescriptionW(hkl, descW, ret + 1); - ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); - ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); - - lret = ImmGetDescriptionA(hkl, descA, ret + 1); - ok(lret, "ImmGetDescriptionA failed, expected != 0 received 0.\n"); - ok(lret == ret, "ImmGetDescriptionA failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); - - ret /= 2; /* try to copy partially */ - lret = ImmGetDescriptionW(hkl, descW, ret + 1); - ok(lret, "ImmGetDescriptionW failed, expected != 0 received 0.\n"); - ok(lret == ret, "ImmGetDescriptionW failed to return the correct amount of data. Expected %d, got %d.\n", ret, lret); - - lret = ImmGetDescriptionA(hkl, descA, ret + 1); - ok(!lret, "ImmGetDescriptionA should fail\n"); - - ret = ImmGetDescriptionW(hkl, descW, 1); - ok(!ret, "ImmGetDescriptionW failed, expected 0 received %d.\n", ret); - - UnloadKeyboardLayout(hkl); -} - static LRESULT (WINAPI *old_imm_wnd_proc)(HWND, UINT, WPARAM, LPARAM); static LRESULT WINAPI imm_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -2794,6 +2739,85 @@ static void test_ImmInstallIME(void) ime_cleanup( hkl ); } +static void test_ImmGetDescription(void) +{ + HKL hkl = GetKeyboardLayout( 0 ); + WCHAR bufferW[MAX_PATH]; + char bufferA[MAX_PATH]; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = ImmGetDescriptionW( NULL, NULL, 0 ); + ok( !ret, "ImmGetDescriptionW returned %lu\n", ret ); + ret = ImmGetDescriptionA( NULL, NULL, 0 ); + ok( !ret, "ImmGetDescriptionA returned %lu\n", ret ); + ret = ImmGetDescriptionW( NULL, NULL, 100 ); + ok( !ret, "ImmGetDescriptionW returned %lu\n", ret ); + ret = ImmGetDescriptionA( NULL, NULL, 100 ); + ok( !ret, "ImmGetDescriptionA returned %lu\n", ret ); + ret = ImmGetDescriptionW( hkl, bufferW, 100 ); + todo_wine + ok( !ret, "ImmGetDescriptionW returned %lu\n", ret ); + ret = ImmGetDescriptionA( hkl, bufferA, 100 ); + todo_wine + ok( !ret, "ImmGetDescriptionA returned %lu\n", ret ); + ret = GetLastError(); + ok( ret == 0xdeadbeef, "got error %lu\n", ret ); + + if (!(hkl = ime_install())) return; + + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetDescriptionW( hkl, bufferW, 2 ); + ok( ret == 1, "ImmGetDescriptionW returned %lu\n", ret ); + ok( !wcscmp( bufferW, L"W" ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetDescriptionA( hkl, bufferA, 2 ); + ok( ret == 0, "ImmGetDescriptionA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetDescriptionW( hkl, bufferW, 11 ); + todo_wine + ok( ret == 10, "ImmGetDescriptionW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, L"WineTest I" ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetDescriptionA( hkl, bufferA, 11 ); + todo_wine + ok( ret == 0, "ImmGetDescriptionA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetDescriptionW( hkl, bufferW, 12 ); + todo_wine + ok( ret == 11, "ImmGetDescriptionW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, L"WineTest IM" ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetDescriptionA( hkl, bufferA, 12 ); + todo_wine + ok( ret == 12, "ImmGetDescriptionA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "WineTest IME" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetDescriptionW( hkl, bufferW, 13 ); + todo_wine + ok( ret == 12, "ImmGetDescriptionW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, L"WineTest IME" ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetDescriptionA( hkl, bufferA, 13 ); + todo_wine + ok( ret == 12, "ImmGetDescriptionA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "WineTest IME" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + ime_cleanup( hkl ); +} + START_TEST(imm32) { if (!is_ime_enabled()) @@ -2805,6 +2829,7 @@ START_TEST(imm32) test_com_initialization(); test_ImmInstallIME(); + test_ImmGetDescription(); if (init()) { @@ -2817,7 +2842,6 @@ START_TEST(imm32) test_ImmThreads(); test_ImmIsUIMessage(); test_ImmGetContext(); - test_ImmGetDescription(); test_ImmDefaultHwnd(); test_default_ime_window_creation(); test_ImmGetIMCLockCount();

1 0

Rémi Bernon : imm32/tests: Test ImmGetIMEFileName with the installed IME.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 313611532405f9b0ac894d42f09832711105f678 URL: https://gitlab.winehq.org/wine/wine/-/commit/313611532405f9b0ac894d42f09832… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 18 10:33:33 2023 +0100 imm32/tests: Test ImmGetIMEFileName with the installed IME. --- dlls/imm32/tests/imm32.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index e259c8b2e22..b617283e922 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2818,6 +2818,89 @@ static void test_ImmGetDescription(void) ime_cleanup( hkl ); } +static void test_ImmGetIMEFileName(void) +{ + HKL hkl = GetKeyboardLayout( 0 ); + WCHAR bufferW[MAX_PATH], expectW[16]; + char bufferA[MAX_PATH], expectA[16]; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = ImmGetIMEFileNameW( NULL, NULL, 0 ); + ok( !ret, "ImmGetIMEFileNameW returned %lu\n", ret ); + ret = ImmGetIMEFileNameA( NULL, NULL, 0 ); + ok( !ret, "ImmGetIMEFileNameA returned %lu\n", ret ); + ret = ImmGetIMEFileNameW( NULL, NULL, 100 ); + ok( !ret, "ImmGetIMEFileNameW returned %lu\n", ret ); + ret = ImmGetIMEFileNameA( NULL, NULL, 100 ); + ok( !ret, "ImmGetIMEFileNameA returned %lu\n", ret ); + ret = ImmGetIMEFileNameW( hkl, bufferW, 100 ); + ok( !ret, "ImmGetIMEFileNameW returned %lu\n", ret ); + ret = ImmGetIMEFileNameA( hkl, bufferA, 100 ); + ok( !ret, "ImmGetIMEFileNameA returned %lu\n", ret ); + ret = GetLastError(); + todo_wine + ok( ret == 0xdeadbeef, "got error %lu\n", ret ); + + if (!(hkl = ime_install())) return; + + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetIMEFileNameW( hkl, bufferW, 2 ); + todo_wine + ok( ret == 1, "ImmGetIMEFileNameW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, L"W" ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetIMEFileNameA( hkl, bufferA, 2 ); + ok( ret == 0, "ImmGetIMEFileNameA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.I", ime_count - 1 ); + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetIMEFileNameW( hkl, bufferW, 11 ); + todo_wine + ok( ret == 10, "ImmGetIMEFileNameW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetIMEFileNameA( hkl, bufferA, 11 ); + ok( ret == 0, "ImmGetIMEFileNameA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, "" ), "got bufferA %s\n", debugstr_a(bufferA) ); + + swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.IM", ime_count - 1 ); + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetIMEFileNameW( hkl, bufferW, 12 ); + todo_wine + ok( ret == 11, "ImmGetIMEFileNameW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) ); + snprintf( expectA, ARRAY_SIZE(expectA), "WINE%04X.IME", ime_count - 1 ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetIMEFileNameA( hkl, bufferA, 12 ); + todo_wine + ok( ret == 12, "ImmGetIMEFileNameA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, expectA ), "got bufferA %s\n", debugstr_a(bufferA) ); + + swprintf( expectW, ARRAY_SIZE(expectW), L"WINE%04X.IME", ime_count - 1 ); + memset( bufferW, 0xcd, sizeof(bufferW) ); + ret = ImmGetIMEFileNameW( hkl, bufferW, 13 ); + todo_wine + ok( ret == 12, "ImmGetIMEFileNameW returned %lu\n", ret ); + todo_wine + ok( !wcscmp( bufferW, expectW ), "got bufferW %s\n", debugstr_w(bufferW) ); + memset( bufferA, 0xcd, sizeof(bufferA) ); + ret = ImmGetIMEFileNameA( hkl, bufferA, 13 ); + todo_wine + ok( ret == 12, "ImmGetIMEFileNameA returned %lu\n", ret ); + todo_wine + ok( !strcmp( bufferA, expectA ), "got bufferA %s\n", debugstr_a(bufferA) ); + + ime_cleanup( hkl ); +} + START_TEST(imm32) { if (!is_ime_enabled()) @@ -2830,6 +2913,7 @@ START_TEST(imm32) test_ImmInstallIME(); test_ImmGetDescription(); + test_ImmGetIMEFileName(); if (init()) {

1 0

Rémi Bernon : makedep: Support resource files for embedded TESTDLL.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 2d39dcafc816a7e9a9a37fa9557d57de63ceb722 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d39dcafc816a7e9a9a37fa9557d57… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 12:50:59 2022 +0100 makedep: Support resource files for embedded TESTDLL. --- tools/makedep.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 07fdf664fb9..49a7514c9f0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2710,8 +2710,13 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c if (source->file->flags & FLAG_RC_HEADER) return; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = "po"; - for (arch = 0; arch < archs.count; arch++) - if (!make->disabled[arch]) strarray_add( &make->res_files[arch], res_file ); + if (!make->testdll || !find_src_file( make, strmake( "%s.spec", obj ) )) /* RC is for a TESTDLL */ + { + for (arch = 0; arch < archs.count; arch++) + if (!make->disabled[arch]) strarray_add( &make->res_files[arch], res_file ); + } + else strarray_add( &make->clean_files, res_file ); + if (source->file->flags & FLAG_RC_PO) { strarray_add( &make->pot_files, strmake( "%s.pot", obj )); @@ -3040,7 +3045,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *output_rsrc, *output_file, *debug_file; + const char *dll_name, *obj_name, *res_name, *output_rsrc, *output_file, *debug_file; unsigned int arch; if (!imports.count) imports = make->imports; @@ -3060,6 +3065,9 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_file = obj_dir_path( make, dll_name ); output_rsrc = strmake( "%s.res", dll_name ); + if (!find_src_file( make, strmake( "%s.rc", obj ) )) res_name = NULL; + else res_name = obj_dir_path( make, strmake( "%s.res", obj ) ); + strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files[arch], output_rsrc ); output( "%s:", obj_dir_path( make, output_rsrc )); @@ -3072,6 +3080,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output( "%s:", output_file ); output_filename( source->filename ); output_filename( obj_name ); + if (res_name) output_filename( res_name ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3083,6 +3092,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( "-shared" ); output_filename( source->filename ); output_filename( obj_name ); + if (res_name) output_filename( res_name ); if ((debug_file = get_debug_file( make, dll_name, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs );

1 0

Rémi Bernon : makedep: Rename TESTDLL generated .res to avoid conflicts.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: d2e79b0905c74dff18aab13acb8dbd7cf927ec3a URL: https://gitlab.winehq.org/wine/wine/-/commit/d2e79b0905c74dff18aab13acb8dbd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 12:50:59 2022 +0100 makedep: Rename TESTDLL generated .res to avoid conflicts. --- tools/makedep.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8fa539026ca..07fdf664fb9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3040,7 +3040,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, struct strarray dll_flags = empty_strarray; struct strarray default_imports = empty_strarray; struct strarray all_libs, dep_libs; - const char *dll_name, *obj_name, *res_name, *output_file, *debug_file; + const char *dll_name, *obj_name, *output_rsrc, *output_file, *debug_file; unsigned int arch; if (!imports.count) imports = make->imports; @@ -3057,12 +3057,12 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (!arch) strarray_addall( &all_libs, libs ); dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); - res_name = strmake( "%s%s.res", arch_dirs[arch], obj ); output_file = obj_dir_path( make, dll_name ); + output_rsrc = strmake( "%s.res", dll_name ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->res_files[arch], res_name ); - output( "%s:", obj_dir_path( make, res_name )); + strarray_add( &make->res_files[arch], output_rsrc ); + output( "%s:", obj_dir_path( make, output_rsrc )); output_filename( output_file ); output_filename( tools_path( make, "wrc" )); output( "\n" );

1 0

Rémi Bernon : imm32/tests: Test ImmInstallIMEW with an actual IME.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: d07a5e6b91352d9a44c8d23491432a6f446ada4b URL: https://gitlab.winehq.org/wine/wine/-/commit/d07a5e6b91352d9a44c8d23491432a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 12:55:42 2022 +0100 imm32/tests: Test ImmInstallIMEW with an actual IME. --- dlls/imm32/tests/Makefile.in | 7 +- dlls/imm32/tests/ime_test.h | 35 ++++++++++ dlls/imm32/tests/ime_wrapper.c | 107 +++++++++++++++++++++++++++++ dlls/imm32/tests/ime_wrapper.rc | 28 ++++++++ dlls/imm32/tests/ime_wrapper.spec | 16 +++++ dlls/imm32/tests/imm32.c | 138 +++++++++++++++++++++++++++++++++++++- 6 files changed, 327 insertions(+), 4 deletions(-)

1 0

Rémi Bernon : imm32/tests: Redirect IME function to the main module.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 16222f2de6e0b4619730467a66b301b62050b90a URL: https://gitlab.winehq.org/wine/wine/-/commit/16222f2de6e0b4619730467a66b301… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 19:53:40 2023 +0100 imm32/tests: Redirect IME function to the main module. For easier testing and to wokaround some Windows IME caching mechanism that prevent the IME module from reloading. --- dlls/imm32/tests/ime_test.h | 21 ++++ dlls/imm32/tests/ime_wrapper.c | 67 +++++++++--- dlls/imm32/tests/ime_wrapper.spec | 1 + dlls/imm32/tests/imm32.c | 210 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 283 insertions(+), 16 deletions(-)

1 0

Rémi Bernon : imm32/tests: Add broken test results for w10v22H2.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: b46ad448ab8ac3bdd2291f0336ec53886e5e7a20 URL: https://gitlab.winehq.org/wine/wine/-/commit/b46ad448ab8ac3bdd2291f0336ec53… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 16 17:22:25 2023 +0100 imm32/tests: Add broken test results for w10v22H2. --- dlls/imm32/tests/imm32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a97457320ce..00e192cb180 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2285,7 +2285,9 @@ static DWORD WINAPI com_initialization_thread(void *arg) static void test_com_initialization(void) { + APTTYPEQUALIFIER qualifier; HANDLE thread; + APTTYPE type; HRESULT hr; HWND wnd; BOOL r; @@ -2340,13 +2342,17 @@ static void test_com_initialization(void) ok(hr == S_OK, "CoInitialize returned %lx\n", hr); test_apttype(APTTYPE_MTA); DestroyWindow(wnd); - test_apttype(-1); + + hr = CoGetApartmentType(&type, &qualifier); + ok(hr == CO_E_NOTINITIALIZED || broken(hr == S_OK) /* w10v22H2 */, + "CoGetApartmentType returned %#lx\n", hr); + test_apttype(hr == S_OK ? APTTYPE_MTA : -1); wnd = CreateWindowA("static", "static", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, 0); ok(wnd != NULL, "CreateWindow failed\n"); - test_apttype(-1); + test_apttype(hr == S_OK ? APTTYPE_MTA : -1); ShowWindow(wnd, SW_SHOW); - test_apttype(APTTYPE_MAINSTA); + test_apttype(hr == S_OK ? APTTYPE_MTA : APTTYPE_MAINSTA); DestroyWindow(wnd); test_apttype(-1); }

1 0

Martin Storsjö : ntdll: Handle aarch64 pointer authentication in unwind info.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 7f7f06fe615fbd662d469cd1c16fd933692e05de URL: https://gitlab.winehq.org/wine/wine/-/commit/7f7f06fe615fbd662d469cd1c16fd9… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Mar 3 11:45:34 2023 +0200 ntdll: Handle aarch64 pointer authentication in unwind info. These were docmented in [1] (with the user-facing name of the opcode adjusted later in [2]). Since MSVC 2022, the precompiled runtimes (both runtimes such as vcruntime140*.dll and the statically linked code from e.g. libcmt.lib) are built with pointer authentication enabled. To correctly handle unwinding through such functions, even on HW that don't support the pointer authentication mechanism itself, wine needs to at least be aware of it (for handling the cases with packed unwind info with CR==2 simiarly to CR==3). This patch has been tested on Linux on HW supporting pointer authentication too, with binaries built with MSVC. [1] https://github.com/MicrosoftDocs/cpp-docs/commit/f510c83085d9764b3c7b522219… [2] https://github.com/MicrosoftDocs/cpp-docs/commit/cac237d3f370a06b71f6c314a6… --- dlls/ntdll/signal_arm64.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2eed51b101e..90be8fc2232 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -690,6 +690,20 @@ static void restore_fpregs( int reg, int count, int pos, CONTEXT *context, } +static void do_pac_auth( CONTEXT *context ) +{ + register DWORD64 x17 __asm__( "x17" ) = context->u.s.Lr; + register DWORD64 x16 __asm__( "x16" ) = context->Sp; + + /* This is the autib1716 instruction. The hint instruction is used here + * as gcc does not assemble autib1716 for pre armv8.3a targets. For + * pre-armv8.3a targets, this is just treated as a hint instruction, which + * is ignored. */ + __asm__( "hint 0xe" : "+r"(x17) : "r"(x16) ); + + context->u.s.Lr = x17; +} + /*********************************************************************** * process_unwind_codes */ @@ -773,6 +787,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, { memcpy( context, (DWORD64 *)context->Sp, sizeof(CONTEXT) ); } + else if (*ptr == 0xfc) /* pac_sign_lr */ + { + do_pac_auth( context ); + } else { WARN( "unsupported code %02x\n", *ptr ); @@ -820,6 +838,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION len = (int_size + 8) / 16 + (fp_size + 8) / 16; switch (func->u.s.CR) { + case 2: + len++; /* pacibsp */ + /* fall through */ case 3: len++; /* mov x29,sp */ len++; /* stp x29,lr,[sp,0] */ @@ -845,7 +866,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (!skip) { - if (func->u.s.CR == 3) + if (func->u.s.CR == 3 || func->u.s.CR == 2) { DWORD64 *fp = (DWORD64 *) context->u.s.Fp; /* u.X[29] */ context->Sp = context->u.s.Fp; @@ -864,6 +885,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION switch (func->u.s.CR) { case 3: + case 2: /* mov x29,sp */ if (pos++ >= skip) context->Sp = context->u.s.Fp; if (local_size <= 512) @@ -932,6 +954,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION restore_regs( 19, 2, -saved_regs, context, ptrs ); } } + if (func->u.s.CR == 2) do_pac_auth( context ); return NULL; }

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP5 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 8, 2023

March 8, 2023

Module: wine Branch: master Commit: 3809a31258b9c06696f308d67a33818500143440 URL: https://gitlab.winehq.org/wine/wine/-/commit/3809a31258b9c06696f308d67a3381… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:31:17 2022 -0600 wined3d: Move the WINED3D_RS_WRAP5 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a0ef4213b11..4c5604fc54e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -103,7 +103,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 065367c605c..be10d1f0b32 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP5: case WINED3D_RS_WRAP6: case WINED3D_RS_WRAP7: case WINED3D_RS_WRAP8: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8a38eb13d9..cf03c1f8f77 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2816,7 +2816,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP3), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP4), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP5), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ded450992f6..f4d767825db 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4686,7 +4686,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP3), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP4), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP5), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5467,7 +5466,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {134, 135}, + {133, 135}, {149, 150}, {162, 162}, {168, 169},

1 0