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
27ab5f7b
Commit
27ab5f7b
authored
Sep 22, 2021
by
Zhiyi Zhang
Committed by
Alexandre Julliard
Sep 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uxtheme: Do not change system metrics in EnableTheming().
Signed-off-by:
Zhiyi Zhang
<
zzhang@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
50005fee
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
7 deletions
+0
-7
system.c
dlls/uxtheme/system.c
+0
-2
system.c
dlls/uxtheme/tests/system.c
+0
-5
No files found.
dlls/uxtheme/system.c
View file @
27ab5f7b
...
...
@@ -576,8 +576,6 @@ HRESULT WINAPI EnableTheming(BOOL fEnable)
if
(
bThemeActive
&&
!
fEnable
)
{
UXTHEME_RestoreSystemMetrics
();
UXTHEME_SaveSystemMetrics
();
bThemeActive
=
fEnable
;
if
(
!
RegOpenKeyW
(
HKEY_CURRENT_USER
,
szThemeManager
,
&
hKey
))
{
RegSetValueExW
(
hKey
,
L"ThemeActive"
,
0
,
REG_SZ
,
(
BYTE
*
)
L"0"
,
2
*
sizeof
(
WCHAR
));
...
...
dlls/uxtheme/tests/system.c
View file @
27ab5f7b
...
...
@@ -1195,7 +1195,6 @@ static void test_EnableTheming(void)
size
=
sizeof
(
color_string
);
ls
=
RegQueryValueExW
(
hkey
,
L"Scrollbar"
,
NULL
,
NULL
,
(
BYTE
*
)
color_string
,
&
size
);
ok
(
!
ls
,
"RegQueryValueExW failed, ls %#x.
\n
"
,
ls
);
todo_wine
ok
(
!
lstrcmpW
(
color_string
,
new_color_string
),
"Expected %s, got %s.
\n
"
,
wine_dbgstr_w
(
new_color_string
),
wine_dbgstr_w
(
color_string
));
...
...
@@ -1204,7 +1203,6 @@ static void test_EnableTheming(void)
ok
(
flat_menu
==
new_flat_menu
,
"Expected %d, got %d.
\n
"
,
new_flat_menu
,
flat_menu
);
ret
=
SystemParametersInfoW
(
SPI_GETGRADIENTCAPTIONS
,
0
,
&
gradient_caption
,
0
);
ok
(
ret
,
"SystemParametersInfoW failed, error %u.
\n
"
,
GetLastError
());
todo_wine
ok
(
gradient_caption
==
new_gradient_caption
,
"Expected %d, got %d.
\n
"
,
new_gradient_caption
,
gradient_caption
);
...
...
@@ -1212,13 +1210,11 @@ static void test_EnableTheming(void)
ncm
.
cbSize
=
FIELD_OFFSET
(
NONCLIENTMETRICSW
,
iPaddedBorderWidth
);
ret
=
SystemParametersInfoW
(
SPI_GETNONCLIENTMETRICS
,
sizeof
(
ncm
),
&
ncm
,
0
);
ok
(
ret
,
"SystemParametersInfoW failed, error %u.
\n
"
,
GetLastError
());
todo_wine
ok
(
!
memcmp
(
&
ncm
,
&
new_ncm
,
sizeof
(
ncm
)),
"Expected non-client metrics unchanged.
\n
"
);
memset
(
&
logfont
,
0
,
sizeof
(
logfont
));
ret
=
SystemParametersInfoW
(
SPI_GETICONTITLELOGFONT
,
sizeof
(
logfont
),
&
logfont
,
0
);
ok
(
ret
,
"SystemParametersInfoW failed, error %u.
\n
"
,
GetLastError
());
todo_wine
ok
(
!
memcmp
(
&
logfont
,
&
new_logfont
,
sizeof
(
logfont
)),
"Expected icon title font unchanged.
\n
"
);
...
...
@@ -1226,7 +1222,6 @@ static void test_EnableTheming(void)
hr
=
EnableTheming
(
TRUE
);
ok
(
hr
==
S_OK
,
"EnableTheming failed, hr %#x.
\n
"
,
hr
);
is_theme_active
=
IsThemeActive
();
todo_wine
ok
(
!
is_theme_active
||
broken
(
is_theme_active
),
/* Win8+ can no longer disable theming */
"Expected theming inactive.
\n
"
);
...
...
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