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

Jacek Caban : win32u: Remove no longer used __wine_set_user_driver PE entry point.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: ff66d8ee0fb80ca0b23c8cc2c33a4a53068ecc6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff66d8ee0fb80ca0b23c8cc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 18:03:27 2022 +0200 win32u: Remove no longer used __wine_set_user_driver PE entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/driver.c | 4 ++-- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 1 - dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 9 --------- include/wine/gdi_driver.h | 12 ++++++------ 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 1f538d100ed..4a853b516f4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1223,9 +1223,9 @@ static const struct user_driver_funcs lazy_load_driver = const struct user_driver_funcs *user_driver = &lazy_load_driver; /****************************************************************************** - * __wine_set_user_driver (win32u.@) + * __wine_set_user_driver (win32u.so) */ -void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) +void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) { struct user_driver_funcs *driver, *prev; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index edb21456d8d..c29e7773e6c 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1249,7 +1249,6 @@ static struct unix_funcs unix_funcs = __wine_get_vulkan_driver, __wine_get_wgl_driver, __wine_send_input, - __wine_set_user_driver, }; NTSTATUS gdi_init(void) diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 17be6894508..8584fc4e5c3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1322,7 +1322,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -@ cdecl __wine_set_user_driver(ptr long) # OpenGL @ cdecl __wine_get_wgl_driver(long long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index fd6dba82da2..c5303010ef3 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -328,7 +328,6 @@ struct unix_funcs const struct vulkan_funcs * (CDECL *get_vulkan_driver)( UINT version ); struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); - void (CDECL *set_user_driver)( const struct user_driver_funcs *funcs, UINT version ); }; /* clipboard.c */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 13b4b7164ab..b336059fe96 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1408,15 +1408,6 @@ BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *raw return unix_funcs->wine_send_input( hwnd, input, rawinput ); } -/*********************************************************************** - * __wine_set_user_driver (win32u.@) - */ -void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ) -{ - if (!unix_funcs) return; - return unix_funcs->set_user_driver( funcs, version ); -} - extern void wrappers_init( unixlib_handle_t handle ) { const void *args; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 52fd6fe49d3..998aa3ed3e9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -168,7 +168,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 79 +#define WINE_GDI_DRIVER_VERSION 80 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -196,9 +196,9 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g /* support for window surfaces */ -struct window_surface; +#ifdef WINE_UNIX_LIB -#ifndef __WINE_USE_MSVCRT +struct window_surface; struct window_surface_funcs { @@ -333,10 +333,10 @@ struct user_driver_funcs void (*pThreadDetach)(void); }; -#endif /* __WINE_USE_MSVCRT */ +extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); + +#endif /* WINE_UNIX_LIB */ -struct user_driver_funcs; -extern void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version ); extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); extern const struct vulkan_funcs * CDECL __wine_get_vulkan_driver( UINT version );

1 0

Jacek Caban : win32u: Move NtUserScrollWindowEx implementation from user32.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: b2db69efcf473a2b7dc6e26155069a4f4094db9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2db69efcf473a2b7dc6e261… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 19:15:14 2022 +0200 win32u: Move NtUserScrollWindowEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/edit.c | 4 +- dlls/user32/listbox.c | 8 +- dlls/user32/mdi.c | 8 +- dlls/user32/painting.c | 240 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 204 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 2 +- dlls/win32u/wrappers.c | 9 ++ include/ntuser.h | 6 ++ 12 files changed, 239 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2db69efcf473a2b7dc6…

1 0

Jacek Caban : win32u: Move SetWindowContextHelpId implementation from user32.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 540dc761fc4bc8df3a73eb15ceab1415f94d9a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=540dc761fc4bc8df3a73eb15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 20:15:02 2022 +0200 win32u: Move SetWindowContextHelpId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 11 +---------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index bac75063f7d..4adffc37d6b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1475,16 +1475,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) */ BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) { - WND *wnd = WIN_GetPtr( hwnd ); - if (!wnd || wnd == WND_DESKTOP) return FALSE; - if (wnd == WND_OTHER_PROCESS) - { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return FALSE; - } - wnd->helpContext = id; - WIN_ReleasePtr( wnd ); - return TRUE; + return NtUserSetWindowContextHelpId( hwnd, id ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 34bf87bc9ba..d09a719185a 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4539,6 +4539,21 @@ static DWORD get_window_context_help_id( HWND hwnd ) return retval; } +/* see SetWindowContextHelpId */ +static BOOL set_window_context_help_id( HWND hwnd, DWORD id ) +{ + WND *win = get_win_ptr( hwnd ); + if (!win || win == WND_DESKTOP) return FALSE; + if (win == WND_OTHER_PROCESS) + { + if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return FALSE; + } + win->helpContext = id; + release_win_ptr( win ); + return TRUE; +} + /*********************************************************************** * send_destroy_message */ @@ -5432,6 +5447,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetForegroundWindow: return set_foreground_window( hwnd, param ); + case NtUserCallHwndParam_SetWindowContextHelpId: + return set_window_context_help_id( hwnd, param ); + case NtUserCallHwndParam_SetWindowPixelFormat: return set_window_pixel_format( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index b6b69879dd7..482bdbcbddd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1021,6 +1021,7 @@ enum NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, NtUserCallHwndParam_SetForegroundWindow, + NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ @@ -1171,6 +1172,11 @@ static inline BOOL NtUserSetForegroundWindow( HWND hwnd, BOOL mouse ) return NtUserCallHwndParam( hwnd, mouse, NtUserCallHwndParam_SetForegroundWindow ); } +static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) +{ + return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId ); +} + static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) { return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat );

1 0

Jacek Caban : win32u: Move NtUserDragDetect implementation from user32.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: a8ed1c94b397cfb83e345ff41f37db62f91e8d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ed1c94b397cfb83e345ff4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 20:27:26 2022 +0200 win32u: Move NtUserDragDetect implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 42 ++--------------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 7 files changed, 57 insertions(+), 41 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4adffc37d6b..7b0fc884402 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1482,47 +1482,9 @@ BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) /******************************************************************* * DragDetect (USER32.@) */ -BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) +BOOL WINAPI DragDetect( HWND hwnd, POINT pt ) { - MSG msg; - RECT rect; - WORD wDragWidth, wDragHeight; - - TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); - - if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) - return FALSE; - - wDragWidth = GetSystemMetrics(SM_CXDRAG); - wDragHeight= GetSystemMetrics(SM_CYDRAG); - SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); - - NtUserSetCapture( hWnd ); - - while(1) - { - while (PeekMessageW( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE )) - { - if( msg.message == WM_LBUTTONUP ) - { - ReleaseCapture(); - return FALSE; - } - if( msg.message == WM_MOUSEMOVE ) - { - POINT tmp; - tmp.x = (short)LOWORD(msg.lParam); - tmp.y = (short)HIWORD(msg.lParam); - if( !PtInRect( &rect, tmp )) - { - ReleaseCapture(); - return TRUE; - } - } - } - WaitMessage(); - } - return FALSE; + return NtUserDragDetect( hwnd, pt.x, pt.y ); } /****************************************************************************** diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 222b74b45d6..7d9adcdec6a 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1158,6 +1158,7 @@ static struct unix_funcs unix_funcs = NtUserDestroyMenu, NtUserDestroyWindow, NtUserDispatchMessage, + NtUserDragDetect, NtUserDrawIconEx, NtUserEmptyClipboard, NtUserEnableMenuItem, diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2b196fb5b1d..6f0e4f45501 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1394,6 +1394,51 @@ BOOL WINAPI NtUserTrackMouseEvent( TRACKMOUSEEVENT *info ) return TRUE; } +/******************************************************************* + * NtUserDragDetect (win32u.@) + */ +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ) +{ + WORD width, height; + RECT rect; + MSG msg; + + TRACE( "%p (%d,%d)\n", hwnd, x, y ); + + if (!(NtUserGetKeyState( VK_LBUTTON ) & 0x8000)) return FALSE; + + width = get_system_metrics( SM_CXDRAG ); + height = get_system_metrics( SM_CYDRAG ); + SetRect( &rect, x - width, y - height, x + width, y + height ); + + NtUserSetCapture( hwnd ); + + for (;;) + { + while (NtUserPeekMessage( &msg, 0, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE )) + { + if (msg.message == WM_LBUTTONUP) + { + release_capture(); + return FALSE; + } + if (msg.message == WM_MOUSEMOVE) + { + POINT tmp; + tmp.x = (short)LOWORD( msg.lParam ); + tmp.y = (short)HIWORD( msg.lParam ); + if (!PtInRect( &rect, tmp )) + { + release_capture(); + return TRUE; + } + } + } + NtUserMsgWaitForMultipleObjectsEx( 0, NULL, INFINITE, QS_ALLINPUT, 0 ); + } + return FALSE; +} + /********************************************************************** * set_capture_window */ diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 86d359b8386..28c839f5901 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -845,7 +845,7 @@ @ stub NtUserDoSoundConnect @ stub NtUserDoSoundDisconnect @ stub NtUserDownlevelTouchpad -@ stub NtUserDragDetect +@ stdcall NtUserDragDetect(long long long) @ stub NtUserDragObject @ stub NtUserDrawAnimatedRects @ stub NtUserDrawCaption diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 2394a8850a5..e72ab8ff1d7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -214,6 +214,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); LRESULT (WINAPI *pNtUserDispatchMessage)( const MSG *msg ); + BOOL (WINAPI *pNtUserDragDetect)( HWND hwnd, int x, int y ); BOOL (WINAPI *pNtUserDrawIconEx)( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL (WINAPI *pNtUserEmptyClipboard)(void); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 679cce95b9a..e4219ed5648 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -855,6 +855,12 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) return unix_funcs->pNtUserDispatchMessage( msg ); } +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserDragDetect( hwnd, x, y ); +} + BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ) { diff --git a/include/ntuser.h b/include/ntuser.h index 482bdbcbddd..7451d649702 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -513,6 +513,7 @@ BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu ); BOOL WINAPI NtUserDestroyWindow( HWND hwnd ); LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ); +BOOL WINAPI NtUserDragDetect( HWND hwnd, int x, int y ); BOOL WINAPI NtUserDrawIconEx( HDC hdc, INT x0, INT y0, HICON icon, INT width, INT height, UINT istep, HBRUSH hbr, UINT flags ); BOOL WINAPI NtUserEmptyClipboard(void);

1 0

Jacek Caban : win32u: Move NtUserInternalGetWindowIcon implementation from user32.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 6e2ea185c2acdb91b5367e9f72c770e2caa6fc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2ea185c2acdb91b5367e9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 00:10:41 2022 +0200 win32u: Move NtUserInternalGetWindowIcon implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 8 ++++++++ dlls/user32/win.c | 47 ------------------------------------------- dlls/win32u/cursoricon.c | 21 +++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 7 +++++++ include/ntuser.h | 15 +++++++++++++- 10 files changed, 102 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e2ea185c2acdb91b536…

1 0

Jacek Caban : winex11: Use LoadImageW in fetch_icon_data.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 9c6895e37d00ea78d6be0dc5116fc8ad4dcab865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6895e37d00ea78d6be0dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 00:16:57 2022 +0200 winex11: Use LoadImageW in fetch_icon_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/dllmain.c | 7 ------- dlls/winex11.drv/unixlib.h | 1 - dlls/winex11.drv/window.c | 5 +++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index e2cbd51351d..b7c5692b32d 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -27,12 +27,6 @@ static unixlib_handle_t x11drv_handle; NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ); -static NTSTATUS x11drv_load_icon( UINT id ) -{ - return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); -} - - typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -43,7 +37,6 @@ static const callback_func callback_funcs[] = x11drv_ime_set_cursor_pos, x11drv_ime_set_open_status, x11drv_ime_update_association, - x11drv_load_icon, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 451c308f0cd..d490600226f 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -105,7 +105,6 @@ enum client_callback client_ime_set_cursor_pos, client_ime_set_open_status, client_ime_update_association, - client_load_icon, client_funcs_count }; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5d9a93688c3..3ebbee0856e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -631,8 +631,9 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); if (!icon_big) { - UINT winlogo = x11drv_client_call( client_load_icon, IDI_WINLOGO ); - icon_big = get_icon_info( UlongToHandle( winlogo ), &ii ); + icon_big = LoadImageW( 0, (const WCHAR *)IDI_WINLOGO, IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE ); + icon_big = get_icon_info( icon_big, &ii ); } } if (!icon_small)

1 0

Jacek Caban : win32u: Move SC_SIZE and SC_MOVE handling from user32.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 61ad0b844d07c7f9f398b96b0ff049a19560079e URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ad0b844d07c7f9f398b96b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 21:25:00 2022 +0200 win32u: Move SC_SIZE and SC_MOVE handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/nonclient.c | 5 - dlls/user32/win.h | 1 - dlls/user32/winpos.c | 406 ---------------------------------------- dlls/win32u/dc.c | 10 + dlls/win32u/defwnd.c | 437 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 2 + dlls/win32u/window.c | 8 +- include/ntgdi.h | 2 + include/ntuser.h | 8 - 9 files changed, 453 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61ad0b844d07c7f9f398…

1 0

Paul Gofman : winhttp: Introduce netconn_wait_overlapped_result() helper.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: dae64e2db5124459ff839069c17d5e2c8e2df99c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae64e2db5124459ff839069… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 8 11:32:04 2022 -0500 winhttp: Introduce netconn_wait_overlapped_result() helper. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/net.c | 7 +++++++ dlls/winhttp/request.c | 4 ++-- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 17520a54f63..a17582c90a6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -51,6 +51,13 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) return -1; } +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) +{ + DWORD retflags; + + return WSAGetOverlappedResult( conn->socket, ovr, len, TRUE, &retflags ); +} + static int sock_recv(int fd, void *msg, size_t len, int flags) { int ret; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2754dc29163..7fb582362aa 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3336,9 +3336,9 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR static DWORD complete_send_frame( struct socket *socket, WSAOVERLAPPED *ovr, const char *buf ) { - DWORD ret, retflags, len, i; + DWORD ret, len, i; - if (!WSAGetOverlappedResult( socket->request->netconn->socket, ovr, &len, TRUE, &retflags )) + if (!netconn_wait_overlapped_result( socket->request->netconn, ovr, &len )) return WSAGetLastError(); if (socket->bytes_in_send_frame_buffer) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 98e05f068ba..6c381af627f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -371,6 +371,7 @@ DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDD DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; +BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) DECLSPEC_HIDDEN; void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : winhttp: Use completion port for async send.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 4f8fe3b1846943dbadb9725368c481b4a2ba5b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f8fe3b1846943dbadb97253… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 8 11:57:54 2022 -0500 winhttp: Use completion port for async send. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/net.c | 23 +++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index a17582c90a6..40c9f3c8534 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -53,9 +53,20 @@ static int sock_send(int fd, const void *msg, size_t len, WSAOVERLAPPED *ovr) BOOL netconn_wait_overlapped_result( struct netconn *conn, WSAOVERLAPPED *ovr, DWORD *len ) { - DWORD retflags; + OVERLAPPED *completion_ovr; + ULONG_PTR key; - return WSAGetOverlappedResult( conn->socket, ovr, len, TRUE, &retflags ); + if (!GetQueuedCompletionStatus( conn->port, len, &key, &completion_ovr, INFINITE )) + { + WARN( "GetQueuedCompletionStatus failed, err %lu.\n", GetLastError() ); + return FALSE; + } + if ((key != conn->socket && conn->socket != -1) || completion_ovr != (OVERLAPPED *)ovr) + { + ERR( "Unexpected completion key %Ix, overlapped %p.\n", key, completion_ovr ); + return FALSE; + } + return TRUE; } static int sock_recv(int fd, void *msg, size_t len, int flags) @@ -279,6 +290,8 @@ void netconn_close( struct netconn *conn ) if (conn->socket != -1) closesocket( conn->socket ); release_host( conn->host ); + if (conn->port) + CloseHandle( conn->port ); free(conn); } @@ -452,6 +465,12 @@ DWORD netconn_send( struct netconn *conn, const void *msg, size_t len, int *sent { DWORD err; + if (ovr && !conn->port) + { + if (!(conn->port = CreateIoCompletionPort( (HANDLE)(SOCKET)conn->socket, NULL, (ULONG_PTR)conn->socket, 0 ))) + ERR( "Failed to create port.\n" ); + } + if (conn->secure) { const BYTE *ptr = msg; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6c381af627f..79941dee31a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -117,6 +117,7 @@ struct netconn char *peek_msg; char *peek_msg_mem; size_t peek_len; + HANDLE port; }; struct header

1 0

Rémi Bernon : dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests.
by Alexandre Julliard 09 Jun '22

09 Jun '22

Module: wine Branch: master Commit: 4e04c710ad4d63163e1452919eeff6e1084bca15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e04c710ad4d63163e145291… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 18:03:46 2022 +0200 dinput/tests: Avoid requiring foreground window in SetCooperativeLevel tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 070d9cc2361..e4c676c4b33 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -1252,7 +1252,6 @@ static void test_simple_joystick( DWORD version ) hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL ); - SetForegroundWindow( hwnd ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); @@ -1261,6 +1260,8 @@ static void test_simple_joystick( DWORD version ) hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#lx\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_NOEFFECT, "Unacquire returned: %#lx\n", hr ); hr = IDirectInputDevice8_Acquire( device );

1 0