[PATCH] comctl32/toolbar: Handle resource strings returned for tooltip text.
Nikolay Sivov
nsivov at codeweavers.com
Wed May 9 00:25:30 CDT 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
For https://bugs.winehq.org/show_bug.cgi?id=45157.
dlls/comctl32/toolbar.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index e1cb7b7169..6a51ad7fc1 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -6248,6 +6248,9 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
TRACE("TTN_GETDISPINFOW - got string %s\n", debugstr_w(lpnmtdi->lpszText));
+ if (IS_INTRESOURCE(lpnmtdi->lpszText))
+ return ret;
+
if (lpnmtdi->lpszText && *lpnmtdi->lpszText)
return ret;
}
@@ -6265,6 +6268,16 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
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)
return ret;
--
2.17.0
More information about the wine-devel
mailing list