comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should…

comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should not return -1 but the string size.

comctl32/toolbar: When a null lParam is passed to TB_GETBUTTONTEXTA, we should…
585c3abb · Giuseppe Bilotta · Alexandre Julliard · fcc9b57c · 585c3abb
Commit 585c3abb authored May 07, 2009 by Giuseppe Bilotta Committed by Alexandre Julliard May 07, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

toolbar.c dlls/comctl32/toolbar.c +1 -4

No files found.
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3435,9 +3435,6 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
    INT nIndex;
    LPWSTR lpText;

-    if (lParam == 0)
-	return -1;
-
    nIndex = TOOLBAR_GetButtonIndex (infoPtr, (INT)wParam, FALSE);
    if (nIndex == -1)
 	return -1;
@@ -3445,7 +3442,7 @@ TOOLBAR_GetButtonTextA (HWND hwnd, WPARAM wParam, LPARAM lParam)
    lpText = TOOLBAR_GetText(infoPtr,&infoPtr->buttons[nIndex]);

    return WideCharToMultiByte( CP_ACP, 0, lpText, -1,
-                                (LPSTR)lParam, 0x7fffffff, NULL, NULL ) - 1;
+                                (LPSTR)lParam, lParam ? 0x7fffffff : 0, NULL, NULL ) - 1;
 }