ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/listbox: Remove some unnecessary differences to the comctl32 version. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2019-02-15 09:40:29 +00:00 committed by Alexandre Julliard
parent 0beea9f474
commit 6a421988df
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/user32/listbox.c
View File

@ -87,7 +87,7 @@ typedef struct
BOOL in_focus; BOOL in_focus;
HFONT font; /* Current font */ HFONT font; /* Current font */
LCID locale; /* Current locale for string comparisons */ LCID locale; /* Current locale for string comparisons */
LPHEADCOMBO lphc; /* ComboLBox */ HEADCOMBO *lphc; /* ComboLBox */
} LB_DESCR; } LB_DESCR;
@ -806,6 +806,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
SetLastError(ERROR_INVALID_INDEX); SetLastError(ERROR_INVALID_INDEX);
return LB_ERR; return LB_ERR;
} }
if (HAS_STRINGS(descr)) if (HAS_STRINGS(descr))
{ {
WCHAR *str = get_item_string(descr, index); WCHAR *str = get_item_string(descr, index);
@ -840,7 +841,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
return LB_ERR; return LB_ERR;
} }
__ENDTRY __ENDTRY
} else { } else
{
if (buffer) if (buffer)
*((ULONG_PTR *)buffer) = get_item_data(descr, index); *((ULONG_PTR *)buffer) = get_item_data(descr, index);
len = sizeof(ULONG_PTR); len = sizeof(ULONG_PTR);
@ -2600,7 +2602,7 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr )
LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode )
{ {
LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 );
LPHEADCOMBO lphc = 0; HEADCOMBO *lphc = NULL;
LRESULT ret; LRESULT ret;
if (!descr) if (!descr)