Gabriel Ivăncescu : comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8e13120c80697d14d3363c2acc6742ebaaa1259d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8e13120c80697d14d3363c2ac...

Author: Gabriel Ivăncescu 
Date:   Tue Nov 13 12:35:57 2018 +0200

comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it.

Signed-off-by: Gabriel Ivăncescu 
Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/comctl32/listbox.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index d0e8e60..3d8804a 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2516,6 +2516,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
     if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL;
     if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE;
     if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT;
+    if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED)
+        descr->style &= ~LBS_NODATA;
     descr->item_height = LISTBOX_SetFont( descr, 0 );

if (descr->style & LBS_OWNERDRAWFIXED)