[PATCH 2/4] user32/listbox: SetCount must fail if LBS_NODATA is not set
Gabriel Ivăncescu
gabrielopcode at gmail.com
Wed Sep 19 10:46:34 CDT 2018
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/user32/listbox.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index c8bd148..97f275a 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -1757,7 +1757,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count )
{
LRESULT ret;
- if (HAS_STRINGS(descr))
+ if (!(descr->style & LBS_NODATA))
{
SetLastError(ERROR_SETCOUNT_ON_BAD_LB);
return LB_ERR;
@@ -2523,6 +2523,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT;
descr->item_height = LISTBOX_SetFont( descr, 0 );
+ if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED)
+ descr->style &= ~LBS_NODATA;
+
if (descr->style & LBS_OWNERDRAWFIXED)
{
if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN))
--
1.9.1
More information about the wine-devel
mailing list