- Wine-Commits - list.winehq.org

Henri Verbeet : vkd3d-utils: Export D3D12CreateDevice() once again.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: 4e32adb8c1173a9a380ec3fd54d3c2b497a63f15 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e32adb8c1173a9a380ec3fd54d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 14:44:42 2023 +0200 vkd3d-utils: Export D3D12CreateDevice() once again. Commit d27fee64ab51c60078215f461a797edd32bc8871 inadvertently stopped exporting D3D12CreateDevice(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 3911c11b..aa1ac5fe 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -85,7 +85,7 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim return vkd3d_create_device(&device_create_info, iid, device); } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0);

1 0

Zebediah Figura : tests: Factor out vkd3d_test_printf().
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: 1bf5050d3dcc5726d309dde06435e4637dc468a2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bf5050d3dcc5726d309dde06435e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 15:42:18 2023 -0600 tests: Factor out vkd3d_test_printf(). --- include/private/vkd3d_test.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 0cc7fe4f..76d4a329 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -134,6 +134,11 @@ broken(bool condition) return condition && vkd3d_test_platform_is_windows(); } +static void vkd3d_test_printf(unsigned int line, const char *msg) +{ + printf("%s:%u%s: %s", vkd3d_test_name, line, vkd3d_test_state.context, msg); +} + static void vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) { @@ -141,12 +146,12 @@ vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va { InterlockedIncrement(&vkd3d_test_state.success_count); if (vkd3d_test_state.debug_level > 1) - printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test succeeded.\n"); } else { InterlockedIncrement(&vkd3d_test_state.failure_count); - printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test failed: "); vprintf(fmt, args); } } @@ -173,9 +178,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg if (is_todo) result = !result; if (result) - printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Fixed bug: "); else - printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Bug: "); vprintf(fmt, args); } else if (is_todo) @@ -183,12 +188,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg if (result) { InterlockedIncrement(&vkd3d_test_state.todo_success_count); - printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Todo succeeded: "); } else { InterlockedIncrement(&vkd3d_test_state.todo_count); - printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Todo: "); } vprintf(fmt, args); } @@ -213,7 +218,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test skipped: "); vprintf(fmt, args); va_end(args); InterlockedIncrement(&vkd3d_test_state.skip_count); @@ -224,7 +229,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, ""); vprintf(fmt, args); va_end(args); }

1 0

Eric Pouech : kernel32/debugger: Fix a failing test (on Wine).
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: b7225671fdf1a28d02c3c7887bae4417fc0c7ac6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7225671fdf1a28d02c3c7887bae44… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 4 18:59:20 2023 +0200 kernel32/debugger: Fix a failing test (on Wine). The failing test was garbled by remaining debug events from previous test. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 64662709e2a..b0c69052936 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1189,7 +1189,6 @@ static void test_debug_loop_wow64(void) default: ok(0, "Unexpected event: %lu\n", ev.dwDebugEventCode); /* fall through */ - case EXIT_PROCESS_DEBUG_EVENT: case EXIT_THREAD_DEBUG_EVENT: ret = ContinueDebugEvent( ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE ); ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); @@ -1205,7 +1204,23 @@ static void test_debug_loop_wow64(void) ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); ok(ec != STILL_ACTIVE, "GetExitCodeProcess still active\n"); } + for (;;) + { + DEBUG_EVENT ev; + ret = WaitForDebugEvent( &ev, 2000 ); + if (!ret || ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + switch (ev.dwDebugEventCode) + { + default: + ok(0, "Unexpected event: %lu\n", ev.dwDebugEventCode); + /* fall through */ + case EXIT_THREAD_DEBUG_EVENT: + ret = ContinueDebugEvent( ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE ); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); + break; + } + } ret = CloseHandle( pi.hThread ); ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle( pi.hProcess );

1 0

Zhiyi Zhang : winex11.drv: Fix a typo.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 3cbba43ddb4b7b6403c9b67482303cd18316d365 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cbba43ddb4b7b6403c9b67482303c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 4 18:06:43 2023 +0800 winex11.drv: Fix a typo. --- dlls/winex11.drv/xinerama.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 2691f9e9c5e..a508141d8c4 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -186,7 +186,7 @@ BOOL xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) done: pthread_mutex_unlock( &xinerama_mutex ); if (ret) - TRACE( "fullsceen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); + TRACE( "fullscreen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); return ret; }

1 0

Rémi Bernon : ws2_32/tests: Adjust test results without host IPv6 support.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: e3453ed81472de873ea989e3640fcbd79bbd5c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3453ed81472de873ea989e3640fcb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 4 09:16:03 2023 +0200 ws2_32/tests: Adjust test results without host IPv6 support. --- dlls/ws2_32/tests/afd.c | 7 +++++++ dlls/ws2_32/tests/protocol.c | 10 ++++++++-- dlls/ws2_32/tests/sock.c | 19 ++++++++++++++++--- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index b07fb40fe3f..d0191ba8dbf 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2281,6 +2281,12 @@ static void test_bind(void) todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); + if (io.Status == STATUS_INVALID_ADDRESS_COMPONENT) + { + skip("IPv6 not supported\n"); + closesocket(s); + goto cleanup; + } ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); @@ -2315,6 +2321,7 @@ static void test_bind(void) closesocket(s2); closesocket(s); +cleanup: CloseHandle(event); free(params); } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 34c0dbb0858..b0259cfe47d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2176,6 +2176,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_getaddrinfo = TRUE; BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); @@ -2376,8 +2377,10 @@ static void test_getaddrinfo(void) } else { + todo_wine ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); - win_skip("getaddrinfo does not support IPV6\n"); + skip("getaddrinfo does not support IPV6\n"); + has_ipv6_getaddrinfo = FALSE; } hint.ai_flags = 0; @@ -2468,7 +2471,10 @@ static void test_getaddrinfo(void) ret = getaddrinfo("www.kernel.org", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); if (!has_ipv6_addr) - todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + { + todo_wine_if(has_ipv6_getaddrinfo) + ok(!ipv6_found(result), "IPv6 address is returned.\n"); + } freeaddrinfo(result); for (i = 0; i < ARRAY_SIZE(hinttests); i++) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17298ca4136..1125d4519d3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2187,7 +2187,14 @@ static void test_reuseaddr(void) ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); rc = bind(s1, tests[i].addr_loopback, tests[i].addrlen); - ok(!rc, "got error %d.\n", WSAGetLastError()); + ok(!rc || (tests[i].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL), "got error %d.\n", WSAGetLastError()); + if (tests[i].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL) + { + skip("IPv6 not supported, skipping test\n"); + closesocket(s1); + winetest_pop_context(); + continue; + } s2 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s2 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); @@ -2392,7 +2399,7 @@ static void test_reuseaddr(void) } } rc = bind(s[0], tests_exclusive[i].s[0].addr, tests_exclusive[i].s[0].addrlen); - ok(!rc, "got error %d.\n", WSAGetLastError()); + ok(!rc || (tests_exclusive[i].s[0].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL), "got error %d.\n", WSAGetLastError()); rc = bind(s[1], tests_exclusive[i].s[1].addr, tests_exclusive[i].s[1].addrlen); @@ -2746,7 +2753,12 @@ static void test_ipv6_cmsg(void) ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); - ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + ok(rc != SOCKET_ERROR || WSAGetLastError() == WSAEADDRNOTAVAIL, "bind failed, error %u\n", WSAGetLastError()); + if (WSAGetLastError() == WSAEADDRNOTAVAIL) + { + skip("IPv6 not supported, skipping test\n"); + goto cleanup; + } rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); @@ -2820,6 +2832,7 @@ static void test_ipv6_cmsg(void) rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); +cleanup: closesocket(server); closesocket(client); }

1 0

Florian Will : dinput/tests: Add guidType test for collection objects.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 4413356d19dadbe7027cdfec1a45020246a51355 URL: https://gitlab.winehq.org/wine/wine/-/commit/4413356d19dadbe7027cdfec1a4502… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Apr 4 08:25:53 2023 +0200 dinput/tests: Add guidType test for collection objects. --- dlls/dinput/tests/joystick8.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 3ab6f3c26d4..a5c0b3958a4 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1450,6 +1450,11 @@ static void test_simple_joystick( DWORD version ) REPORT_COUNT(1, 4), INPUT(1, Data|Var|Abs), END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_RZ), + COLLECTION(1, Physical), + END_COLLECTION, END_COLLECTION, }; C_ASSERT(sizeof(report_desc) < MAX_HID_DESCRIPTOR_LEN); @@ -1679,6 +1684,14 @@ static void test_simple_joystick( DWORD version ) .wUsagePage = HID_USAGE_PAGE_GENERIC, .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwType = DIDFT_COLLECTION|DIDFT_NODATA|DIDFT_MAKEINSTANCE(2), + .tszName = L"Collection 2 - Z Rotation", + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_RZ, + }, }; const DIDEVICEOBJECTINSTANCEW expect_objects_5[] = { @@ -1764,6 +1777,21 @@ static void test_simple_joystick( DWORD version ) .wReportId = 1, }, }; + struct check_object_todo todo_objects[ARRAY_SIZE(expect_objects)] = + { + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + {0}, + { .guid = TRUE }, + }; struct check_object_todo todo_objects_5[ARRAY_SIZE(expect_objects_5)] = { {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, @@ -1780,7 +1808,7 @@ static void test_simple_joystick( DWORD version ) .version = version, .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, - .todo_objs = version < 0x700 ? todo_objects_5 : NULL, + .todo_objs = version < 0x700 ? todo_objects_5 : todo_objects, .todo_extra = version < 0x700, };

1 0

Florian Will : dinput: Set guidType = GUID_Unknown for HID collections.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: ba889f2c4c4e17007653bf9a93e58787859358e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ba889f2c4c4e17007653bf9a93e587… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Apr 4 09:32:16 2023 +0200 dinput: Set guidType = GUID_Unknown for HID collections. Fixes an issue in Zusi 3 where DIDFT_COLLECTION objects would be passed to SetDataFormat. --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/tests/joystick8.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 42f58c52202..3320ac92a1c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -728,7 +728,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, instance.dwFlags = 0; instance.wUsagePage = node->usage_page; instance.wUsage = node->usage; - instance.guidType = *object_usage_to_guid( instance.wUsagePage, instance.wUsage ); + instance.guidType = GUID_Unknown; instance.wReportId = 0; instance.wCollectionNumber = node->parent; instance.dwDimension = 0; diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index a5c0b3958a4..2eb12bd3ba2 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1777,21 +1777,6 @@ static void test_simple_joystick( DWORD version ) .wReportId = 1, }, }; - struct check_object_todo todo_objects[ARRAY_SIZE(expect_objects)] = - { - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - {0}, - { .guid = TRUE }, - }; struct check_object_todo todo_objects_5[ARRAY_SIZE(expect_objects_5)] = { {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, @@ -1808,7 +1793,7 @@ static void test_simple_joystick( DWORD version ) .version = version, .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, - .todo_objs = version < 0x700 ? todo_objects_5 : todo_objects, + .todo_objs = version < 0x700 ? todo_objects_5 : NULL, .todo_extra = version < 0x700, };

1 0

Florian Will : dinput/tests: Remove unmatched winetest_pop_context().
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: c5a58aed089083bafbfdf153c3ee4553a09897fb URL: https://gitlab.winehq.org/wine/wine/-/commit/c5a58aed089083bafbfdf153c3ee45… Author: Florian Will <florian.will(a)gmail.com> Date: Tue Apr 4 09:37:15 2023 +0200 dinput/tests: Remove unmatched winetest_pop_context(). --- dlls/dinput/tests/joystick8.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 2eb12bd3ba2..b6a627d6d25 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4196,7 +4196,6 @@ static void test_many_axes_joystick(void) done: hid_device_stop( &desc, 1 ); cleanup_registry_keys(); - winetest_pop_context(); } static void test_driving_wheel_axes(void) @@ -4416,7 +4415,6 @@ static void test_driving_wheel_axes(void) done: hid_device_stop( &desc, 1 ); cleanup_registry_keys(); - winetest_pop_context(); } static BOOL test_winmm_joystick(void)

1 0

Rémi Bernon : imm32: Use a stack allocated buffer in ImmTranslateMessage.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 3385cda1c73d090bbb9ae030e49dcd51975b19ef URL: https://gitlab.winehq.org/wine/wine/-/commit/3385cda1c73d090bbb9ae030e49dcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 3 18:33:10 2023 +0200 imm32: Use a stack allocated buffer in ImmTranslateMessage. --- dlls/imm32/imm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 736e1dcf211..e936bb27754 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -3016,12 +3016,19 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) */ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - static const DWORD list_count = 10; + union + { + struct + { + UINT uMsgCount; + TRANSMSG TransMsg[10]; + }; + TRANSMSGLIST list; + } buffer = {.uMsgCount = ARRAY_SIZE(buffer.TransMsg)}; UINT scan, vkey, count, i; struct imc *data; struct ime *ime; BYTE state[256]; - TRANSMSGLIST *list = NULL; WCHAR chr; TRACE( "hwnd %p, msg %#x, wparam %#Ix, lparam %#Ix\n", hwnd, msg, wparam, lparam ); @@ -3034,9 +3041,6 @@ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar scan = lparam >> 0x10 & 0xff; vkey = data->lastVK; - list = calloc( list_count, sizeof(TRANSMSG) + sizeof(DWORD) ); - list->uMsgCount = list_count; - if (ime->info.fdwProperty & IME_PROP_KBD_CHAR_FIRST) { if (!ime_is_unicode( ime )) ToAscii( data->lastVK, scan, state, &chr, 0 ); @@ -3044,13 +3048,11 @@ BOOL WINAPI ImmTranslateMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar vkey = MAKELONG( data->lastVK, chr ); } - count = ime->pImeToAsciiEx( vkey, scan, state, list, 0, data->handle ); + count = ime->pImeToAsciiEx( vkey, scan, state, &buffer.list, 0, data->handle ); TRACE( "%u messages generated\n", count ); - if (count > list_count) ImmGenerateMessage( data->handle ); - else for (i = 0; i < count; i++) imc_post_message( data, list->TransMsg + i ); - - free( list ); + if (count > ARRAY_SIZE(buffer.TransMsg)) ImmGenerateMessage( data->handle ); + else for (i = 0; i < count; i++) imc_post_message( data, buffer.TransMsg + i ); data->lastVK = VK_PROCESSKEY;

1 0

Rémi Bernon : imm32: Rewrite ImmInternalSendIMENotify helper as imc_notify_ime.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 7f0c2c48df2dab74d73ccff518f43b3eb14dbc47 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f0c2c48df2dab74d73ccff518f43b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 3 17:42:26 2023 +0200 imm32: Rewrite ImmInternalSendIMENotify helper as imc_notify_ime. --- dlls/imm32/imm.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index de32196a133..31a0b927d07 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -748,17 +748,11 @@ static void imc_send_message( struct imc *imc, TRANSMSG *message ) SendMessageW( target, message->message, message->wParam, message->lParam ); } -static LRESULT ImmInternalSendIMENotify( struct imc *data, WPARAM notify, LPARAM lParam ) +static LRESULT imc_notify_ime( struct imc *imc, WPARAM notify, LPARAM lparam ) { HWND target; - - target = data->IMC.hWnd; - if (!target) target = GetFocus(); - - if (target) - return SendMessageW(target, WM_IME_NOTIFY, notify, lParam); - - return 0; + if (!(target = imc->IMC.hWnd) && !(target = GetFocus())) return 0; + return SendMessageW( target, WM_IME_NOTIFY, notify, lparam ); } /*********************************************************************** @@ -2368,7 +2362,7 @@ BOOL WINAPI ImmSetCandidateWindow( data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); - ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); + imc_notify_ime( data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex ); return TRUE; } @@ -2393,7 +2387,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); - ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + imc_notify_ime( data, IMN_SETCOMPOSITIONFONT, 0 ); return TRUE; } @@ -2416,7 +2410,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) data->IMC.lfFont.W = *lplf; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); - ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + imc_notify_ime( data, IMN_SETCOMPOSITIONFONT, 0 ); return TRUE; } @@ -2575,7 +2569,7 @@ BOOL WINAPI ImmSetCompositionWindow( if (ui_hwnd && reshow) ShowWindow( ui_hwnd, SW_SHOWNOACTIVATE ); - ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); + imc_notify_ime( data, IMN_SETCOMPOSITIONWINDOW, 0 ); return TRUE; } @@ -2603,14 +2597,14 @@ BOOL WINAPI ImmSetConversionStatus( oldConversion = data->IMC.fdwConversion; data->IMC.fdwConversion = fdwConversion; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); - ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); + imc_notify_ime( data, IMN_SETCONVERSIONMODE, 0 ); } if ( fdwSentence != data->IMC.fdwSentence ) { oldSentence = data->IMC.fdwSentence; data->IMC.fdwSentence = fdwSentence; ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + imc_notify_ime( data, IMN_SETSENTENCEMODE, 0 ); } return TRUE; @@ -2640,7 +2634,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { data->IMC.fOpen = fOpen; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); - ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); + imc_notify_ime( data, IMN_SETOPENSTATUS, 0 ); } return TRUE; @@ -2667,7 +2661,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) data->IMC.ptStatusWndPos = *lpptPos; ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS); - ImmInternalSendIMENotify(data, IMN_SETSTATUSWINDOWPOS, 0); + imc_notify_ime( data, IMN_SETSTATUSWINDOWPOS, 0 ); return TRUE; }

1 0