Commit c74a72c4 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

comctl32/toolbar: Handle resource strings returned for tooltip text.

parent da8a801a
...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment