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

Jacek Caban : win32u: Move set_window_style implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: 895ef97bc0c662c6a006b7a7285ba3a191dec796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=895ef97bc0c662c6a006b7a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:34:55 2022 +0100 win32u: Move set_window_style implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 --- dlls/user32/win.c | 49 +++--------------------------------- dlls/win32u/driver.c | 1 + dlls/win32u/message.c | 3 +++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 69 insertions(+), 48 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 27a83dc662b..5867b6b4009 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1866,9 +1866,6 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar return ShowWindow( hwnd, wparam ); case WM_WINE_SETWINDOWLONG: return WIN_SetWindowLong( hwnd, (short)LOWORD(wparam), HIWORD(wparam), lparam, TRUE ); - case WM_WINE_SETSTYLE: - if (is_desktop_window( hwnd )) return 0; - return WIN_SetStyle(hwnd, wparam, lparam); default: { MSG m; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ca4697713d6..bb6df478b1b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -668,51 +668,10 @@ static HWND WIN_SetOwner( HWND hwnd, HWND owner ) */ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) { - BOOL ok, made_visible = FALSE; - STYLESTRUCT style; - WND *win = WIN_GetPtr( hwnd ); - - if (!win || win == WND_DESKTOP) return 0; - if (win == WND_OTHER_PROCESS) - { - if (IsWindow(hwnd)) - return SendMessageW(hwnd, WM_WINE_SETSTYLE, set_bits, clear_bits); - return 0; - } - style.styleOld = win->dwStyle; - style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; - if (style.styleNew == style.styleOld) - { - WIN_ReleasePtr( win ); - return style.styleNew; - } - SERVER_START_REQ( set_window_info ) - { - req->handle = wine_server_user_handle( hwnd ); - req->flags = SET_WIN_STYLE; - req->style = style.styleNew; - req->extra_offset = -1; - if ((ok = !wine_server_call( req ))) - { - style.styleOld = reply->old_style; - win->dwStyle = style.styleNew; - } - } - SERVER_END_REQ; - - if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) - { - made_visible = (style.styleNew & WS_VISIBLE) != 0; - invalidate_dce( win, NULL ); - } - WIN_ReleasePtr( win ); - - if (!ok) return 0; - - USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); - if (made_visible) update_window_state( hwnd ); - - return style.styleOld; + /* FIXME: Use SetWindowLong or move callers to win32u instead. + * We use STYLESTRUCT to pass params, but meaning of its field does not match our usage. */ + STYLESTRUCT style = { .styleNew = set_bits, .styleOld = clear_bits }; + return NtUserCallHwndParam( hwnd, (UINT_PTR)&style, NtUserSetWindowStyle ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 56fce1c6496..afe44e1c4a3 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1196,6 +1196,7 @@ static const struct user_driver_funcs lazy_load_driver = .pSetLayeredWindowAttributes = loaderdrv_SetLayeredWindowAttributes, .pSetParent = nulldrv_SetParent, .pSetWindowRgn = loaderdrv_SetWindowRgn, + .pSetWindowStyle = nulldrv_SetWindowStyle, .pMsgWaitForMultipleObjectsEx = nulldrv_MsgWaitForMultipleObjectsEx, .pReleaseDC = nulldrv_ReleaseDC, .pScrollDC = nulldrv_ScrollDC, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5582f627166..1f0d6e6c297 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -47,6 +47,9 @@ LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar case WM_WINE_SETPARENT: if (is_desktop_window( hwnd )) return 0; return HandleToUlong( NtUserSetParent( hwnd, UlongToHandle(wparam) )); + case WM_WINE_SETSTYLE: + if (is_desktop_window( hwnd )) return 0; + return set_window_style( hwnd, wparam, lparam ); case WM_WINE_SETACTIVEWINDOW: if (!wparam && NtUserGetForegroundWindow() == hwnd) return 0; return (LRESULT)NtUserSetActiveWindow( (HWND)wparam ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ac40daa5d35..67df4490bf3 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -361,6 +361,7 @@ extern int map_window_points( HWND hwnd_from, HWND hwnd_to, POINT *points, UINT UINT dpi ) DECLSPEC_HIDDEN; extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) DECLSPEC_HIDDEN; +extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; /* to release pointers retrieved by win_get_ptr */ diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c3da53d08e4..01b1f15d158 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1050,6 +1050,60 @@ static WORD get_window_word( HWND hwnd, INT offset ) return get_window_long_size( hwnd, offset, sizeof(WORD), TRUE ); } +/*********************************************************************** + * set_window_style + * + * Change the style of a window. + */ +ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) +{ + BOOL ok, made_visible = FALSE; + STYLESTRUCT style; + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + if (is_window(hwnd)) + return send_message( hwnd, WM_WINE_SETSTYLE, set_bits, clear_bits ); + return 0; + } + style.styleOld = win->dwStyle; + style.styleNew = (win->dwStyle | set_bits) & ~clear_bits; + if (style.styleNew == style.styleOld) + { + release_win_ptr( win ); + return style.styleNew; + } + SERVER_START_REQ( set_window_info ) + { + req->handle = wine_server_user_handle( hwnd ); + req->flags = SET_WIN_STYLE; + req->style = style.styleNew; + req->extra_offset = -1; + if ((ok = !wine_server_call( req ))) + { + style.styleOld = reply->old_style; + win->dwStyle = style.styleNew; + } + } + SERVER_END_REQ; + + if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + { + made_visible = (style.styleNew & WS_VISIBLE) != 0; + invalidate_dce( win, NULL ); + } + release_win_ptr( win ); + + if (!ok) return 0; + + user_driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); + if (made_visible) update_window_state( hwnd ); + + return style.styleOld; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -2954,6 +3008,11 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); + case NtUserSetWindowStyle: + { + STYLESTRUCT *style = (void *)param; + return set_window_style( hwnd, style->styleNew, style->styleOld ); + } default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index f68f5481f90..96f61d2a07a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -183,6 +183,7 @@ enum NtUserSetForegroundWindow, /* temporary exports */ NtUserIsWindowDrawable, + NtUserSetWindowStyle, }; /* NtUserMessageCall codes */

1 0

Jacek Caban : win32u: Move NtUsetSetWindowLong implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: 1b847dff822bb3f43d3a82b1c08e97192372c431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b847dff822bb3f43d3a82b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:25 2022 +0100 win32u: Move NtUsetSetWindowLong implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 7 +- dlls/user32/message.c | 2 - dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 307 +---------------------------------------- dlls/user32/win.h | 1 - dlls/win32u/class.c | 11 ++ dlls/win32u/gdiobj.c | 3 + dlls/win32u/message.c | 2 + dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/window.c | 317 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 18 +++ include/ntuser.h | 3 + 14 files changed, 369 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b847dff822bb3f43d3a…

1 0

Jacek Caban : win32u: Move __wine_set_pixel_format implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: ea764fbd3e21b53efd969ca1bc1745d2e3166d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea764fbd3e21b53efd969ca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:35 2022 +0100 win32u: Move __wine_set_pixel_format implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 39 +-------------------------------------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2c241aad7d2..a21bdc62ed5 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -258,32 +258,6 @@ static void send_parent_notify( HWND hwnd, UINT msg ) } -/******************************************************************* - * update_window_state - * - * Trigger an update of the window's driver state and surface. - */ -static void update_window_state( HWND hwnd ) -{ - DPI_AWARENESS_CONTEXT context; - RECT window_rect, client_rect, valid_rects[2]; - - if (!WIN_IsCurrentThread( hwnd )) - { - PostMessageW( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); - return; - } - - context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - valid_rects[0] = valid_rects[1] = client_rect; - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, - &window_rect, &client_rect, valid_rects ); - SetThreadDpiAwarenessContext( context ); -} - - /******************************************************************* * get_hwnd_message_parent * @@ -2726,18 +2700,7 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) */ BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format ) { - WND *win = WIN_GetPtr( hwnd ); - - if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) - { - WARN( "setting format %d on win %p not supported\n", format, hwnd ); - return FALSE; - } - win->pixel_format = format; - WIN_ReleasePtr( win ); - - update_window_state( hwnd ); - return TRUE; + return NtUserCallHwndParam( hwnd, format, NtUserSetWindowPixelFormat ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e4311b49608..2700df862ca 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1421,6 +1421,22 @@ LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, return set_window_long( hwnd, offset, sizeof(LONG_PTR), newval, ansi ); } +static BOOL set_window_pixel_format( HWND hwnd, int format ) +{ + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) + { + WARN( "setting format %d on win %p not supported\n", format, hwnd ); + return FALSE; + } + win->pixel_format = format; + release_win_ptr( win ); + + update_window_state( hwnd ); + return TRUE; +} + /*********************************************************************** * NtUserGetProp (win32u.@) * @@ -3322,6 +3338,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return set_capture_window( hwnd, param, NULL ); case NtUserSetForegroundWindow: return set_foreground_window( hwnd, param ); + case NtUserSetWindowPixelFormat: + return set_window_pixel_format( hwnd, param ); /* temporary exports */ case NtUserIsWindowDrawable: return is_window_drawable( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index 0e48aea0f9c..4ca4c063ef8 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -181,6 +181,7 @@ enum NtUserMonitorFromWindow, NtUserSetCaptureWindow, NtUserSetForegroundWindow, + NtUserSetWindowPixelFormat, /* temporary exports */ NtUserIsWindowDrawable, NtUserSetWindowStyle,

1 0

Jacek Caban : win32u: Move NtUserSetTimer implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: ac8e0ce2554b17aea03043b974ab3bad11ae549f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac8e0ce2554b17aea03043b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:35:55 2022 +0100 win32u: Move NtUserSetTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 35 +---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++++++ include/ntuser.h | 1 + 8 files changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index c5bdc0efccc..da0abef9469 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4408,45 +4408,12 @@ BOOL WINAPI MessageBeep( UINT i ) } -/*********************************************************************** - * SetCoalescableTimer (USER32.@) - */ -UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) -{ - UINT_PTR ret; - WNDPROC winproc = 0; - - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - - timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); - - SERVER_START_REQ( set_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_TIMER; - req->id = id; - req->rate = timeout; - req->lparam = (ULONG_PTR)winproc; - if (!wine_server_call_err( req )) - { - ret = reply->id; - if (!ret) ret = TRUE; - } - else ret = 0; - } - SERVER_END_REQ; - - TRACE("Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout ); - return ret; -} - - /****************************************************************** * SetTimer (USER32.@) */ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) { - return SetCoalescableTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); + return NtUserSetTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a70ac8605d7..7f27a0731a2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -655,7 +655,7 @@ @ stdcall SetClassWord(long long long) NtUserSetClassWord @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) -@ stdcall SetCoalescableTimer(long long long ptr long) +@ stdcall SetCoalescableTimer(long long long ptr long) NtUserSetTimer # @ stub SetConsoleReserveKeys @ stdcall -import SetCursor(long) NtUserSetCursor @ stub SetCursorContents diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c28114668b8..e895f65c652 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -128,6 +128,38 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) return ret; } +/*********************************************************************** + * NtUserSetTimer (win32u.@) + */ +UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) +{ + UINT_PTR ret; + WNDPROC winproc = 0; + + if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE ); + + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); + + SERVER_START_REQ( set_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_TIMER; + req->id = id; + req->rate = timeout; + req->lparam = (ULONG_PTR)winproc; + if (!wine_server_call_err( req )) + { + ret = reply->id; + if (!ret) ret = TRUE; + } + else ret = 0; + } + SERVER_END_REQ; + + TRACE( "Added %p %lx %p timeout %d\n", hwnd, id, winproc, timeout ); + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index abe32b8d70c..b167ecc9680 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -154,6 +154,7 @@ static void * const syscalls[] = NtUserSetProcessWindowStation, NtUserSetProp, NtUserSetThreadDesktop, + NtUserSetTimer, NtUserSetWinEventHook, NtUserSetWindowsHookEx, NtUserUnhookWinEvent, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2b5e4d71461..7d4599f0241 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1236,7 +1236,7 @@ @ stub NtUserSetThreadInputBlocked @ stub NtUserSetThreadLayoutHandles @ stub NtUserSetThreadState -@ stub NtUserSetTimer +@ stdcall -syscall NtUserSetTimer(long long long ptr long) @ stdcall -syscall NtUserSetWinEventHook(long long long ptr ptr long long long) @ stub NtUserSetWindowArrangement @ stub NtUserSetWindowBand diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index b6cdf5edfb2..3ded58962b8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -139,6 +139,7 @@ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserSetTimer ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserUnhookWinEvent ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b8c4a86a352..c9f81d86672 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -533,6 +533,17 @@ NTSTATUS WINAPI wow64_NtUserGetGUIThreadInfo( UINT *args ) return TRUE; } +NTSTATUS WINAPI wow64_NtUserSetTimer( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + UINT_PTR id = get_ulong( &args ); + UINT timeout = get_ulong( &args ); + TIMERPROC proc = get_ptr( &args ); + ULONG tolerance = get_ulong( &args ); + + return NtUserSetTimer( hwnd, id, timeout, proc, tolerance ); +} + NTSTATUS WINAPI wow64_NtUserCopyAcceleratorTable( UINT *args ) { HACCEL src = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 4ca4c063ef8..a055aa47905 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -403,6 +403,7 @@ BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *values ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); +UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ); LONG WINAPI NtUserSetWindowLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ); LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); BOOL WINAPI NtUserSetWindowPos( HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags );

1 0

Jacek Caban : win32u: Move NtUserSetSystemTimer implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: ce9a782a4f4c4db38badb40751c91302ab747858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9a782a4f4c4db38badb407… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:18 2022 +0100 win32u: Move NtUserSetSystemTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 4 ++-- dlls/user32/input.c | 3 ++- dlls/user32/listbox.c | 2 +- dlls/user32/message.c | 33 --------------------------------- dlls/user32/scroll.c | 16 ++++++++-------- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 4 ---- dlls/user32/winproc.c | 2 +- dlls/win32u/message.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 15 files changed, 64 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce9a782a4f4c4db38bad…

1 0

Jacek Caban : win32u: Move NtUserKillTimer implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: e520e29ca4a0d03125e82a8654596a4b212d1ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e520e29ca4a0d03125e82a86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:30 2022 +0100 win32u: Move NtUserKillTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- dlls/user32/message.c | 19 ------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/message.c | 18 ++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ include/ntuser.h | 1 + 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 9bbfa2727b2..28d93b98b83 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3633,7 +3633,7 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - KillTimer(es->hwndSelf, 0); + NtUserKillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eee4759513a..7fe9df68508 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4417,25 +4417,6 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) } -/*********************************************************************** - * KillTimer (USER32.@) - */ -BOOL WINAPI KillTimer( HWND hwnd, UINT_PTR id ) -{ - BOOL ret; - - SERVER_START_REQ( kill_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_TIMER; - req->id = id; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * KillSystemTimer (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c5ea5e6c4c0..7c27d9400db 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -484,7 +484,7 @@ @ stdcall IsWindowVisible(long) @ stdcall IsZoomed(long) @ stdcall KillSystemTimer(long long) -@ stdcall KillTimer(long long) +@ stdcall KillTimer(long long) NtUserKillTimer @ stdcall LoadAcceleratorsA(long str) @ stdcall LoadAcceleratorsW(long wstr) @ stdcall LoadBitmapA(long str) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5fb238566f3..d70984dbe2b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -192,6 +192,24 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME return ret; } +/*********************************************************************** + * NtUserKillTimer (win32u.@) + */ +BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ) +{ + BOOL ret; + + SERVER_START_REQ( kill_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_TIMER; + req->id = id; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5dbf6f43ac6..2be2cfce3bf 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -142,6 +142,7 @@ static void * const syscalls[] = NtUserGetWindowRgnEx, NtUserInitializeClientPfnArrays, NtUserInternalGetWindowText, + NtUserKillTimer, NtUserNotifyWinEvent, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9c6103b84f8..96d8d4833b0 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1059,7 +1059,7 @@ @ stub NtUserIsTouchWindow @ stub NtUserIsWindowBroadcastingDpiToChildren @ stub NtUserIsWindowGDIScaledDpiMessageEnabled -@ stub NtUserKillTimer +@ stdcall -syscall NtUserKillTimer(long long) @ stub NtUserLayoutCompleted @ stub NtUserLinkDpiCursor @ stub NtUserLoadKeyboardLayoutEx diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 4b181ecba89..7b6bbb5eda6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -127,6 +127,7 @@ SYSCALL_ENTRY( NtUserGetWindowRgnEx ) \ SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \ SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ + SYSCALL_ENTRY( NtUserKillTimer ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 2af7f9a3115..1a43b4793fb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -554,6 +554,14 @@ NTSTATUS WINAPI wow64_NtUserSetTimer( UINT *args ) return NtUserSetTimer( hwnd, id, timeout, proc, tolerance ); } +NTSTATUS WINAPI wow64_NtUserKillTimer( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + UINT_PTR id = get_ulong( &args ); + + return NtUserKillTimer( hwnd, id ); +} + NTSTATUS WINAPI wow64_NtUserCopyAcceleratorTable( UINT *args ) { HACCEL src = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index afa4d0d561f..3352a63e1ea 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -365,6 +365,7 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs const void *client_workers, HINSTANCE user_module ); INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); +BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ); UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); BOOL WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, ULONG_PTR result_info, DWORD type, BOOL ansi );

1 0

Jacek Caban : win32u: Move KillSystemTimer implementation from user32.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: a23ad9819a9e5dd7ebd7f83fdc77b2964131f985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23ad9819a9e5dd7ebd7f83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 15:36:42 2022 +0100 win32u: Move KillSystemTimer implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 12 +----------- dlls/win32u/message.c | 16 ++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 7fe9df68508..365f703c56e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4422,17 +4422,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) */ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT_PTR id ) { - BOOL ret; - - SERVER_START_REQ( kill_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_SYSTIMER; - req->id = id; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserCallHwndParam( hwnd, id, NtUserKillSystemTimer ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d70984dbe2b..d00178e6aa4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -210,6 +210,22 @@ BOOL WINAPI NtUserKillTimer( HWND hwnd, UINT_PTR id ) return ret; } +/* see KillSystemTimer */ +BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) +{ + BOOL ret; + + SERVER_START_REQ( kill_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_SYSTIMER; + req->id = id; + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /* see SendMessageW */ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c943089c462..0c4e3b82f0f 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -313,6 +313,7 @@ extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECL extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; /* message.c */ +extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 2700df862ca..079b4b0695f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3332,6 +3332,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_word( hwnd, param ); case NtUserIsChild: return is_child( hwnd, UlongToHandle(param) ); + case NtUserKillSystemTimer: + return kill_system_timer( hwnd, param ); case NtUserMonitorFromWindow: return HandleToUlong( monitor_from_window( hwnd, param, NtUserMonitorFromWindow )); case NtUserSetCaptureWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 3352a63e1ea..5e79083aa01 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -178,6 +178,7 @@ enum NtUserGetWindowThread, NtUserGetWindowWord, NtUserIsChild, + NtUserKillSystemTimer, NtUserMonitorFromWindow, NtUserSetCaptureWindow, NtUserSetForegroundWindow,

1 0

Daniel Lehman : kernel32/tests: Add test for FileTimeToSystemTime.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: a4a7ab8e3b5e88125cfb859d5cb7e81422de38c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a7ab8e3b5e88125cfb859d… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 10:12:01 2022 -0700 kernel32/tests: Add test for FileTimeToSystemTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index b1e14b1b8c4..fdef78a4466 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -395,6 +395,16 @@ static void test_FileTimeToSystemTime(void) "Got Year %4d Month %2d Day %2d Hour %2d Min %2d Sec %2d mSec %3d\n", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + + ft.dwHighDateTime = -1; + ft.dwLowDateTime = -1; + SetLastError(0xdeadbeef); + ret = FileTimeToSystemTime(&ft, &st); + todo_wine { + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + } } static void test_FileTimeToLocalFileTime(void)

1 0

Daniel Lehman : kernelbase: Check for invalid value in FileTimeToSystemTime.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: a5d14fa980542fcf26aeb5fa41e098b042f7b29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d14fa980542fcf26aeb5fa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 10:15:13 2022 -0700 kernelbase: Check for invalid value in FileTimeToSystemTime. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 2 -- dlls/kernelbase/file.c | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index fdef78a4466..ee818a0e4a1 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -400,11 +400,9 @@ static void test_FileTimeToSystemTime(void) ft.dwLowDateTime = -1; SetLastError(0xdeadbeef); ret = FileTimeToSystemTime(&ft, &st); - todo_wine { ok(!ret, "expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - } } static void test_FileTimeToLocalFileTime(void) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index c6dc904044a..a3a4b4f480b 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3874,8 +3874,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH FileTimeToLocalFileTime( const FILETIME *utc, FILE BOOL WINAPI DECLSPEC_HOTPATCH FileTimeToSystemTime( const FILETIME *ft, SYSTEMTIME *systime ) { TIME_FIELDS tf; + const LARGE_INTEGER *li = (const LARGE_INTEGER *)ft; - RtlTimeToTimeFields( (const LARGE_INTEGER *)ft, &tf ); + if (li->QuadPart < 0) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + RtlTimeToTimeFields( li, &tf ); systime->wYear = tf.Year; systime->wMonth = tf.Month; systime->wDay = tf.Day;

1 0

Bernhard Kölbl : windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled.
by Alexandre Julliard 16 Mar '22

16 Mar '22

Module: wine Branch: master Commit: be725a5e0db5999c031a1b391e8d57b4d93615b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be725a5e0db5999c031a1b39… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Wed Mar 16 17:31:00 2022 +0100 windows.media.speech: Implement ISpeechRecognitionConstraint isEnabled. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/listconstraint.c | 14 ++++++++++---- dlls/windows.media.speech/tests/speech.c | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/listconstraint.c b/dlls/windows.media.speech/listconstraint.c index 33fe9d4ae51..d641902f4bc 100644 --- a/dlls/windows.media.speech/listconstraint.c +++ b/dlls/windows.media.speech/listconstraint.c @@ -34,6 +34,8 @@ struct list_constraint ISpeechRecognitionListConstraint ISpeechRecognitionListConstraint_iface; ISpeechRecognitionConstraint ISpeechRecognitionConstraint_iface; LONG ref; + + BOOLEAN enabled; }; /* @@ -142,14 +144,18 @@ DEFINE_IINSPECTABLE(constraint, ISpeechRecognitionConstraint, struct list_constr static HRESULT WINAPI constraint_get_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN *value ) { - FIXME("iface %p, value %p stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %p.\n", iface, value); + *value = impl->enabled; + return S_OK; } static HRESULT WINAPI constraint_put_IsEnabled( ISpeechRecognitionConstraint *iface, BOOLEAN value ) { - FIXME("iface %p, value %u stub!\n", iface, value); - return E_NOTIMPL; + struct list_constraint *impl = impl_from_ISpeechRecognitionConstraint(iface); + TRACE("iface %p, value %u.\n", iface, value); + impl->enabled = value; + return S_OK; } static HRESULT WINAPI constraint_get_Tag( ISpeechRecognitionConstraint *iface, HSTRING *value ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index a88b8aae3d2..66869a164d2 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -797,13 +797,13 @@ static void test_SpeechRecognitionListConstraint(void) hr = WindowsDeleteString(tag_out); todo_wine ok(hr == S_OK, "WindowsDeleteString failed, hr %#lx.\n", hr); +skip_tests: hr = ISpeechRecognitionConstraint_put_IsEnabled(constraint, TRUE); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); + ok(hr == S_OK, "ISpeechRecognitionConstraint_put_IsEnabled failed, hr %#lx.\n", hr); hr = ISpeechRecognitionConstraint_get_IsEnabled(constraint, &enabled); - todo_wine ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); - todo_wine ok(enabled, "ListConstraint didn't get enabled.\n"); + ok(hr == S_OK, "ISpeechRecognitionConstraint_get_IsEnabled failed, hr %#lx.\n", hr); + ok(enabled, "ListConstraint didn't get enabled.\n"); -skip_tests: ref = ISpeechRecognitionConstraint_Release(constraint); ok(ref == 1, "Got unexpected ref %lu.\n", ref);

1 0