Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
quininer
wine
Commits
078c6e5a
Commit
078c6e5a
authored
2 years ago
by
Rémi Bernon
Committed by
Alexandre Julliard
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
comctl32: Skip restoring window proc if it has been modified.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=43073
parent
8387d2fe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/comctl32/commctrl.c
+3
-1
3 additions, 1 deletion
dlls/comctl32/commctrl.c
dlls/comctl32/tests/subclass.c
+1
-1
1 addition, 1 deletion
dlls/comctl32/tests/subclass.c
with
4 additions
and
2 deletions
dlls/comctl32/commctrl.c
+
3
−
1
View file @
078c6e5a
...
...
@@ -1243,7 +1243,9 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u
if
(
!
stack
->
SubclassProcs
&&
!
stack
->
running
)
{
TRACE
(
"Last Subclass removed, cleaning up
\n
"
);
/* clean up our heap and reset the original window procedure */
if
(
stack
->
is_unicode
)
if
((
WNDPROC
)
GetWindowLongPtrW
(
hWnd
,
GWLP_WNDPROC
)
!=
COMCTL32_SubclassProc
)
WARN
(
"Window procedure has been modified, skipping restore
\n
"
);
else
if
(
stack
->
is_unicode
)
SetWindowLongPtrW
(
hWnd
,
GWLP_WNDPROC
,
(
DWORD_PTR
)
stack
->
origproc
);
else
SetWindowLongPtrA
(
hWnd
,
GWLP_WNDPROC
,
(
DWORD_PTR
)
stack
->
origproc
);
...
...
This diff is collapsed.
Click to expand it.
dlls/comctl32/tests/subclass.c
+
1
−
1
View file @
078c6e5a
...
...
@@ -192,7 +192,7 @@ static void check_unicode_(int line, HWND hwnd, DWORD flags)
else
if
(
flags
&
EXPECT_WNDPROC_1
)
ok_
(
__FILE__
,
line
)(
proc
==
wnd_proc_1
,
"got proc %p
\n
"
,
proc
);
else
if
(
flags
&
EXPECT_WNDPROC_3
)
todo_wine_if
(
proc
==
wnd_proc_1
)
ok_
(
__FILE__
,
line
)(
proc
==
wnd_proc_3
,
"got proc %p
\n
"
,
proc
);
ok_
(
__FILE__
,
line
)(
proc
==
wnd_proc_3
,
"got proc %p
\n
"
,
proc
);
else
ok_
(
__FILE__
,
line
)(
!
IS_WNDPROC_HANDLE
(
proc
),
"got proc %p
\n
"
,
proc
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment