[PATCH] user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.

[Zhiyi Zhang]

GetDeviceCaps(hdc, DESKTOPHORZRES/DESKTOPVERTRES) on Windows reports
the primary desktop, but on Wine it reports the virtual screen.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/user32/tests/sysparams.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index 645c188008..e40d49e8f8 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -3267,6 +3267,7 @@ static void test_dpi_mapping(void)
         ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n",
             i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) );
         SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ));
+        todo_wine_if(monitor_count > 1)
         ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n",
             i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) );
         DeleteDC( hdc );
@@ -3345,6 +3346,7 @@ static void test_dpi_mapping(void)
             ok( EqualRect( &expect, &rect ), "%lu/%lu: wrong DC resolution %s expected %s\n",
                 i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) );
             SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES ));
+            todo_wine_if(monitor_count > 1)
             ok( EqualRect( &desktop, &rect ), "%lu/%lu: wrong desktop resolution %s expected %s\n",
                 i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) );
             ReleaseDC( hwnd, hdc );
-- 
2.24.0

[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=62500

Your paranoid android.


=== w2003std (task log) ===

Task errors:
The task timed out

=== w8 (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w8adm (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w864 (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809 (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809_2scr (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809_ar (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809_he (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809_ja (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

=== w1064v1809_zh_CN (32 bit report) ===

user32:
sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out
sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1