June 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Generate rules to build makedep.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 7c0aa6fd8c5ede0867b3b388d4695c7f016aac9f URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0aa6fd8c5ede0867b3b388d4695c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 17:12:52 2024 +0200 makefiles: Generate rules to build makedep. --- configure | 16 ++-------------- configure.ac | 16 ++-------------- tools/Makefile.in | 5 +++++ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 64afddd6a51..a91ee8891e0 100755 --- a/configure +++ b/configure @@ -23100,7 +23100,6 @@ test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine" if test "x$enable_tools" != xno then - as_fn_append CONFIGURE_TARGETS " tools/makedep$ac_exeext" ac_config_commands="$ac_config_commands tools/makedep" fi @@ -23142,18 +23141,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$@" fi -if test "x$enable_tools" != xno -then - as_fn_append wine_rules " -tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status - @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext" -else - as_fn_append wine_rules " -\$(MAKEDEP): - @echo \"You need to run make in $toolsdir first\" && false" -fi - if test -n "$with_wine64" then @@ -23905,7 +23892,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 wine_fn_output_makedep () { as_dir=tools; as_fn_mkdir_p - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c + $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS } wine_fn_output_makefile () { diff --git a/configure.ac b/configure.ac index 8c2f0f3e09b..2ff2e062973 100644 --- a/configure.ac +++ b/configure.ac @@ -3586,12 +3586,12 @@ test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine) if test "x$enable_tools" != xno then - WINE_IGNORE_FILE(tools/makedep$ac_exeext) AC_CONFIG_COMMANDS([tools/makedep],[wine_fn_output_makedep || AS_EXIT], [wine_fn_output_makedep () { AS_MKDIR_P(tools) - $CC -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep$ac_exeext ${wine_srcdir}tools/makedep.c $LDFLAGS + $CC -c -I${wine_srcdir}tools -Iinclude -I${wine_srcdir}include -D__WINESRC__ -DWINE_UNIX_LIB $EXTRACFLAGS $CPPFLAGS $CFLAGS -o tools/makedep.o ${wine_srcdir}tools/makedep.c + $CC -o tools/makedep$ac_exeext tools/makedep.o $LDFLAGS }]) fi @@ -3655,18 +3655,6 @@ include/stamp-h.in: configure.ac aclocal.m4 @echo timestamp > \$[@]]) fi -if test "x$enable_tools" != xno -then - WINE_APPEND_RULE( -[tools/makedep$ac_exeext: ${wine_srcdir}tools/makedep.c include/config.h config.status - @./config.status tools/makedep -Makefile: tools/makedep$ac_exeext]) -else - WINE_APPEND_RULE( -[\$(MAKEDEP): - @echo \"You need to run make in $toolsdir first\" && false]) -fi - dnl Rules for wineloader if test -n "$with_wine64" diff --git a/tools/Makefile.in b/tools/Makefile.in index cd643e7e90b..71bd896b8a0 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,6 +1,11 @@ PROGRAMS = \ + makedep \ make_xftmpl SOURCES = \ + makedep.c \ make_xftmpl.c \ wineapploader.in + +makedep_OBJS = makedep.o +make_xftmpl_OBJS = make_xftmpl.o

1 0

Torge Matthies : winegstreamer: Fix race between wg_parser_stream_en/disable and GST_EVENT_FLUSH_START/STOP.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 490d8ed6635665a73c339fe9e906cdfa2726b4b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/490d8ed6635665a73c339fe9e906cd… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Mon Jun 3 11:05:38 2024 +0200 winegstreamer: Fix race between wg_parser_stream_en/disable and GST_EVENT_FLUSH_START/STOP. --- dlls/winegstreamer/wg_parser.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index f9b76b12f8f..021aa66ae12 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -608,17 +608,14 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: pthread_mutex_lock(&parser->mutex); - if (stream->enabled) - { - stream->flushing = true; - pthread_cond_signal(&stream->event_empty_cond); + stream->flushing = true; + pthread_cond_signal(&stream->event_empty_cond); - if (stream->buffer) - { - gst_buffer_unmap(stream->buffer, &stream->map_info); - gst_buffer_unref(stream->buffer); - stream->buffer = NULL; - } + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; } pthread_mutex_unlock(&parser->mutex); @@ -636,8 +633,7 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) pthread_mutex_lock(&parser->mutex); stream->eos = false; - if (stream->enabled) - stream->flushing = false; + stream->flushing = false; pthread_mutex_unlock(&parser->mutex); break;

1 0

Torge Matthies : winegstreamer: Don't only accept segment events when streams are enabled.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 215478fc4627792b1df8d42cf04e016d460c2106 URL: https://gitlab.winehq.org/wine/wine/-/commit/215478fc4627792b1df8d42cf04e01… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Tue Apr 23 19:30:17 2024 +0200 winegstreamer: Don't only accept segment events when streams are enabled. I don't know why this was done previously but this just creates a race condition, with no to me apparent benefit. --- dlls/winegstreamer/wg_parser.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 021aa66ae12..b942273d02b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -576,24 +576,20 @@ static gboolean sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEGMENT: - pthread_mutex_lock(&parser->mutex); - if (stream->enabled) - { - const GstSegment *segment; - - gst_event_parse_segment(event, &segment); - - if (segment->format != GST_FORMAT_TIME) - { - pthread_mutex_unlock(&parser->mutex); - GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); - break; - } + { + const GstSegment *segment; - gst_segment_copy_into(segment, &stream->segment); + gst_event_parse_segment(event, &segment); + if (segment->format != GST_FORMAT_TIME) + { + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); + break; } + pthread_mutex_lock(&parser->mutex); + gst_segment_copy_into(segment, &stream->segment); pthread_mutex_unlock(&parser->mutex); break; + } case GST_EVENT_EOS: pthread_mutex_lock(&parser->mutex);

1 0

Torge Matthies : winegstreamer: Ignore an assert in wg_parser.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 62d8d3415cefc95b34afba7a52d32d730d3b7585 URL: https://gitlab.winehq.org/wine/wine/-/commit/62d8d3415cefc95b34afba7a52d32d… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Tue Mar 19 04:06:37 2024 +0100 winegstreamer: Ignore an assert in wg_parser. This gets hit when a wg_parser receives GST_EVENT_FLUSH_START between the wg_parser_stream_get_buffer function return and the wg_parser_stream_release_buffer call. In this case the NULL buffer can be ignored, it does no harm and there is no memory leak from this. --- dlls/winegstreamer/wg_parser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index b942273d02b..7253013b6a3 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -412,11 +412,12 @@ static NTSTATUS wg_parser_stream_release_buffer(void *args) pthread_mutex_lock(&parser->mutex); - assert(stream->buffer); - - gst_buffer_unmap(stream->buffer, &stream->map_info); - gst_buffer_unref(stream->buffer); - stream->buffer = NULL; + if (stream->buffer) + { + gst_buffer_unmap(stream->buffer, &stream->map_info); + gst_buffer_unref(stream->buffer); + stream->buffer = NULL; + } pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&stream->event_empty_cond);

1 0

Elizabeth Figura : ntdll: Do not queue an IOCP packet in complete_async() if an APC routine is specified.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 8fee7e8b7c37eb1998a14439972c25c3417e08f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fee7e8b7c37eb1998a14439972c25… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 25 19:24:59 2022 -0500 ntdll: Do not queue an IOCP packet in complete_async() if an APC routine is specified. --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ea2f5d3a670..123e318058b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1434,7 +1434,7 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo io->Information = information; if (event) NtSetEvent( event, NULL ); if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 ); - if (apc_user) add_completion( handle, (ULONG_PTR)apc_user, status, information, FALSE ); + else if (apc_user) add_completion( handle, (ULONG_PTR)apc_user, status, information, FALSE ); }

1 0

Elizabeth Figura : ntdll: Move complete_async() to file.c and use it in NtWriteFileGather().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 7e3293107f11037bab6e96266b7f4016f4e5c427 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e3293107f11037bab6e96266b7f40… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:03:34 2024 -0500 ntdll: Move complete_async() to file.c and use it in NtWriteFileGather(). --- dlls/ntdll/unix/file.c | 27 ++++++++++++++++----------- dlls/ntdll/unix/socket.c | 28 ++++++++-------------------- dlls/ntdll/unix/unix_private.h | 3 ++- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c128e8aa369..c9a0b023d23 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5470,7 +5470,7 @@ static unsigned int register_async_file_read( HANDLE handle, HANDLE event, return status; } -void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) +static void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) { SERVER_START_REQ( add_fd_completion ) { @@ -5484,6 +5484,20 @@ void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info SERVER_END_REQ; } +/* complete async file I/O, signaling completion in all ways necessary */ +void file_complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ) +{ + ULONG_PTR iosb_ptr = iosb_client_ptr(io); + + io->Status = status; + io->Information = information; + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 ); + else if (apc_user) add_completion( handle, (ULONG_PTR)apc_user, status, information, FALSE ); +} + + static unsigned int set_pending_write( HANDLE device ) { unsigned int status; @@ -6019,10 +6033,7 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap int result, unix_handle, needs_close; unsigned int options, status; UINT pos = 0, total = 0; - client_ptr_t iosb_ptr = iosb_client_ptr(io); enum server_fd_type type; - ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE; TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io, segments, (int)length, offset, key ); @@ -6074,24 +6085,18 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } - send_completion = cvalue != 0; - done: if (needs_close) close( unix_handle ); if (status == STATUS_SUCCESS) { - io->Status = status; - io->Information = total; + file_complete_async( file, event, apc, apc_user, io, status, total ); TRACE("= SUCCESS (%u)\n", total); - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 ); } else { TRACE("= 0x%08x\n", status); if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); } - if (send_completion) add_completion( file, cvalue, status, total, FALSE ); return status; } diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 123e318058b..587faf51ccf 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1425,18 +1425,6 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, return status; } -static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ) -{ - ULONG_PTR iosb_ptr = iosb_client_ptr(io); - - io->Status = status; - io->Information = information; - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, iosb_ptr, 0 ); - else if (apc_user) add_completion( handle, (ULONG_PTR)apc_user, status, information, FALSE ); -} - static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, int option, void *out_buffer, ULONG out_size ) @@ -1563,7 +1551,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } SERVER_END_REQ; - complete_async( handle, event, apc, apc_user, io, status, 0 ); + file_complete_async( handle, event, apc, apc_user, io, status, 0 ); return status; } @@ -1710,7 +1698,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return STATUS_BUFFER_TOO_SMALL; status = *(NTSTATUS *)in_buffer; - complete_async( handle, event, apc, apc_user, io, status, 0 ); + file_complete_async( handle, event, apc, apc_user, io, status, 0 ); return status; } @@ -1736,7 +1724,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc { *(int *)out_buffer = 0; if (needs_close) close( fd ); - complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); return STATUS_SUCCESS; } } @@ -1749,7 +1737,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } *(int *)out_buffer = value; if (needs_close) close( fd ); - complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); return STATUS_SUCCESS; } @@ -1788,7 +1776,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc *(int *)out_buffer = !value; } if (needs_close) close( fd ); - complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); return STATUS_SUCCESS; } @@ -1815,7 +1803,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (out_size < ret_size) { freeifaddrs( ifaddrs ); - complete_async( handle, event, apc, apc_user, io, STATUS_BUFFER_TOO_SMALL, 0 ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_BUFFER_TOO_SMALL, 0 ); return STATUS_PENDING; } @@ -1865,7 +1853,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } freeifaddrs( ifaddrs ); - complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, ret_size ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, ret_size ); return STATUS_PENDING; #else FIXME( "Interface list queries are currently not supported on this platform.\n" ); @@ -1920,7 +1908,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } if (needs_close) close( fd ); - complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + file_complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b278ab8df84..fcb3de83a29 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -342,7 +342,8 @@ extern NTSTATUS open_unix_file( HANDLE *handle, const char *unix_name, ACCESS_MA extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *info ); extern void init_files(void); extern void init_cpu_info(void); -extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ); +extern void file_complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, NTSTATUS status, ULONG_PTR information ); extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ); extern NTSTATUS unixcall_wine_dbg_write( void *args );

1 0

Elizabeth Figura : ntdll: Use file_complete_async() in tape_DeviceIoControl().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: d140164d7689c4c51964a3de8c4332d8a8332a70 URL: https://gitlab.winehq.org/wine/wine/-/commit/d140164d7689c4c51964a3de8c4332… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon May 27 22:33:41 2024 -0500 ntdll: Use file_complete_async() in tape_DeviceIoControl(). Thereby also handling completion and APCs. --- dlls/ntdll/unix/tape.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index f513e558898..366096bbf4f 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -580,10 +580,6 @@ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, if (needs_close) close( fd ); if (!NT_ERROR(status)) - { - io->Status = status; - io->Information = sz; - if (event) NtSetEvent( event, NULL ); - } + file_complete_async( device, event, apc, apc_user, io, status, sz ); return status; }

1 0

Elizabeth Figura : ntdll: Use file_complete_async() in cdrom_DeviceIoControl().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: c133f14fe6d6eeaeb2f1b0c770c32b7bb24aa6ff URL: https://gitlab.winehq.org/wine/wine/-/commit/c133f14fe6d6eeaeb2f1b0c770c32b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 28 18:22:03 2024 -0500 ntdll: Use file_complete_async() in cdrom_DeviceIoControl(). Thereby also handling completion and APCs. --- dlls/ntdll/unix/cdrom.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 427e559968f..c92ccc1185d 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -3113,10 +3113,6 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc } if (needs_close) close( fd ); if (!NT_ERROR(status)) - { - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); - } + file_complete_async( device, event, apc, apc_user, io, status, sz ); return status; }

1 0

Elizabeth Figura : ntdll: Use file_complete_async() in serial_DeviceIoControl().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 0a42bd290de25d6ff4eb9bf895b74a9003833fa4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a42bd290de25d6ff4eb9bf895b74a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue May 28 18:50:44 2024 -0500 ntdll: Use file_complete_async() in serial_DeviceIoControl(). Thereby also handling completion and APCs. --- dlls/ntdll/unix/serial.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index a8abee6eeb6..cc3929c7a0b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1457,11 +1457,7 @@ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE ap if (needs_close) close( fd ); if (!NT_ERROR(status)) - { - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); - } + file_complete_async( device, event, apc, apc_user, io, status, sz ); return status; }

1 0

Vijay Kiran Kamuju : ntdll: Fix RtlEnumerateGenericTableWithoutSplaying function parameters.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 32e2ede0dfd94b524231ae7f7d335e7152382f20 URL: https://gitlab.winehq.org/wine/wine/-/commit/32e2ede0dfd94b524231ae7f7d335e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:30:45 2024 +0200 ntdll: Fix RtlEnumerateGenericTableWithoutSplaying function parameters. --- dlls/ntdll/rtl.c | 2 +- include/ddk/ntddk.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 81160cd1f70..d9690cdec96 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -191,7 +191,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM /****************************************************************************** * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] */ -void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, PVOID *previous) { static int warn_once; diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 6a8fffd532e..7f5db987ed4 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -274,6 +274,7 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutineEx(PLOAD_IMAGE_NOTIFY_ROUTINE,ULONG_PTR); LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); void WINAPI RtlCopyString(STRING*,const STRING*); +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(PRTL_GENERIC_TABLE,PVOID*); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *);

1 0