mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 11:19:26 +00:00
comctl32: TTM_ADDTOOLW must refuse to set a tooltip text to NULL.
This commit is contained in:
parent
202d046d68
commit
542652deab
|
@ -700,10 +700,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts)
|
|||
if (infoPtr->hwndToolTip) {
|
||||
INT nTipCount;
|
||||
TTTOOLINFOW ti;
|
||||
WCHAR wEmpty = 0;
|
||||
|
||||
ZeroMemory (&ti, sizeof(TTTOOLINFOW));
|
||||
ti.cbSize = sizeof(TTTOOLINFOW);
|
||||
ti.hwnd = infoPtr->Self;
|
||||
ti.lpszText = &wEmpty;
|
||||
|
||||
nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
|
||||
if (nTipCount < infoPtr->numParts) {
|
||||
|
|
|
@ -420,7 +420,7 @@ static void test_gettext(void)
|
|||
toolinfoW.lParam = 0xdeadbeef;
|
||||
GetClientRect(hwnd, &toolinfoW.rect);
|
||||
r = SendMessageW(hwnd, TTM_ADDTOOLW, 0, (LPARAM)&toolinfoW);
|
||||
todo_wine ok(!r, "Adding the tool to the tooltip failed\n");
|
||||
ok(!r, "Adding the tool to the tooltip succeeded!\n");
|
||||
|
||||
if (0) /* crashes on NT4 */
|
||||
{
|
||||
|
|
|
@ -1037,6 +1037,9 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
|
|||
infoPtr->hwndSelf, ti->hwnd, ti->uId,
|
||||
(ti->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
|
||||
|
||||
if (ti->cbSize >= TTTOOLINFOW_V2_SIZE && !ti->lpszText && isW)
|
||||
return FALSE;
|
||||
|
||||
if (infoPtr->uNumTools == 0) {
|
||||
infoPtr->tools = Alloc (sizeof(TTTOOL_INFO));
|
||||
toolPtr = infoPtr->tools;
|
||||
|
@ -1060,27 +1063,29 @@ TOOLTIPS_AddToolT (TOOLTIPS_INFO *infoPtr, const TTTOOLINFOW *ti, BOOL isW)
|
|||
toolPtr->rect = ti->rect;
|
||||
toolPtr->hinst = ti->hinst;
|
||||
|
||||
if (IS_INTRESOURCE(ti->lpszText)) {
|
||||
TRACE("add string id %x\n", LOWORD(ti->lpszText));
|
||||
toolPtr->lpszText = ti->lpszText;
|
||||
}
|
||||
else if (ti->lpszText) {
|
||||
if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) {
|
||||
TRACE("add CALLBACK!\n");
|
||||
toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
|
||||
}
|
||||
else if (isW) {
|
||||
INT len = lstrlenW (ti->lpszText);
|
||||
TRACE("add text %s!\n", debugstr_w(ti->lpszText));
|
||||
toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR));
|
||||
strcpyW (toolPtr->lpszText, ti->lpszText);
|
||||
}
|
||||
else {
|
||||
INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0);
|
||||
TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText);
|
||||
toolPtr->lpszText = Alloc (len * sizeof(WCHAR));
|
||||
MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len);
|
||||
}
|
||||
if (ti->cbSize >= TTTOOLINFOW_V1_SIZE) {
|
||||
if (IS_INTRESOURCE(ti->lpszText)) {
|
||||
TRACE("add string id %x\n", LOWORD(ti->lpszText));
|
||||
toolPtr->lpszText = ti->lpszText;
|
||||
}
|
||||
else if (ti->lpszText) {
|
||||
if (TOOLTIPS_IsCallbackString(ti->lpszText, isW)) {
|
||||
TRACE("add CALLBACK!\n");
|
||||
toolPtr->lpszText = LPSTR_TEXTCALLBACKW;
|
||||
}
|
||||
else if (isW) {
|
||||
INT len = lstrlenW (ti->lpszText);
|
||||
TRACE("add text %s!\n", debugstr_w(ti->lpszText));
|
||||
toolPtr->lpszText = Alloc ((len + 1)*sizeof(WCHAR));
|
||||
strcpyW (toolPtr->lpszText, ti->lpszText);
|
||||
}
|
||||
else {
|
||||
INT len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, NULL, 0);
|
||||
TRACE("add text \"%s\"!\n", (LPSTR)ti->lpszText);
|
||||
toolPtr->lpszText = Alloc (len * sizeof(WCHAR));
|
||||
MultiByteToWideChar(CP_ACP, 0, (LPSTR)ti->lpszText, -1, toolPtr->lpszText, len);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ti->cbSize >= TTTOOLINFOW_V2_SIZE)
|
||||
|
|
|
@ -1525,11 +1525,13 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs)
|
|||
hwnd, 0, 0, 0);
|
||||
|
||||
if (infoPtr->hwndToolTip) {
|
||||
TTTOOLINFOW ti;
|
||||
TTTOOLINFOW ti;
|
||||
WCHAR wEmpty = 0;
|
||||
ZeroMemory (&ti, sizeof(ti));
|
||||
ti.cbSize = sizeof(ti);
|
||||
ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE;
|
||||
ti.hwnd = hwnd;
|
||||
ti.lpszText = &wEmpty;
|
||||
|
||||
SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue