[PATCH 0/1] MR6144: win32u: fix incorrect comparison in add_virtual_modes
From: Fan WenJie <fanwj(a)mail.ustc.edu.cn> --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 807f2f4ae81..edf1a705168 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1914,8 +1914,8 @@ static void add_virtual_modes( struct device_manager_ctx *ctx, const DEVMODEW *c mode.dmPelsWidth = screen_sizes[j].width; mode.dmPelsHeight = screen_sizes[j].height; - if (mode.dmPelsWidth > maximum->dmPelsWidth || mode.dmPelsHeight > maximum->dmPelsWidth) continue; - if (mode.dmPelsWidth == maximum->dmPelsWidth && mode.dmPelsHeight == maximum->dmPelsWidth) continue; + if (mode.dmPelsWidth > maximum->dmPelsWidth || mode.dmPelsHeight > maximum->dmPelsHeight) continue; + if (mode.dmPelsWidth == maximum->dmPelsWidth && mode.dmPelsHeight == maximum->dmPelsHeight) continue; if (mode.dmPelsWidth == initial->dmPelsWidth && mode.dmPelsHeight == initial->dmPelsHeight) continue; modes[modes_count++] = mode; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6144
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147299 Your paranoid android. === debian11b (64 bit WoW report) === Report validation errors: dxgi:dxgi has unaccounted for todo messages dxgi:dxgi has unaccounted for skip messages The report seems to have been truncated
Can you add a `Fixes: 60eb5cb5d252e400abe91a8fc8f53ea4841d50f9` header to the commit message? :frog: -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6144#note_76870
This merge request was approved by Zhiyi Zhang. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6144
Rémi is out this week. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6144#note_76880
participants (5)
-
Aida Jonikienė -
Fan WenJie -
Fan WenJie (@fanwenjie) -
Marvin -
Zhiyi Zhang (@zhiyi)