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>

comctl32/toolbar: Handle resource strings returned for tooltip text.
c74a72c4 · Nikolay Sivov · Alexandre Julliard · da8a801a · c74a72c4
Commit c74a72c4 authored May 09, 2018 by Nikolay Sivov Committed by Alexandre Julliard May 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

toolbar.c dlls/comctl32/toolbar.c +13 -0

No files found.
--- 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;