commit fea1a8457261f5966787ba490a2d301b504b3b1a
author Mike McCormack <mike@codeweavers.com> Thu Aug 26 18:11:06 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 26 18:11:06 2004 +0000
tree 66033187f268168196199e709e56b8f0d1ce3973
parent 97551bcef5604d106f9fcb08a5f86724fd56f577

Return the correct character count in DBCS locales.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index c00d889..9c422a7 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -778,7 +778,13 @@
     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));