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
81406eac
Commit
81406eac
authored
Oct 21, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Nov 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemac.drv: Use the primary adapter name instead of calling back win32u.
parent
6aeaeed9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
23 deletions
+1
-23
display.c
dlls/winemac.drv/display.c
+1
-23
No files found.
dlls/winemac.drv/display.c
View file @
81406eac
...
...
@@ -685,24 +685,6 @@ void check_retina_status(void)
}
}
static
BOOL
get_primary_adapter
(
WCHAR
*
name
)
{
DISPLAY_DEVICEW
dd
;
DWORD
i
;
dd
.
cb
=
sizeof
(
dd
);
for
(
i
=
0
;
!
NtUserEnumDisplayDevices
(
NULL
,
i
,
&
dd
,
0
);
++
i
)
{
if
(
dd
.
StateFlags
&
DISPLAY_DEVICE_PRIMARY_DEVICE
)
{
lstrcpyW
(
name
,
dd
.
DeviceName
);
return
TRUE
;
}
}
return
FALSE
;
}
static
BOOL
is_detached_mode
(
const
DEVMODEW
*
mode
)
{
return
mode
->
dmFields
&
DM_POSITION
&&
...
...
@@ -771,7 +753,6 @@ static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef dis
*/
LONG
macdrv_ChangeDisplaySettings
(
LPDEVMODEW
displays
,
LPCWSTR
primary_name
,
HWND
hwnd
,
DWORD
flags
,
LPVOID
lpvoid
)
{
WCHAR
primary_adapter
[
CCHDEVICENAME
];
LONG
ret
=
DISP_CHANGE_SUCCESSFUL
;
DEVMODEW
*
mode
;
int
bpp
;
...
...
@@ -785,9 +766,6 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN
init_original_display_mode
();
if
(
!
get_primary_adapter
(
primary_adapter
))
return
DISP_CHANGE_FAILED
;
if
(
macdrv_get_displays
(
&
macdrv_displays
,
&
num_displays
))
return
DISP_CHANGE_FAILED
;
...
...
@@ -804,7 +782,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWN
for
(
mode
=
displays
;
mode
->
dmSize
&&
!
ret
;
mode
=
NEXT_DEVMODEW
(
mode
))
{
if
(
wcsicmp
(
primary_
adapter
,
mode
->
dmDeviceName
))
if
(
wcsicmp
(
primary_
name
,
mode
->
dmDeviceName
))
{
FIXME
(
"Changing non-primary adapter settings is currently unsupported.
\n
"
);
continue
;
...
...
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