March 2024 - Wine-Commits - list.winehq.org

Paul Gofman : cryptowinrt: Force debug info in critical sections.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 8d933bf1870133d8f9915fe06c6538c09e6c7269 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d933bf1870133d8f9915fe06c6538… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 7 16:24:34 2024 -0600 cryptowinrt: Force debug info in critical sections. --- dlls/cryptowinrt/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptowinrt/async.c b/dlls/cryptowinrt/async.c index dbf111cc880..5c3d718ae2d 100644 --- a/dlls/cryptowinrt/async.c +++ b/dlls/cryptowinrt/async.c @@ -355,7 +355,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param ); - InitializeCriticalSection( &impl->cs ); + InitializeCriticalSectionEx( &impl->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); impl->cs.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": async_info.cs" ); *out = &impl->IWineAsyncInfoImpl_iface;

1 0

Paul Gofman : diasymreader: Force debug info in critical sections.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 63ff75cf1205436cf96d3b1da0d108f26f889471 URL: https://gitlab.winehq.org/wine/wine/-/commit/63ff75cf1205436cf96d3b1da0d108… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 7 16:25:57 2024 -0600 diasymreader: Force debug info in critical sections. --- dlls/diasymreader/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 55e0615c58e..bbf5b45dcfa 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -602,7 +602,7 @@ HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) This->iface.lpVtbl = &SymWriter_Vtbl; This->IPdbWriter_iface.lpVtbl = &SymWriter_PdbWriter_Vtbl; This->ref = 1; - InitializeCriticalSection(&This->lock); + InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SymWriter.lock"); UuidCreate(&This->pdb_guid); This->pdb_age = 1;

1 0

Zhiyi Zhang : win32u: Support HiDPI for the non-client close button in WS_EX_TOOLWINDOW windows.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 2f094cbfe6439fe6c5e2860ac4254bcbe54ac72f URL: https://gitlab.winehq.org/wine/wine/-/commit/2f094cbfe6439fe6c5e2860ac4254b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 14 12:27:02 2024 +0800 win32u: Support HiDPI for the non-client close button in WS_EX_TOOLWINDOW windows. --- dlls/win32u/defwnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index cf3af86d161..744f4527dc6 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1462,8 +1462,8 @@ static void draw_close_button( HWND hwnd, HDC hdc, BOOL down, BOOL grayed ) { /* Windows does not use SM_CXSMSIZE and SM_CYSMSIZE * it uses 11x11 for the close button in tool window */ - const int bmp_height = 11; - const int bmp_width = 11; + int bmp_height = muldiv( 11, get_dpi_for_window( hwnd ), 96 ); + int bmp_width = bmp_height; int caption_height = get_system_metrics( SM_CYSMCAPTION ); rect.top = rect.top + (caption_height - 1 - bmp_height) / 2;

1 0

Nikolay Sivov : d3d10_1/tests: Remove todo from now passing test.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: a5a0bc10f9e8688c2f3f32486a84fcf995e4a3e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5a0bc10f9e8688c2f3f32486a84fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:58:41 2024 +0100 d3d10_1/tests: Remove todo from now passing test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 105a7d46dfb..e3cd3943594 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1074,7 +1074,6 @@ static void test_compile_effect(void) /* Compilation fails due to 10.1 feature incompatibility with fx_4_0 profile. */ hr = D3D10CompileEffectFromMemory(bs_source2, strlen(bs_source2), NULL, NULL, NULL, 0, 0, &blob, NULL); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); }

1 0

Nikolay Sivov : d3dx10/tests: Remove todo's from now passing tests.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: e91243a94e8772e13ae1cb7ddef042bc65e61bec URL: https://gitlab.winehq.org/wine/wine/-/commit/e91243a94e8772e13ae1cb7ddef042… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:56:02 2024 +0100 d3dx10/tests: Remove todo's from now passing tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 45 +++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 5853669d9c5..f7f2e2e32f8 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -4375,11 +4375,10 @@ static void test_create_effect_from_memory(void) effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromMemory(test_fx_source, strlen(test_fx_source) + 1, NULL, NULL, NULL, "fx_4_0", 0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); - todo_wine ok(!!effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); - if (hr == S_OK) - effect->lpVtbl->Release(effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!errors, "Got unexpected errors %p.\n", errors); + ok(!!effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device); ok(!refcount, "Got unexpected refcount %lu.\n", refcount); @@ -4465,21 +4464,19 @@ static void test_create_effect_from_file(void) effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromFileW(path, NULL, NULL, "fx_4_0", 0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); - todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); - if (hr == S_OK) - effect->lpVtbl->Release(effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!errors, "Got unexpected errors %p.\n", errors); + ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); + effect->lpVtbl->Release(effect); errors = (ID3D10Blob *)0xdeadbeef; effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromFileA(get_str_a(path), NULL, NULL, "fx_4_0", 0x0, 0x0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); - todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); - if (hr == S_OK) - effect->lpVtbl->Release(effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!errors, "Got unexpected errors %p.\n", errors); + ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); + effect->lpVtbl->Release(effect); delete_file(test_file_name); @@ -4584,21 +4581,19 @@ static void test_create_effect_from_resource(void) effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromResourceW(resource_module, test_resource_name, NULL, NULL, NULL, "fx_4_0", 0, 0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); - todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); - if (hr == S_OK) - effect->lpVtbl->Release(effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!errors, "Got unexpected errors %p.\n", errors); + ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); + effect->lpVtbl->Release(effect); errors = (ID3D10Blob *)0xdeadbeef; effect = (ID3D10Effect *)0xdeadbeef; hr = D3DX10CreateEffectFromResourceA(resource_module, get_str_a(test_resource_name), NULL, NULL, NULL, "fx_4_0", 0, 0, device, NULL, NULL, &effect, &errors, NULL); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(!errors, "Got unexpected errors %p.\n", errors); - todo_wine ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); - if (hr == S_OK) - effect->lpVtbl->Release(effect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!errors, "Got unexpected errors %p.\n", errors); + ok(effect && effect != (ID3D10Effect *)0xdeadbeef, "Got unexpected effect %p.\n", effect); + effect->lpVtbl->Release(effect); delete_resource_module(test_resource_name, resource_module);

1 0

Nikolay Sivov : wshom/network: Check pointer argument in get_UserName().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 866cb1ca6382f2b7bbc44ecf167bf12415a586e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/866cb1ca6382f2b7bbc44ecf167bf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:12:01 2024 +0100 wshom/network: Check pointer argument in get_UserName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 3 +++ dlls/wshom.ocx/tests/wshom.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index ef7f5e52808..f2a88c2117f 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -126,6 +126,9 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n TRACE("%p, %p.\n", iface, user_name); + if (!user_name) + return E_POINTER; + GetUserNameW(NULL, &len); *user_name = SysAllocStringLen(NULL, len-1); if (!*user_name) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 3e124b218c6..ed0f4e186a3 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -710,6 +710,9 @@ static void test_wshnetwork(void) hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&nw2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IWshNetwork2_get_UserName(nw2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + str = NULL; hr = IWshNetwork2_get_UserName(nw2, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : wshom/network: Implement GetTypeInfo().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 2c325f8bd3d035e719b026d06199f87c0b1d95ab URL: https://gitlab.winehq.org/wine/wine/-/commit/2c325f8bd3d035e719b026d06199f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:02:22 2024 +0100 wshom/network: Implement GetTypeInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index fd022f14045..86c68ff8830 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -69,8 +69,9 @@ static HRESULT WINAPI WshNetwork2_GetTypeInfoCount(IWshNetwork2 *iface, UINT *pc static HRESULT WINAPI WshNetwork2_GetTypeInfo(IWshNetwork2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - FIXME("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IWshNetwork2_tid, ppTInfo); } static HRESULT WINAPI WshNetwork2_GetIDsOfNames(IWshNetwork2 *iface, REFIID riid, LPOLESTR *rgszNames,

1 0

Nikolay Sivov : wshom/network: Implement ComputerName() property.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: 30e5111dd53d765b5aac62a9467bc7333f9690b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/30e5111dd53d765b5aac62a9467bc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:10:12 2024 +0100 wshom/network: Implement ComputerName() property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56434 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 27 ++++++++++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 29 ++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index 86c68ff8830..ef7f5e52808 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -124,7 +124,7 @@ static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_n BOOL ret; DWORD len = 0; - TRACE("%p\n", user_name); + TRACE("%p, %p.\n", iface, user_name); GetUserNameW(NULL, &len); *user_name = SysAllocStringLen(NULL, len-1); @@ -151,9 +151,30 @@ static HRESULT WINAPI WshNetwork2_get_UserProfile(IWshNetwork2 *iface, BSTR *use static HRESULT WINAPI WshNetwork2_get_ComputerName(IWshNetwork2 *iface, BSTR *name) { - FIXME("%p stub\n", name); + HRESULT hr = S_OK; + DWORD len = 0; + BOOL ret; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, name); + + if (!name) + return E_POINTER; + + GetComputerNameW(NULL, &len); + *name = SysAllocStringLen(NULL, len - 1); + if (!*name) + return E_OUTOFMEMORY; + + ret = GetComputerNameW(*name, &len); + if (!ret) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + SysFreeString(*name); + *name = NULL; + return hr; + } + + return S_OK; } static HRESULT WINAPI WshNetwork2_get_Organization(IWshNetwork2 *iface, BSTR *name) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 5212dd83b5c..3e124b218c6 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -693,7 +693,7 @@ static void test_wshnetwork(void) { IDispatch *disp; IWshNetwork2 *nw2; - BSTR str,username; + BSTR str, name; HRESULT hr; DWORD len = 0; BOOL ret; @@ -717,13 +717,32 @@ static void test_wshnetwork(void) CHECK_BSTR_LENGTH(str); GetUserNameW(NULL, &len); ok(len > 0, "Unexpected len %ld.\n", len); - username = SysAllocStringLen(NULL, len-1); - ret = GetUserNameW(username, &len); + name = SysAllocStringLen(NULL, len-1); + ret = GetUserNameW(name, &len); ok(ret == TRUE, "GetUserNameW returned %d.\n", ret); - ok(!wcscmp(str,username), "user names do not match %s %s.\n", debugstr_w(str), debugstr_w(username)); - SysFreeString(username); + ok(!wcscmp(str, name), "User names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name)); + SysFreeString(name); + SysFreeString(str); + + hr = IWshNetwork2_get_ComputerName(nw2, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IWshNetwork2_get_ComputerName(nw2, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(str && str[0] != 0, "Got empty string.\n"); + CHECK_BSTR_LENGTH(str); + len = 0; + GetComputerNameW(NULL, &len); + ok(len > 0, "Unexpected length %ld.\n", len); + name = SysAllocStringLen(NULL, len - 1); + ret = GetComputerNameW(name, &len); + ok(ret, "GetComputerName() failed %ld.\n", GetLastError()); + ok(!wcscmp(str, name), "Computer names do not match %s, %s.\n", debugstr_w(str), debugstr_w(name)); + SysFreeString(name); SysFreeString(str); + IWshNetwork2_Release(nw2); IDispatch_Release(disp); }

1 0

Nikolay Sivov : wshom/network: Use TRACE() for implemented method.
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: fcce3920668ee43683cb60289ebf61ee2a6e31c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcce3920668ee43683cb60289ebf61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 13:00:19 2024 +0100 wshom/network: Use TRACE() for implemented method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index 42ed61ffe01..fd022f14045 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -258,7 +258,7 @@ static IWshNetwork2 WshNetwork2 = { &WshNetwork2Vtbl }; HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), ppv); return IWshNetwork2_QueryInterface(&WshNetwork2, riid, ppv); }

1 0

Dmitry Timoshkov : comctl32: Implement IImageList2::Initialize().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: wine Branch: master Commit: ee3b9be8e25e58b167efa18d1c7908908c231de3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee3b9be8e25e58b167efa18d1c7908… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 14:13:52 2024 +0300 comctl32: Implement IImageList2::Initialize(). ... by moving ImageList_Create() implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/imagelist.c | 193 ++++++++++++++++++++-------------------- dlls/comctl32/tests/imagelist.c | 2 - 2 files changed, 98 insertions(+), 97 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 85bb2fe0026..49155e8d2c1 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -763,106 +763,18 @@ HIMAGELIST WINAPI ImageList_Create (INT cx, INT cy, UINT flags, INT cInitial, INT cGrow) { - HIMAGELIST himl; - INT nCount; - HBITMAP hbmTemp; - UINT ilc = (flags & 0xFE); - static const WORD aBitBlend25[] = - {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00}; - - static const WORD aBitBlend50[] = - {0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA}; + IImageList2 *himl; TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); - if (cx < 0 || cy < 0) return NULL; - if (!((flags&ILC_COLORDDB) == ILC_COLORDDB) && (cx == 0 || cy == 0)) return NULL; - /* Create the IImageList interface for the image list */ - if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) + if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList2, (void **)&himl))) return NULL; - cGrow = (WORD)((max( cGrow, 1 ) + 3) & ~3); - - if (cGrow > 256) - { - /* Windows doesn't limit the size here, but X11 doesn't let us allocate such huge bitmaps */ - WARN( "grow %d too large, limiting to 256\n", cGrow ); - cGrow = 256; - } - - himl->cx = cx; - himl->cy = cy; - himl->flags = flags; - himl->cMaxImage = cInitial + 1; - himl->cInitial = cInitial; - himl->cGrow = cGrow; - himl->clrFg = CLR_DEFAULT; - himl->clrBk = CLR_NONE; - himl->color_table_set = FALSE; - - /* initialize overlay mask indices */ - for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) - himl->nOvlIdx[nCount] = -1; - - /* Create Image & Mask DCs */ - himl->hdcImage = CreateCompatibleDC (0); - if (!himl->hdcImage) - goto cleanup; - if (himl->flags & ILC_MASK){ - himl->hdcMask = CreateCompatibleDC(0); - if (!himl->hdcMask) - goto cleanup; - } - - /* Default to ILC_COLOR4 if none of the ILC_COLOR* flags are specified */ - if (ilc == ILC_COLOR) - { - ilc = ILC_COLOR4; - himl->flags |= ILC_COLOR4; - } - - if (ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) - himl->uBitsPixel = ilc; - else - himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); - - if (himl->cMaxImage > 0) { - himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); - SelectObject(himl->hdcImage, himl->hbmImage); - } else - himl->hbmImage = 0; - - if ((himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) { - SIZE sz; - - imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz); - himl->hbmMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); - if (himl->hbmMask == 0) { - ERR("Error creating mask bitmap!\n"); - goto cleanup; - } - SelectObject(himl->hdcMask, himl->hbmMask); - } - else - himl->hbmMask = 0; - - himl->item_flags = Alloc( himl->cMaxImage * sizeof(*himl->item_flags) ); - - /* create blending brushes */ - hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); - himl->hbrBlend25 = CreatePatternBrush (hbmTemp); - DeleteObject (hbmTemp); - - hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend50); - himl->hbrBlend50 = CreatePatternBrush (hbmTemp); - DeleteObject (hbmTemp); - - TRACE("created imagelist %p\n", himl); - return himl; + if (IImageList2_Initialize(himl, cx, cy, flags, cInitial, cGrow) == S_OK) + return (HIMAGELIST)himl; -cleanup: - ImageList_Destroy(himl); + IImageList2_Release(himl); return NULL; } @@ -3721,8 +3633,99 @@ static HRESULT WINAPI ImageListImpl_GetStatistics(IImageList2 *iface, IMAGELISTS static HRESULT WINAPI ImageListImpl_Initialize(IImageList2 *iface, INT cx, INT cy, UINT flags, INT initial, INT grow) { - FIXME("(%p)->(%d %d %d %d %d): stub\n", iface, cx, cy, flags, initial, grow); - return E_NOTIMPL; + HIMAGELIST himl = impl_from_IImageList2(iface); + INT nCount; + HBITMAP hbmTemp; + UINT ilc = (flags & 0xFE); + static const WORD aBitBlend25[] = + {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00}; + static const WORD aBitBlend50[] = + {0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA}; + + TRACE("(%p)->(%d %d %d %d %d)\n", iface, cx, cy, flags, initial, grow); + + if (cx < 0 || cy < 0) return E_INVALIDARG; + if (!((flags&ILC_COLORDDB) == ILC_COLORDDB) && (cx == 0 || cy == 0)) return E_INVALIDARG; + + grow = (WORD)((max( grow, 1 ) + 3) & ~3); + + if (grow > 256) + { + /* Windows doesn't limit the size here, but X11 doesn't let us allocate such huge bitmaps */ + WARN( "grow %d too large, limiting to 256\n", grow ); + grow = 256; + } + + himl->cx = cx; + himl->cy = cy; + himl->flags = flags; + himl->cMaxImage = initial + 1; + himl->cInitial = initial; + himl->cGrow = grow; + himl->clrFg = CLR_DEFAULT; + himl->clrBk = CLR_NONE; + himl->color_table_set = FALSE; + + /* initialize overlay mask indices */ + for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) + himl->nOvlIdx[nCount] = -1; + + /* Create Image & Mask DCs */ + himl->hdcImage = CreateCompatibleDC (0); + if (!himl->hdcImage) + return E_FAIL; + if (himl->flags & ILC_MASK){ + himl->hdcMask = CreateCompatibleDC(0); + if (!himl->hdcMask) + return E_FAIL; + } + + /* Default to ILC_COLOR4 if none of the ILC_COLOR* flags are specified */ + if (ilc == ILC_COLOR) + { + ilc = ILC_COLOR4; + himl->flags |= ILC_COLOR4; + } + + if (ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) + himl->uBitsPixel = ilc; + else + himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); + + if (himl->cMaxImage > 0) { + himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); + SelectObject(himl->hdcImage, himl->hbmImage); + } else + himl->hbmImage = 0; + + if ((himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) { + SIZE sz; + + imagelist_get_bitmap_size(himl, himl->cMaxImage, &sz); + himl->hbmMask = CreateBitmap (sz.cx, sz.cy, 1, 1, NULL); + if (himl->hbmMask == 0) { + ERR("Error creating mask bitmap!\n"); + return E_FAIL; + } + SelectObject(himl->hdcMask, himl->hbmMask); + } + else + himl->hbmMask = 0; + + himl->item_flags = Alloc( himl->cMaxImage * sizeof(*himl->item_flags) ); + + /* create blending brushes */ + hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); + himl->hbrBlend25 = CreatePatternBrush (hbmTemp); + DeleteObject (hbmTemp); + + hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend50); + himl->hbrBlend50 = CreatePatternBrush (hbmTemp); + DeleteObject (hbmTemp); + + TRACE("created imagelist %p\n", himl); + return S_OK; + } static HRESULT WINAPI ImageListImpl_Replace2(IImageList2 *iface, INT i, HBITMAP image, HBITMAP mask, IUnknown *unk, DWORD flags) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 6caea741df8..de0b0dd4c08 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1745,9 +1745,7 @@ static void test_iimagelist(void) } hr = IImageList2_Initialize(imagelist, BMP_CX, BMP_CX, ILC_COLOR24, 1, 1); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (hr != S_OK) return; check_iml_data((HIMAGELIST)imagelist, BMP_CX, BMP_CX, 0, 2, 1, ILC_COLOR24, "IImageList2 0");

1 0