wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Piotr Caban : msvcirt/tests: Fix uninitialized variable warning.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 47f79c4d17ae31857ad3c755ce4745d97613165b URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f79c4d17ae31857ad3c755… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 14 15:32:49 2022 +0100 msvcirt/tests: Fix uninitialized variable warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 43ffb277ed4..924d38339ac 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -505,12 +505,12 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); -static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); -static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); -static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, const void *b, - const void *c ); -static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, - const void *c, const void *d ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, void *a, void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, void *a, void *b, + void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, void *a, void *b, + void *c, void *d ); static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); static void * (WINAPI *call_thiscall_func2_ptr_flt)( void *func, void *this, float a ); @@ -533,12 +533,12 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),(const void*)(b), \ - (const void*)(c)) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),(const void*)(b), \ - (const void*)(c), (const void *)(d)) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(void*)(a),(void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(void*)(a),(void*)(b), \ + (void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(void*)(a),(void*)(b), \ + (void*)(c), (void *)(d)) #define call_func2_ptr_dbl(func,_this,a) call_thiscall_func2_ptr_dbl(func,_this,a) #define call_func2_ptr_flt(func,_this,a) call_thiscall_func2_ptr_flt(func,_this,a)

1 0

Jacek Caban : win32u: Move GetCursorPos implementation from user.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: b5b9126c7364adf551ab440548d234238151571c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b9126c7364adf551ab4405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:27 2022 +0100 win32u: Move GetCursorPos implementation from user. 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 | 13 +------------ dlls/user32/input.c | 28 +--------------------------- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/input.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 7 files changed, 46 insertions(+), 39 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 247093bfc17..6dbc07d318a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -136,11 +136,6 @@ static void CDECL nulldrv_SetCursor( HCURSOR cursor ) { } -static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) -{ - return TRUE; -} - static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { return TRUE; @@ -298,11 +293,6 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } -static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt ) -{ - return load_driver()->pGetCursorPos( pt ); -} - static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -371,7 +361,7 @@ static struct user_driver_funcs lazy_load_driver = /* cursor/icon functions */ nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, - loaderdrv_GetCursorPos, + NULL, loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ @@ -431,7 +421,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); SET_USER_FUNC(SetCursor); - SET_USER_FUNC(GetCursorPos); SET_USER_FUNC(SetCursorPos); SET_USER_FUNC(ClipCursor); SET_USER_FUNC(UpdateClipboard); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 210cc368527..b3329eb3c07 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -305,33 +305,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { - BOOL ret; - DWORD last_change; - UINT dpi; - - if (!pt) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - if ((ret = !wine_server_call( req ))) - { - pt->x = reply->new_x; - pt->y = reply->new_y; - last_change = reply->last_change; - } - } - SERVER_END_REQ; - - /* query new position from graphics driver if we haven't updated recently */ - if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); - if (ret && (dpi = get_thread_dpi())) - { - DPI_AWARENESS_CONTEXT context; - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - *pt = map_dpi_point( *pt, get_monitor_dpi( MonitorFromPoint( *pt, MONITOR_DEFAULTTOPRIMARY )), dpi ); - SetThreadDpiAwarenessContext( context ); - } - return ret; + return NtUserCallOneParam( (UINT_PTR)pt, NtUserGetCursorPos ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 24815922bbb..ea8d32d62f9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1010,6 +1010,11 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } +static BOOL CDECL loaderdrv_GetCursorPos( POINT *pt ) +{ + return load_driver()->pGetCursorPos( pt ); +} + static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -1049,6 +1054,7 @@ static const struct user_driver_funcs lazy_load_driver = .pVkKeyScanEx = loaderdrv_VkKeyScanEx, /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, + .pGetCursorPos = loaderdrv_GetCursorPos, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, /* clipboard functions */ diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 493efcd605b..328546c9f77 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -96,6 +96,38 @@ BOOL WINAPI NtUserSetCursorPos( INT x, INT y ) return ret; } +/*********************************************************************** + * get_cursor_pos + */ +BOOL get_cursor_pos( POINT *pt ) +{ + BOOL ret; + DWORD last_change; + UINT dpi; + + if (!pt) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + if ((ret = !wine_server_call( req ))) + { + pt->x = reply->new_x; + pt->y = reply->new_y; + last_change = reply->last_change; + } + } + SERVER_END_REQ; + + /* query new position from graphics driver if we haven't updated recently */ + if (ret && NtGetTickCount() - last_change > 100) ret = user_driver->pGetCursorPos( pt ); + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_point( *pt, MONITOR_DEFAULTTOPRIMARY, 0 ); + *pt = map_dpi_point( *pt, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 603c16acd41..ae9b4f73cfb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4492,6 +4492,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { case NtUserGetClipCursor: return get_clip_cursor( (RECT *)arg ); + case NtUserGetCursorPos: + return get_cursor_pos( (POINT *)arg ); case NtUserGetSysColor: return get_sys_color( arg ); case NtUserRealizePalette: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 0a5f6ce10b8..cd50b48feec 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -245,6 +245,9 @@ struct unix_funcs /* cursoricon.c */ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +/* input.c */ +extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; + /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 92173300a35..a115f7c9259 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -53,6 +53,7 @@ struct enum_display_monitor_params enum { NtUserGetClipCursor, + NtUserGetCursorPos, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0

Jacek Caban : win32u: Move MessageBeep implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8c5befe49bfcbfb2a4fb9684c1447837256f20ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5befe49bfcbfb2a4fb9684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:05 2022 +0100 win32u: Move MessageBeep 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 | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 73f4ee67257..247093bfc17 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -119,10 +119,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -static void CDECL nulldrv_Beep(void) -{ -} - static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return TRUE; @@ -287,11 +283,6 @@ static void CDECL nulldrv_ThreadDetach( void ) * Each entry point simply loads the real driver and chains to it. */ -static void CDECL loaderdrv_Beep(void) -{ - load_driver()->pBeep(); -} - static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return load_driver()->pRegisterHotKey( hwnd, modifiers, vk ); @@ -369,7 +360,7 @@ static struct user_driver_funcs lazy_load_driver = { NULL }, /* keyboard functions */ NULL, - loaderdrv_Beep, + NULL, NULL, NULL, NULL, @@ -436,7 +427,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v #define SET_USER_FUNC(name) \ do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) - SET_USER_FUNC(Beep); SET_USER_FUNC(RegisterHotKey); SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 44b08da79dd..1c60244623a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4432,10 +4432,7 @@ BOOL WINAPI SetMessageQueue( INT size ) */ BOOL WINAPI MessageBeep( UINT i ) { - BOOL active = TRUE; - SystemParametersInfoA( SPI_GETBEEP, 0, &active, FALSE ); - if (active) USER_Driver->pBeep(); - return TRUE; + return NtUserCallOneParam( i, NtUserMessageBeep ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 2caacd2b2a6..24815922bbb 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -958,6 +958,11 @@ static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) return load_driver()->pActivateKeyboardLayout( layout, flags ); } +static void CDECL loaderdrv_Beep(void) +{ + load_driver()->pBeep(); +} + static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -1033,22 +1038,30 @@ static const struct vulkan_funcs * CDECL loaderdrv_wine_get_vulkan_driver( UINT static const struct user_driver_funcs lazy_load_driver = { + /* keyboard functions */ .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, + .pBeep = loaderdrv_Beep, .pGetKeyNameText = loaderdrv_GetKeyNameText, .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList, .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, .pToUnicodeEx = loaderdrv_ToUnicodeEx, .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, - .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, - .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, - .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, + /* clipboard functions */ .pUpdateClipboard = loaderdrv_UpdateClipboard, + /* display modes */ + .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, + .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, + .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* windowing functions */ .pScrollDC = nulldrv_ScrollDC, + /* system parameters */ .pSystemParametersInfo = nulldrv_SystemParametersInfo, + /* vulkan support */ .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, }; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e29a05661dc..603c16acd41 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4475,6 +4475,14 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) return dpi_awareness; } +static BOOL message_beep( UINT i ) +{ + BOOL active = TRUE; + NtUserSystemParametersInfo( SPI_GETBEEP, 0, &active, FALSE ); + if (active) user_driver->pBeep(); + return TRUE; +} + /*********************************************************************** * NtUserCallOneParam (win32u.@) */ @@ -4496,6 +4504,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_system_metrics( arg ); case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); + case NtUserMessageBeep: + return message_beep( arg ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 929d773cc97..92173300a35 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -57,6 +57,7 @@ enum NtUserGetSysColorBrush, NtUserGetSysColorPen, NtUserGetSystemMetrics, + NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */ NtUserGetDeskPattern,

1 0

Jacek Caban : win32u: Move NtUserSetCursorPos implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 5d308b1606ebd748c67b6e706671e869eec0a9ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d308b1606ebd748c67b6e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:53 2022 +0100 win32u: Move NtUserSetCursorPos 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/input.c | 31 ------------------------------- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 4 ++-- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 34 ++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 20 ++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 12 files changed, 76 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d308b1606ebd748c67b…

1 0

Jacek Caban : win32u: Move GetClipCursor implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 1af4919a3f161c66c16feb6ab1ebeda9dfb7f287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af4919a3f161c66c16feb6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:34 2022 +0100 win32u: Move GetClipCursor 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/cursoricon.c | 27 +-------------------------- dlls/win32u/cursoricon.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 4 ++++ include/ntuser.h | 1 + 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 32c04852bf9..59c50ae53d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1947,32 +1947,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu */ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { - DPI_AWARENESS_CONTEXT context; - UINT dpi; - BOOL ret; - - if (!rect) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - if ((ret = !wine_server_call( req ))) - { - rect->left = reply->new_clip.left; - rect->top = reply->new_clip.top; - rect->right = reply->new_clip.right; - rect->bottom = reply->new_clip.bottom; - } - } - SERVER_END_REQ; - - if (ret && (dpi = get_thread_dpi())) - { - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - *rect = map_dpi_rect( *rect, get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY )), dpi ); - SetThreadDpiAwarenessContext( context ); - } - return ret; + return NtUserCallOneParam( (UINT_PTR)rect, NtUserGetClipCursor ); } diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 7b23dfb7d0b..cafea198809 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -127,3 +127,31 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect ) if (ret) user_driver->pClipCursor( &new_rect ); return ret; } + +BOOL get_clip_cursor( RECT *rect ) +{ + UINT dpi; + BOOL ret; + + if (!rect) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + if ((ret = !wine_server_call( req ))) + { + rect->left = reply->new_clip.left; + rect->top = reply->new_clip.top; + rect->right = reply->new_clip.right; + rect->bottom = reply->new_clip.bottom; + } + } + SERVER_END_REQ; + + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); + *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d57203e330c..f409921785f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4462,6 +4462,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { switch(code) { + case NtUserGetClipCursor: + return get_clip_cursor( (RECT *)arg ); case NtUserGetSysColor: return get_sys_color( arg ); case NtUserRealizePalette: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ee26d4af52a..6594d7b10b7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -241,6 +241,10 @@ struct unix_funcs struct window_surface *surface ); }; +/* cursoricon.c */ +extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; + +/* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_system_dpi(void) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index b2aa11f90fd..11bc0bbcb44 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -52,6 +52,7 @@ struct enum_display_monitor_params /* NtUserCallOneParam codes, not compatible with Windows */ enum { + NtUserGetClipCursor, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0

Jacek Caban : win32u: Move NtUserClipCursor implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 91c095cd46fa5158764b5d70c02196f45bf8271c URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c095cd46fa5158764b5d70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:25 2022 +0100 win32u: Move NtUserClipCursor 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/cursoricon.c | 49 -------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/cursoricon.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/sysparams.c | 6 +++--- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 11 files changed, 73 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91c095cd46fa5158764b…

1 0

Jacek Caban : win32u: Move monitor_from_rect implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: db8fcc1c9dd32af92d68ae36653608a333adf7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=db8fcc1c9dd32af92d68ae36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:14 2022 +0100 win32u: Move monitor_from_rect 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/sysparams.c | 79 +------------------------------------------------ dlls/win32u/sysparams.c | 68 ++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 70 insertions(+), 78 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 9d553d7dfff..1b26098a413 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -989,89 +989,12 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) return ret; } -struct monitor_enum_info -{ - RECT rect; - UINT max_area; - UINT min_distance; - HMONITOR primary; - HMONITOR nearest; - HMONITOR ret; -}; - -/* helper callback for MonitorFromRect */ -static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - struct monitor_enum_info *info = (struct monitor_enum_info *)lp; - RECT intersect; - - if (IntersectRect( &intersect, rect, &info->rect )) - { - /* check for larger intersecting area */ - UINT area = (intersect.right - intersect.left) * (intersect.bottom - intersect.top); - if (area > info->max_area) - { - info->max_area = area; - info->ret = monitor; - } - } - else if (!info->max_area) /* if not intersecting, check for min distance */ - { - UINT distance; - UINT x, y; - - if (info->rect.right <= rect->left) x = rect->left - info->rect.right; - else if (rect->right <= info->rect.left) x = info->rect.left - rect->right; - else x = 0; - if (info->rect.bottom <= rect->top) y = rect->top - info->rect.bottom; - else if (rect->bottom <= info->rect.top) y = info->rect.top - rect->bottom; - else y = 0; - distance = x * x + y * y; - if (distance < info->min_distance) - { - info->min_distance = distance; - info->nearest = monitor; - } - } - if (!info->primary) - { - MONITORINFO mon_info; - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - if (mon_info.dwFlags & MONITORINFOF_PRIMARY) info->primary = monitor; - } - return TRUE; -} - /*********************************************************************** * MonitorFromRect (USER32.@) */ HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { - struct monitor_enum_info info; - - info.rect = *rect; - info.max_area = 0; - info.min_distance = ~0u; - info.primary = 0; - info.nearest = 0; - info.ret = 0; - - if (IsRectEmpty(&info.rect)) - { - info.rect.right = info.rect.left + 1; - info.rect.bottom = info.rect.top + 1; - } - - if (!NtUserEnumDisplayMonitors( 0, NULL, monitor_enum, (LPARAM)&info )) return 0; - if (!info.ret) - { - if (flags & MONITOR_DEFAULTTOPRIMARY) info.ret = info.primary; - else if (flags & MONITOR_DEFAULTTONEAREST) info.ret = info.nearest; - } - - TRACE( "%s flags %x returning %p\n", wine_dbgstr_rect(rect), flags, info.ret ); - return info.ret; + return UlongToHandle( NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserMonitorFromRect )); } /*********************************************************************** diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 6c8c297bc63..7123b0d95c8 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1936,6 +1936,72 @@ static BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) return FALSE; } +static HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) +{ + HMONITOR primary = 0, nearest = 0, ret = 0; + UINT max_area = 0, min_distance = ~0u; + struct monitor *monitor; + RECT r; + + r = map_dpi_rect( *rect, dpi, system_dpi ); + if (is_rect_empty( &r )) + { + r.right = r.left + 1; + r.bottom = r.top + 1; + } + + if (!lock_display_devices()) return 0; + + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + { + RECT intersect; + RECT monitor_rect = map_dpi_rect( monitor->rc_monitor, get_monitor_dpi( monitor->handle ), + system_dpi ); + + if (intersect_rect( &intersect, &monitor_rect, &r )) + { + /* check for larger intersecting area */ + UINT area = (intersect.right - intersect.left) * (intersect.bottom - intersect.top); + if (area > max_area) + { + max_area = area; + ret = monitor->handle; + } + } + else if (!max_area) /* if not intersecting, check for min distance */ + { + UINT distance; + UINT x, y; + + if (r.right <= monitor_rect.left) x = monitor_rect.left - r.right; + else if (monitor_rect.right <= r.left) x = r.left - monitor_rect.right; + else x = 0; + if (r.bottom <= monitor_rect.top) y = monitor_rect.top - r.bottom; + else if (monitor_rect.bottom <= r.top) y = r.top - monitor_rect.bottom; + else y = 0; + distance = x * x + y * y; + if (distance < min_distance) + { + min_distance = distance; + nearest = monitor->handle; + } + } + + if (monitor->flags & MONITORINFOF_PRIMARY) primary = monitor->handle; + } + + unlock_display_devices(); + + if (!ret) + { + if (flags & MONITOR_DEFAULTTOPRIMARY) ret = primary; + else if (flags & MONITOR_DEFAULTTONEAREST) ret = nearest; + } + + TRACE( "%s flags %x returning %p\n", wine_dbgstr_rect(rect), flags, ret ); + return ret; +} + /*********************************************************************** * NtUserGetSystemDpiForProcess (win32u.@) */ @@ -4427,6 +4493,8 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return get_system_metrics_for_dpi( arg1, arg2 ); case NtUserMirrorRgn: return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); + case NtUserMonitorFromRect: + return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 4b665e6a364..89106f38628 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -67,6 +67,7 @@ enum NtUserGetMonitorInfo, NtUserGetSystemMetricsForDpi, NtUserMirrorRgn, + NtUserMonitorFromRect, }; /* color index used to retrieve system 55aa brush */

1 0

Hans Leidekker : wmiutils: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: c6d1921e930bb015166095819e4ed690791c1aef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d1921e930bb01516609581… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:15:01 2022 +0100 wmiutils: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/Makefile.in | 1 - dlls/wmiutils/path.c | 46 +++--- dlls/wmiutils/statuscode.c | 4 +- dlls/wmiutils/tests/Makefile.in | 1 - dlls/wmiutils/tests/path.c | 323 ++++++++++++++++++++-------------------- 5 files changed, 185 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c6d1921e930bb0151660…

1 0

Hans Leidekker : wbemdisp: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 82ca6773579f4ef4135573196006643a217e5e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ca6773579f4ef413557319… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:15:00 2022 +0100 wbemdisp: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/Makefile.in | 1 - dlls/wbemdisp/locator.c | 104 ++++++++++++------------- dlls/wbemdisp/tests/Makefile.in | 1 - dlls/wbemdisp/tests/wbemdisp.c | 163 ++++++++++++++++++++-------------------- 4 files changed, 134 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82ca6773579f4ef41355…

1 0

Hans Leidekker : wbemprox/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: ce22a025643bb8e102779f054f7d143117a5e250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce22a025643bb8e102779f05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 14 12:14:59 2022 +0100 wbemprox/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/Makefile.in | 1 - dlls/wbemprox/tests/query.c | 538 ++++++++++++++++++++-------------------- dlls/wbemprox/tests/services.c | 78 +++--- 3 files changed, 307 insertions(+), 310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce22a025643bb8e10277…

1 0

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 February 2022