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
9cbc9386
Commit
9cbc9386
authored
Sep 09, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Sep 13, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Rename get_full_mode variables and avoid using devmode directly.
parent
37c2c6e3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
19 deletions
+20
-19
sysparams.c
dlls/win32u/sysparams.c
+20
-19
No files found.
dlls/win32u/sysparams.c
View file @
9cbc9386
...
...
@@ -2140,9 +2140,11 @@ static DEVMODEW *find_display_mode( DEVMODEW *modes, DEVMODEW *devmode )
return
NULL
;
}
static
DEVMODEW
*
get_full_mode
(
const
WCHAR
*
adapter_path
,
const
WCHAR
*
device_name
,
DEVMODEW
*
modes
,
DEVMODEW
*
devmode
,
DEVMODEW
*
temp
_mode
)
static
DEVMODEW
*
get_full_mode
(
const
WCHAR
*
adapter_path
,
const
WCHAR
*
device_name
,
DEVMODEW
*
adapter_
modes
,
DEVMODEW
*
devmode
,
DEVMODEW
*
full
_mode
)
{
DEVMODEW
*
adapter_mode
;
if
(
devmode
)
{
trace_devmode
(
devmode
);
...
...
@@ -2156,40 +2158,39 @@ static DEVMODEW *get_full_mode( const WCHAR *adapter_path, const WCHAR *device_n
devmode
=
NULL
;
}
if
(
devmode
)
memcpy
(
temp
_mode
,
devmode
,
devmode
->
dmSize
);
if
(
devmode
)
memcpy
(
full
_mode
,
devmode
,
devmode
->
dmSize
);
else
{
if
(
!
read_registry_settings
(
adapter_path
,
temp
_mode
))
return
NULL
;
if
(
!
read_registry_settings
(
adapter_path
,
full
_mode
))
return
NULL
;
TRACE
(
"Return to original display mode
\n
"
);
}
devmode
=
temp_mode
;
if
((
dev
mode
->
dmFields
&
(
DM_PELSWIDTH
|
DM_PELSHEIGHT
))
!=
(
DM_PELSWIDTH
|
DM_PELSHEIGHT
))
if
((
full_
mode
->
dmFields
&
(
DM_PELSWIDTH
|
DM_PELSHEIGHT
))
!=
(
DM_PELSWIDTH
|
DM_PELSHEIGHT
))
{
WARN
(
"devmode doesn't specify the resolution: %#x
\n
"
,
dev
mode
->
dmFields
);
WARN
(
"devmode doesn't specify the resolution: %#x
\n
"
,
full_
mode
->
dmFields
);
return
NULL
;
}
if
(
!
is_detached_mode
(
devmode
)
&&
(
!
devmode
->
dmPelsWidth
||
!
devmode
->
dmPelsHeight
||
!
(
dev
mode
->
dmFields
&
DM_POSITION
)))
if
(
!
is_detached_mode
(
full_mode
)
&&
(
!
full_mode
->
dmPelsWidth
||
!
full_mode
->
dmPelsHeight
||
!
(
full_
mode
->
dmFields
&
DM_POSITION
)))
{
DEVMODEW
current_mode
=
{.
dmSize
=
sizeof
(
DEVMODEW
)};
if
(
!
user_driver
->
pGetCurrentDisplaySettings
(
device_name
,
&
current_mode
))
return
NULL
;
if
(
!
devmode
->
dmPelsWidth
)
dev
mode
->
dmPelsWidth
=
current_mode
.
dmPelsWidth
;
if
(
!
devmode
->
dmPelsHeight
)
dev
mode
->
dmPelsHeight
=
current_mode
.
dmPelsHeight
;
if
(
!
(
dev
mode
->
dmFields
&
DM_POSITION
))
if
(
!
full_mode
->
dmPelsWidth
)
full_
mode
->
dmPelsWidth
=
current_mode
.
dmPelsWidth
;
if
(
!
full_mode
->
dmPelsHeight
)
full_
mode
->
dmPelsHeight
=
current_mode
.
dmPelsHeight
;
if
(
!
(
full_
mode
->
dmFields
&
DM_POSITION
))
{
dev
mode
->
dmPosition
=
current_mode
.
dmPosition
;
dev
mode
->
dmFields
|=
DM_POSITION
;
full_
mode
->
dmPosition
=
current_mode
.
dmPosition
;
full_
mode
->
dmFields
|=
DM_POSITION
;
}
}
if
((
devmode
=
find_display_mode
(
modes
,
devmode
))
&&
devmode
!=
temp
_mode
)
if
((
adapter_mode
=
find_display_mode
(
adapter_modes
,
full_mode
))
&&
adapter_mode
!=
full
_mode
)
{
dev
mode
->
dmFields
|=
DM_POSITION
;
devmode
->
dmPosition
=
temp
_mode
->
dmPosition
;
adapter_
mode
->
dmFields
|=
DM_POSITION
;
adapter_mode
->
dmPosition
=
full
_mode
->
dmPosition
;
}
return
dev
mode
;
return
adapter_
mode
;
}
static
DEVMODEW
*
get_display_settings
(
const
WCHAR
*
devname
,
const
DEVMODEW
*
devmode
)
...
...
@@ -2446,7 +2447,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod
LONG
WINAPI
NtUserChangeDisplaySettings
(
UNICODE_STRING
*
devname
,
DEVMODEW
*
devmode
,
HWND
hwnd
,
DWORD
flags
,
void
*
lparam
)
{
DEVMODEW
*
modes
,
temp
_mode
=
{.
dmSize
=
sizeof
(
DEVMODEW
)};
DEVMODEW
*
modes
,
full
_mode
=
{.
dmSize
=
sizeof
(
DEVMODEW
)};
WCHAR
device_name
[
CCHDEVICENAME
],
adapter_path
[
MAX_PATH
];
LONG
ret
=
DISP_CHANGE_SUCCESSFUL
;
struct
adapter
*
adapter
;
...
...
@@ -2472,7 +2473,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm
return
DISP_CHANGE_BADPARAM
;
}
if
(
!
(
devmode
=
get_full_mode
(
adapter_path
,
device_name
,
modes
,
devmode
,
&
temp
_mode
)))
ret
=
DISP_CHANGE_BADMODE
;
if
(
!
(
devmode
=
get_full_mode
(
adapter_path
,
device_name
,
modes
,
devmode
,
&
full
_mode
)))
ret
=
DISP_CHANGE_BADMODE
;
else
if
((
flags
&
CDS_UPDATEREGISTRY
)
&&
!
write_registry_settings
(
adapter_path
,
devmode
))
ret
=
DISP_CHANGE_NOTUPDATED
;
else
if
(
flags
&
(
CDS_TEST
|
CDS_NORESET
))
ret
=
DISP_CHANGE_SUCCESSFUL
;
else
ret
=
apply_display_settings
(
device_name
,
devmode
,
hwnd
,
flags
,
lparam
);
...
...
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