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
eaeef1de
Commit
eaeef1de
authored
Aug 04, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Aug 23, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Use current mode position if desired mode doesn't specify it.
parent
f60716c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
sysparams.c
dlls/win32u/sysparams.c
+6
-1
display.c
dlls/winex11.drv/display.c
+0
-10
No files found.
dlls/win32u/sysparams.c
View file @
eaeef1de
...
...
@@ -2060,12 +2060,17 @@ static DEVMODEW *validate_display_settings( const WCHAR *adapter_path, const WCH
return
NULL
;
}
if
(
!
is_detached_mode
(
devmode
)
&&
(
!
devmode
->
dmPelsWidth
||
!
devmode
->
dmPelsHeight
))
if
(
!
is_detached_mode
(
devmode
)
&&
(
!
devmode
->
dmPelsWidth
||
!
devmode
->
dmPelsHeight
||
!
(
devmode
->
dmFields
&
DM_POSITION
)
))
{
DEVMODEW
current_mode
=
{.
dmSize
=
sizeof
(
DEVMODEW
)};
if
(
!
user_driver
->
pGetCurrentDisplaySettings
(
device_name
,
&
current_mode
))
return
NULL
;
if
(
!
devmode
->
dmPelsWidth
)
devmode
->
dmPelsWidth
=
current_mode
.
dmPelsWidth
;
if
(
!
devmode
->
dmPelsHeight
)
devmode
->
dmPelsHeight
=
current_mode
.
dmPelsHeight
;
if
(
!
(
devmode
->
dmFields
&
DM_POSITION
))
{
devmode
->
dmPosition
=
current_mode
.
dmPosition
;
devmode
->
dmFields
|=
DM_POSITION
;
}
}
return
devmode
;
...
...
dlls/winex11.drv/display.c
View file @
eaeef1de
...
...
@@ -498,16 +498,6 @@ static LONG get_display_settings(DEVMODEW **new_displays, const WCHAR *dev_name,
else
if
(
!
wcsicmp
(
dev_name
,
display_device
.
DeviceName
))
{
*
mode
=
*
dev_mode
;
if
(
!
(
dev_mode
->
dmFields
&
DM_POSITION
))
{
memset
(
&
current_mode
,
0
,
sizeof
(
current_mode
));
current_mode
.
dmSize
=
sizeof
(
current_mode
);
if
(
!
NtUserEnumDisplaySettings
(
&
device_name
,
ENUM_CURRENT_SETTINGS
,
&
current_mode
,
0
))
goto
done
;
mode
->
dmFields
|=
DM_POSITION
;
mode
->
dmPosition
=
current_mode
.
dmPosition
;
}
}
else
{
...
...
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