Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
40cda880
Commit
40cda880
authored
Jun 03, 2022
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 08, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
win32u: Don't call CopyImage with user lock in NtUserRegisterClassExWOW.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=53082
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
parent
9f3eb4b7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
class.c
dlls/win32u/class.c
+7
-5
No files found.
dlls/win32u/class.c
View file @
40cda880
...
@@ -358,6 +358,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
...
@@ -358,6 +358,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
{
{
const
BOOL
is_builtin
=
fnid
,
ansi
=
flags
;
const
BOOL
is_builtin
=
fnid
,
ansi
=
flags
;
HINSTANCE
instance
;
HINSTANCE
instance
;
HICON
sm_icon
=
0
;
CLASS
*
class
;
CLASS
*
class
;
ATOM
atom
;
ATOM
atom
;
BOOL
ret
;
BOOL
ret
;
...
@@ -427,6 +428,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
...
@@ -427,6 +428,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
}
}
/* Other non-null values must be set by caller */
/* Other non-null values must be set by caller */
if
(
wc
->
hIcon
&&
!
wc
->
hIconSm
)
sm_icon
=
CopyImage
(
wc
->
hIcon
,
IMAGE_ICON
,
get_system_metrics
(
SM_CXSMICON
),
get_system_metrics
(
SM_CYSMICON
),
LR_COPYFROMRESOURCE
);
user_lock
();
user_lock
();
if
(
class
->
local
)
list_add_head
(
&
class_list
,
&
class
->
entry
);
if
(
class
->
local
)
list_add_head
(
&
class_list
,
&
class
->
entry
);
...
@@ -440,15 +446,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
...
@@ -440,15 +446,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
class
->
hIcon
=
wc
->
hIcon
;
class
->
hIcon
=
wc
->
hIcon
;
class
->
hIconSm
=
wc
->
hIconSm
;
class
->
hIconSm
=
wc
->
hIconSm
;
class
->
hIconSmIntern
=
sm_icon
;
class
->
hCursor
=
wc
->
hCursor
;
class
->
hCursor
=
wc
->
hCursor
;
class
->
hbrBackground
=
wc
->
hbrBackground
;
class
->
hbrBackground
=
wc
->
hbrBackground
;
class
->
winproc
=
alloc_winproc
(
wc
->
lpfnWndProc
,
ansi
);
class
->
winproc
=
alloc_winproc
(
wc
->
lpfnWndProc
,
ansi
);
if
(
client_menu_name
)
class
->
menu_name
=
*
client_menu_name
;
if
(
client_menu_name
)
class
->
menu_name
=
*
client_menu_name
;
if
(
wc
->
hIcon
&&
!
wc
->
hIconSm
)
class
->
hIconSmIntern
=
CopyImage
(
wc
->
hIcon
,
IMAGE_ICON
,
get_system_metrics
(
SM_CXSMICON
),
get_system_metrics
(
SM_CYSMICON
),
LR_COPYFROMRESOURCE
);
release_class_ptr
(
class
);
release_class_ptr
(
class
);
return
atom
;
return
atom
;
}
}
...
...
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