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

user32: Optimize getting virtual screen rectangle with GetSystemMetrics(). 

This saves calls to GetMonitorInfo().

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2021-05-18 17:11:18 +08:00 committed by Alexandre Julliard
parent ab431c70b4
commit 59e5a8d055
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dlls/user32/sysparams.c
View File

@ -337,38 +337,20 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A
/* Helper functions to retrieve monitors info */ /* Helper functions to retrieve monitors info */
struct monitor_info static BOOL CALLBACK get_virtual_screen_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp )
{ {
int count; RECT *virtual_rect = (RECT *)lp;
RECT primary_rect;
RECT virtual_rect;
};
static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) UnionRect( virtual_rect, virtual_rect, rect );
{
MONITORINFO mi;
struct monitor_info *info = (struct monitor_info *)lp;
info->count++;
UnionRect( &info->virtual_rect, &info->virtual_rect, rect );
mi.cbSize = sizeof(mi);
if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY))
info->primary_rect = mi.rcMonitor;
return TRUE; return TRUE;
} }
static void get_monitors_info( struct monitor_info *info )
{
info->count = 0;
SetRectEmpty( &info->primary_rect );
SetRectEmpty( &info->virtual_rect );
EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info );
}
RECT get_virtual_screen_rect(void) RECT get_virtual_screen_rect(void)
{ {
struct monitor_info info; RECT rect = {0};
get_monitors_info( &info );
return info.virtual_rect; EnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect );
return rect;
} }
static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp )
@ -2527,7 +2509,6 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam,
*/ */
INT WINAPI GetSystemMetrics( INT index ) INT WINAPI GetSystemMetrics( INT index )
{ {
struct monitor_info info;
NONCLIENTMETRICSW ncm; NONCLIENTMETRICSW ncm;
MINIMIZEDMETRICS mm; MINIMIZEDMETRICS mm;
ICONMETRICSW im; ICONMETRICSW im;
@ -2743,17 +2724,17 @@ INT WINAPI GetSystemMetrics( INT index )
rect = get_primary_monitor_rect(); rect = get_primary_monitor_rect();
return rect.bottom - rect.top; return rect.bottom - rect.top;
case SM_XVIRTUALSCREEN: case SM_XVIRTUALSCREEN:
get_monitors_info( &info ); rect = get_virtual_screen_rect();
return info.virtual_rect.left; return rect.left;
case SM_YVIRTUALSCREEN: case SM_YVIRTUALSCREEN:
get_monitors_info( &info ); rect = get_virtual_screen_rect();
return info.virtual_rect.top; return rect.top;
case SM_CXVIRTUALSCREEN: case SM_CXVIRTUALSCREEN:
get_monitors_info( &info ); rect = get_virtual_screen_rect();
return info.virtual_rect.right - info.virtual_rect.left; return rect.right - rect.left;
case SM_CYVIRTUALSCREEN: case SM_CYVIRTUALSCREEN:
get_monitors_info( &info ); rect = get_virtual_screen_rect();
return info.virtual_rect.bottom - info.virtual_rect.top; return rect.bottom - rect.top;
case SM_CMONITORS: case SM_CMONITORS:
return get_monitor_count(); return get_monitor_count();
case SM_SAMEDISPLAYFORMAT: case SM_SAMEDISPLAYFORMAT: