November 2018 - Wine-commits

Henri Verbeet : d3d8: Do not add map access indiscriminately in texture_init().
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: b5606045bc4b6bc38c762ffbb509aa71e09d31d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5606045bc4b6bc38c762ffb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 13:31:22 2018 +0330 d3d8: Do not add map access indiscriminately in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 7bfca86..0b86ed9 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1110,8 +1110,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1;

1 0

Wolfgang Walter : wineps: Cope correctly with a missing table.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 2b23eb2e9a4532b2c8e3d096d0c10740baa0aac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b23eb2e9a4532b2c8e3d096… Author: Wolfgang Walter <wine(a)stwm.de> Date: Mon Nov 12 10:56:10 2018 +0000 wineps: Cope correctly with a missing table. Signed-off-by: Wolfgang Walter <wine(a)stwm.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/type42.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 8a56cc6..c808ddb 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -100,10 +100,15 @@ struct tagTYPE42 { static BOOL LoadTable(HDC hdc, OTTable *table) { unsigned int i; + DWORD len; if(table->MS_tag == MS_MAKE_TAG('g','d','i','r')) return TRUE; - table->len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); - table->data = HeapAlloc(GetProcessHeap(), 0, (table->len + 3) & ~3 ); + table->len = 0; + len = GetFontData(hdc, table->MS_tag, 0, NULL, 0); + if(len == GDI_ERROR) return FALSE; + table->data = HeapAlloc(GetProcessHeap(), 0, (len + 3) & ~3); + if(!table->data) return FALSE; + table->len = len; memset(table->data + ((table->len - 1) & ~3), 0, sizeof(DWORD)); GetFontData(hdc, table->MS_tag, 0, table->data, table->len); table->check = 0;

1 0

Nikolay Sivov : d2d1: Implement GetMaximumBitmapSize().
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: b5e9896370216ed676a9185ec78ba0b934e4fceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e9896370216ed676a9185e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 12 16:15:38 2018 +0300 d2d1: Implement GetMaximumBitmapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 4 +- dlls/d2d1/tests/d2d1.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0e96224..7c39896 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1720,9 +1720,9 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_device_context_GetPixelSize(ID2D1Devi static UINT32 STDMETHODCALLTYPE d2d_device_context_GetMaximumBitmapSize(ID2D1DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return 0; + return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; } static BOOL STDMETHODCALLTYPE d2d_device_context_IsSupported(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b7d3bfa..617977f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7925,6 +7925,124 @@ todo_wine ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_max_bitmap_size(void) +{ + D2D1_RENDER_TARGET_PROPERTIES desc; + D2D1_BITMAP_PROPERTIES bitmap_desc; + IDXGISwapChain *swapchain; + ID2D1Factory *factory; + IDXGISurface *surface; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + ID2D1Bitmap *bitmap; + UINT32 bitmap_size; + unsigned int i, j; + HWND window; + HRESULT hr; + + static const struct + { + const char *name; + DWORD type; + } + device_types[] = + { + { "HW", D3D10_DRIVER_TYPE_HARDWARE }, + { "WARP", D3D10_DRIVER_TYPE_WARP }, + { "REF", D3D10_DRIVER_TYPE_REFERENCE }, + }; + static const struct + { + const char *name; + DWORD type; + } + target_types[] = + { + { "DEFAULT", D2D1_RENDER_TARGET_TYPE_DEFAULT }, + { "HW", D2D1_RENDER_TARGET_TYPE_HARDWARE }, + }; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(device_types); ++i) + { + if (FAILED(hr = D3D10CreateDevice1(NULL, device_types[i].type, NULL, D3D10_CREATE_DEVICE_BGRA_SUPPORT, + D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + { + skip("Failed to create %s d3d device, hr %#x.\n", device_types[i].name, hr); + continue; + } + + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(target_types); ++j) + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + D2D1_SIZE_U size; + + desc.type = target_types[j].type; + desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 0.0f; + desc.dpiY = 0.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &rt); + ok(SUCCEEDED(hr), "%s/%s: failed to create render target, hr %#x.\n", device_types[i].name, + target_types[j].name, hr); + + bitmap_size = ID2D1RenderTarget_GetMaximumBitmapSize(rt); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "%s/%s: unexpected bitmap size %u.\n", + device_types[i].name, target_types[j].name, bitmap_size); + + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + + size.width = bitmap_size; + size.height = 1; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + ID2D1Bitmap_Release(bitmap); + + ID2D1RenderTarget_Release(rt); + + texture_desc.Width = bitmap_size; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr) || broken(hr == E_INVALIDARG && device_types[i].type == D3D10_DRIVER_TYPE_WARP) /* Vista */, + "%s/%s: failed to create texture, hr %#x.\n", device_types[i].name, target_types[j].name, hr); + if (SUCCEEDED(hr)) + ID3D10Texture2D_Release(texture); + } + + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); + + ID3D10Device1_Release(device); + } + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7969,6 +8087,7 @@ START_TEST(d2d1) queue_test(test_invert_matrix); queue_test(test_skew_matrix); queue_test(test_command_list); + queue_test(test_max_bitmap_size); run_queued_tests(); }

1 0

Jacek Caban : wpp: Skip parsing #if expression if it's ignored anyway.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: bdea31c1772eb480165bcb9e92991a4377bb6cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdea31c1772eb480165bcb9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 20:50:15 2018 +0100 wpp: Skip parsing #if expression if it's ignored anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/ppl.l | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 243049a..1a04860 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -150,6 +150,7 @@ %x pp_macexp %x pp_if %x pp_ifd +%x pp_ifignored %x pp_endif %x pp_line %x pp_defined @@ -390,7 +391,7 @@ void pp_writestring(const char *format, ...) <pp_pp>{ws}*undef{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_ifd); return tUNDEF;} else {yy_pp_state(pp_eol);} <pp_pp>{ws}*ifdef{ws}* yy_pp_state(pp_ifd); return tIFDEF; <pp_pp>{ws}*ifndef{ws}* pp_incl_state.seen_junk--; yy_pp_state(pp_ifd); return tIFNDEF; -<pp_pp>{ws}*if{ws}* yy_pp_state(pp_if); return tIF; +<pp_pp>{ws}*if{ws}* if(yy_top_state() != pp_ignore) {yy_pp_state(pp_if);} else {yy_pp_state(pp_ifignored);} return tIF; <pp_pp>{ws}*elif{ws}* yy_pp_state(pp_if); return tELIF; <pp_pp>{ws}*else{ws}* yy_pp_state(pp_endif); return tELSE; <pp_pp>{ws}*endif{ws}* yy_pp_state(pp_endif); return tENDIF; @@ -450,6 +451,9 @@ void pp_writestring(const char *format, ...) <pp_if>\" ppy_error("String constants not allowed in conditionals"); <pp_if>. return *ppy_text; +<pp_ifignored>[^\n]+ ppy_lval.sint = 0; return tSINT; +<pp_ifignored>\n newline(1); yy_pop_state(); return tNL; + /* * Handle #ifdef, #ifndef and #undef * to get only an untranslated/unexpanded identifier

1 0

Mihail Ivanchev : include: Fixed the Unicode expansion of _sntprintf.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: f17df0543d5a19408e87cc8eb23c576aa2af6178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17df0543d5a19408e87cc8e… Author: Mihail Ivanchev <contact(a)ivanchev.net> Date: Sat Nov 10 00:16:43 2018 +0100 include: Fixed the Unicode expansion of _sntprintf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45913 Signed-off-by: Mihail Ivanchev <contact(a)ivanchev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tchar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tchar.h b/include/tchar.h index d6f2b00..9e7a846 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -95,7 +95,7 @@ extern "C" { #define _puttc WINE_tchar_routine(putc, putc, putwc) #define _puttchar WINE_tchar_routine(putchar, putchar, putwchar) #define _putts WINE_tchar_routine(puts, puts, putws) -#define _sntprintf WINE_tchar_routine(snprintf, snprintf, snwprintf) +#define _sntprintf WINE_tchar_routine(snprintf, snprintf, _snwprintf) #define _stprintf WINE_tchar_routine(sprintf, sprintf, swprintf) #define _stscanf WINE_tchar_routine(sscanf, sscanf, swscanf) #define _taccess WINE_tchar_routine(access, _access, _waccess)

1 0

André Hentschel : msi: Allow ARM64 installations.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: d5a169463b30af229368a5559b20f9ae415c3048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a169463b30af229368a555… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:13:47 2018 +0100 msi: Allow ARM64 installations. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 4 +++- dlls/msi/package.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4e61fdb..1ea6b77 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -361,7 +361,8 @@ enum platform PLATFORM_INTEL, PLATFORM_INTEL64, PLATFORM_X64, - PLATFORM_ARM + PLATFORM_ARM, + PLATFORM_ARM64 }; enum clr_version @@ -1185,6 +1186,7 @@ static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; +static const WCHAR szARM64[] = {'A','r','m','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6ac73a3..b57e89d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1208,6 +1208,7 @@ static enum platform parse_platform( const WCHAR *str ) else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64; else if (!strcmpW( str, szARM )) return PLATFORM_ARM; + else if (!strcmpW( str, szARM64 )) return PLATFORM_ARM64; return PLATFORM_UNKNOWN; } @@ -1290,6 +1291,10 @@ static UINT validate_package( MSIPACKAGE *package ) if (package->platform == PLATFORM_ARM) return ERROR_INSTALL_PLATFORM_UNSUPPORTED; #endif +#ifndef __aarch64__ + if (package->platform == PLATFORM_ARM64) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; +#endif if (package->platform == PLATFORM_X64) { if (!is_64bit && !is_wow64)

1 0

André Hentschel : include: Add IMAGE_REL_ARM64_BRANCH19.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 3aa8206b379f128944bb280d476609fa24017d38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa8206b379f128944bb280d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:13:18 2018 +0100 include: Add IMAGE_REL_ARM64_BRANCH19. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index b8a630e..9edd65e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3490,6 +3490,7 @@ typedef const IMAGE_DELAYLOAD_DESCRIPTOR *PCIMAGE_DELAYLOAD_DESCRIPTOR; #define IMAGE_REL_ARM64_TOKEN 0x000C #define IMAGE_REL_ARM64_SECTION 0x000D #define IMAGE_REL_ARM64_ADDR64 0x000E +#define IMAGE_REL_ARM64_BRANCH19 0x000F /* IA64 relocation types */ #define IMAGE_REL_IA64_ABSOLUTE 0x0000

1 0

André Hentschel : include: Add more PROCESSOR_ARCHITECTURE defines.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 2febd18e2806ffc9914a58807c45bfbdfefce73a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2febd18e2806ffc9914a5880… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:13:28 2018 +0100 include: Add more PROCESSOR_ARCHITECTURE defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 9edd65e..6b5b660 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -653,6 +653,8 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_NEUTRAL 11 #define PROCESSOR_ARCHITECTURE_ARM64 12 +#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 +#define PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 14 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF /* dwProcessorType */

1 0

Nikolay Sivov : kernel32/tests: Fix skips for implemented functions.
by Alexandre Julliard 12 Nov '18

12 Nov '18

Module: wine Branch: master Commit: 982b93148ca102e2e76421401c0288519931600d URL: https://source.winehq.org/git/wine.git/?a=commit;h=982b93148ca102e2e7642140… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 21:15:05 2018 +0300 kernel32/tests: Fix skips for implemented functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/process.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0c99fca..168bdd5 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4710,7 +4710,7 @@ static void test_GetFinalPathNameByHandleA(void) if (!pGetFinalPathNameByHandleA) { - skip("GetFinalPathNameByHandleA is missing\n"); + win_skip("GetFinalPathNameByHandleA is missing\n"); return; } @@ -4803,7 +4803,7 @@ static void test_GetFinalPathNameByHandleW(void) if (!pGetFinalPathNameByHandleW) { - skip("GetFinalPathNameByHandleW is missing\n"); + win_skip("GetFinalPathNameByHandleW is missing\n"); return; } @@ -5026,7 +5026,7 @@ static void test_post_completion(void) if (!pGetQueuedCompletionStatusEx) { - skip("GetQueuedCompletionStatusEx not available\n"); + win_skip("GetQueuedCompletionStatusEx not available\n"); CloseHandle( port ); return; } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720..fe68d28 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2117,7 +2117,7 @@ static void test_IsWow64Process(void) if (!pIsWow64Process) { - skip("IsWow64Process is not available\n"); + win_skip("IsWow64Process is not available\n"); return; } @@ -3660,7 +3660,7 @@ static void test_largepages(void) SIZE_T size; if (!pGetLargePageMinimum) { - skip("No GetLargePageMinimum support.\n"); + win_skip("No GetLargePageMinimum support.\n"); return; } size = pGetLargePageMinimum();

1 0

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

12 Nov '18

Module: wine Branch: master Commit: ed7804e714a26ea55c993a6b98faca12a3ae5280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed7804e714a26ea55c993a6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sun Nov 11 10:04:11 2018 +0300 comctl32/tests: Add more Listbox tests for ownerdraw styles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index d4bb2cc..c118047 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -433,6 +433,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(WC_LISTBOXA, "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); } @@ -1737,7 +1766,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; @@ -1767,6 +1802,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 == 1) + ok( GetLastError() == 0xdeadbeef, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); }

1 0