From 2ef02afe95f105d0a078e7587625bc3456a34ffc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Hentschel?= Date: Tue, 20 Jan 2009 20:34:48 +0100 Subject: [PATCH] comctl32: Fix callback in treeview. --- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/comctl32/treeview.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0e85014c2de..cb10be4ee15 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -311,7 +311,7 @@ static void TestCallback(void) ok(ret == 1, "Expected SetItem return 1, got %ld\n", ret); tvi.pszText = buf; TreeView_GetItem(hTree, &tvi); - todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); U(ins).item.pszText = NULL; @@ -320,7 +320,7 @@ static void TestCallback(void) tvi.hItem = hItem2; memset(buf, 0, sizeof(buf)); TreeView_GetItem(hTree, &tvi); - todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dd0563ad834..abc6fc7fa10 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1112,7 +1112,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (tvItem->mask & TVIF_TEXT) { wineItem->textWidth = 0; /* force width recalculation */ - if (tvItem->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) /* covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ { int len; LPWSTR newText; -- 2.11.4.GIT