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
c98bed32
Commit
c98bed32
authored
7 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32/tooltips: Reset window subclass data when removing tools.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
030488bc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
13 deletions
+9
-13
tooltips.c
dlls/comctl32/tooltips.c
+9
-13
No files found.
dlls/comctl32/tooltips.c
View file @
c98bed32
...
...
@@ -1142,6 +1142,13 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
return
TRUE
;
}
static
void
TOOLTIPS_ResetSubclass
(
const
TTTOOL_INFO
*
toolPtr
)
{
/* Reset subclassing data. */
if
(
toolPtr
->
uInternalFlags
&
TTF_SUBCLASS
)
SetWindowSubclass
(
toolPtr
->
uInternalFlags
&
TTF_IDISHWND
?
(
HWND
)
toolPtr
->
uId
:
toolPtr
->
hwnd
,
TOOLTIPS_SubclassProc
,
1
,
0
);
}
static
LRESULT
TOOLTIPS_DelToolT
(
TOOLTIPS_INFO
*
infoPtr
,
const
TTTOOLINFOW
*
ti
,
BOOL
isW
)
...
...
@@ -1174,15 +1181,7 @@ TOOLTIPS_DelToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
Free
(
toolPtr
->
lpszText
);
}
/* remove subclassing */
if
(
toolPtr
->
uInternalFlags
&
TTF_SUBCLASS
)
{
if
(
toolPtr
->
uInternalFlags
&
TTF_IDISHWND
)
{
RemoveWindowSubclass
((
HWND
)
toolPtr
->
uId
,
TOOLTIPS_SubclassProc
,
1
);
}
else
{
RemoveWindowSubclass
(
toolPtr
->
hwnd
,
TOOLTIPS_SubclassProc
,
1
);
}
}
TOOLTIPS_ResetSubclass
(
toolPtr
);
/* delete tool from tool list */
if
(
infoPtr
->
uNumTools
==
1
)
{
...
...
@@ -1888,10 +1887,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr)
}
}
/* Reset subclassing data. */
if
(
toolPtr
->
uInternalFlags
&
TTF_SUBCLASS
)
SetWindowSubclass
(
toolPtr
->
uInternalFlags
&
TTF_IDISHWND
?
(
HWND
)
toolPtr
->
uId
:
toolPtr
->
hwnd
,
TOOLTIPS_SubclassProc
,
1
,
0
);
TOOLTIPS_ResetSubclass
(
toolPtr
);
}
Free
(
infoPtr
->
tools
);
...
...
This diff is collapsed.
Click to expand it.
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