Module: wine Branch: master Commit: c74a72c46e078bbc91bd1c4b23832f748dfc843d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74a72c46e078bbc91bd1c4b2...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Wed May 9 08:25:30 2018 +0300
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
---
dlls/comctl32/toolbar.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e1cb7b7..6a51ad7 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;