marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32: Return the correct value for CB_GETLBTEXTLEN.

oldstable
Mike McCormack 2006-10-06 17:42:22 +09:00 committed by Alexandre Julliard
parent 4d41a2b9ee
commit 1207e84af5
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/comctl32/comboex.c
View File

@ -501,6 +501,32 @@ static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr)
/* *** CBEM_xxx message support *** */
static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf)
{
CBE_ITEMDATA *item;
LPCWSTR str;
item = COMBOEX_FindItem(infoPtr, n);
if (!item)
return 0;
str = COMBOEX_GetText(infoPtr, item);
if (infoPtr->unicode)
{
if (buf)
lstrcpyW(buf, str);
return lstrlenW(str);
}
else
{
UINT r;
r = WideCharToMultiByte(CP_ACP, 0, str, -1, (LPSTR)buf, 0x40000000, NULL, NULL);
if (r) r--;
return r;
}
}
static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index)
{
@ -2193,11 +2219,15 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case WM_GETTEXT:
return SendMessageW(infoPtr->hwndEdit, uMsg, wParam, lParam);
case CB_GETLBTEXT:
return COMBOEX_GetListboxText(infoPtr, wParam, (LPWSTR)lParam);
case CB_GETLBTEXTLEN:
return COMBOEX_GetListboxText(infoPtr, wParam, NULL);
/* Combo messages we are not sure if we need to process or just forward */
case CB_GETDROPPEDCONTROLRECT:
case CB_GETITEMHEIGHT:
case CB_GETLBTEXT:
case CB_GETLBTEXTLEN:
case CB_GETEXTENDEDUI:
case CB_LIMITTEXT:
case CB_RESETCONTENT: