Re: [PATCH] user32/tests: Skip monitor tests with modes larger than original.

[Zhiyi Zhang]

On 8/7/20 6:35 PM, Rémi Bernon wrote:
> This seems to cause a lot of timeouts on the testbot, for some reason.
> Signed-off-by: Rémi Bernon
>
> Clearly this is not ideal, but it looks like the timeouts weren't
> completely fixed by the update. In particular the 32bit runs are still
> failing.

Hi Rémi,

You patch prompted me to look at this again and I think I found the cause this time[1]
but I can't be sure as I can't reproduce it locally. Anyway, even if this patch works,
the bug will still pop up in, for example, dxgi, d3d* tests when they change resolutions.
We should at least look into TestBot again before accepting such workarounds.

Thanks,
Zhiyi

1: https://www.winehq.org/pipermail/wine-devel/2020-August/171411.html
> dlls/user32/tests/monitor.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
> index 85fb2f080a7..3809221f76c 100644
> --- a/dlls/user32/tests/monitor.c
> +++ b/dlls/user32/tests/monitor.c
> @@ -627,6 +627,12 @@ static void test_ChangeDisplaySettingsEx(void)
>          dm.dmSize = sizeof(dm);
>          for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm, 0); ++mode)
>          {
> -
>        if (dm.dmPelsWidth > devices[0].original_mode.dmPelsWidth || dm.dmPelsHeight > devices[0].original_mode.dmPelsHeight)
> -
>        {
> -
>            trace("skipping display mode %s %dx%d@%d\n", devices[device].name, dm.dmPelsWidth, dm.dmPelsHeight, dm.dmDisplayFrequency);
> -
>            continue;
> -
>        }
> -
>        dm.dmPosition = position;
>        dm.dmFields |= DM_POSITION;
>        res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL);