Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e3eb89d5
Commit
e3eb89d5
authored
Jun 02, 2020
by
Brendan Shanks
Committed by
Alexandre Julliard
Jun 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11.drv: Ensure output IDs are unique for mirrored displays.
Signed-off-by:
Brendan Shanks
<
bshanks@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f0ebaffc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
display.c
dlls/winex11.drv/display.c
+4
-3
No files found.
dlls/winex11.drv/display.c
View file @
e3eb89d5
...
...
@@ -484,7 +484,7 @@ done:
}
static
BOOL
X11DRV_InitMonitor
(
HDEVINFO
devinfo
,
const
struct
x11drv_monitor
*
monitor
,
int
monitor_index
,
int
video_index
,
const
LUID
*
gpu_luid
)
int
video_index
,
const
LUID
*
gpu_luid
,
UINT
output_id
)
{
SP_DEVINFO_DATA
device_data
=
{
sizeof
(
SP_DEVINFO_DATA
)};
WCHAR
bufferW
[
MAX_PATH
];
...
...
@@ -509,7 +509,7 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo
/* Write DEVPROPKEY_MONITOR_OUTPUT_ID */
if
(
!
SetupDiSetDevicePropertyW
(
devinfo
,
&
device_data
,
&
DEVPROPKEY_MONITOR_OUTPUT_ID
,
DEVPROP_TYPE_UINT32
,
(
const
BYTE
*
)
&
video_index
,
sizeof
(
video_index
),
0
))
DEVPROP_TYPE_UINT32
,
(
const
BYTE
*
)
&
output_id
,
sizeof
(
output_id
),
0
))
goto
done
;
/* Create driver key */
...
...
@@ -614,6 +614,7 @@ void X11DRV_DisplayDevices_Init(BOOL force)
WCHAR
guidW
[
40
];
WCHAR
driverW
[
1024
];
LUID
gpu_luid
;
UINT
output_id
=
0
;
mutex
=
get_display_device_init_mutex
();
...
...
@@ -664,7 +665,7 @@ void X11DRV_DisplayDevices_Init(BOOL force)
for
(
monitor
=
0
;
monitor
<
monitor_count
;
monitor
++
)
{
TRACE
(
"monitor: %#x %s
\n
"
,
monitor
,
wine_dbgstr_w
(
monitors
[
monitor
].
name
));
if
(
!
X11DRV_InitMonitor
(
monitor_devinfo
,
&
monitors
[
monitor
],
monitor
,
video_index
,
&
gpu_luid
))
if
(
!
X11DRV_InitMonitor
(
monitor_devinfo
,
&
monitors
[
monitor
],
monitor
,
video_index
,
&
gpu_luid
,
output_id
++
))
goto
done
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment