[PATCH 1/6] user32: Optimize getting monitor count with GetSystemMetrics().

[Zhiyi Zhang]

This saves calls to GetMonitorInfo().

Signed-off-by: Zhiyi Zhang 
---
 dlls/user32/sysparams.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 0b4dbfc2d78..7dc2a8df645 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -371,6 +371,22 @@ RECT get_virtual_screen_rect(void)
     return info.virtual_rect;
 }

+static BOOL CALLBACK get_monitor_count_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp )
+{
+    INT *count = (INT *)lp;
+
+    ++(*count);
+    return TRUE;
+}
+
+static INT get_monitor_count(void)
+{
+    INT count = 0;
+
+    EnumDisplayMonitors( 0, NULL, get_monitor_count_proc, (LPARAM)&count );
+    return count;
+}
+
 static BOOL get_primary_adapter(WCHAR *name)
 {
     DISPLAY_DEVICEW dd;
@@ -2717,8 +2733,7 @@ INT WINAPI GetSystemMetrics( INT index )
         get_monitors_info( &info );
         return info.virtual_rect.bottom - info.virtual_rect.top;
     case SM_CMONITORS:
-        get_monitors_info( &info );
-        return info.count;
+        return get_monitor_count();
     case SM_SAMEDISPLAYFORMAT:
         return 1;
     case SM_IMMENABLED:

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=90666

Your paranoid android.

=== debiant2 (32 bit WoW report) ===

user32:
win.c:10161: Test failed: Expected foreground window 000E0120, got 00EB00D4