ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Scale coordinates in ClipCursor() based on DPI awareness. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-08-27 14:20:01 +02:00
parent 910f3ed4da
commit 8bca1b29cd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/user32/cursoricon.c
View File

@ -2116,12 +2116,22 @@ HCURSOR WINAPI GetCursor(void)
*/ */
BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect )
{ {
UINT dpi;
BOOL ret; BOOL ret;
RECT new_rect; RECT new_rect;
TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) );
if (rect && (rect->left > rect->right || rect->top > rect->bottom)) return FALSE; if (rect)
{
if (rect->left > rect->right || rect->top > rect->bottom) return FALSE;
if ((dpi = get_thread_dpi()))
{
new_rect = map_dpi_rect( *rect, dpi,
get_monitor_dpi( MonitorFromRect( rect, MONITOR_DEFAULTTOPRIMARY )));
rect = &new_rect;
}
}
SERVER_START_REQ( set_cursor ) SERVER_START_REQ( set_cursor )
{ {
@ -2155,6 +2165,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect )
*/ */
BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect )
{ {
DPI_AWARENESS_CONTEXT context;
UINT dpi;
BOOL ret; BOOL ret;
if (!rect) return FALSE; if (!rect) return FALSE;
@ -2171,6 +2183,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect )
} }
} }
SERVER_END_REQ; 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 ret;
} }