wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Gabriel Ivăncescu : user32/listbox: Don' t set any data for LBS_NODATA listboxes.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: d30aadd3e12aefc46ffa88e70711e643cee41aff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30aadd3e12aefc46ffa88e7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:21 2018 +0200 user32/listbox: Don't set any data for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index d46f685..7fc724c 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2692,7 +2692,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = lParam; + if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 2115ee4..d0eb731 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2104,13 +2104,10 @@ static void test_LBS_NODATA(void) /* More messages that don't work with LBS_NODATA. */ ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox);

1 0

Gabriel Ivăncescu : user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: cab591c59b0ceab26a7d3654eab64e655969645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cab591c59b0ceab26a7d3654… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:20 2018 +0200 user32/listbox: Return 0 from LB_GETITEMDATA for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 044d73d..d46f685 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2684,7 +2684,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - return descr->items[wParam].data; + return (descr->style & LBS_NODATA) ? 0 : descr->items[wParam].data; case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 3c3de71..2115ee4 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2099,7 +2099,6 @@ static void test_LBS_NODATA(void) ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0); - todo_wine ok(ret == 0, "Unexpected return value %d.\n", ret); }

1 0

Gabriel Ivăncescu : user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: c980edc2270d70a3378df4561c2494e80512f222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c980edc2270d70a3378df456… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:19 2018 +0200 user32/listbox: Always retrieve zeros in LB_GETTEXT for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 3 ++- dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5746293..044d73d 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -799,7 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL __ENDTRY } else { if (buffer) - *((ULONG_PTR *)buffer) = descr->items[index].data; + *((ULONG_PTR *)buffer) = (descr->style & LBS_NODATA) + ? 0 : descr->items[index].data; len = sizeof(ULONG_PTR); } return len; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 658893a..3c3de71 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2096,7 +2096,6 @@ static void test_LBS_NODATA(void) memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); - todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n"); ret = SendMessageA(listbox, LB_GETITEMDATA, valid_idx[i], 0);

1 0

Gabriel Ivăncescu : user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: c920b4dc5aa2758913c141261c7297e60f301977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c920b4dc5aa2758913c14126… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:18 2018 +0200 user32/listbox: Use ULONG_PTR instead of DWORD when retrieving text without HAS_STRINGS. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 6 +++--- dlls/user32/tests/listbox.c | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b5b7dc6..5746293 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -799,8 +799,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL __ENDTRY } else { if (buffer) - *((LPDWORD)buffer)=*(LPDWORD)(&descr->items[index].data); - len = sizeof(DWORD); + *((ULONG_PTR *)buffer) = descr->items[index].data; + len = sizeof(ULONG_PTR); } return len; } @@ -2707,7 +2707,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - if (!HAS_STRINGS(descr)) return sizeof(DWORD); + if (!HAS_STRINGS(descr)) return sizeof(ULONG_PTR); if (unicode) return strlenW( descr->items[wParam].str ); return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str, strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL ); diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 813968f..658893a 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2091,12 +2091,10 @@ static void test_LBS_NODATA(void) ret = SendMessageA(listbox, LB_SETITEMDATA, valid_idx[i], 42); ok(ret == TRUE, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_GETTEXTLEN, valid_idx[i], 0); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); memset(&data, 0xee, sizeof(data)); ret = SendMessageA(listbox, LB_GETTEXT, valid_idx[i], (LPARAM)&data); - todo_wine_if(sizeof(void *) == 8) ok(ret == sizeof(data), "Unexpected return value %d.\n", ret); todo_wine ok(!memcmp(&data, &zero_data, sizeof(data)), "Unexpected item data.\n");

1 0

Gabriel Ivăncescu : user32/listbox: Make SetCount fail if LBS_NODATA is not set.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 0a5c360f39b36c9e5bac6e6bb51e1766fe8b8025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a5c360f39b36c9e5bac6e6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:17 2018 +0200 user32/listbox: Make SetCount fail if LBS_NODATA is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2fcd735..b5b7dc6 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; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 776e3f3..813968f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -264,7 +264,6 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA } else { - todo_wine_if((style & LBS_NODATA) && strings[mi->itemID]) ok((void*)mi->itemData == strings[mi->itemID], "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); } @@ -1765,9 +1764,7 @@ static void test_set_count( void ) SetLastError( 0xdeadbeef ); ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); - todo_wine_if(i == 0) ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); - todo_wine_if(i == 0) ok( GetLastError() == ERROR_SETCOUNT_ON_BAD_LB, "Unexpected error %d.\n", GetLastError() ); DestroyWindow( listbox ); @@ -2137,7 +2134,6 @@ todo_wine style = GetWindowLongA(listbox, GWL_STYLE); ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); - todo_wine_if(i == 1 || i == 4) ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); DestroyWindow(listbox); }

1 0

Gabriel Ivăncescu : user32/listbox: Disable LBS_NODATA if styles are incompatible with it.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: afe443c3f27d62bd8c4f80fc2a9a632764552e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afe443c3f27d62bd8c4f80fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:16 2018 +0200 user32/listbox: Disable LBS_NODATA if styles are incompatible with it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f021029..2fcd735 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2521,6 +2521,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)

1 0

Gabriel Ivăncescu : user32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 9b59eb477b9d3aa54bb7c5115de8e3dae1be0205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b59eb477b9d3aa54bb7c511… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:15 2018 +0200 user32/listbox: Clear LBS_OWNERDRAWVARIABLE if LBS_OWNERDRAWFIXED is set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index c8bd148..f021029 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2525,6 +2525,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_OWNERDRAWFIXED) { + descr->style &= ~LBS_OWNERDRAWVARIABLE; + if( descr->lphc && (descr->lphc->dwStyle & CBS_DROPDOWN)) { /* WinWord gets VERY unhappy if we send WM_MEASUREITEM from here */ diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index dc5657c..776e3f3 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -374,6 +374,8 @@ static void test_ownerdraw(void) NULL, NULL, NULL, 0); ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + ok(GetWindowLongA(hLB, GWL_STYLE) & LBS_OWNERDRAWVARIABLE, "Unexpected window style.\n"); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); @@ -389,7 +391,6 @@ static void test_ownerdraw(void) ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); -todo_wine ok(ret == 42, "Unexpected item height %d.\n", ret); ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0);

1 0

Gabriel Ivăncescu : user32/tests: Test incompatible styles for LBS_NODATA.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 24b539dea8d64480f30018183dceba2907a5e061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b539dea8d64480f3001818… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:14 2018 +0200 user32/tests: Test incompatible styles for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 6e90d1d..dc5657c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -264,6 +264,7 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA } else { + todo_wine_if((style & LBS_NODATA) && strings[mi->itemID]) ok((void*)mi->itemData == strings[mi->itemID], "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); } @@ -2042,12 +2043,21 @@ static void test_WM_MEASUREITEM(void) static void test_LBS_NODATA(void) { + static const DWORD invalid_styles[] = + { + 0, + LBS_OWNERDRAWVARIABLE, + LBS_SORT, + LBS_HASSTRINGS, + LBS_OWNERDRAWFIXED | LBS_SORT, + LBS_OWNERDRAWFIXED | LBS_HASSTRINGS, + }; static const UINT invalid_idx[] = { -2, 2 }; static const UINT valid_idx[] = { 0, 1 }; static const ULONG_PTR zero_data; + HWND listbox, parent; unsigned int i; ULONG_PTR data; - HWND listbox; INT ret; listbox = CreateWindowA("listbox", "TestList", LBS_NODATA | LBS_OWNERDRAWFIXED | WS_VISIBLE, @@ -2110,6 +2120,28 @@ todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox); + + /* Invalid window style combinations. */ + parent = create_parent(); + ok(parent != NULL, "Failed to create parent window.\n"); + + for (i = 0; i < ARRAY_SIZE(invalid_styles); ++i) + { + DWORD style; + + listbox = CreateWindowA("listbox", "TestList", LBS_NODATA | WS_CHILD | invalid_styles[i], + 0, 0, 100, 100, parent, (HMENU)1, NULL, 0); + ok(listbox != NULL, "Failed to create a listbox.\n"); + + style = GetWindowLongA(listbox, GWL_STYLE); + ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); + ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); + todo_wine_if(i == 1 || i == 4) + ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); + DestroyWindow(listbox); + } + + DestroyWindow(parent); } START_TEST(listbox)

1 0

Gabriel Ivăncescu : user32/tests: Add some tests for LBS_NODATA.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 2fc9d0afd9f15d5588c0f19fb2b426f3b5623742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc9d0afd9f15d5588c0f19f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:13 2018 +0200 user32/tests: Add some tests for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 156 +++++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fc9d0afd9f15d5588c0…

1 0

Gabriel Ivăncescu : user32/tests: Add more Listbox tests for ownerdraw styles.
by Alexandre Julliard 16 Nov '18

16 Nov '18

Module: wine Branch: master Commit: 686fb7001684ea59b2d0c256c44974d46b60d243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=686fb7001684ea59b2d0c256… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:12 2018 +0200 user32/tests: Add more Listbox tests for ownerdraw styles. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 019d284..4b5d574 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -371,6 +371,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1695,7 +1724,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1725,6 +1760,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 0) + ok( GetLastError() == ERROR_SETCOUNT_ON_BAD_LB, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); }

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018