Handle case when item text is empty.

According to MSDN, length should be returned when lParam is NULL.

Handle case when item text is empty.
0178c111 · Ulrich Czekalla · Alexandre Julliard · ed3d86f9 · 0178c111
Commit 0178c111 authored Jun 02, 2004 by Ulrich Czekalla Committed by Alexandre Julliard Jun 02, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

toolbar.c dlls/comctl32/toolbar.c +9 -5

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3297,9 +3297,7 @@ TOOLBAR_GetButtonTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)
    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 @@ TOOLBAR_GetButtonTextW (HWND hwnd, WPARAM wParam, LPARAM lParam)

    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;
 }