wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 474a6771ba03e2c475cd088ff40c97e8285a455f

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-02-27 11:09:27 +11:00
parent 733fa5c485
commit 7c1618b197
8 changed files with 46 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
patches/gdi32-MultiMonitor/0005-user32-Return-a-more-reasonable-display-DeviceID.patch
View File

@@ -1,15 +1,15 @@
From 99f4a556a733ff6036edbcde171beef389449d6f Mon Sep 17 00:00:00 2001
From 547a92d26b034a226b65a64aec229412129bdd61 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 27 May 2017 04:15:55 +0200
Subject: user32: Return a more reasonable display DeviceID.
Subject: [PATCH] user32: Return a more reasonable display DeviceID.
---
dlls/user32/misc.c | 7 ++++++-
dlls/user32/tests/monitor.c | 16 +++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
dlls/user32/tests/monitor.c | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index 1898ce1b696..03114650348 100644
index a6b7644020f..c1c812dbd51 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -249,7 +249,12 @@ static const WCHAR adapter_device_deviceid[] = {'P','C','I','\\','V','E','N','_'
@@ -27,33 +27,18 @@ index 1898ce1b696..03114650348 100644
struct display_devices_enum_info
{
diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c
index dfdca49e792..886d63ccfe2 100644
index 8bf284a5e1c..6a886da1b63 100644
--- a/dlls/user32/tests/monitor.c
+++ b/dlls/user32/tests/monitor.c
@@ -89,12 +89,12 @@ static void test_enumdisplaydevices(void)
}
@@ -225,6 +225,7 @@ static void test_enumdisplaydevices(void)
int adapter_index;
int monitor_index;
BOOL ret;
+ int num;
dd.cb = sizeof(dd);
- while(1)
+ for (num = 0;; num++)
if (!pEnumDisplayDevicesA)
{
- BOOL ret;
HDC dc;
ret = pEnumDisplayDevicesA(NULL, num, &dd, 0);
if(!ret) break;
+
if(dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
{
strcpy(primary_device_name, dd.DeviceName);
@@ -107,7 +107,6 @@ static void test_enumdisplaydevices(void)
ok(dc != NULL, "Failed to CreateDC(\"%s\") err=%d\n", dd.DeviceName, GetLastError());
DeleteDC(dc);
}
- num++;
}
if (primary_num == -1 || !pEnumDisplayMonitors || !pGetMonitorInfoA)
@@ -122,6 +121,17 @@ static void test_enumdisplaydevices(void)
@@ -276,6 +277,17 @@ static void test_enumdisplaydevices(void)
ok(!strcmp(primary_monitor_device_name, primary_device_name),
"monitor device name %s, device name %s\n", primary_monitor_device_name,
primary_device_name);
@@ -72,5 +57,5 @@ index dfdca49e792..886d63ccfe2 100644
struct vid_mode
--
2.12.2
2.20.1