wine-commits April 2023

wine-commits@winehq.org

1 participants
817 discussions

Connor McAdams : uiautomationcore: Implement UIA_ControlTypePropertyId for default HWND provider.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: cee22e0cb6ca43503c9df7518bec1bee2e4b06a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cee22e0cb6ca43503c9df7518bec1b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 23 10:48:38 2023 -0400 uiautomationcore: Implement UIA_ControlTypePropertyId for default HWND provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 86 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 52 ++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ddeb3f3f055..6e84124d1b5 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -12361,12 +12361,49 @@ static void test_node_hwnd_provider_(HUIANODE node, HWND hwnd, const char *file, winetest_pop_context(); } +enum { + PARENT_HWND_NULL, + PARENT_HWND_HWND, + PARENT_HWND_DESKTOP, +}; + +struct uia_hwnd_control_type_test { + DWORD style; + DWORD style_ex; + int exp_control_type; + int parent_hwnd_type; +}; + +static const struct uia_hwnd_control_type_test hwnd_control_type_test[] = { + { WS_OVERLAPPEDWINDOW, 0, UIA_WindowControlTypeId, PARENT_HWND_NULL }, + /* Top-level window (parent is desktop window) is always a window control. */ + { WS_CHILD, 0, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, + /* Not a top-level window, considered a pane. */ + { WS_CHILD, 0, UIA_PaneControlTypeId, PARENT_HWND_HWND }, + /* Not a top-level window, but WS_EX_APPWINDOW is always considered a window. */ + { WS_CHILD, WS_EX_APPWINDOW, UIA_WindowControlTypeId, PARENT_HWND_HWND }, + /* + * WS_POPUP is always a pane regardless of being a top level window, + * unless WS_CAPTION is set. + */ + { WS_CAPTION | WS_POPUP, 0, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, + { WS_BORDER | WS_POPUP, 0, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + { WS_POPUP, 0, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + /* + * Top level window with WS_EX_TOOLWINDOW and without WS_CAPTION is + * considered a pane. + */ + { WS_CHILD, WS_EX_TOOLWINDOW, UIA_PaneControlTypeId, PARENT_HWND_DESKTOP }, + { WS_CHILD | WS_CAPTION, WS_EX_TOOLWINDOW, UIA_WindowControlTypeId, PARENT_HWND_DESKTOP }, +}; + static void test_default_clientside_providers(void) { HUIANODE node; HRESULT hr; HWND hwnd; VARIANT v; + int i; CoInitializeEx(NULL, COINIT_MULTITHREADED); hwnd = create_test_hwnd("test_default_clientside_providers class"); @@ -12411,6 +12448,55 @@ static void test_default_clientside_providers(void) ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref); ok(Provider_nc.ref == 1, "Unexpected refcnt %ld\n", Provider_nc.ref); + method_sequences_enabled = FALSE; + VariantInit(&v); + for (i = 0; i < ARRAY_SIZE(hwnd_control_type_test); i++) + { + const struct uia_hwnd_control_type_test *test = &hwnd_control_type_test[i]; + HWND hwnd2, parent; + + if (test->parent_hwnd_type == PARENT_HWND_HWND) + parent = hwnd; + else if (test->parent_hwnd_type == PARENT_HWND_DESKTOP) + parent = GetDesktopWindow(); + else + parent = NULL; + + hwnd2 = CreateWindowExA(test->style_ex, "test_default_clientside_providers class", "Test window", test->style, + 0, 0, 100, 100, parent, NULL, NULL, NULL); + initialize_provider(&Provider_nc, ProviderOptions_ClientSideProvider | ProviderOptions_NonClientAreaProvider, hwnd2, TRUE); + initialize_provider(&Provider, ProviderOptions_ClientSideProvider, hwnd2, TRUE); + Provider_nc.ignore_hwnd_prop = Provider.ignore_hwnd_prop = TRUE; + Provider.ret_invalid_prop_type = Provider_nc.ret_invalid_prop_type = TRUE; + + /* If parent is hwnd, it will be queried for an override provider. */ + if (test->style == WS_CHILD && (parent == hwnd)) + SET_EXPECT_MULTI(winproc_GETOBJECT_UiaRoot, 2); + else + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent on Win7. */ + SET_EXPECT(winproc_GETOBJECT_CLIENT); + hr = UiaNodeFromProvider(&Provider_nc.IRawElementProviderSimple_iface, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider_nc.ref == 2, "Unexpected refcnt %ld\n", Provider_nc.ref); + if (hwnd_control_type_test[i].style == WS_CHILD && (parent == hwnd)) + todo_wine CHECK_CALLED_MULTI(winproc_GETOBJECT_UiaRoot, 2); + else + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; + + hr = UiaGetPropertyValue(node, UIA_ControlTypePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + ok(V_I4(&v) == test->exp_control_type, "Unexpected control type %ld\n", V_I4(&v)); + VariantClear(&v); + + UiaNodeRelease(node); + DestroyWindow(hwnd2); + } + + method_sequences_enabled = TRUE; DestroyWindow(hwnd); UnregisterClassA("test_default_clientside_providers class", NULL); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index ed00abaf33b..1609d53fe3c 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1229,6 +1229,45 @@ static HRESULT uia_send_message_timeout(HWND hwnd, UINT msg, WPARAM wparam, LPAR return S_OK; } +static BOOL is_top_level_hwnd(HWND hwnd) +{ + return (GetAncestor(hwnd, GA_PARENT) == GetDesktopWindow()) ? TRUE : FALSE; +} + +static HRESULT get_uia_control_type_for_hwnd(HWND hwnd, int *control_type) +{ + LONG_PTR style, ex_style; + + *control_type = 0; + if ((ex_style = GetWindowLongPtrW(hwnd, GWL_EXSTYLE)) & WS_EX_APPWINDOW) + { + *control_type = UIA_WindowControlTypeId; + return S_OK; + } + + SetLastError(NO_ERROR); + if (!(style = GetWindowLongPtrW(hwnd, GWL_STYLE)) && (GetLastError() != NO_ERROR)) + return uia_get_hr_for_last_error(); + + /* + * Non-caption HWNDs that are popups or tool windows aren't considered full + * windows, only panes. + */ + if (((style & WS_CAPTION) != WS_CAPTION) && ((ex_style & WS_EX_TOOLWINDOW) || (style & WS_POPUP))) + { + *control_type = UIA_PaneControlTypeId; + return S_OK; + } + + /* Non top-level HWNDs are considered panes as well. */ + if (!is_top_level_hwnd(hwnd)) + *control_type = UIA_PaneControlTypeId; + else + *control_type = UIA_WindowControlTypeId; + + return S_OK; +} + /* * Default ProviderType_BaseHwnd IRawElementProviderSimple interface. */ @@ -1366,6 +1405,19 @@ static HRESULT WINAPI base_hwnd_provider_GetPropertyValue(IRawElementProviderSim break; } + case UIA_ControlTypePropertyId: + { + int control_type; + + hr = get_uia_control_type_for_hwnd(base_hwnd_prov->hwnd, &control_type); + if (SUCCEEDED(hr)) + { + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = control_type; + } + break; + } + default: break; }

1 0

Bernhard Übelacker : ntoskrnl: Do not leak memory by setting input buffer to NULL.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 07c0cd6ba5f4b1d6ef738ad7f3cad9992947dd3d URL: https://gitlab.winehq.org/wine/wine/-/commit/07c0cd6ba5f4b1d6ef738ad7f3cad9… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jan 11 22:15:26 2022 +0100 ntoskrnl: Do not leak memory by setting input buffer to NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52322 --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d506402036..02b58d1311e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -832,7 +832,6 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ return dispatch_irp( device, irp, context );

1 0

Hans Leidekker : wine.inf: Use FLG_ADDREG_NOCLOBBER for CurrentMajor/MinorVersionNumber.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 956e580f0656a8191489d1fd354f3038d0ea1431 URL: https://gitlab.winehq.org/wine/wine/-/commit/956e580f0656a8191489d1fd354f30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 17 10:16:08 2023 +0200 wine.inf: Use FLG_ADDREG_NOCLOBBER for CurrentMajor/MinorVersionNumber. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54844 --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 38103d12876..347af35af6d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2500,8 +2500,8 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.3" -HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10 -HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0 +HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10003,10 +HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10003,0 HKLM,%CurrentVersionNT%,"CurrentBuild",2,"18362" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"18362" HKLM,%CurrentVersionNT%,"CurrentType",2,"Multiprocessor Free"

1 0

Gabriel Ivăncescu : mshtml: Use proper event type for PageTransition events.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 602e7f891dc16984d466583228b6afbd548d0c6b URL: https://gitlab.winehq.org/wine/wine/-/commit/602e7f891dc16984d466583228b6af… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 14 16:52:51 2023 +0300 mshtml: Use proper event type for PageTransition events. wine-gecko now supports their creation via CreateEvent. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 92daa60ff11..dd0bfe8db02 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -83,7 +83,7 @@ static const WCHAR *event_types[] = { L"MouseEvent", L"Event", /* FIXME */ L"UIEvent", - L"Event", /* FIXME */ + L"PageTransitionEvent", L"MessageEvent", L"ProgressEvent", L"StorageEvent",

1 0

Gabriel Ivăncescu : mshtml: Implement MediaQueryList's removeListener method.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: bce0ebafa6e0d021f9ba27960abe74c83b63a3cc URL: https://gitlab.winehq.org/wine/wine/-/commit/bce0ebafa6e0d021f9ba27960abe74… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 14 16:52:51 2023 +0300 mshtml: Implement MediaQueryList's removeListener method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 17 +++++++++++++++-- dlls/mshtml/tests/es5.js | 10 +++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index b95d2d74e93..298d99f86eb 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2817,10 +2817,23 @@ static HRESULT WINAPI media_query_list_addListener(IWineMSHTMLMediaQueryList *if static HRESULT WINAPI media_query_list_removeListener(IWineMSHTMLMediaQueryList *iface, VARIANT *listener) { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); + struct media_query_list_listener *entry; - FIXME("(%p)->(%s)\n", media_query_list, debugstr_variant(listener)); + TRACE("(%p)->(%s)\n", media_query_list, debugstr_variant(listener)); - return E_NOTIMPL; + if(V_VT(listener) != VT_DISPATCH || !V_DISPATCH(listener)) + return S_OK; + + LIST_FOR_EACH_ENTRY(entry, &media_query_list->listeners, struct media_query_list_listener, entry) { + if(entry->function == V_DISPATCH(listener)) { + list_remove(&entry->entry); + IDispatch_Release(entry->function); + free(entry); + break; + } + } + + return S_OK; } static const IWineMSHTMLMediaQueryListVtbl media_query_list_vtbl = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8bd8d8e7d06..982544f6b84 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2101,6 +2101,8 @@ async_test("matchMedia", function() { ok(!("removeEventListener" in mql), "removeEventListener in MediaQueryList"); r = mql.addListener(null); ok(r === undefined, "addListener with null returned " + r); + r = mql.removeListener(null); + ok(r === undefined, "removeListener with null returned " + r); r = mql.addListener("function() { ok(false, 'string handler called'); }"); ok(r === undefined, "addListener with string returned " + r); @@ -2117,7 +2119,9 @@ async_test("matchMedia", function() { } var tests = [ [ 20, 20, function() { - var r = mql.addListener(handler); + var r = mql.removeListener("function() { ok(false, 'string handler called'); }"); + ok(r === undefined, "removeListener with string returned " + r); + r = mql.addListener(handler); ok(r === undefined, "addListener with function returned " + r); }], [ 120, 120, function() { @@ -2129,8 +2133,12 @@ async_test("matchMedia", function() { [ 30, 30, function() { ok(event_fired === true, "event not fired after changing from 120x120 to 30x30 view"); ok(event2_fired === true, "event not fired from second handler after changing from 120x120 to 30x30 view"); + var r = mql.removeListener(handler); + ok(r === undefined, "removeListener with function returned " + r); }], [ 300, 300, function() { + ok(event_fired === false, "removed event handler fired after changing from 30x30 to 300x300 view"); + ok(event2_fired === true, "event not fired from second handler after changing from 30x30 to 300x300 view"); }] ];

1 0

Gabriel Ivăncescu : mshtml: Implement MediaQueryList's addListener method.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 1a01fb23a3aed816030da4a22586ed6755d8e2dd URL: https://gitlab.winehq.org/wine/wine/-/commit/1a01fb23a3aed816030da4a22586ed… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Apr 14 16:52:50 2023 +0300 mshtml: Implement MediaQueryList's addListener method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 10 +++ dlls/mshtml/omnavigator.c | 147 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 63 ++++++++++++++++++- dlls/mshtml/tests/script.c | 22 +++++++ 6 files changed, 240 insertions(+), 5 deletions(-)

1 0

Francois Gouget : user32/tests: Fix the DBCS WM_CHAR tests in mixed locales.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 8b8d787d7dc0b2ff2894968173bfcf763f16e131 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b8d787d7dc0b2ff2894968173bfcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 17 14:44:06 2023 +0200 user32/tests: Fix the DBCS WM_CHAR tests in mixed locales. WM_CHAR interprets the character codes using a code page tied to the keyboard layout, not CP_ACP. Also skip the test if WideCharToMultiByte() used the default character since that breaks the round-trip. Trace the code page when skipping the tests. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54424 --- dlls/user32/tests/edit.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 78328ee1729..bbde9b16616 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3368,15 +3368,22 @@ static void test_wordbreak_proc(void) static void test_dbcs_WM_CHAR(void) { + HKL hkl; + UINT cp; WCHAR textW[] = { 0x4e00, 0x4e8c, 0x4e09, 0 }; /* one, two, three */ unsigned char bytes[7]; + BOOL hasdefault; HWND hwnd[2]; int i; - WideCharToMultiByte(CP_ACP, 0, textW, -1, (char *)bytes, ARRAY_SIZE(bytes), NULL, NULL); - if (!IsDBCSLeadByte(bytes[0])) + hkl = GetKeyboardLayout( 0 ); + if (!GetLocaleInfoW(LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR))) + cp = CP_ACP; + + WideCharToMultiByte(cp, WC_NO_BEST_FIT_CHARS, textW, -1, (char *)bytes, ARRAY_SIZE(bytes), NULL, &hasdefault); + if (hasdefault || !IsDBCSLeadByteEx(cp, bytes[0])) { - skip("Skipping DBCS WM_CHAR test in this codepage\n"); + skip("Skipping DBCS WM_CHAR test in the %d codepage\n", cp); return; } hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); @@ -3396,6 +3403,7 @@ static void test_dbcs_WM_CHAR(void) r = SetWindowTextA(hwnd[i], ""); ok(r, "SetWindowText failed\n"); + /* sending the lead byte separately works for DBCS locales */ for (p = bytes; *p; p++) PostMessageA(hwnd[i], WM_CHAR, *p, 1);

1 0

Rémi Bernon : user32: Ignore WM_IME_COMPOSITION from the IME UI window in DefWindowProc.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 6fb47669476a2cdd982b5e3a461d0d97ebf74dec URL: https://gitlab.winehq.org/wine/wine/-/commit/6fb47669476a2cdd982b5e3a461d0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 17 09:37:58 2023 +0200 user32: Ignore WM_IME_COMPOSITION from the IME UI window in DefWindowProc. As in 6fd3bd9b62f405a54db29dc5a72805063a6099ca. --- dlls/user32/defwnd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6c45f89e392..60afec4e7c6 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -119,8 +119,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_IME_COMPOSITION: + { + HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd ); + if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break; + default_ime_compositionA( hwnd, wParam, lParam ); /* fall through */ + } default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); @@ -178,8 +183,13 @@ LRESULT WINAPI DefWindowProcW( break; case WM_IME_COMPOSITION: + { + HWND ime_hwnd = NtUserGetDefaultImeWindow( hwnd ); + if (!ime_hwnd || ime_hwnd == NtUserGetParent( hwnd )) break; + default_ime_compositionW( hwnd, wParam, lParam ); /* fall through */ + } default: result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE );

1 0

Rémi Bernon : user32: Move WM_IME_COMPOSITION DefWindowProc handlers in separate helpers.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 45b096abb489f0a92b03a73328de7ca9958a4322 URL: https://gitlab.winehq.org/wine/wine/-/commit/45b096abb489f0a92b03a73328de7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 17 09:35:04 2023 +0200 user32: Move WM_IME_COMPOSITION DefWindowProc handlers in separate helpers. --- dlls/user32/defwnd.c | 110 +++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index b4b42b86ae1..6c45f89e392 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -25,6 +25,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +static void default_ime_compositionW( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + WCHAR *buf = NULL; + LONG size, i; + HIMC himc; + + if (!(lparam & GCS_RESULTSTR) || !(himc = ImmGetContext( hwnd ))) return; + + if ((size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 ))) + { + if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0; + else size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); + } + ImmReleaseContext( hwnd, himc ); + + for (i = 0; i < size / sizeof(WCHAR); i++) + SendMessageW( hwnd, WM_IME_CHAR, buf[i], 1 ); + HeapFree( GetProcessHeap(), 0, buf ); +} + +static void default_ime_compositionA( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + unsigned char lead = 0; + char *buf = NULL; + LONG size, i; + HIMC himc; + + if (!(lparam & GCS_RESULTSTR) || !(himc = ImmGetContext( hwnd ))) return; + + if ((size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, NULL, 0 ))) + { + if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0; + else size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, buf, size ); + } + ImmReleaseContext( hwnd, himc ); + + for (i = 0; i < size; i++) + { + unsigned char c = buf[i]; + if (!lead) + { + if (IsDBCSLeadByte( c )) lead = c; + else SendMessageA( hwnd, WM_IME_CHAR, c, 1 ); + } + else + { + SendMessageA( hwnd, WM_IME_CHAR, MAKEWORD(c, lead), 1 ); + lead = 0; + } + } + + HeapFree( GetProcessHeap(), 0, buf ); +} /*********************************************************************** * DefWindowProcA (USER32.@) @@ -66,41 +119,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_IME_COMPOSITION: - if (lParam & GCS_RESULTSTR) - { - LONG size, i; - unsigned char lead = 0; - char *buf = NULL; - HIMC himc = ImmGetContext( hwnd ); - - if (himc) - { - if ((size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, NULL, 0 ))) - { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, size ))) size = 0; - else size = ImmGetCompositionStringA( himc, GCS_RESULTSTR, buf, size ); - } - ImmReleaseContext( hwnd, himc ); - - for (i = 0; i < size; i++) - { - unsigned char c = buf[i]; - if (!lead) - { - if (IsDBCSLeadByte( c )) - lead = c; - else - SendMessageA( hwnd, WM_IME_CHAR, c, 1 ); - } - else - { - SendMessageA( hwnd, WM_IME_CHAR, MAKEWORD(c, lead), 1 ); - lead = 0; - } - } - HeapFree( GetProcessHeap(), 0, buf ); - } - } + default_ime_compositionA( hwnd, wParam, lParam ); /* fall through */ default: @@ -159,26 +178,7 @@ LRESULT WINAPI DefWindowProcW( break; case WM_IME_COMPOSITION: - if (lParam & GCS_RESULTSTR) - { - LONG size, i; - WCHAR *buf = NULL; - HIMC himc = ImmGetContext( hwnd ); - - if (himc) - { - if ((size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, NULL, 0 ))) - { - if (!(buf = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) size = 0; - else size = ImmGetCompositionStringW( himc, GCS_RESULTSTR, buf, size * sizeof(WCHAR) ); - } - ImmReleaseContext( hwnd, himc ); - - for (i = 0; i < size / sizeof(WCHAR); i++) - SendMessageW( hwnd, WM_IME_CHAR, buf[i], 1 ); - HeapFree( GetProcessHeap(), 0, buf ); - } - } + default_ime_compositionW( hwnd, wParam, lParam ); /* fall through */ default:

1 0

Byeong-Sik Jeon : imm32: Avoid updating INPUTCONTEXT hWnd on ImmSetActiveContext deactivation.
by Alexandre Julliard 17 Apr '23

17 Apr '23

Module: wine Branch: master Commit: 93e5d7b317e9a9dc90a95dc731e5e07e8b1ec776 URL: https://gitlab.winehq.org/wine/wine/-/commit/93e5d7b317e9a9dc90a95dc731e5e0… Author: Byeong-Sik Jeon <bsjeon(a)hanmail.net> Date: Mon Apr 17 10:10:28 2023 +0200 imm32: Avoid updating INPUTCONTEXT hWnd on ImmSetActiveContext deactivation. --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5a32138561c..2fd247f36c7 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -852,7 +852,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) if (data) { - data->IMC.hWnd = activate ? hwnd : NULL; + if (activate) data->IMC.hWnd = hwnd; if ((ime = imc_select_ime( data ))) ime->pImeSetActiveContext( himc, activate ); } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d9f8c7c446a..92b59b7d005 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -5314,7 +5314,7 @@ static void test_ImmSetActiveContext(void) ctx->hWnd = (HWND)0xdeadbeef; ok_ret( 1, ImmSetActiveContext( hwnd, himc, FALSE ) ); - todo_wine ok_eq( (HWND)0xdeadbeef, ctx->hWnd, HWND, "%p" ); + ok_eq( (HWND)0xdeadbeef, ctx->hWnd, HWND, "%p" ); deactivate_2_seq[0].himc = himc; ok_seq( deactivate_2_seq );

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2023