August 2021 - Wine-Commits - list.winehq.org

Luke Deller : kernelbase: Translate FILE_FLAG_SEQUENTIAL_SCAN.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 8294b2c8adc127794b6f16580059721abc4d4589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8294b2c8adc127794b6f1658… Author: Luke Deller <luke(a)deller.id.au> Date: Wed Aug 4 21:29:35 2021 +1000 kernelbase: Translate FILE_FLAG_SEQUENTIAL_SCAN. Translate FILE_FLAG_SEQUENTIAL_SCAN into the corresponding flag for NtCreateFile options Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index e0a75c2ad08..d21ad299d1f 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -723,6 +723,8 @@ static UINT get_nt_file_options( DWORD attributes ) options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_SEQUENTIAL_SCAN) + options |= FILE_SEQUENTIAL_ONLY; if (attributes & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; return options; @@ -3227,6 +3229,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTO if (flags & FILE_FLAG_NO_BUFFERING) options |= FILE_NO_INTERMEDIATE_BUFFERING; if (!(flags & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; if (flags & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (flags & FILE_FLAG_SEQUENTIAL_SCAN) options |= FILE_SEQUENTIAL_ONLY; flags &= FILE_ATTRIBUTE_VALID_FLAGS; objectName.Length = sizeof(ULONGLONG);

1 0

Alexandre Julliard : winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory().
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 4303e753137d0b44cff4f9261d10ef86d57016f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4303e753137d0b44cff4f926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:02:39 2021 +0200 winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++--- dlls/winepulse.drv/pulse.c | 59 +++++++++++++++++++++---------------------- dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 67a42de97f9..ab4cccd7242 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); -static UINT64 pulse_handle; +static unixlib_handle_t pulse_handle; #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -82,10 +82,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(dll); - if (__wine_init_unix_lib(dll, reason, NULL, &pulse_handle)) + if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &pulse_handle, sizeof(pulse_handle), NULL )) + return FALSE; + if (__wine_unix_call(pulse_handle, process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { - __wine_init_unix_lib(dll, reason, NULL, NULL); + __wine_unix_call(pulse_handle, process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 55579ecda80..2e6ad4848eb 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -178,6 +178,32 @@ static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, return r; } +static NTSTATUS pulse_process_attach(void *args) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); + + if (pthread_mutex_init(&pulse_mutex, &attr) != 0) + pthread_mutex_init(&pulse_mutex, NULL); + + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_process_detach(void *args) +{ + if (pulse_ctx) + { + pa_context_disconnect(pulse_ctx); + pa_context_unref(pulse_ctx); + } + if (pulse_ml) + pa_mainloop_quit(pulse_ml, 0); + + return STATUS_SUCCESS; +} + static NTSTATUS pulse_main_loop(void *args) { struct main_loop_params *params = args; @@ -1929,8 +1955,10 @@ static NTSTATUS pulse_is_started(void *args) return STATUS_SUCCESS; } -static const unixlib_entry_t unix_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { + pulse_process_attach, + pulse_process_detach, pulse_main_loop, pulse_create_stream, pulse_release_stream, @@ -1953,32 +1981,3 @@ static const unixlib_entry_t unix_funcs[] = pulse_test_connect, pulse_is_started, }; - -NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) -{ - pthread_mutexattr_t attr; - - switch (reason) - { - case DLL_PROCESS_ATTACH: - pthread_mutexattr_init(&attr); - pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); - - if (pthread_mutex_init(&pulse_mutex, &attr) != 0) - pthread_mutex_init(&pulse_mutex, NULL); - - *(UINT64 *)ptr_out = (UINT_PTR)&unix_funcs; - break; - case DLL_PROCESS_DETACH: - if (pulse_ctx) - { - pa_context_disconnect(pulse_ctx); - pa_context_unref(pulse_ctx); - } - if (pulse_ml) - pa_mainloop_quit(pulse_ml, 0); - - } - - return STATUS_SUCCESS; -} diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 9e7af57b716..98639e7705f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -187,6 +187,8 @@ struct is_started_params enum unix_funcs { + process_attach, + process_detach, main_loop, create_stream, release_stream,

1 0

Alexandre Julliard : ntdll: Add a Wine-specific NtQueryVirtualMemory() query to retrieve the Unix call table.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: d91d05b80a4f7ccd7447c4514e5f8298bfcb177b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91d05b80a4f7ccd7447c451… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 17:56:14 2021 +0200 ntdll: Add a Wine-specific NtQueryVirtualMemory() query to retrieve the Unix call table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 4 +++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index ee1f331d778..3532f5c8746 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -657,6 +657,29 @@ void *get_builtin_so_handle( void *module ) } +/*********************************************************************** + * get_builtin_unix_funcs + */ +NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) +{ + const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; + sigset_t sigset; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + struct builtin_module *builtin; + + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; + *funcs = dlsym( builtin->unix_handle, ptr_name ); + status = STATUS_SUCCESS; + break; + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; +} + + /*********************************************************************** * get_builtin_unix_info */ @@ -4289,6 +4312,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, MEMORY_INFORMATION_CLASS info_class, PVOID buffer, SIZE_T len, SIZE_T *res_len ) { + NTSTATUS status; + TRACE("(%p, %p, info_class=%d, %p, %ld, %p)\n", process, addr, info_class, buffer, len, res_len); @@ -4311,13 +4336,27 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, if (handle) { - NTSTATUS status = get_builtin_init_funcs( handle, buffer, len, res_len ); + status = get_builtin_init_funcs( handle, buffer, len, res_len ); release_builtin_module( module ); return status; } } return STATUS_INVALID_HANDLE; + case MemoryWineUnixFuncs: + case MemoryWineUnixWow64Funcs: + if (len != sizeof(UINT64)) return STATUS_INFO_LENGTH_MISMATCH; + if (process == GetCurrentProcess()) + { + void *module = (void *)addr; + void *funcs = NULL; + + status = get_builtin_unix_funcs( module, info_class == MemoryWineUnixWow64Funcs, &funcs ); + if (!status) *(UINT64 *)buffer = (UINT_PTR)funcs; + return status; + } + return STATUS_INVALID_HANDLE; + default: FIXME("(%p,%p,info_class=%d,%p,%ld,%p) Unknown information class\n", process, addr, info_class, buffer, len, res_len); diff --git a/include/winternl.h b/include/winternl.h index 075b1863f72..41bc56d186d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1919,7 +1919,9 @@ typedef enum _MEMORY_INFORMATION_CLASS { MemoryBasicInformationCapped, MemoryPhysicalContiguityInformation, #ifdef __WINESRC__ - MemoryWineImageInitFuncs = 1000 + MemoryWineImageInitFuncs = 1000, + MemoryWineUnixFuncs, + MemoryWineUnixWow64Funcs, #endif } MEMORY_INFORMATION_CLASS;

1 0

Alexandre Julliard : ntdll: Load the Unix dll at the same time as the PE one, but don't map it yet.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: c29f6504747c3a80135085a7ae9ac470d2950c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f6504747c3a80135085a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:55:21 2021 +0200 ntdll: Load the Unix dll at the same time as the PE one, but don't map it yet. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 17 +++++++++-------- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5f1cbda51a9..f5135a19f40 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1121,21 +1121,17 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr if (!entry) { - if (!name) return STATUS_DLL_NOT_FOUND; - if (!(handle = dlopen( name, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + if (!name || !handle) return STATUS_DLL_NOT_FOUND; if (!(nt = dlsym( handle, "__wine_spec_nt_header" )) || !(entry = dlsym( handle, "__wine_init_unix_lib" ))) - { - dlclose( handle ); - set_builtin_unix_info( module, NULL, NULL, NULL ); return STATUS_INVALID_IMAGE_FORMAT; - } + TRACE( "loaded %s for %p\n", debugstr_a(name), module ); unix_module = (void *)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); map_so_dll( nt, unix_module ); fixup_ntdll_imports( name, unix_module ); - set_builtin_unix_info( module, NULL, handle, entry ); + set_builtin_unix_entry( module, entry ); } init_func = entry; return init_func( module, reason, ptr_in, ptr_out ); @@ -1417,8 +1413,13 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T done: if (status >= 0 && ext) { + void *handle; + strcpy( ext, ".so" ); - set_builtin_unix_info( *module, ptr, NULL, NULL ); + if ((handle = dlopen( ptr, RTLD_NOW ))) + { + if (set_builtin_unix_handle( *module, ptr, handle )) dlclose( handle ); + } } free( file ); return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7d89d99d120..0fce580b120 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -231,7 +231,8 @@ extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; -extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_handle( void *module, const char *name, void *handle ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_entry( void *module, void *entry ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN; extern void *get_native_context( CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 63b322a0c68..ee1f331d778 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -682,9 +682,9 @@ NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, /*********************************************************************** - * set_builtin_unix_info + * set_builtin_unix_handle */ -NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) +NTSTATUS set_builtin_unix_handle( void *module, const char *name, void *handle ) { sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -696,10 +696,8 @@ NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, vo if (builtin->module != module) continue; if (!builtin->unix_handle) { - free( builtin->unix_name ); - builtin->unix_name = name ? strdup( name ) : NULL; + builtin->unix_name = strdup( name ); builtin->unix_handle = handle; - builtin->unix_entry = entry; status = STATUS_SUCCESS; } else status = STATUS_IMAGE_ALREADY_LOADED; @@ -710,6 +708,31 @@ NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, vo } +/*********************************************************************** + * set_builtin_unix_entry + */ +NTSTATUS set_builtin_unix_entry( void *module, void *entry ) +{ + sigset_t sigset; + NTSTATUS status = STATUS_DLL_NOT_FOUND; + struct builtin_module *builtin; + + server_enter_uninterrupted_section( &virtual_mutex, &sigset ); + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != module) continue; + if (builtin->unix_handle) + { + builtin->unix_entry = entry; + status = STATUS_SUCCESS; + } + break; + } + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; +} + + /*********************************************************************** * free_ranges_lower_bound *

1 0

Alexandre Julliard : ntdll: Make release_builtin_module() static.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 18408b18f3ebd9630a02f0bd16864f5e5118b71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=18408b18f3ebd9630a02f0bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:26:31 2021 +0200 ntdll: Make release_builtin_module() static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 61c290c156d..7d89d99d120 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -229,7 +229,6 @@ extern void virtual_set_force_exec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS release_builtin_module( void *module ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f055be94238..63b322a0c68 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -615,7 +615,7 @@ static void add_builtin_module( void *module, void *handle ) /*********************************************************************** * release_builtin_module */ -NTSTATUS release_builtin_module( void *module ) +static void release_builtin_module( void *module ) { struct builtin_module *builtin; @@ -630,9 +630,8 @@ NTSTATUS release_builtin_module( void *module ) free( builtin->unix_name ); free( builtin ); } - return STATUS_SUCCESS; + break; } - return STATUS_INVALID_PARAMETER; }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Restore default mute threshold.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: ae01a6f6adcbe59913c6338b7ec2bc8422c49d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae01a6f6adcbe59913c6338b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:18 2021 +0200 ntoskrnl.exe/tests: Restore default mute threshold. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index aa84890f6af..f73f6f938ca 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -51,7 +51,7 @@ static int winetest_debug; static int winetest_report_success; /* silence todos and skips above this threshold */ -static int winetest_mute_threshold = 1; +static int winetest_mute_threshold = 42; /* counts how many times a given line printed a message */ static LONG line_counters[16384];

1 0

Rémi Bernon : hidclass.sys: Use a simpler ring buffer with ref-counted reports.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 325984ded50b354686e5a454aa5aca3aafa81432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=325984ded50b354686e5a454… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:17 2021 +0200 hidclass.sys: Use a simpler ring buffer with ref-counted reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/buffer.c | 204 ------------------------------------------ dlls/hidclass.sys/device.c | 162 +++++++++++++++++++++++++-------- dlls/hidclass.sys/hid.h | 25 +++--- 4 files changed, 136 insertions(+), 256 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=325984ded50b354686e5…

1 0

Rémi Bernon : hidclass.sys: Process pending IRP queue using last read packet.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 0a104844eb4ab402be7c419f05b430f107fc0763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a104844eb4ab402be7c419f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:16 2021 +0200 hidclass.sys: Process pending IRP queue using last read packet. Instead of requiring the ring buffer to keep previously read packets. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 34 ---------------------------------- dlls/hidclass.sys/device.c | 45 ++++++++++++++++++--------------------------- dlls/hidclass.sys/hid.h | 1 - 3 files changed, 18 insertions(+), 62 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 720ca4eeb20..59c0edf29f9 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -154,40 +154,6 @@ void RingBuffer_ReadNew(struct ReportRingBuffer *ring, UINT index, void *output, } } -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) -{ - int pointer; - void *ret = NULL; - - EnterCriticalSection(&ring->lock); - if (index >= ring->pointer_alloc || ring->pointers[index] == POINTER_UNUSED - || ring->end == ring->start) - { - LeaveCriticalSection(&ring->lock); - *size = 0; - return; - } - - pointer = ring->pointers[index]; - - if (pointer == ring->end) - pointer--; - - if (pointer < 0) - pointer = ring->size - 1; - - ret = &ring->buffer[pointer * ring->buffer_size]; - memcpy(output, ret, ring->buffer_size); - if (pointer == ring->pointers[index]) - { - ring->pointers[index]++; - if (ring->pointers[index] == ring->size) - ring->pointers[index] = 0; - } - LeaveCriticalSection(&ring->lock); - *size = ring->buffer_size; -} - UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { UINT idx; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index a3c82d03269..8510f25ae41 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -82,10 +82,13 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp) static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *packet ) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; + HID_XFER_PACKET *read_packet, *last_packet = packet; struct hid_report_queue *queue; RAWINPUT *rawinput; ULONG size; KIRQL irql; + IRP *irp; size = offsetof( RAWINPUT, data.hid.bRawData[packet->reportBufferLen] ); if (!(rawinput = malloc( size ))) ERR( "Failed to allocate rawinput data!\n" ); @@ -114,37 +117,27 @@ static void hid_device_queue_input( DEVICE_OBJECT *device, HID_XFER_PACKET *pack LIST_FOR_EACH_ENTRY( queue, &ext->u.pdo.report_queues, struct hid_report_queue, entry ) RingBuffer_Write( queue->buffer, packet ); KeReleaseSpinLock( &ext->u.pdo.report_queues_lock, irql ); -} - -static void HID_Device_processQueue(DEVICE_OBJECT *device) -{ - BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - struct hid_preparsed_data *preparsed = ext->u.pdo.preparsed_data; - struct hid_report_queue *queue; - HID_XFER_PACKET *packet; - UINT buffer_size; - IRP *irp; - packet = malloc( sizeof(*packet) + preparsed->caps.InputReportByteLength ); + if (!(read_packet = malloc( sizeof(*packet) + preparsed->caps.InputReportByteLength ))) + { + ERR( "Failed to allocate read_packet!\n" ); + return; + } - while((irp = pop_irp_from_queue(ext))) + while ((irp = pop_irp_from_queue( ext ))) { queue = irp->Tail.Overlay.OriginalFileObject->FsContext; - RingBuffer_Read( queue->buffer, 0, packet, &buffer_size ); - if (buffer_size) - { - memcpy( irp->AssociatedIrp.SystemBuffer, packet + 1, preparsed->caps.InputReportByteLength ); - irp->IoStatus.Information = packet->reportBufferLen; - irp->IoStatus.Status = STATUS_SUCCESS; - } - else - { - irp->IoStatus.Information = 0; - irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - } + RingBuffer_ReadNew( queue->buffer, 0, read_packet, &size ); + if (!size) packet = last_packet; + else packet = read_packet; + + memcpy( irp->AssociatedIrp.SystemBuffer, packet + 1, preparsed->caps.InputReportByteLength ); + irp->IoStatus.Information = packet->reportBufferLen; + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); } - free(packet); + + free( read_packet ); } static DWORD CALLBACK hid_device_thread(void *args) @@ -187,7 +180,6 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBufferLen = io.Information; hid_device_queue_input( device, packet ); - HID_Device_processQueue(device); } rc = WaitForSingleObject(ext->u.pdo.halt_event, @@ -229,7 +221,6 @@ static DWORD CALLBACK hid_device_thread(void *args) packet->reportBufferLen = io.Information; hid_device_queue_input( device, packet ); - HID_Device_processQueue(device); } if (exit_now) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index d886672ec10..6bfba100007 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -96,7 +96,6 @@ struct hid_report_queue void RingBuffer_Write(struct ReportRingBuffer *buffer, void *data) DECLSPEC_HIDDEN; UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; void RingBuffer_ReadNew(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : hidclass.sys: Create separate report queue for each opened handle.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 3a3e0ed2e9525667b9839ea2f218183182350022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a3e0ed2e9525667b9839ea2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 11:31:15 2021 +0200 hidclass.sys: Create separate report queue for each opened handle. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 127 ++++++++++++++++++++++++------------- dlls/hidclass.sys/hid.h | 10 ++- dlls/hidclass.sys/pnp.c | 7 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 +- 4 files changed, 95 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a3e0ed2e9525667b983…

1 0

Ziqing Hui : d2d1: Implement d2d_effect_SetInputCount().
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: a60e45b64b00ec7e5c9948fbde5410b7c8ece1ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a60e45b64b00ec7e5c9948fb… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Aug 10 12:05:13 2021 +0800 d2d1: Implement d2d_effect_SetInputCount(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 10 +++++++++ dlls/d2d1/effect.c | 55 +++++++++++++++++++++++++++++++----------------- dlls/d2d1/tests/d2d1.c | 2 -- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 88c712cf51c..e823b2092bf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -565,12 +565,22 @@ struct d2d_device void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; +struct d2d_effect_info +{ + const CLSID *clsid; + UINT32 default_input_count; + UINT32 min_inputs; + UINT32 max_inputs; +}; + struct d2d_effect { ID2D1Effect ID2D1Effect_iface; ID2D1Image ID2D1Image_iface; LONG refcount; + const struct d2d_effect_info *info; + ID2D1Factory *factory; ID2D1Image **inputs; size_t inputs_size; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 560d87479a9..ef1189ba042 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -20,17 +20,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); -struct d2d_effect_info -{ - const CLSID *clsid; - UINT32 default_input_count; -}; - static const struct d2d_effect_info builtin_effects[] = { - {&CLSID_D2D12DAffineTransform, 1}, - {&CLSID_D2D13DPerspectiveTransform, 1}, - {&CLSID_D2D1Composite, 2} + {&CLSID_D2D12DAffineTransform, 1, 1, 1}, + {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, + {&CLSID_D2D1Composite, 2, 1, 0xffffffff} }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) @@ -207,9 +201,38 @@ static void STDMETHODCALLTYPE d2d_effect_SetInput(ID2D1Effect *iface, UINT32 ind static HRESULT STDMETHODCALLTYPE d2d_effect_SetInputCount(ID2D1Effect *iface, UINT32 count) { - FIXME("iface %p, count %u stub!\n", iface, count); + struct d2d_effect *effect = impl_from_ID2D1Effect(iface); + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, count %u.\n", iface, count); + + if (count < effect->info->min_inputs || count > effect->info->max_inputs) + return E_INVALIDARG; + if (count == effect->input_count) + return S_OK; + + if (count < effect->input_count) + { + for (i = count; i < effect->input_count; ++i) + { + if (effect->inputs[i]) + ID2D1Image_Release(effect->inputs[i]); + } + effect->input_count = count; + return S_OK; + } + + if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, + count, sizeof(*effect->inputs))) + { + ERR("Failed to resize inputs array.\n"); + return E_OUTOFMEMORY; + } + + memset(&effect->inputs[effect->input_count], 0, sizeof(*effect->inputs) * (count - effect->input_count)); + effect->input_count = count; + + return S_OK; } static void STDMETHODCALLTYPE d2d_effect_GetInput(ID2D1Effect *iface, UINT32 index, ID2D1Image **input) @@ -326,15 +349,9 @@ HRESULT d2d_effect_init(struct d2d_effect *effect, ID2D1Factory *factory, const { if (IsEqualGUID(effect_id, builtin_effects[i].clsid)) { - effect->input_count = builtin_effects[i].default_input_count; - - if (!d2d_array_reserve((void **)&effect->inputs, &effect->inputs_size, - effect->input_count, sizeof(*effect->inputs))) - return E_OUTOFMEMORY; - memset(effect->inputs, 0, sizeof(*effect->inputs) * effect->input_count); - + effect->info = &builtin_effects[i]; + d2d_effect_SetInputCount(&effect->ID2D1Effect_iface, effect->info->default_input_count); ID2D1Factory_AddRef(effect->factory = factory); - return S_OK; } } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a6f7ac88d0d..f655274754e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9811,10 +9811,8 @@ static void test_effect(BOOL d3d11) winetest_push_context("Input %u", j); hr = ID2D1Effect_SetInputCount(effect, j); if (j < test->min_inputs || j > test->max_inputs) - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); else - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); winetest_pop_context(); }

1 0