December 2021 - Wine-commits

Alexandre Julliard : Release 7.0-rc2.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 2f5f8b4bd4cb5771223d1ee96a55002d18ad01eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5f8b4bd4cb5771223d1ee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 486 ++++++++++++++++++++------------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 169 insertions(+), 338 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f5f8b4bd4cb5771223d…

1 0

Tag wine-7.0-rc2 : Alexandre Julliard : Release 7.0-rc2
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: refs/tags/wine-7.0-rc2 Tag: 4361b9ac6bb238f1088ee28719bd0b4cbb622416 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4361b9ac6bb238f1088ee28719b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 22:13:07 2021 +0100 Release 7.0-rc2

1 0

Alexandre Julliard : crypt32/tests: Mark a failing test as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: b714ed411a24c0ae189033e75d4fe21c19ab30ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b714ed411a24c0ae189033e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:05:09 2021 +0100 crypt32/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 68817b98dda..5f7f6a5b777 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4261,7 +4261,7 @@ static ChainCheck chainCheck[] = { { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, googleSimpleStatus }, TODO_INFO, &oct2016 }, + 1, googleSimpleStatus }, TODO_INFO | TODO_ERROR, &oct2016 }, /* The stanford chain may or may not have its root trusted, so ignore the error */ { { ARRAY_SIZE(stanfordChain), stanfordChain },

1 0

Alexandre Julliard : wininet/tests: Mark a failing test as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 13966ac99737acd1e05d3affb0ee5f0dd6c06216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13966ac99737acd1e05d3aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:10:48 2021 +0100 wininet/tests: Mark a failing test as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3b8f16a9fb2..cf3f62f868a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6612,6 +6612,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); + todo_wine ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); @@ -6675,7 +6676,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); if(req_error != ERROR_INTERNET_SEC_CERT_ERRORS) { - win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); + skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, 3); return;

1 0

Alexandre Julliard : d3d11/tests: Mark a couple of failing tests as todo.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 91fb87b2898b2e05c90057541e6a2f422152b652 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91fb87b2898b2e05c9005754… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 15:18:42 2021 +0100 d3d11/tests: Mark a couple of failing tests as todo. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 53087684acf..154221e405c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6249,7 +6249,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded); @@ -6259,7 +6259,7 @@ static void test_so_statistics_query(void) get_query_data(context, query, &data, sizeof(data)); ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", (unsigned int)data.NumPrimitivesWritten); - todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS || query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + todo_wine ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", (unsigned int)data.PrimitivesStorageNeeded);

1 0

Rémi Bernon : winepulse.drv: Stop writing the same data again on underflow.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 6995b77a6d0111bba045ed1dafa348cc465bc5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6995b77a6d0111bba045ed1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:24 2021 +0100 winepulse.drv: Stop writing the same data again on underflow. Data in [lcl_offs_bytes;lcl_offs_bytes+held_bytes] is the data we've received from the client and that we consider being used by pulse, regardless of how we write it to it. A subset of this is [pa_offs_bytes;pa_offs_bytes+pa_held_bytes], which is the data we have received from the client but not yet written to pulse. If pulsed has underflown it means that it has used all the data we've written already, and resetting pa_offs_bytes and pa_held_bytes like here will only make us write the same data again (in addition to silence) to mend the underflow, ending up with potentially duplicate audio frames being played. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index bce70ac358c..c329e8c423c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -260,9 +260,6 @@ static void pulse_underflow_callback(pa_stream *s, void *userdata) struct pulse_stream *stream = userdata; WARN("%p: Underflow\n", userdata); stream->just_underran = TRUE; - /* re-sync */ - stream->pa_offs_bytes = stream->lcl_offs_bytes; - stream->pa_held_bytes = stream->held_bytes; } static void pulse_started_callback(pa_stream *s, void *userdata)

1 0

Rémi Bernon : winepulse.drv: Keep buffer size separate from allocated size.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 262c52110ccc50cdca001eebc8c2f5481b902506 URL: https://source.winehq.org/git/wine.git/?a=commit;h=262c52110ccc50cdca001eeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:25 2021 +0100 winepulse.drv: Keep buffer size separate from allocated size. So that it rounds to integral audio frame count. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index c329e8c423c..fb8133e9e45 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -876,7 +876,7 @@ static NTSTATUS pulse_create_stream(void *args) stream->alloc_size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->real_bufsize_bytes, MEM_COMMIT, PAGE_READWRITE)) + 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets;

1 0

Rémi Bernon : winepulse.drv: Write data to pulse in pulse_release_render_buffer.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 033cd6013ea9852244b8d58360554c964a7bb540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=033cd6013ea9852244b8d583… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 16 18:20:26 2021 +0100 winepulse.drv: Write data to pulse in pulse_release_render_buffer. Instead of waiting for the timer loop, which sometimes causes pulse buffer underflows. This greatly reduces the amount of underflows in Prince of Persia: The Forgotten Sands, as well as in Forza Horizon 4 introduction and menu audio, which are suffering from audio clicks since PE xaudio conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/pulse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index fb8133e9e45..bd886e0d879 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1675,6 +1675,9 @@ static NTSTATUS pulse_release_render_buffer(void *args) stream->clock_written += written_bytes; stream->locked = 0; + /* push as much data as we can to pulseaudio too */ + pulse_write(stream); + TRACE("Released %u, held %lu\n", params->written_frames, stream->held_bytes / pa_frame_size(&stream->ss)); pulse_unlock();

1 0

Eric Pouech : ntdll: Use proper names for magic constants.
by Alexandre Julliard 17 Dec '21

17 Dec '21

Module: wine Branch: master Commit: 594036d620ca46c9e1ad78136a6703da5ed21112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594036d620ca46c9e1ad7813… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 15:57:23 2021 +0100 ntdll: Use proper names for magic constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 23aa340359e..99c8e37053c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -444,7 +444,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so if (!(pid = fork())) /* grandchild */ { if (params->ConsoleFlags || - params->ConsoleHandle == (HANDLE)1 /* KERNEL32_CONSOLE_ALLOC */ || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid();

1 0

Zebediah Figura : user32: Do not use SetDIBits() in create_masked_bitmap().
by Alexandre Julliard 16 Dec '21

16 Dec '21

Module: wine Branch: master Commit: 197f2ee6c0e2dd70cfac6e15ede7fc0e38948188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197f2ee6c0e2dd70cfac6e15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 15 16:49:16 2021 -0600 user32: Do not use SetDIBits() in create_masked_bitmap(). The given bitmap is in DDB format, not DIB format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51296 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 31 +++++++++++++++------------- dlls/user32/tests/cursoricon.c | 47 +++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 827db302a30..828c88de92f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1753,22 +1753,25 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) { - HDC dc = CreateCompatibleDC( 0 ); - HBITMAP bitmap; - - const BITMAPINFO bitmap_info = - { - .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biWidth = width, - .bmiHeader.biHeight = height * 2, - .bmiHeader.biPlanes = 1, - .bmiHeader.biBitCount = 1, - }; + HBITMAP and_bitmap, xor_bitmap, bitmap; + HDC src_dc, dst_dc; + and_bitmap = CreateBitmap( width, height, 1, 1, and ); + xor_bitmap = CreateBitmap( width, height, 1, 1, xor ); bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); - SetDIBits( dc, bitmap, 0, height, and, &bitmap_info, FALSE ); - SetDIBits( dc, bitmap, height, height, xor, &bitmap_info, FALSE ); - DeleteDC( dc ); + src_dc = CreateCompatibleDC( 0 ); + dst_dc = CreateCompatibleDC( 0 ); + + SelectObject( dst_dc, bitmap ); + SelectObject( src_dc, and_bitmap ); + BitBlt( dst_dc, 0, 0, width, height, src_dc, 0, 0, SRCCOPY ); + SelectObject( src_dc, xor_bitmap ); + BitBlt( dst_dc, 0, height, width, height, src_dc, 0, 0, SRCCOPY ); + + DeleteObject( and_bitmap ); + DeleteObject( xor_bitmap ); + DeleteDC( src_dc ); + DeleteDC( dst_dc ); return bitmap; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 1bbe2591d59..3e8d7c1707f 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -769,8 +769,9 @@ static void test_initial_cursor(void) } static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, - UINT exp_mask_cy, UINT exp_bpp, UINT has_color, int line) + UINT exp_mask_cy, UINT exp_bpp, const BYTE *mask_bits, UINT has_color, int line) { + BYTE ret_bits[1024]; ICONINFO info; DWORD ret; BITMAP bmMask, bmColor; @@ -783,6 +784,15 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, ok_(__FILE__, line)(info.yHotspot == exp_cy/2, "info.yHotspot = %u\n", info.yHotspot); ok_(__FILE__, line)(info.hbmMask != 0, "info.hbmMask is NULL\n"); + if (mask_bits) + { + unsigned int exp_stride = (exp_cx + 7) / 8; + exp_stride = (exp_stride + 1) & ~1; + ret = GetBitmapBits(info.hbmMask, sizeof(ret_bits), ret_bits); + ok_(__FILE__, line)(ret == exp_stride * exp_mask_cy, "GetBitmapBits returned %u\n", ret); + ok_(__FILE__, line)(!memcmp(ret_bits, mask_bits, ret), "mask bitmap didn't match\n"); + } + ret = GetObjectA(info.hbmMask, sizeof(bmMask), &bmMask); ok_(__FILE__, line)(ret == sizeof(bmMask), "GetObject(info.hbmMask) failed, ret %u\n", ret); @@ -849,11 +859,11 @@ static void test_icon_info_(HICON hIcon, UINT exp_cx, UINT exp_cy, } } -#define test_icon_info(a,b,c,d,e,f) test_icon_info_(a,b,c,d,e,f,__LINE__) +#define test_icon_info(a,b,c,d,e,f,g) test_icon_info_(a,b,c,d,e,f,g,__LINE__) static void test_CreateIcon(void) { - static const BYTE bmp_bits[1024]; + BYTE bmp_bits[1024]; HICON hIcon; HBITMAP hbmMask, hbmColor; BITMAPINFO *bmpinfo; @@ -863,6 +873,9 @@ static void test_CreateIcon(void) UINT display_bpp; int i; + for (i = 0; i < sizeof(bmp_bits); ++i) + bmp_bits[i] = 111 * i; + hdc = GetDC(0); display_bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -871,19 +884,19 @@ static void test_CreateIcon(void) hIcon = CreateIcon(0, 16, 16, 1, 1, NULL, bmp_bits); */ - hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); + hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); - hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, bmp_bits); + hIcon = CreateCursor(0, 8, 8, 16, 16, bmp_bits, &bmp_bits[16 * 16 / 8]); ok(hIcon != 0, "CreateCursor failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyCursor(hIcon); hIcon = CreateIcon(0, 16, 16, 1, display_bpp, bmp_bits, bmp_bits); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); @@ -918,7 +931,7 @@ static void test_CreateIcon(void) info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 16, display_bpp, TRUE); + test_icon_info(hIcon, 16, 16, 16, display_bpp, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -935,7 +948,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, bmp_bits, FALSE); DestroyIcon(hIcon); info.hbmMask = hbmMask; @@ -943,7 +956,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 32, 32, 1, TRUE); + test_icon_info(hIcon, 16, 32, 32, 1, bmp_bits, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -961,7 +974,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 1, i / 2, max(i,1), 1, FALSE); + test_icon_info(hIcon, 1, i / 2, max(i,1), 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); } @@ -974,7 +987,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 32, 1, FALSE); + test_icon_info(hIcon, 16, 16, 32, 1, NULL, FALSE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -1006,7 +1019,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1024,7 +1037,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -1042,7 +1055,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 32, 8, TRUE); + test_icon_info(hIcon, 32, 32, 32, 8, NULL, TRUE); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -2812,7 +2825,7 @@ static void test_PrivateExtractIcons(void) ok(ret == 1, "PrivateExtractIconsA returned %u\n", ret); ok(icon != NULL, "icon == NULL\n"); - test_icon_info(icon, 32, 32, 32, 32, TRUE); + test_icon_info(icon, 32, 32, 32, 32, NULL, TRUE); DestroyIcon(icon); DeleteFileA("extract.ico");

1 0