September 2018 - Wine-Devel

[PATCH] winex11.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/brush.c | 2 +- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/graphics.c | 6 +++--- dlls/winex11.drv/mouse.c | 6 +++--- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/pen.c | 10 +++++----- dlls/winex11.drv/systray.c | 6 +++--- dlls/winex11.drv/window.c | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 46bd2dd814..e3e5668b5a 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -169,7 +169,7 @@ static Pixmap BRUSH_DitherMono( COLORREF color ) { 0x1, 0x3 }, /* LTGRAY */ }; int gray = (30 * GetRValue(color) + 59 * GetGValue(color) + 11 * GetBValue(color)) / 100; - int idx = gray * (sizeof gray_dither/sizeof gray_dither[0] + 1)/256 - 1; + int idx = gray * (ARRAY_SIZE( gray_dither ) + 1)/256 - 1; TRACE("color=%06x -> gray=%x\n", color, gray); return XCreateBitmapFromData( gdi_display, root_window, gray_dither[idx], 2, 2 ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 296c00c3a5..a37530fdbf 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1933,12 +1933,12 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA static BOOL wait_clipboard_mutex(void) { static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + sizeof(prefix) / sizeof(WCHAR)]; + WCHAR buffer[MAX_PATH + ARRAY_SIZE( prefix )]; HANDLE mutex; memcpy( buffer, prefix, sizeof(prefix) ); if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_NAME, - buffer + sizeof(prefix) / sizeof(WCHAR), + buffer + ARRAY_SIZE( prefix ), sizeof(buffer) - sizeof(prefix), NULL )) { ERR( "failed to get winstation name\n" ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index b36ce6f267..6054f645c4 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1739,7 +1739,7 @@ static BOOL X11DRV_ClientMessage( HWND hwnd, XEvent *xev ) return FALSE; } - for (i = 0; i < sizeof(client_messages)/sizeof(client_messages[0]); i++) + for (i = 0; i < ARRAY_SIZE( client_messages ); i++) { if (event->message_type == X11DRV_Atoms[client_messages[i].atom - FIRST_XATOM]) { diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e8c59f9baf..2209053617 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1644,7 +1644,7 @@ BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) 'P','r','o','f','i','l','e','.','i','c','m',0}; HKEY hkey; DWORD required, len; - WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + sizeof(color_path)/sizeof(WCHAR)]; + WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + ARRAY_SIZE( color_path )]; unsigned char *buffer; unsigned long buflen; @@ -1653,7 +1653,7 @@ BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) GetSystemDirectoryW( fullname, MAX_PATH ); strcatW( fullname, color_path ); - len = sizeof(profile)/sizeof(WCHAR); + len = ARRAY_SIZE( profile ); if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && !RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL )) /* FIXME handle multiple values */ { @@ -1726,7 +1726,7 @@ INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) return -1; len_sysdir = GetSystemDirectoryW( sysdir, MAX_PATH ); - len_path = len_sysdir + sizeof(color_path) / sizeof(color_path[0]) - 1; + len_path = len_sysdir + ARRAY_SIZE( color_path ) - 1; len = 64; for (;;) { diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 10985c1472..d6787068a9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -986,7 +986,7 @@ static int find_fallback_shape( const char *name ) { struct cursor_font_fallback *fallback; - if ((fallback = bsearch( name, fallbacks, sizeof(fallbacks) / sizeof(fallbacks[0]), + if ((fallback = bsearch( name, fallbacks, ARRAY_SIZE( fallbacks ), sizeof(*fallback), fallback_cmp ))) return fallback->shape; return -1; @@ -1038,9 +1038,9 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) if (info->szResName[0]) goto done; /* only integer resources are supported here */ if (!(module = GetModuleHandleW( info->szModName ))) goto done; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + if (i == ARRAY_SIZE( module_cursors )) goto done; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0b0fd5179a..13a1da32ea 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -555,7 +555,7 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) return TRUE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( opengl_func_names ); i++) { if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( opengl_handle, opengl_func_names[i], NULL, 0 ))) { diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index c6a15daabf..6df26597b9 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -108,27 +108,27 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte switch(logpen.lopnStyle & PS_STYLE_MASK) { case PS_DASH: - physDev->pen.dash_len = sizeof(PEN_dash)/sizeof(*PEN_dash); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dash ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dash : PEN_dash, physDev->pen.dash_len); break; case PS_DOT: - physDev->pen.dash_len = sizeof(PEN_dot)/sizeof(*PEN_dot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dot : PEN_dot, physDev->pen.dash_len); break; case PS_DASHDOT: - physDev->pen.dash_len = sizeof(PEN_dashdot)/sizeof(*PEN_dashdot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dashdot : PEN_dashdot, physDev->pen.dash_len); break; case PS_DASHDOTDOT: - physDev->pen.dash_len = sizeof(PEN_dashdotdot)/sizeof(*PEN_dashdotdot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdotdot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dashdotdot : PEN_dashdotdot, physDev->pen.dash_len); break; case PS_ALTERNATE: - physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate); + physDev->pen.dash_len = ARRAY_SIZE( PEN_alternate ); memcpy(physDev->pen.dashes, PEN_alternate, physDev->pen.dash_len); break; case PS_USERSTYLE: diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index da322e0436..d4262c43cf 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -772,13 +772,13 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0a4f118c34..7a3b340e19 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1530,7 +1530,7 @@ static void create_whole_window( struct x11drv_win_data *data ) SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window ); /* set the window text */ - if (!InternalGetWindowText( data->hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + if (!InternalGetWindowText( data->hwnd, text, ARRAY_SIZE( text ))) text[0] = 0; sync_window_text( data->display, data->whole_window, text ); /* set the window region */ -- 2.14.4

1 0

[PATCH 3/3] dxgi/tests: Avoid "skipping tests" in skip() messages.
by Józef Kucia Sept. 19, 2018

Sept. 19, 2018

skip() prints "Tests skipped:". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 62070e0bcf20..d1908ac1c2b8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -643,7 +643,7 @@ static void test_adapter_desc(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -884,7 +884,7 @@ static void test_create_surface(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -922,7 +922,7 @@ static void test_parents(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -947,7 +947,7 @@ static void test_parents(void) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter has not outputs, skipping output tests.\n"); + skip("Adapter has not outputs.\n"); } else { @@ -990,7 +990,7 @@ static void test_output(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1000,7 +1000,7 @@ static void test_output(void) hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) { - skip("Adapter doesn't have any outputs, skipping tests.\n"); + skip("Adapter doesn't have any outputs.\n"); IDXGIAdapter_Release(adapter); IDXGIDevice_Release(device); return; @@ -1076,7 +1076,7 @@ static void test_output(void) } else { - skip("Not enough modes for test, skipping.\n"); + skip("Not enough modes for test.\n"); } heap_free(modes); @@ -1308,7 +1308,7 @@ static void test_create_swapchain(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2916,7 +2916,7 @@ static void test_private_data(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3489,7 +3489,7 @@ static void test_swapchain_parameters(void) if (!(device = create_device(0))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } window = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, -- 2.16.4

2 1

[PATCH 2/3] dxgi/tests: Add test for swapchain window styles.
by Józef Kucia Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8c41eab41cfe..62070e0bcf20 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4480,6 +4480,145 @@ done: UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_swapchain_window_styles(void) +{ + LONG style, exstyle, fullscreen_style, fullscreen_exstyle; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const struct + { + LONG style, exstyle; + LONG expected_style, expected_exstyle; + } + tests[] = + { + {WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, 0, + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPSIBLINGS, + WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE, 0, + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPSIBLINGS | WS_VISIBLE, + WS_EX_WINDOWEDGE}, + {WS_OVERLAPPED | WS_VISIBLE, 0, + WS_OVERLAPPED | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_DISABLED, WS_EX_TOPMOST, + WS_CAPTION | WS_DISABLED | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_DISABLED | WS_VISIBLE, WS_EX_TOPMOST, + WS_CAPTION | WS_DISABLED | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_SYSMENU | WS_VISIBLE, WS_EX_APPWINDOW, + WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE}, + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + swapchain_desc.OutputWindow = CreateWindowExA(tests[i].exstyle, "static", "dxgi_test", + tests[i].style, 0, 0, 400, 200, 0, 0, 0, 0); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + fullscreen_style = tests[i].expected_style & (WS_VISIBLE | WS_DISABLED | WS_CLIPSIBLINGS); + fullscreen_exstyle = (tests[i].expected_exstyle & WS_EX_APPWINDOW) | WS_EX_TOPMOST; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to set fullscreen state, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine + ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, fullscreen_style); + ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, fullscreen_exstyle); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + skip("Test %u: Could not change fullscreen state.\n", i); + } + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + DestroyWindow(swapchain_desc.OutputWindow); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4574,6 +4713,7 @@ START_TEST(dxgi) test_inexact_modes(); test_swapchain_parameters(); test_swapchain_window_messages(); + test_swapchain_window_styles(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); -- 2.16.4

3 2

[PATCH 1/3] dxgi/tests: Add test for swapchain window messages.
by Józef Kucia Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- With some tweaks wined3d passes the test. --- dlls/dxgi/tests/dxgi.c | 276 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 9ab247254922..8c41eab41cfe 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2152,9 +2152,9 @@ static void test_set_fullscreen(void) ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); check_swapchain_fullscreen_state(swapchain, &initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || - broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ - "SetFullscreenState failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "SetFullscreenState failed, hr %#x.\n", hr); if (FAILED(hr)) { skip("Could not change fullscreen state.\n"); @@ -4211,6 +4211,275 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + int diff = 200; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +struct message +{ + unsigned int message; + BOOL check_wparam; + WPARAM expect_wparam; +}; + +static BOOL expect_no_messages; +static const struct message *expect_messages; +static const struct message *expect_messages_broken; + +static BOOL check_message(const struct message *expected, + HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + if (expected->message != message) + return FALSE; + + if (expected->check_wparam) + { + ok(wparam == expected->expect_wparam, + "Got unexpected wparam %lx for message %x, expected %lx.\n", + wparam, message, expected->expect_wparam); + } + + return TRUE; +} + +static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#lx, lparam %#lx.\n", + message, hwnd, wparam, lparam); + + if (expect_messages) + { + if (check_message(expect_messages, hwnd, message, wparam, lparam)) + ++expect_messages; + } + + if (expect_messages_broken) + { + if (check_message(expect_messages_broken, hwnd, message, wparam, lparam)) + ++expect_messages_broken; + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_swapchain_window_messages(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + DXGI_MODE_DESC mode_desc; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + WNDCLASSA wc; + HWND window; + HRESULT hr; + + static const struct message enter_fullscreen_messages[] = + { + {WM_STYLECHANGING, TRUE, GWL_STYLE}, + {WM_STYLECHANGED, TRUE, GWL_STYLE}, + {WM_STYLECHANGING, TRUE, GWL_EXSTYLE}, + {WM_STYLECHANGED, TRUE, GWL_EXSTYLE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_GETMINMAXINFO, FALSE, 0}, + {WM_NCCALCSIZE, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_MOVE, FALSE, 0}, + {WM_SIZE, FALSE, 0}, + {0, FALSE, 0}, + }; + static const struct message enter_fullscreen_messages_vista[] = + { + {WM_STYLECHANGING, TRUE, GWL_STYLE}, + {WM_STYLECHANGED, TRUE, GWL_STYLE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_NCCALCSIZE, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_MOVE, FALSE, 0}, + {WM_SIZE, FALSE, 0}, + {WM_STYLECHANGING, TRUE, GWL_EXSTYLE}, + {WM_STYLECHANGED, TRUE, GWL_EXSTYLE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_GETMINMAXINFO, FALSE, 0}, + {WM_NCCALCSIZE, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, FALSE, 0}, + {0, FALSE, 0}, + }; + static const struct message leave_fullscreen_messages[] = + { + {WM_STYLECHANGING, TRUE, GWL_STYLE}, + {WM_STYLECHANGED, TRUE, GWL_STYLE}, + {WM_STYLECHANGING, TRUE, GWL_EXSTYLE}, + {WM_STYLECHANGED, TRUE, GWL_EXSTYLE}, + {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_GETMINMAXINFO, FALSE, 0}, + {WM_NCCALCSIZE, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_MOVE, FALSE, 0}, + {WM_SIZE, FALSE, 0}, + {0, FALSE, 0}, + }; + static const struct message resize_target_messages[] = + { + {WM_WINDOWPOSCHANGING, FALSE, 0}, + {WM_GETMINMAXINFO, FALSE, 0}, + {WM_NCCALCSIZE, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FALSE, 0}, + {WM_SIZE, FALSE, 0}, + {0, FALSE, 0}, + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = test_wndproc; + wc.lpszClassName = "dxgi_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + window = CreateWindowA("dxgi_test_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!window, "Failed to create window.\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = window; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + /* create swapchain */ + flush_events(); + expect_no_messages = TRUE; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + flush_events(); + expect_no_messages = FALSE; + + /* resize target */ + expect_messages = resize_target_messages; + memset(&mode_desc, 0, sizeof(mode_desc)); + mode_desc.Width = 800; + mode_desc.Width = 600; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + flush_events(); + ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); + + expect_messages = resize_target_messages; + memset(&mode_desc, 0, sizeof(mode_desc)); + mode_desc.Width = 400; + mode_desc.Width = 200; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + flush_events(); + ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); + + /* enter fullscreen */ + expect_messages = enter_fullscreen_messages; + expect_messages_broken = enter_fullscreen_messages_vista; + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to enter fullscreen, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + goto done; + } + flush_events(); + todo_wine + ok(!expect_messages->message || broken(!expect_messages_broken->message), + "Expected message %#x or %#x.\n", + expect_messages->message, expect_messages_broken->message); + expect_messages_broken = NULL; + + /* leave fullscreen */ + expect_messages = leave_fullscreen_messages; + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + flush_events(); + todo_wine + ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); + expect_messages = NULL; + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + /* create fullscreen swapchain */ + DestroyWindow(window); + window = CreateWindowA("dxgi_test_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!window, "Failed to create window.\n"); + swapchain_desc.OutputWindow = window; + swapchain_desc.Windowed = FALSE; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + flush_events(); + + expect_messages = enter_fullscreen_messages; + expect_messages_broken = enter_fullscreen_messages_vista; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + flush_events(); + todo_wine + ok(!expect_messages->message || broken(!expect_messages_broken->message), + "Expected message %#x or %#x.\n", + expect_messages->message, expect_messages_broken->message); + expect_messages_broken = NULL; + + /* leave fullscreen */ + expect_messages = leave_fullscreen_messages; + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + flush_events(); + todo_wine + ok(!expect_messages->message, "Expected message %#x.\n", expect_messages->message); + expect_messages = NULL; + +done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(window); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4304,6 +4573,7 @@ START_TEST(dxgi) test_resize_target(); test_inexact_modes(); test_swapchain_parameters(); + test_swapchain_window_messages(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); -- 2.16.4

2 1

[PATCH] comctl32: Add NULL checks to SetWindowSubclass (Valgrind)
by Sven Baars Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- Without these checks I found memory leaks in for instance updown.c dlls/comctl32/commctrl.c | 3 +++ dlls/comctl32/tests/subclass.c | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 45b93bdc8b..c228b647f8 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1082,6 +1082,9 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, TRACE ("(%p, %p, %lx, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef); + if (!hWnd || !pfnSubclass) + return FALSE; + /* Since the window procedure that we set here has two additional arguments, * we can't simply set it as the new window procedure of the window. So we * set our own window procedure and then calculate the other two arguments diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 75a134352e..41ba06560a 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -218,46 +218,61 @@ static LRESULT WINAPI wnd_proc_sub(HWND hwnd, UINT message, WPARAM wParam, LPARA static void test_subclass(void) { + BOOL ret; HWND hwnd = CreateWindowExA(0, "TestSubclass", "Test subclass", WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); ok(hwnd != NULL, "failed to create test subclass wnd\n"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 0); SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_BasicTest, "Basic"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 2, DELETE_SELF); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, DELETE_SELF); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_DeletedTest, "Deleted"); SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_AfterDeletedTest, "After Deleted"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 0); + ok(ret == TRUE, "Expected TRUE\n"); orig_proc_3 = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)wnd_proc_3); SendMessageA(hwnd, WM_USER, 1, 0); SendMessageA(hwnd, WM_USER, 2, 0); ok_sequence(Sub_OldAfterNewTest, "Old after New"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 0); ok_sequence(Sub_MixTest, "Mix"); /* Now the fun starts */ - pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixAndNestTest, "Mix and nest"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST | DELETE_SELF); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 4, SEND_NEST | DELETE_SELF); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixNestDelTest, "Mix, nest, del"); - pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); - pSetWindowSubclass(hwnd, wnd_proc_sub, 5, DELETE_PREV); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 4, 0); + ok(ret == TRUE, "Expected TRUE\n"); + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 5, DELETE_PREV); + ok(ret == TRUE, "Expected TRUE\n"); SendMessageA(hwnd, WM_USER, 1, 1); ok_sequence(Sub_MixDelPrevTest, "Mix and del prev"); + ret = pSetWindowSubclass(NULL, wnd_proc_sub, 1, 0); + ok(ret == FALSE, "Expected FALSE\n"); + + ret = pSetWindowSubclass(hwnd, NULL, 1, 0); + ok(ret == FALSE, "Expected FALSE\n"); + DestroyWindow(hwnd); } -- 2.17.1

1 0

[PATCH 2/2] winhttp: Set last error in WinHttpQueryAuthSchemes when no auth scheme is found.
by Jacek Caban Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)

3 2

[PATCH 1/2] winhttp: Modify index only if query_headers succeeded.
by Jacek Caban Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/request.c | 3 +-- dlls/winhttp/tests/winhttp.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-)

3 3

[PATCH 1/4] comctl32/listbox: SetCount must fail if LBS_NODATA is not set
by Gabriel Ivăncescu Sept. 19, 2018

Sept. 19, 2018

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

2 5

[PATCH 1/2] comctl32/listbox: Optimize SetCount partly
by Gabriel Ivăncescu Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The case where count < descr->nb_items isn't really optimal, just stops redrawing right now. The other case (growing) should be optimal now, though. dlls/comctl32/listbox.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..01588bb 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1758,18 +1758,31 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) return LB_ERR; } - /* FIXME: this is far from optimal... */ if (count > descr->nb_items) { - while (count > descr->nb_items) - if ((ret = LISTBOX_InsertString( descr, -1, 0 )) < 0) - return ret; + INT num = descr->nb_items; + if ((ret = LISTBOX_InitStorage(descr, count - num)) != LB_OKAY) + return ret; + memset(&descr->items[num], 0, (count - num) * sizeof(*descr->items)); + descr->nb_items = count; + + LISTBOX_UpdateScroll(descr); + LISTBOX_InvalidateItems(descr, num); + + /* If listbox was empty, set focus to the first item */ + if (count == 1) LISTBOX_SetCaretIndex(descr, 0, FALSE); } else if (count < descr->nb_items) { + /* FIXME: This is not really optimal */ + DWORD oldstyle = descr->style; + LISTBOX_SetRedraw(descr, FALSE); + while (count < descr->nb_items) if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) - return ret; + break; + if (!(oldstyle & LBS_NOREDRAW)) LISTBOX_SetRedraw(descr, TRUE); + if (ret < 0) return ret; } InvalidateRect( descr->self, NULL, TRUE ); -- 1.9.1

2 9

[PATCH v2 1/2] comctl32/listbox: Fix InitStorage heap extension
by Gabriel Ivăncescu Sept. 19, 2018

Sept. 19, 2018

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Assume LB_ARRAY_GRANULARITY is a power of 2 and note it in the comments. Only increase the item array if we actually have to. Previously, sending for example just 1 to nb_items repeatedly would always increase the array by LB_ARRAY_GRANULARITY, even if there was plenty of space. dlls/comctl32/listbox.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2137ef8..5c171ab 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(listbox); -/* Items array granularity */ +/* Items array granularity; must be a power of 2 */ #define LB_ARRAY_GRANULARITY 16 /* Scrolling timeout in ms */ @@ -673,16 +673,18 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) { LB_ITEMDATA *item; - nb_items += LB_ARRAY_GRANULARITY - 1; - nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - item = HeapReAlloc( GetProcessHeap(), 0, descr->items, - nb_items * sizeof(LB_ITEMDATA)); + nb_items += descr->nb_items; + if (nb_items > HeapSize(GetProcessHeap(), 0, descr->items) / sizeof(*item)) + { + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapReAlloc(GetProcessHeap(), 0, descr->items, n * sizeof(*item)); + } + else return LB_OKAY; } else { - item = HeapAlloc( GetProcessHeap(), 0, - nb_items * sizeof(LB_ITEMDATA)); + UINT n = (nb_items + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); + item = HeapAlloc(GetProcessHeap(), 0, n * sizeof(*item)); } if (!item) -- 1.9.1

1 1