August 2022 - Wine-Commits - list.winehq.org

Jacek Caban : winex11: Implement wow64 thunks.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: a34a403723661a3bf9c958c2431d58cce6c392bf URL: https://gitlab.winehq.org/wine/wine/-/commit/a34a403723661a3bf9c958c2431d58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 02:14:49 2022 +0200 winex11: Implement wow64 thunks. --- dlls/winex11.drv/dllmain.c | 3 +- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/unixlib.h | 4 +- dlls/winex11.drv/x11drv_main.c | 107 ++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/xdnd.c | 2 +- 5 files changed, 111 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 99a137f66e7..8ed0e40d1ac 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -67,6 +67,7 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) struct init_params params = { foreign_window_proc, + &show_systray, }; if (reason != DLL_PROCESS_ATTACH) return TRUE; @@ -81,8 +82,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; memcpy( callback_table + NtUserDriverCallbackFirst, kernel_callbacks, sizeof(kernel_callbacks) ); - - show_systray = params.show_systray; return TRUE; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ddf5cd0433b..25ca9d885a7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1802,7 +1802,7 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) XClientMessageEvent e; DWORD effect; - params.hwnd = hwnd; + params.hwnd = HandleToUlong( hwnd ); params.point = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); params.effect = effect = xdnd_action_to_drop_effect( event->data.l[4] ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index fa3685af33a..e8b243d67a1 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -50,7 +50,7 @@ struct create_desktop_params struct init_params { WNDPROC foreign_window_proc; - BOOL show_systray; + BOOL *show_systray; }; struct systray_dock_params @@ -123,7 +123,7 @@ struct format_entry /* x11drv_dnd_position_event params */ struct dnd_position_event_params { - HWND hwnd; + ULONG hwnd; POINT point; DWORD effect; }; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e94977f8caf..7f9ada291a0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -714,7 +714,7 @@ static NTSTATUS x11drv_init( void *arg ) init_user_driver(); X11DRV_DisplayDevices_Init(FALSE); - params->show_systray = show_systray; + *params->show_systray = show_systray; return STATUS_SUCCESS; } @@ -1337,3 +1337,108 @@ const unixlib_entry_t __wine_unix_call_funcs[] = C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + + +#ifdef _WIN64 + +static NTSTATUS x11drv_wow64_init( void *arg ) +{ + struct + { + ULONG foreign_window_proc; + ULONG show_systray; + } *params32 = arg; + struct init_params params; + + params.foreign_window_proc = UlongToPtr( params32->foreign_window_proc ); + params.show_systray = UlongToPtr( params32->show_systray ); + return x11drv_init( &params ); +} + +static NTSTATUS x11drv_wow64_systray_clear( void *arg ) +{ + HWND hwnd = UlongToPtr( *(ULONG *)arg ); + return x11drv_systray_clear( &hwnd ); +} + +static NTSTATUS x11drv_wow64_systray_dock( void *arg ) +{ + struct + { + UINT64 event_handle; + ULONG icon; + int cx; + int cy; + ULONG layered; + } *params32 = arg; + struct systray_dock_params params; + + params.event_handle = params32->event_handle; + params.icon = UlongToPtr( params32->icon ); + params.cx = params32->cx; + params.cy = params32->cy; + params.layered = UlongToPtr( params32->layered ); + return x11drv_systray_dock( &params ); +} + +static NTSTATUS x11drv_wow64_systray_hide( void *arg ) +{ + HWND hwnd = UlongToPtr( *(ULONG *)arg ); + return x11drv_systray_hide( &hwnd ); +} + +static NTSTATUS x11drv_wow64_tablet_get_packet( void *arg ) +{ + FIXME( "%p\n", arg ); + return 0; +} + +static NTSTATUS x11drv_wow64_tablet_info( void *arg ) +{ + struct + { + UINT category; + UINT index; + ULONG output; + } *params32 = arg; + struct tablet_info_params params; + + params.category = params32->category; + params.index = params32->index; + params.output = UlongToPtr( params32->output ); + return x11drv_tablet_info( &params ); +} + +static NTSTATUS x11drv_wow64_xim_preedit_state( void *arg ) +{ + struct + { + ULONG hwnd; + BOOL open; + } *params32 = arg; + struct xim_preedit_state_params params; + + params.hwnd = UlongToHandle( params32->hwnd ); + params.open = params32->open; + return x11drv_xim_preedit_state( &params ); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + x11drv_create_desktop, + x11drv_wow64_init, + x11drv_wow64_systray_clear, + x11drv_wow64_systray_dock, + x11drv_wow64_systray_hide, + x11drv_systray_init, + x11drv_tablet_attach_queue, + x11drv_wow64_tablet_get_packet, + x11drv_wow64_tablet_info, + x11drv_tablet_load_info, + x11drv_wow64_xim_preedit_state, + x11drv_xim_reset, +}; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + +#endif /* _WIN64 */ diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9137f46b5dc..21a4bb7f6fb 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -177,7 +177,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) HRESULT hr; XDNDxy = params->point; - targetWindow = window_from_point_dnd( params->hwnd, XDNDxy ); + targetWindow = window_from_point_dnd( UlongToHandle( params->hwnd ), XDNDxy ); if (!XDNDAccepted || XDNDLastTargetWnd != targetWindow) {

1 0

Jacek Caban : wow64win: Fix NtGdiDdDDICreateDevice thunk.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: a17bb304a0c7e0fa4ea09e5b9dfa1617a7962431 URL: https://gitlab.winehq.org/wine/wine/-/commit/a17bb304a0c7e0fa4ea09e5b9dfa16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 18 01:15:13 2022 +0200 wow64win: Fix NtGdiDdDDICreateDevice thunk. --- dlls/wow64win/gdi.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 5ddadaa642b..6fa36b5f3a3 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -239,23 +239,20 @@ NTSTATUS WINAPI wow64_NtGdiDdDDICreateDevice( UINT *args ) UINT PatchLocationListSize; } *desc32 = get_ptr( &args ); - D3DKMT_CREATEDEVICE desc = - { - { desc32->hAdapter }, - desc32->Flags - }; + D3DKMT_CREATEDEVICE desc; NTSTATUS status; + if (!desc32) return STATUS_INVALID_PARAMETER; + desc.hAdapter = desc32->hAdapter; + desc.Flags = desc32->Flags; + desc.pCommandBuffer = UlongToPtr( desc32->pCommandBuffer ); + desc.CommandBufferSize = desc32->CommandBufferSize; + desc.pAllocationList = UlongToPtr( desc32->pAllocationList ); + desc.AllocationListSize = desc32->AllocationListSize; + desc.pPatchLocationList = UlongToPtr( desc32->pPatchLocationList ); + desc.PatchLocationListSize = desc32->PatchLocationListSize; if (!(status = NtGdiDdDDICreateDevice( &desc ))) - { desc32->hDevice = desc.hDevice; - desc32->pCommandBuffer = PtrToUlong( desc.pCommandBuffer ); - desc32->CommandBufferSize = desc.CommandBufferSize; - desc32->pAllocationList = PtrToUlong( desc.pAllocationList ); - desc32->AllocationListSize = desc.AllocationListSize; - desc32->pPatchLocationList = PtrToUlong( desc.pPatchLocationList ); - desc32->PatchLocationListSize = desc.PatchLocationListSize; - } return status; }

1 0

Jacek Caban : win32u: Move process initialization to NtUserInitializeClientPfnArrays.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 29f320edd9ec2908e999a03f25b025f4247bd4f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/29f320edd9ec2908e999a03f25b025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 18 01:24:45 2022 +0200 win32u: Move process initialization to NtUserInitializeClientPfnArrays. On wow64 64-bit win32u.dll is always loaded, causing win32u.so to initialize at earlier stage than it would otherwise do. This patch makes it more consistent across environments. --- dlls/win32u/class.c | 12 ++++++++++++ dlls/win32u/gdiobj.c | 5 ++--- dlls/win32u/syscall.c | 8 +------- dlls/win32u/win32u_private.h | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 6f368b50431..28eabcc1f51 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -246,6 +246,14 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) return ansi ? proc->procA : proc->procW; } +static void init_user(void) +{ + gdi_init(); + winstation_init(); + sysparams_init(); + register_desktop_class(); +} + /*********************************************************************** * NtUserInitializeClientPfnArrays (win32u.@) */ @@ -253,6 +261,8 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs const struct user_client_procs *client_procsW, const void *client_workers, HINSTANCE user_module ) { + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + winproc_array[WINPROC_BUTTON].procA = client_procsA->pButtonWndProc; winproc_array[WINPROC_BUTTON].procW = client_procsW->pButtonWndProc; winproc_array[WINPROC_COMBO].procA = client_procsA->pComboWndProc; @@ -283,6 +293,8 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs winproc_array[WINPROC_MESSAGE].procW = client_procsW->pMessageWndProc; user32_module = user_module; + + pthread_once( &init_once, init_user ); return STATUS_SUCCESS; } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 881c76ee165..f8a1bd96f8f 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1153,7 +1153,7 @@ static struct unix_funcs unix_funcs = __wine_send_input, }; -NTSTATUS gdi_init(void) +void gdi_init(void) { pthread_mutexattr_t attr; unsigned int dpi; @@ -1165,11 +1165,10 @@ NTSTATUS gdi_init(void) NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); init_gdi_shared(); - if (!gdi_shared) return STATUS_NO_MEMORY; + if (!gdi_shared) return; dpi = font_init(); init_stock_objects( dpi ); - return 0; } NTSTATUS callbacks_init( void *args ) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index e36e7097047..5f78d8c6ab9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -314,13 +314,7 @@ static SYSTEM_SERVICE_TABLE syscall_table = static NTSTATUS init( void *dispatcher ) { - NTSTATUS status; - if ((status = ntdll_init_syscalls( 1, &syscall_table, dispatcher ))) return status; - if ((status = gdi_init())) return status; - winstation_init(); - sysparams_init(); - register_desktop_class(); - return STATUS_SUCCESS; + return ntdll_init_syscalls( 1, &syscall_table, dispatcher ); } unixlib_entry_t __wine_unix_call_funcs[] = diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e1d163ea8eb..298cafcf7bf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -411,7 +411,7 @@ static inline void release_win_ptr( struct tagWND *ptr ) } extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; -extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; +extern void gdi_init(void) DECLSPEC_HIDDEN; extern NTSTATUS callbacks_init( void *args ) DECLSPEC_HIDDEN; extern void winstation_init(void) DECLSPEC_HIDDEN; extern void sysparams_init(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : user32: Move dialog proc getting implementation from win32u.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 577fbb0ff174c3bd1ad59fd9a279285790a430c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/577fbb0ff174c3bd1ad59fd9a27928… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 18 00:19:57 2022 +0200 user32: Move dialog proc getting implementation from win32u. --- dlls/user32/user_private.h | 2 ++ dlls/user32/win.c | 27 +++++++++++++++++++++++++-- dlls/user32/winproc.c | 31 +++++++++++++++++++++---------- dlls/win32u/class.c | 22 +++------------------- dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/sysparams.c | 3 +++ dlls/win32u/window.c | 7 ------- include/ntuser.h | 19 ++++++------------- 8 files changed, 61 insertions(+), 52 deletions(-)

1 0

Jacek Caban : user32: Move dialog proc setting implementation from win32u.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 95791ea044bb7c6083eb9045f238ad7aedf37f7f URL: https://gitlab.winehq.org/wine/wine/-/commit/95791ea044bb7c6083eb9045f238ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 18 01:47:36 2022 +0200 user32: Move dialog proc setting implementation from win32u. --- dlls/user32/win.c | 26 ++++++++++++++++++++++++++ dlls/win32u/window.c | 11 ----------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0060247f6b6..9507486754b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -637,6 +637,18 @@ static LONG_PTR get_window_long_ptr( HWND hwnd, int offset, LONG_PTR ret, BOOL a } +static LONG_PTR set_dialog_proc( HWND hwnd, LONG_PTR newval, BOOL ansi ) +{ + DLGPROC proc; + LONG_PTR ret; + newval = NtUserCallTwoParam( newval, ansi, NtUserAllocWinProc ); + ret = NtUserSetWindowLong( hwnd, DWLP_DLGPROC, newval, ansi ); + proc = NtUserGetDialogProc( (DLGPROC)ret, ansi ); + if (proc) ret = (UINT_PTR)proc; + return ret; +} + + /*********************************************************************** * GetDpiForWindow (USER32.@) */ @@ -723,6 +735,10 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval WARN( "Invalid offset %d\n", offset ); SetLastError( ERROR_INVALID_INDEX ); return 0; +#else + case DWLP_DLGPROC: + if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, TRUE ); + /* fall through */ #endif default: return NtUserSetWindowLong( hwnd, offset, newval, TRUE ); @@ -811,6 +827,10 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( WARN("Invalid offset %d\n", offset ); SetLastError( ERROR_INVALID_INDEX ); return 0; +#else + case DWLP_DLGPROC: + if (NtUserGetDialogInfo( hwnd )) return set_dialog_proc( hwnd, newval, FALSE ); + /* fall through */ #endif default: return NtUserSetWindowLong( hwnd, offset, newval, FALSE ); @@ -1450,6 +1470,9 @@ LONG_PTR WINAPI GetWindowLongPtrA( HWND hwnd, INT offset ) */ LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval ) { + if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) + return set_dialog_proc( hwnd, newval, FALSE ); + return NtUserSetWindowLongPtr( hwnd, offset, newval, FALSE ); } @@ -1458,6 +1481,9 @@ LONG_PTR WINAPI SetWindowLongPtrW( HWND hwnd, INT offset, LONG_PTR newval ) */ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) { + if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) + return set_dialog_proc( hwnd, newval, TRUE ); + return NtUserSetWindowLongPtr( hwnd, offset, newval, TRUE ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 997f6359917..b4a65b883f3 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1309,17 +1309,6 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO case GWLP_HINSTANCE: case GWLP_USERDATA: break; - case DWLP_DLGPROC: - if ((win->cbWndExtra - sizeof(LONG_PTR) >= DWLP_DLGPROC) && - (size == sizeof(LONG_PTR)) && win->dlgInfo) - { - WNDPROC *ptr = (WNDPROC *)((char *)win->wExtra + DWLP_DLGPROC); - retval = (ULONG_PTR)get_winproc( *ptr, ansi ); - *ptr = alloc_winproc( (WNDPROC)newval, ansi ); - release_win_ptr( win ); - return retval; - } - /* fall through */ default: if (offset < 0 || offset > (int)(win->cbWndExtra - size)) {

1 0

Zhiyi Zhang : comctl32/edit: Don't repaint immediately when losing focus.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: e2a725621a5ad940bb6cb7c1b00d5fc2510e594e URL: https://gitlab.winehq.org/wine/wine/-/commit/e2a725621a5ad940bb6cb7c1b00d5f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Don't repaint immediately when losing focus. Ignore some messages for the parent window because the "Kill focus" message sequence starts succeeding with this commit but sometimes those messages appear on Wine and cause random test failures. Those messages are not interested in the tests so ignore them. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/edit.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 4596d0bec67..3111cda2a4b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3402,7 +3402,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) */ static LRESULT EDIT_WM_KillFocus(HTHEME theme, EDITSTATE *es) { - UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + UINT flags = RDW_INVALIDATE; es->flags &= ~EF_FOCUSED; DestroyCaret(); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 5727fa2a4e1..5f23fff2c9c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -900,6 +900,10 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_GETMINMAXINFO && message != WM_PAINT && message != WM_CTLCOLOREDIT && + message != WM_WINDOWPOSCHANGING && + message != WM_WINDOWPOSCHANGED && + message != WM_MOVE && + message != WM_MOUSEACTIVATE && message < 0xc000) { add_message(sequences, COMBINED_SEQ_INDEX, &msg); @@ -3451,7 +3455,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", FALSE); /* Test message sequences without waiting for posted messages */ SetFocus(parent_wnd); @@ -3463,7 +3467,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_sent_only_combined_seq, - "Kill focus sent only", TRUE); + "Kill focus sent only", FALSE); SetCursorPos(orig_pos.x, orig_pos.y);

1 0

Zhiyi Zhang : user32/edit: Handle IME composition result string only when EIMES_GETCOMPSTRATONCE is set.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 2aa54a90bd24f6aa422a2eb832a54d9afe585259 URL: https://gitlab.winehq.org/wine/wine/-/commit/2aa54a90bd24f6aa422a2eb832a54d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/edit: Handle IME composition result string only when EIMES_GETCOMPSTRATONCE is set. If EIMES_GETCOMPSTRATONCE is not set, WM_IME_COMPOSITION with LPARAM set to GCS_RESULTSTR should be passed to the default window procedure according to MSDN. Fix some windows based on edit control not being able to input Chinese. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 6593ee6dce2..49cf2751f0a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5198,6 +5198,12 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; case WM_IME_COMPOSITION: + if (lParam & GCS_RESULTSTR && !(es->ime_status & EIMES_GETCOMPSTRATONCE)) + { + DefWindowProcT(hwnd, msg, wParam, lParam, unicode); + break; + } + EDIT_ImeComposition(hwnd, lParam, es); break;

1 0

Zhiyi Zhang : comctl32/edit: Don't repaint immediately when getting focus.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: a336b43a93ce7e0db813a6dac329b8aa1b5ccd9f URL: https://gitlab.winehq.org/wine/wine/-/commit/a336b43a93ce7e0db813a6dac329b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/edit: Don't repaint immediately when getting focus. Fix MSXML 3.0 installer username edit control missing part of its edge. The application has a static control overlapping an edit control. Repainting the edit control immediately will cause the edit control to be painted under the static control. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 5b900825981..4596d0bec67 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3684,7 +3684,7 @@ static void EDIT_WM_NCPaint(HWND hwnd, HRGN region) */ static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) { - UINT flags = RDW_INVALIDATE | RDW_UPDATENOW; + UINT flags = RDW_INVALIDATE; es->flags |= EF_FOCUSED; diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 429f01f8210..5727fa2a4e1 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3458,7 +3458,7 @@ static void test_change_focus(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(hwnd); ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_sent_only_combined_seq, - "Set focus sent only", TRUE); + "Set focus sent only", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); SetFocus(parent_wnd);

1 0

Zhiyi Zhang : comctl32/tests: Test that changing focus for edit controls doesn't repaint immediately.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 2a27ffe423c3e8ccaafe3452ea76be2cfd25fdbb URL: https://gitlab.winehq.org/wine/wine/-/commit/2a27ffe423c3e8ccaafe3452ea76be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 comctl32/tests: Test that changing focus for edit controls doesn't repaint immediately. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index e588df8170b..429f01f8210 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3326,6 +3326,22 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static const struct message setfocus_sent_only_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_SETFOCUS), 0, PARENT_ID }, + { 0 } +}; + +static const struct message killfocus_sent_only_combined_seq[] = +{ + { WM_KILLFOCUS, sent|id, 0, 0, EDIT_ID }, + { WM_COMMAND, sent|wparam|id, MAKEWPARAM(1, EN_KILLFOCUS), 0, PARENT_ID }, + { WM_SETFOCUS, sent|id, 0, 0, PARENT_ID }, + { 0 } +}; + static void test_cue_banner(void) { HWND hwnd_edit; @@ -3437,6 +3453,18 @@ static void test_change_focus(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_combined_seq, "Kill focus", TRUE); + /* Test message sequences without waiting for posted messages */ + SetFocus(parent_wnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(hwnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, setfocus_sent_only_combined_seq, + "Set focus sent only", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SetFocus(parent_wnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, killfocus_sent_only_combined_seq, + "Kill focus sent only", TRUE); + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hwnd);

1 0

Zhiyi Zhang : user32/edit: Implement EM_GETIMESTATUS.
by Alexandre Julliard Aug. 18, 2022

Aug. 18, 2022

Module: wine Branch: master Commit: 89ee2b020412a6cec846288c622df37fdd0af0c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/89ee2b020412a6cec846288c622df3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/edit: Implement EM_GETIMESTATUS. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 5 ++++- dlls/user32/tests/msg.c | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7bfe18e952e..bee158586b9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EM_GETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC * - ES_OEMCONVERT @@ -4936,6 +4935,10 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B result = 1; break; + case EM_GETIMESTATUS: + result = wParam == EMSIS_COMPOSITIONSTRING ? es->ime_status : 1; + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dcfeb329abc..adda16a0f3b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12201,26 +12201,22 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_CANCELCOMPSTRINFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_CANCELCOMPSTRINFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_COMPLETECOMPSTRKILLFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_COMPLETECOMPSTRKILLFOCUS, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == (EIMES_GETCOMPSTRATONCE | EIMES_CANCELCOMPSTRINFOCUS | EIMES_COMPLETECOMPSTRKILLFOCUS), "Got unexpected lr %#Ix.\n", lr); @@ -12231,11 +12227,9 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) /* Invalid EM_{GET|SET}IMESTATUS status types and flags */ lr = SendMessageA(hwnd, EM_GETIMESTATUS, 0, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING + 1, 0); - todo_wine ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, 0, EIMES_GETCOMPSTRATONCE); @@ -12251,7 +12245,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0xFFFFFFFF); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == 0xFFFF, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); @@ -12284,7 +12277,6 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); ok(lr == 1, "Got unexpected lr %#Ix.\n", lr); lr = SendMessageA(hwnd, EM_GETIMESTATUS, EMSIS_COMPOSITIONSTRING, 0); - todo_wine ok(lr == EIMES_GETCOMPSTRATONCE, "Got unexpected lr %#Ix.\n", lr); ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0);

1 0