[PATCH 4/6] winex11.drv: Reject changing non-primary adapter settings.

[Zhiyi Zhang]

Changing non-primary adapter settings is currently unsupported.
Reject non-primary adapter settings changes so that when users
want to change the settings of non-primary adapters, the primary
adapter settings don't get changed unintentionally.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
---
 dlls/winex11.drv/settings.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c
index 3e7a5960f0..e9039022d5 100644
--- a/dlls/winex11.drv/settings.c
+++ b/dlls/winex11.drv/settings.c
@@ -386,6 +386,12 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
         if (flags & CDS_UPDATEREGISTRY)
             write_registry_settings(devmode);
 
+        if (lstrcmpiW(primary_adapter, devname))
+        {
+            FIXME("Changing non-primary adapter settings is currently unsupported.\n");
+            return DISP_CHANGE_SUCCESSFUL;
+        }
+
         if (!(flags & (CDS_TEST | CDS_NORESET)))
             return pSetCurrentMode(i);
 
-- 
2.20.1

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

Your paranoid android.


=== debian10 (32 bit report) ===

user32:
menu.c:2339: Test failed: test 25

msg.c:
msg.c:8772: Test failed: WaitForSingleObject failed 102
msg.c:8778: Test failed: destroy child on thread exit: 0: the msg 0x0082 was expected, but got msg 0x000f instead
msg.c:8778: Test failed: destroy child on thread exit: 1: the msg 0x000f was expected, but got msg 0x0014 instead
msg.c:8778: Test failed: destroy child on thread exit: 2: the msg sequence is not complete: expected 0014 - actual 0000

Report validation errors:
user32:menu has unaccounted for failure messages

=== debian10 (32 bit Chinese:China report) ===

=== debian10 (32 bit WoW report) ===

=== debian10 (64 bit WoW report) ===