commit 0178c1116b2ec294c894ac3629c46cc00ab780a1
author Ulrich Czekalla <ulrich@codeweavers.com> Wed Jun 02 21:34:05 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jun 02 21:34:05 2004 +0000
tree 0f48321adf3d45a43d1d71a1c7696c81640b61bb
parent ed3d86f9befbd806abab268cc6a97f3492281af8

Handle case when item text is empty.
According to MSDN, length should be returned when lParam is NULL.

dlls/comctl32/toolbar.c

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index bb55d3b..f97fe29 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3297,9 +3297,7 @@
     TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
     INT nIndex;
     LPWSTR lpText;
-
-    if (lParam == 0)
-	return -1;
+    LRESULT ret = 0;
 
     nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
     if (nIndex == -1)
@@ -3307,9 +3305,15 @@
 
     lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]);
 
-    strcpyW ((LPWSTR)lParam, lpText);
+    if (lpText)
+    {
+        ret = strlenW (lpText);
 
-    return strlenW (lpText);
+        if (lParam)
+            strcpyW ((LPWSTR)lParam, lpText);
+    }
+
+    return ret;
 }