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

Rémi Bernon : imm32/tests: Add broken test results for w10v22H2.
by Alexandre Julliard 08 Mar '23

08 Mar '23

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

Rémi Bernon : makedep: Rename TESTDLL generated .res to avoid conflicts.
by Alexandre Julliard 08 Mar '23

08 Mar '23

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 : makedep: Support resource files for embedded TESTDLL.
by Alexandre Julliard 08 Mar '23

08 Mar '23

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 : imm32/tests: Test ImmInstallIMEW with an actual IME.
by Alexandre Julliard 08 Mar '23

08 Mar '23

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 08 Mar '23

08 Mar '23

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: Test ImmGetDescription with the installed IME.
by Alexandre Julliard 08 Mar '23

08 Mar '23

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 08 Mar '23

08 Mar '23

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

Alexandre Julliard : maintainers: Assume maintainership of ARM platforms.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: 4d217cb274847223cdaab79bbd0980dff1c09dd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d217cb274847223cdaab79bbd0980… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 09:16:12 2023 +0100 maintainers: Assume maintainership of ARM platforms. --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9d60385414f..7e2645d8b5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29,7 +29,8 @@ Maintainers List ----------------------------------- ARM, ARM64 -M: André Zwing <nerv(a)dawncrow.de> +M: Alexandre Julliard <julliard(a)winehq.org> +P: André Zwing <nerv(a)dawncrow.de> F: dlls/dbghelp/cpu_arm* F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm*

1 0

Alexandre Julliard : ntdll: Always call Wow64PrepareForException when dispatching an exception.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: eccf92996c88adee809cea6e1416fa72e4c92ef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eccf92996c88adee809cea6e1416fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 11:42:58 2023 +0100 ntdll: Always call Wow64PrepareForException when dispatching an exception. --- dlls/ntdll/signal_arm64.c | 2 ++ dlls/ntdll/signal_x86_64.c | 3 ++- dlls/wow64cpu/cpu.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cadf774be67..2eed51b101e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -494,6 +494,8 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE( "code=%lx flags=%lx addr=%p pc=%016I64x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Pc ); for (c = 0; c < rec->NumberParameters; c++) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 81479f1fd91..7ebd52766e6 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -508,6 +508,8 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) NTSTATUS status; DWORD c; + if (pWow64PrepareForException) pWow64PrepareForException( rec, context ); + TRACE_(seh)( "code=%lx flags=%lx addr=%p ip=%Ix\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Rip ); for (c = 0; c < min( EXCEPTION_MAXIMUM_PARAMETERS, rec->NumberParameters ); c++) @@ -584,7 +586,6 @@ NTSTATUS WINAPI dispatch_wow_exception( EXCEPTION_RECORD *rec_ptr, CONTEXT *cont RtlInitializeExtendedContext( buffer, context_ptr->ContextFlags, &context_ex ); context = RtlLocateLegacyContext( context_ex, NULL ); RtlCopyContext( context, context_ptr->ContextFlags, context_ptr ); - pWow64PrepareForException( &rec, context ); return dispatch_exception( &rec, context ); } diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 13c94751d19..5bcaf9d1c45 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -375,6 +375,8 @@ NTSTATUS WINAPI BTCpuResetToConsistentState( EXCEPTION_POINTERS *ptrs ) CONTEXT *context = ptrs->ContextRecord; I386_CONTEXT wow_context; + if (context->SegCs == cs64_sel) return STATUS_SUCCESS; /* exception in 64-bit code, nothing to do */ + copy_context_64to32( &wow_context, CONTEXT_I386_ALL, context ); wow_context.EFlags &= ~(0x100|0x40000); BTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &wow_context );

1 0

Alexandre Julliard : server: Determine the native thread context flags on the client side.
by Alexandre Julliard 08 Mar '23

08 Mar '23

Module: wine Branch: master Commit: fa47ea740020dd5bffa94b3cd835559393b2f752 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa47ea740020dd5bffa94b3cd83555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 12:24:49 2023 +0100 server: Determine the native thread context flags on the client side. --- dlls/ntdll/unix/thread.c | 15 +++++++++++++++ include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 2 ++ server/request.h | 6 ++++-- server/thread.c | 8 +++----- server/trace.c | 2 ++ 6 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d56962e1721..79943ebabc2 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -207,6 +207,18 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin } +/*********************************************************************** + * get_native_context_flags + * + * Get flags for registers that are set from the native context in WoW mode. + */ +static unsigned int get_native_context_flags( USHORT native_machine, USHORT wow_machine ) +{ + if (native_machine == wow_machine) return 0; + return SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; +} + + /*********************************************************************** * context_to_server * @@ -1691,6 +1703,7 @@ NTSTATUS set_thread_context( HANDLE handle, const void *context, BOOL *self, USH SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); + req->native_flags = server_contexts[0].flags & get_native_context_flags( native_machine, machine ); wine_server_add_data( req, server_contexts, count * sizeof(server_contexts[0]) ); ret = wine_server_call( req ); *self = reply->self; @@ -1717,6 +1730,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->handle = wine_server_obj_handle( handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); *self = reply->self; @@ -1734,6 +1748,7 @@ NTSTATUS get_thread_context( HANDLE handle, void *context, BOOL *self, USHORT ma req->context = wine_server_obj_handle( context_handle ); req->flags = flags; req->machine = machine; + req->native_flags = flags & get_native_context_flags( native_machine, machine ); wine_server_set_reply( req, server_contexts, sizeof(server_contexts) ); ret = wine_server_call( req ); count = wine_server_reply_size( reply ) / sizeof(server_contexts[0]); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ffef499df20..f61918271ff 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2531,8 +2531,9 @@ struct get_thread_context_request obj_handle_t handle; obj_handle_t context; unsigned int flags; + unsigned int native_flags; unsigned short machine; - char __pad_26[6]; + char __pad_30[2]; }; struct get_thread_context_reply { @@ -2548,7 +2549,9 @@ struct set_thread_context_request { struct request_header __header; obj_handle_t handle; + unsigned int native_flags; /* VARARG(contexts,contexts); */ + char __pad_20[4]; }; struct set_thread_context_reply { @@ -6355,7 +6358,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 761 +#define SERVER_PROTOCOL_VERSION 762 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 57957efdae3..c857f72ce68 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1931,6 +1931,7 @@ struct process_info obj_handle_t handle; /* thread handle */ obj_handle_t context; /* context handle */ unsigned int flags; /* context flags */ + unsigned int native_flags; /* flags for native context if WoW present */ unsigned short machine; /* context architecture */ @REPLY int self; /* was it a handle to the current thread? */ @@ -1942,6 +1943,7 @@ struct process_info /* Set the current context of a thread */ @REQ(set_thread_context) obj_handle_t handle; /* thread handle */ + unsigned int native_flags; /* flags for native context if WoW present */ VARARG(contexts,contexts); /* thread context(s) */ @REPLY int self; /* was it a handle to the current thread? */ diff --git a/server/request.h b/server/request.h index 10b877b1deb..b8d4f6a6d5e 100644 --- a/server/request.h +++ b/server/request.h @@ -1278,13 +1278,15 @@ C_ASSERT( sizeof(struct get_timer_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, context) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, flags) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, native_flags) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_context_request, machine) == 28 ); C_ASSERT( sizeof(struct get_thread_context_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, self) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_thread_context_reply, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, handle) == 12 ); -C_ASSERT( sizeof(struct set_thread_context_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_thread_context_request, native_flags) == 16 ); +C_ASSERT( sizeof(struct set_thread_context_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_thread_context_reply, self) == 8 ); C_ASSERT( sizeof(struct set_thread_context_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_selector_entry_request, handle) == 12 ); diff --git a/server/thread.c b/server/thread.c index 5f8493dd309..c9adccfef66 100644 --- a/server/thread.c +++ b/server/thread.c @@ -127,8 +127,6 @@ struct context /* flags for registers that always need to be set from the server side */ static const unsigned int system_flags = SERVER_CTX_DEBUG_REGISTERS; -/* flags for registers that are set from the native context even in WoW mode */ -static const unsigned int always_native_flags = SERVER_CTX_DEBUG_REGISTERS | SERVER_CTX_FLOATING_POINT | SERVER_CTX_YMM_REGISTERS; static void dump_context( struct object *obj, int verbose ); static int context_signaled( struct object *obj, struct wait_queue_entry *entry ); @@ -1866,8 +1864,8 @@ DECL_HANDLER(get_thread_context) if (req->machine == thread_context->regs[CTX_WOW].machine) { - native_flags = req->flags & always_native_flags; - wow_flags = req->flags & ~always_native_flags; + native_flags = req->native_flags; + wow_flags = req->flags & ~native_flags; } if ((context = set_reply_data_size( (!!native_flags + !!wow_flags) * sizeof(context_t) ))) { @@ -1922,7 +1920,7 @@ DECL_HANDLER(set_thread_context) unsigned int ctx = CTX_NATIVE; const context_t *context = &contexts[CTX_NATIVE]; unsigned int flags = system_flags & context->flags; - unsigned int native_flags = always_native_flags & context->flags; + unsigned int native_flags = context->flags & req->native_flags; if (thread != current) stop_thread( thread ); else if (flags) set_thread_context( thread, context, flags ); diff --git a/server/trace.c b/server/trace.c index 91bc3ae7af9..fb006f605b5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2509,6 +2509,7 @@ static void dump_get_thread_context_request( const struct get_thread_context_req fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", context=%04x", req->context ); fprintf( stderr, ", flags=%08x", req->flags ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); fprintf( stderr, ", machine=%04x", req->machine ); } @@ -2522,6 +2523,7 @@ static void dump_get_thread_context_reply( const struct get_thread_context_reply static void dump_set_thread_context_request( const struct set_thread_context_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", native_flags=%08x", req->native_flags ); dump_varargs_contexts( ", contexts=", cur_size ); }

1 0