LB_GETTEXT: Handle passed NULL buffer.

4f7dc46c · Marcus Meissner · Alexandre Julliard · 21777c59 · 4f7dc46c
Commit 4f7dc46c authored Nov 22, 1998 by Marcus Meissner Committed by Alexandre Julliard Nov 22, 1998
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

listbox.c controls/listbox.c +5 -4

No files found.
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -636,12 +636,13 @@ static LRESULT LISTBOX_GetText( WND *wnd, LB_DESCR *descr, INT32 index,
    if ((index < 0) || (index >= descr->nb_items)) return LB_ERR;
    if (HAS_STRINGS(descr))
    {
+        if (!buffer)
+		return strlen(descr->items[index].str);
        lstrcpy32A( buffer, descr->items[index].str );
        return strlen(buffer);
-    }
-    else
-    {
-        memcpy( buffer, &descr->items[index].data, sizeof(DWORD) );
+    } else {
+    	if (buffer)
+        	*((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data);
        return sizeof(DWORD);
    }
 }