[PATCH v2 1/8] comctl32/listbox: Make SetCount fail if LBS_NODATA is not set

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---

Supersedes series starting with 151474.

v2: Looks like Windows accepts both LBS_OWNERDRAWFIXED and
LBS_OWNERDRAWVARIABLE at once, for some stupid reason, and only
LBS_OWNERDRAWFIXED takes effect (based on testing on Windows XP). So keep
LBS_NODATA if they're both set.

 dlls/comctl32/listbox.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 2137ef8..0a7c341 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -1752,7 +1752,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;
@@ -2518,6 +2518,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_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

[PATCH v2 2/8] user32/listbox: Make SetCount fail if LBS_NODATA is not set

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)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..529a47b 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_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

[PATCH v2 3/8] comctl32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---

Spotted by tests and it simply makes no sense to have both.

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

diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c
index 0a7c341..5e33466 100644
--- a/dlls/comctl32/listbox.c
+++ b/dlls/comctl32/listbox.c
@@ -2523,6 +2523,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
 
     if (descr->style & LBS_OWNERDRAWFIXED)
     {
+        /* Windows accepts both, but FIXED overrides VARIABLE */
+        descr->style &= ~LBS_OWNERDRAWVARIABLE;
+
 	if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN))
 	{
 	    /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */
-- 
1.9.1

[PATCH v2 4/8] user32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/user32/listbox.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 529a47b..02bb923 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2528,6 +2528,9 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc )
 
     if (descr->style & LBS_OWNERDRAWFIXED)
     {
+        /* Windows accepts both, but FIXED overrides VARIABLE */
+        descr->style &= ~LBS_OWNERDRAWVARIABLE;
+
 	if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN))
 	{
 	    /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */
-- 
1.9.1

[PATCH v2 5/8] comctl32/tests: Test for LB_SETCOUNT without LBS_NODATA

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/comctl32/tests/listbox.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c
index c9d13a8..16efa60 100644
--- a/dlls/comctl32/tests/listbox.c
+++ b/dlls/comctl32/tests/listbox.c
@@ -1753,6 +1753,13 @@ static void test_set_count( void )
     ok( !IsRectEmpty( &r ), "got empty rect\n");
 
     DestroyWindow( listbox );
+
+    listbox = create_listbox( LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent );
+
+    ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 );
+    ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret );
+
+    DestroyWindow( listbox );
     DestroyWindow( parent );
 }
 
-- 
1.9.1

[PATCH v2 5/8] comctl32/tests: Test for LB_SETCOUNT without LBS_NODATA

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42332

Your paranoid android.


=== wvistau64 (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_zh_CN (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_fr (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_he (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64 (64 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

[PATCH v2 6/8] user32/tests: Test for LB_SETCOUNT without LBS_NODATA

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/user32/tests/listbox.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index dfa8de7..4d9e70f 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -1711,6 +1711,13 @@ static void test_set_count( void )
     ok( !IsRectEmpty( &r ), "got empty rect\n");
 
     DestroyWindow( listbox );
+
+    listbox = create_listbox( LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent );
+
+    ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 );
+    ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret );
+
+    DestroyWindow( listbox );
     DestroyWindow( parent );
 }
 
-- 
1.9.1

[PATCH v2 6/8] user32/tests: Test for LB_SETCOUNT without LBS_NODATA

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42333

Your paranoid android.


=== wvistau64 (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_zh_CN (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_fr (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_he (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64 (64 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

[PATCH v2 7/8] comctl32/tests: Test incompatible styles for LBS_NODATA

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/comctl32/tests/listbox.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c
index 16efa60..ad341c5 100644
--- a/dlls/comctl32/tests/listbox.c
+++ b/dlls/comctl32/tests/listbox.c
@@ -1763,6 +1763,26 @@ static void test_set_count( void )
     DestroyWindow( parent );
 }
 
+static void test_nodata_invalid_styles( void )
+{
+    static const DWORD style[] =
+    {
+        0, LBS_OWNERDRAWVARIABLE, LBS_SORT, LBS_HASSTRINGS,
+        LBS_OWNERDRAWFIXED | LBS_SORT, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS
+    };
+    HWND parent, listbox;
+    UINT i;
+
+    parent = create_parent();
+    for (i = 0; i < ARRAY_SIZE(style); i++)
+    {
+        listbox = create_listbox(style[i] | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent);
+        ok(SendMessageA(listbox, LB_SETCOUNT, 100, 0) == LB_ERR, "LBS_NODATA enabled with incompatible styles 0x%X\n", style[i]);
+        DestroyWindow(listbox);
+    }
+    DestroyWindow(parent);
+}
+
 static int lb_getlistboxinfo;
 
 static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -2204,6 +2224,7 @@ START_TEST(listbox)
     test_listbox_LB_DIR();
     test_listbox_dlgdir();
     test_set_count();
+    test_nodata_invalid_styles();
     test_GetListBoxInfo();
     test_missing_lbuttonup();
     test_extents();
-- 
1.9.1

[PATCH v2 7/8] comctl32/tests: Test incompatible styles for LBS_NODATA

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42334

Your paranoid android.


=== wvistau64 (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_zh_CN (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_fr (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_he (32 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64 (64 bit Windows report) ===

comctl32:
listbox.c:1129: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

[PATCH v2 8/8] user32/tests: Test incompatible styles for LBS_NODATA

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
---
 dlls/user32/tests/listbox.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c
index 4d9e70f..5259f29 100644
--- a/dlls/user32/tests/listbox.c
+++ b/dlls/user32/tests/listbox.c
@@ -1721,6 +1721,26 @@ static void test_set_count( void )
     DestroyWindow( parent );
 }
 
+static void test_nodata_invalid_styles( void )
+{
+    static const DWORD style[] =
+    {
+        0, LBS_OWNERDRAWVARIABLE, LBS_SORT, LBS_HASSTRINGS,
+        LBS_OWNERDRAWFIXED | LBS_SORT, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS
+    };
+    HWND parent, listbox;
+    UINT i;
+
+    parent = create_parent();
+    for (i = 0; i < ARRAY_SIZE(style); i++)
+    {
+        listbox = create_listbox(style[i] | LBS_NODATA | WS_CHILD | WS_VISIBLE, parent);
+        ok(SendMessageA(listbox, LB_SETCOUNT, 100, 0) == LB_ERR, "LBS_NODATA enabled with incompatible styles 0x%X\n", style[i]);
+        DestroyWindow(listbox);
+    }
+    DestroyWindow(parent);
+}
+
 static DWORD (WINAPI *pGetListBoxInfo)(HWND);
 static int lb_getlistboxinfo;
 
@@ -2067,6 +2087,7 @@ START_TEST(listbox)
   test_listbox_LB_DIR();
   test_listbox_dlgdir();
   test_set_count();
+  test_nodata_invalid_styles();
   test_GetListBoxInfo();
   test_missing_lbuttonup();
   test_extents();
-- 
1.9.1

[PATCH v2 8/8] user32/tests: Test incompatible styles for LBS_NODATA

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=42335

Your paranoid android.


=== wvistau64 (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_zh_CN (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_fr (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64_he (32 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

=== wvistau64 (64 bit Windows report) ===

user32:
listbox.c:844: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7
listbox.c:1079: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18