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
c74a72c4
Commit
c74a72c4
authored
May 09, 2018
by
Nikolay Sivov
Committed by
Alexandre Julliard
May 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32/toolbar: Handle resource strings returned for tooltip text.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
da8a801a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
toolbar.c
dlls/comctl32/toolbar.c
+13
-0
No files found.
dlls/comctl32/toolbar.c
View file @
c74a72c4
...
@@ -6248,6 +6248,9 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
...
@@ -6248,6 +6248,9 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
TRACE
(
"TTN_GETDISPINFOW - got string %s
\n
"
,
debugstr_w
(
lpnmtdi
->
lpszText
));
TRACE
(
"TTN_GETDISPINFOW - got string %s
\n
"
,
debugstr_w
(
lpnmtdi
->
lpszText
));
if
(
IS_INTRESOURCE
(
lpnmtdi
->
lpszText
))
return
ret
;
if
(
lpnmtdi
->
lpszText
&&
*
lpnmtdi
->
lpszText
)
if
(
lpnmtdi
->
lpszText
&&
*
lpnmtdi
->
lpszText
)
return
ret
;
return
ret
;
}
}
...
@@ -6265,6 +6268,16 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
...
@@ -6265,6 +6268,16 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
TRACE
(
"TTN_GETDISPINFOA - got string %s
\n
"
,
debugstr_a
(
nmtdi
.
lpszText
));
TRACE
(
"TTN_GETDISPINFOA - got string %s
\n
"
,
debugstr_a
(
nmtdi
.
lpszText
));
lpnmtdi
->
hinst
=
nmtdi
.
hinst
;
lpnmtdi
->
uFlags
=
nmtdi
.
uFlags
;
lpnmtdi
->
lParam
=
nmtdi
.
lParam
;
if
(
IS_INTRESOURCE
(
nmtdi
.
lpszText
))
{
lpnmtdi
->
lpszText
=
(
WCHAR
*
)
nmtdi
.
lpszText
;
return
ret
;
}
if
(
!
nmtdi
.
lpszText
||
!*
nmtdi
.
lpszText
)
if
(
!
nmtdi
.
lpszText
||
!*
nmtdi
.
lpszText
)
return
ret
;
return
ret
;
...
...
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