commit 741325b86aa4322b66e8a1cc2fec8dbbee3d87b1
author Alexandre Julliard <julliard@winehq.org> Thu Jun 13 19:20:43 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jun 13 19:20:43 2002 +0000
tree 66a164f923bef8edcb1c0074e68aa2aeb0c11151
parent 935e3df35c2c7bf00ff70f98a0c5dd8cbc902698

Make sure edit and listbox controls are of same ASCII/Unicode style as
the combo box. Fixed a few MBCS issues with WM_GETTEXTLENGTH handling.

controls/listbox.c

diff --git a/controls/listbox.c b/controls/listbox.c
index 951f548..e537a5e 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -2608,8 +2608,10 @@
     case LB_GETTEXTLEN:
         if ((INT)wParam >= descr->nb_items || (INT)wParam < 0)
             return LB_ERR;
-        return (HAS_STRINGS(descr) ? strlenW(descr->items[wParam].str)
-                                   : sizeof(DWORD));
+        if (!HAS_STRINGS(descr)) return sizeof(DWORD);
+        if (unicode) return strlenW( descr->items[wParam].str );
+        return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str,
+                                    strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL );
 
     case LB_GETCURSEL16:
     case LB_GETCURSEL: