December 2021 - Wine-Commits

Andrey Gusev : wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format.
by Alexandre Julliard Dec. 17, 2021

Dec. 17, 2021

Module: wine Branch: master Commit: b006a4c5acbc5704210a3b2bc55ec4c6dcef31ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b006a4c5acbc5704210a3b2b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 17 18:33:48 2021 +0200 wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format. Used by Dark Souls: Remastered. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 5 files changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a4729f9d2d3..a1c4be46b7f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12370,6 +12370,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -13649,6 +13650,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R11G11B10_FLOAT}, {DXGI_FORMAT_R16_FLOAT}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 154221e405c..a76e5fa1295 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18549,6 +18549,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -20623,6 +20624,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0}, {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6cc2f0cd9a8..5511a70a8ff 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -159,6 +159,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, + {"GL_ARB_vertex_type_10f_11f_11f_rev", ARB_VERTEX_TYPE_10F_11F_11F_REV}, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, {"GL_ARB_texture_barrier", ARB_TEXTURE_BARRIER }, @@ -3385,6 +3386,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, + {ARB_VERTEX_TYPE_10F_11F_11F_REV, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef2e28b545a..5e375f43a48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -709,6 +709,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_10F_11F_11F_REV, + ARB_VERTEX_TYPE_10F_11F_11F_REV}, {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2dbc56ab79d..7b6fa50c5f0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -143,6 +143,7 @@ enum wined3d_gl_extension ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, + ARB_VERTEX_TYPE_10F_11F_11F_REV, ARB_VERTEX_TYPE_2_10_10_10_REV, ARB_VIEWPORT_ARRAY, ARB_TEXTURE_BARRIER,

1 0

Eric Pouech : server/console: Ensure conhost has created the TTY input stream before waiting.
by Alexandre Julliard Dec. 17, 2021

Dec. 17, 2021

Module: wine Branch: master Commit: 751a3325a6ac93d11f08088c40b45a9ae05b52de URL: https://source.winehq.org/git/wine.git/?a=commit;h=751a3325a6ac93d11f08088c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Dec 17 17:18:51 2021 +0100 server/console: Ensure conhost has created the TTY input stream before waiting. Some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) This hangs for ever because conhost's main input thread hasn't been started yet. 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> --- server/console.c | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/server/console.c b/server/console.c index 977c428cf9f..136c14862e3 100644 --- a/server/console.c +++ b/server/console.c @@ -71,13 +71,14 @@ static struct object *console_lookup_name( struct object *obj, struct unicode_st unsigned int attr, struct object *root ); static struct object *console_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ); static const struct object_ops console_ops = { sizeof(struct console), /* size */ &file_type, /* type */ console_dump, /* dump */ - add_queue, /* add_queue */ + console_add_queue, /* add_queue */ remove_queue, /* remove_queue */ console_signaled, /* signaled */ no_satisfied, /* satisfied */ @@ -129,14 +130,15 @@ struct console_host_ioctl struct console_server { - struct object obj; /* object header */ - struct fd *fd; /* pseudo-fd for ioctls */ - struct console *console; /* attached console */ - struct list queue; /* ioctl queue */ - struct list read_queue; /* blocking read queue */ - int busy; /* flag if server processing an ioctl */ - int term_fd; /* UNIX terminal fd */ - struct termios termios; /* original termios */ + struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ + struct console *console; /* attached console */ + struct list queue; /* ioctl queue */ + struct list read_queue; /* blocking read queue */ + unsigned int busy : 1; /* flag if server processing an ioctl */ + unsigned int once_input : 1; /* flag if input thread has already been requested */ + int term_fd; /* UNIX terminal fd */ + struct termios termios; /* original termios */ }; static void console_server_dump( struct object *obj, int verbose ); @@ -462,6 +464,23 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int queue_host_ioctl( struct console_server *server, unsigned int code, unsigned int output, + struct async *async, struct async_queue *queue ); + +static int console_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console *console = (struct console*)obj; + assert( obj->ops == &console_ops ); + /* before waiting, ensure conhost's input thread has been started */ + if (console->server && !console->server->once_input) + { + console->server->once_input = 1; + if (console->server->term_fd == -1) + queue_host_ioctl( console->server, IOCTL_CONDRV_PEEK, 0, NULL, NULL ); + } + return add_queue( &console->obj, entry ); +} + static int console_signaled( struct object *obj, struct wait_queue_entry *entry ) { struct console *console = (struct console*)obj; @@ -889,9 +908,10 @@ static struct object *create_console_server( void ) struct console_server *server; if (!(server = alloc_object( &console_server_ops ))) return NULL; - server->console = NULL; - server->busy = 0; - server->term_fd = -1; + server->console = NULL; + server->busy = 0; + server->once_input = 0; + server->term_fd = -1; list_init( &server->queue ); list_init( &server->read_queue ); server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -1315,7 +1335,7 @@ static int console_input_add_queue( struct object *obj, struct wait_queue_entry set_error( STATUS_ACCESS_DENIED ); return 0; } - return add_queue( &current->process->console->obj, entry ); + return console_add_queue( &current->process->console->obj, entry ); } static struct fd *console_input_get_fd( struct object *obj )

1 0

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

Dec. 17, 2021

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 Dec. 17, 2021

Dec. 17, 2021

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 Dec. 17, 2021

Dec. 17, 2021

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

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

Dec. 17, 2021

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

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

Dec. 17, 2021

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

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

Dec. 17, 2021

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 Dec. 17, 2021

Dec. 17, 2021

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

John Sullivan : user32: Call DestroyIcon() to delete icon handles in CopyImage().
by Alexandre Julliard Dec. 16, 2021

Dec. 16, 2021

Module: wine Branch: master Commit: 4a200821672dfe719dc5b20df853e719678496b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a200821672dfe719dc5b20d… Author: John Sullivan <jswinebz(a)kanargh.org.uk> Date: Thu Dec 16 11:58:37 2021 -0600 user32: Call DestroyIcon() to delete icon handles in CopyImage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52207 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 828c88de92f..582b2612688 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3183,7 +3183,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, release_icon_frame( icon, frame ); release_user_handle_ptr( icon ); - if (res && (flags & LR_COPYDELETEORG)) DeleteObject( hnd ); + if (res && (flags & LR_COPYDELETEORG)) DestroyIcon( hnd ); return res; } }

1 0