From c858429fb143c962b42e649a4acdbbc9a96a0c07 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 5 Feb 2024 08:08:33 +0900 Subject: [PATCH] [COMCTL32] ToolTips: Don't set text on default LPSTR_TEXTCALLBACK (#6412) Based on KRosUser's tooltip_fix.patch. JIRA issue: CORE-19309 Don't set text on default processing of LPSTR_TEXTCALLBACK. --- dll/win32/comctl32/tooltips.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/comctl32/tooltips.c b/dll/win32/comctl32/tooltips.c index b0857e0b4a4..a1729380d93 100644 --- a/dll/win32/comctl32/tooltips.c +++ b/dll/win32/comctl32/tooltips.c @@ -417,6 +417,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too buffer[0] = '\0'; } +#ifndef __REACTOS_ /* no text available - try calling parent instead as per native */ /* FIXME: Unsure if SETITEM should save the value or not */ if (buffer[0] == 0x00) { @@ -431,6 +432,7 @@ static void TOOLTIPS_GetDispInfoA(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too Str_GetPtrAtoW(ttnmdi.lpszText, buffer, INFOTIPSIZE); } } +#endif } static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *toolPtr, WCHAR *buffer) @@ -473,6 +475,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too buffer[0] = '\0'; } +#ifndef __REACTOS__ /* no text available - try calling parent instead as per native */ /* FIXME: Unsure if SETITEM should save the value or not */ if (buffer[0] == 0x00) { @@ -487,6 +490,7 @@ static void TOOLTIPS_GetDispInfoW(const TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *too Str_GetPtrW(ttnmdi.lpszText, buffer, INFOTIPSIZE); } } +#endif }