wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Davide Beatrici : mmdevapi: Return errors early in adjust_timing().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 5dcb879df1aa18dab2c97a0b963aafbf7079a68f URL: https://gitlab.winehq.org/wine/wine/-/commit/5dcb879df1aa18dab2c97a0b963aaf… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 19 02:51:58 2024 +0200 mmdevapi: Return errors early in adjust_timing(). --- dlls/mmdevapi/client.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index ed635bcf98a..1058c639ff9 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -140,21 +140,21 @@ static HRESULT adjust_timing(struct audio_client *client, const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)fmt; if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + return AUDCLNT_E_UNSUPPORTED_FORMAT; else { if (*period == 0) *period = def_period; if (*period < min_period || *period > 5000000) - hr = AUDCLNT_E_INVALID_DEVICE_PERIOD; + return AUDCLNT_E_INVALID_DEVICE_PERIOD; else if (*duration > 20000000) /* The smaller the period, the lower this limit. */ - hr = AUDCLNT_E_BUFFER_SIZE_ERROR; + return AUDCLNT_E_BUFFER_SIZE_ERROR; else if (flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { if (*duration != *period) - hr = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - hr = AUDCLNT_E_DEVICE_IN_USE; + return AUDCLNT_E_DEVICE_IN_USE; } else if (*duration < 8 * *period) *duration = 8 * *period; /* May grow above 2s. */ }

1 0

Alex Henrie : ntdll: Don't special-case default values in RtlQueryRegistryValues.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 7053e0f641bd992d03219e54f7f5b2803d8b391c URL: https://gitlab.winehq.org/wine/wine/-/commit/7053e0f641bd992d03219e54f7f5b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 23 21:48:45 2024 -0600 ntdll: Don't special-case default values in RtlQueryRegistryValues. Additional tests reveal that RTL_QUERY_REGISTRY_DIRECT does work with non-string default values, it just requires a pointer to the value and it doesn't infer the size automatically. That means that the same code can be used to handle both default and non-default values. --- dlls/ntdll/reg.c | 102 ++++++++++++++++++++++++------------------------- dlls/ntdll/tests/reg.c | 89 ++++++++++++++++++++++++++++++++---------- 2 files changed, 118 insertions(+), 73 deletions(-)

1 0

Aida Jonikienė : ntdll: Fix params_mask type in NtRaiseHardError().
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 5eafe53e5449a5a2602d947a3f1d0864a2f6e476 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eafe53e5449a5a2602d947a3f1d08… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Tue Mar 5 10:06:23 2024 +0200 ntdll: Fix params_mask type in NtRaiseHardError(). Real-world app testing reveals that parameter isn't used as a pointer (so change it to an integer). --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_arm64ec.c | 2 +- dlls/ntdll/unix/system.c | 4 ++-- include/winternl.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f82146c6d39..9147cdca3cd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall -syscall NtQueueApcThread(long ptr long long long) @ stdcall -syscall NtQueueApcThreadEx(long long ptr long long long) @ stdcall -syscall NtRaiseException(ptr ptr long) -@ stdcall -syscall NtRaiseHardError(long long ptr ptr long ptr) +@ stdcall -syscall NtRaiseHardError(long long long ptr long ptr) @ stdcall -syscall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall -syscall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) # @ stub NtReadRequestData @@ -1389,7 +1389,7 @@ @ stdcall -private -syscall ZwQueueApcThread(long ptr long long long) NtQueueApcThread @ stdcall -private -syscall ZwQueueApcThreadEx(long long ptr long long long) NtQueueApcThreadEx @ stdcall -private -syscall ZwRaiseException(ptr ptr long) NtRaiseException -@ stdcall -private -syscall ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError +@ stdcall -private -syscall ZwRaiseHardError(long long long ptr long ptr) NtRaiseHardError @ stdcall -private -syscall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile @ stdcall -private -syscall ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter # @ stub ZwReadRequestData diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 44b026fc044..393d5f7e697 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -270,7 +270,7 @@ DEFINE_SYSCALL(NtQueryVolumeInformationFile, (HANDLE handle, IO_STATUS_BLOCK *io DEFINE_SYSCALL(NtQueueApcThread, (HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_SYSCALL(NtQueueApcThreadEx, (HANDLE handle, HANDLE reserve_handle, PNTAPCFUNC func, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3)) DEFINE_WRAPPED_SYSCALL(NtRaiseException, (EXCEPTION_RECORD *rec, ARM64_NT_CONTEXT *context, BOOL first_chance)) -DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, UNICODE_STRING *params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) +DEFINE_SYSCALL(NtRaiseHardError, (NTSTATUS status, ULONG count, ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response)) DEFINE_SYSCALL(NtReadFile, (HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, void *buffer, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadFileScatter, (HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, ULONG length, LARGE_INTEGER *offset, ULONG *key)) DEFINE_SYSCALL(NtReadVirtualMemory, (HANDLE process, const void *addr, void *buffer, SIZE_T size, SIZE_T *bytes_read)) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index eb5e60af7b9..efb6e7f4579 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -4073,10 +4073,10 @@ NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) * NtRaiseHardError (NTDLL.@) */ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, - UNICODE_STRING *params_mask, void **params, + ULONG params_mask, void **params, HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { - FIXME( "%08x stub\n", (int)status ); + FIXME( "%#08x %u %#x %p %u %p: stub\n", (int)status, (int)count, (int)params_mask, params, option, response ); return STATUS_NOT_IMPLEMENTED; } diff --git a/include/winternl.h b/include/winternl.h index 22cdceeaedb..8406d4b8d46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4564,7 +4564,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVO NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); -NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); +NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,ULONG,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG);

1 0

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

24 Jun '24

Module: wine Branch: master Commit: 0db0f6180d3837212b59b53a90757a389df2d611 URL: https://gitlab.winehq.org/wine/wine/-/commit/0db0f6180d3837212b59b53a90757a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:30:16 2024 -0500 ntdll: Use file_complete_async() in NtFsControlFile(). --- dlls/ntdll/unix/file.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c9a0b023d23..b8fb4f19e13 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6182,6 +6182,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { + ULONG_PTR size = 0; NTSTATUS status; TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n", @@ -6225,7 +6226,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap buffer->StartingVcn.QuadPart = 1; buffer->Extents[0].NextVcn.QuadPart = 0; buffer->Extents[0].Lcn.QuadPart = 0; - io->Information = sizeof(RETRIEVAL_POINTERS_BUFFER); + size = sizeof(RETRIEVAL_POINTERS_BUFFER); status = STATUS_SUCCESS; } else @@ -6259,7 +6260,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap memset( info, 0, sizeof(*info) ); memcpy( info->ObjectId, &st.st_dev, sizeof(st.st_dev) ); memcpy( info->ObjectId + 8, &st.st_ino, sizeof(st.st_ino) ); - io->Information = sizeof(*info); + size = sizeof(*info); } else status = STATUS_BUFFER_TOO_SMALL; break; @@ -6267,7 +6268,6 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap case FSCTL_SET_SPARSE: TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); - io->Information = 0; status = STATUS_SUCCESS; break; default: @@ -6275,7 +6275,8 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap in_buffer, in_size, out_buffer, out_size ); } - if (!NT_ERROR(status) && status != STATUS_PENDING) io->Status = status; + if (!NT_ERROR(status) && status != STATUS_PENDING) + file_complete_async( handle, event, apc, apc_context, io, status, size ); 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

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 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: 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: 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

Vijay Kiran Kamuju : ntdll: Add stub RtlNumberGenericTableElementsAvl function.
by Alexandre Julliard 24 Jun '24

24 Jun '24

Module: wine Branch: master Commit: 2a6e7ab4ed984837fc19828d4404a3cc3e6add2a URL: https://gitlab.winehq.org/wine/wine/-/commit/2a6e7ab4ed984837fc19828d4404a3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 19 21:49:00 2024 +0200 ntdll: Add stub RtlNumberGenericTableElementsAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56839 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7d31bf41f55..f82146c6d39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -898,7 +898,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -# @ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stdcall RtlOemStringToUnicodeSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 9b25c6b70ab..5597daa061f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -800,6 +800,15 @@ void * WINAPI RtlEnumerateGenericTableWithoutSplayingAvl(RTL_AVL_TABLE *table, P return NULL; } +/****************************************************************************** + * RtlNumberGenericTableElementsAvl (NTDLL.@) + */ +ULONG WINAPI RtlNumberGenericTableElementsAvl(RTL_AVL_TABLE *table) +{ + FIXME("(%p) stub!\n", table); + return 0; +} + /*********************************************************************** * RtlInsertElementGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a546c5811a6..48e1def449c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1214,7 +1214,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -@ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stub RtlOemStringToCountedUnicodeString diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 426ba4fa31b..e9ca903715d 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -285,6 +285,7 @@ void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSTATUS WINAPI RtlUpcaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); char WINAPI RtlUpperChar(char);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2024