wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Jacek Caban : win32u: Move process initialization to NtUserInitializeClientPfnArrays.
by Alexandre Julliard 18 Aug '22

18 Aug '22

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 : wow64win: Fix NtGdiDdDDICreateDevice thunk.
by Alexandre Julliard 18 Aug '22

18 Aug '22

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: Fix handling uninitialized process_layout.
by Alexandre Julliard 18 Aug '22

18 Aug '22

Module: wine Branch: master Commit: 50bbaf9d5e40cfd0c36d7e8e82e33822b3df23bb URL: https://gitlab.winehq.org/wine/wine/-/commit/50bbaf9d5e40cfd0c36d7e8e82e338… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 5 12:34:19 2022 +0200 win32u: Fix handling uninitialized process_layout. --- dlls/win32u/sysparams.c | 7 ++++++- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 201004e1447..454c4702612 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -375,7 +375,7 @@ union sysparam_all_entry static UINT system_dpi; static RECT work_area; -DWORD process_layout = ~0u; +static DWORD process_layout = ~0u; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; @@ -1631,6 +1631,11 @@ DPI_AWARENESS get_thread_dpi_awareness(void) } } +DWORD get_process_layout(void) +{ + return process_layout == ~0u ? 0 : process_layout; +} + /********************************************************************** * get_thread_dpi */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a0bc1d62882..e1d163ea8eb 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -326,7 +326,6 @@ extern void track_scroll_bar( HWND hwnd, int scrollbar, POINT pt ) DECLSPEC_HIDD /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; -extern DWORD process_layout DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) DECLSPEC_HIDDEN; @@ -335,6 +334,7 @@ extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect( UINT dpi ) DECLSPEC_HIDDEN; +extern DWORD get_process_layout(void) DECLSPEC_HIDDEN; extern COLORREF get_sys_color( int index ) DECLSPEC_HIDDEN; extern HBRUSH get_sys_color_brush( unsigned int index ) DECLSPEC_HIDDEN; extern HPEN get_sys_color_pen( unsigned int index ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b4a65b883f3..d9c771e5d3d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5094,7 +5094,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, (class_name->Length != sizeof(messageW) || wcsnicmp( class_name->Buffer, messageW, ARRAYSIZE(messageW) ))) { - if (process_layout & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; + if (get_process_layout() & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; parent = get_desktop_window(); } }

1 0

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

18 Aug '22

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

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

18 Aug '22

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

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

18 Aug '22

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 : comctl32/edit: Don't repaint immediately when getting focus.
by Alexandre Julliard 18 Aug '22

18 Aug '22

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 18 Aug '22

18 Aug '22

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: Handle IME composition result string only when EIMES_GETCOMPSTRATONCE is set.
by Alexandre Julliard 18 Aug '22

18 Aug '22

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 : user32/edit: Let DefWindowProcA/W() handle WM_IME_CHAR.
by Alexandre Julliard 18 Aug '22

18 Aug '22

Module: wine Branch: master Commit: ac9c3ef5aae3f769ec2e92929359c7e30c5a8db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac9c3ef5aae3f769ec2e92929359c7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 user32/edit: Let DefWindowProcA/W() handle WM_IME_CHAR. So that WM_IME_CHAR will be converted to WM_CHAR in DefWindowProcA/W(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/edit.c | 14 -------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index bee158586b9..6593ee6dce2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4976,20 +4976,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B } break; - case WM_IME_CHAR: - if (!unicode) - { - WCHAR charW; - CHAR strng[2]; - - strng[0] = wParam >> 8; - strng[1] = wParam & 0xff; - if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); - else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - result = EDIT_WM_Char(es, charW); - break; - } - /* fall through */ case WM_CHAR: { WCHAR charW; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index adda16a0f3b..2d43c1ad1aa 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12271,7 +12271,7 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) flush_sequence(); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", FALSE); /* Test IME messages when EIMES_GETCOMPSTRATONCE is set */ lr = SendMessageA(hwnd, EM_SETIMESTATUS, EMSIS_COMPOSITIONSTRING, EIMES_GETCOMPSTRATONCE); @@ -12292,7 +12292,7 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) flush_sequence(); SendMessageA(hwnd, WM_IME_CHAR, '0', 1); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", TRUE); + ok_sequence(edit_wm_ime_char_seq, "WM_IME_CHAR", FALSE); ImmReleaseContext(hwnd, himc); DestroyWindow(hwnd);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
60
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 August 2022