Return the correct character count in DBCS locales.

fea1a845 · Mike McCormack · Alexandre Julliard · 97551bce · fea1a845
Commit fea1a845 authored Aug 26, 2004 by Mike McCormack Committed by Alexandre Julliard Aug 26, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

listbox.c controls/listbox.c +7 -1

No files found.
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -778,7 +778,13 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPARAM lParam, BOOL 
    if (HAS_STRINGS(descr))
    {
        if (!lParam)
-            return strlenW(descr->items[index].str);
+        {
+            DWORD len = strlenW(descr->items[index].str);
+            if( unicode )
+                return len;
+            return WideCharToMultiByte( CP_ACP, 0, descr->items[index].str, len,
+                                        NULL, 0, NULL, NULL );
+        }

 	TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str));