ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/tooltip: Compare to special callback pointer value directly. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2018-04-30 14:32:01 +03:00 committed by Alexandre Julliard
parent 07e41e4c9b
commit 5e7e3cbda6
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/comctl32/tooltips.c
View File

@ -177,15 +177,6 @@ typedef struct
static LRESULT CALLBACK static LRESULT CALLBACK
TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef);
static inline BOOL TOOLTIPS_IsCallbackString(LPCWSTR str, BOOL isW)
{
if (isW)
return str == LPSTR_TEXTCALLBACKW;
else
return (LPCSTR)str == LPSTR_TEXTCALLBACKA;
}
static inline UINT_PTR static inline UINT_PTR
TOOLTIPS_GetTitleIconIndex(HICON hIcon) TOOLTIPS_GetTitleIconIndex(HICON hIcon)
{ {
@ -1091,7 +1082,7 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
toolPtr->lpszText = ti->lpszText; toolPtr->lpszText = ti->lpszText;
} }
else if (ti->lpszText) { else if (ti->lpszText) {
if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) { if (ti->lpszText == LPSTR_TEXTCALLBACKW) {
TRACE("add CALLBACK\n"); TRACE("add CALLBACK\n");
toolPtr->lpszText = LPSTR_TEXTCALLBACKW; toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
} }
@ -1674,7 +1665,7 @@ TOOLTIPS_SetToolInfoT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
toolPtr->lpszText = ti->lpszText; toolPtr->lpszText = ti->lpszText;
} }
else { else {
if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) if (ti->lpszText == LPSTR_TEXTCALLBACKW)
toolPtr->lpszText = LPSTR_TEXTCALLBACKW; toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
else { else {
if ( (toolPtr->lpszText) && if ( (toolPtr->lpszText) &&
@ -1800,7 +1791,7 @@ TOOLTIPS_UpdateTipTextT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW
toolPtr->lpszText = ti->lpszText; toolPtr->lpszText = ti->lpszText;
} }
else if (ti->lpszText) { else if (ti->lpszText) {
if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) if (ti->lpszText == LPSTR_TEXTCALLBACKW)
toolPtr->lpszText = LPSTR_TEXTCALLBACKW; toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
else { else {
if ( (toolPtr->lpszText) && if ( (toolPtr->lpszText) &&