November 2022 - Wine-Commits

Rémi Bernon : ntdll: Rename heap block ALIGNMENT macro to BLOCK_ALIGN.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: ab28138862e7c07e06c10074f9c533b7b97156f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab28138862e7c07e06c10074f9c533… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 20 14:42:08 2022 +0100 ntdll: Rename heap block ALIGNMENT macro to BLOCK_ALIGN. And COMMIT_MASK to REGION_ALIGN - 1. --- dlls/ntdll/heap.c | 102 ++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 52 deletions(-)

1 0

Rémi Bernon : ntdll: Use BLOCK_FLAG_LARGE rather than subheap pointer.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 21218ce309eee7fb7dfaedff36f6b842ebc54319 URL: https://gitlab.winehq.org/wine/wine/-/commit/21218ce309eee7fb7dfaedff36f6b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 14:38:35 2022 +0100 ntdll: Use BLOCK_FLAG_LARGE rather than subheap pointer. --- dlls/ntdll/heap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index b861c77a5b3..183f5e01547 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1558,7 +1558,7 @@ static NTSTATUS heap_free( struct heap *heap, void *ptr ) SUBHEAP *subheap; if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; - if (!subheap) free_large_block( heap, block ); + if (block_get_flags( block ) & BLOCK_FLAG_LARGE) free_large_block( heap, block ); else free_used_block( heap, subheap, block ); return STATUS_SUCCESS; @@ -1603,7 +1603,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; - if (!subheap) + if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { if (!(block = realloc_large_block( heap, flags, block, size ))) return STATUS_NO_MEMORY; @@ -1747,7 +1747,7 @@ static NTSTATUS heap_size( const struct heap *heap, const void *ptr, SIZE_T *siz SUBHEAP *subheap; if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; - if (!subheap) + if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { const ARENA_LARGE *large_arena = CONTAINING_RECORD( block, ARENA_LARGE, block ); *size = large_arena->data_size; @@ -2023,7 +2023,7 @@ BOOLEAN WINAPI RtlGetUserInfoHeap( HANDLE handle, ULONG flags, void *ptr, void * } else if (!(*user_flags = HEAP_USER_FLAGS(block_get_flags( block )))) WARN( "Block %p wasn't allocated with user info\n", ptr ); - else if (!subheap) + else if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { const ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block ); *user_flags = *user_flags & ~HEAP_ADD_USER_INFO; @@ -2062,7 +2062,7 @@ BOOLEAN WINAPI RtlSetUserValueHeap( HANDLE handle, ULONG flags, void *ptr, void WARN( "Failed to find block %p in heap %p\n", ptr, handle ); else if (!(block_get_flags( block ) & BLOCK_FLAG_USER_INFO)) WARN( "Block %p wasn't allocated with user info\n", ptr ); - else if (!subheap) + else if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { ARENA_LARGE *large = CONTAINING_RECORD( block, ARENA_LARGE, block ); large->user_value = user_value;

1 0

Rémi Bernon : ntdll: Compute block size before calling heap_(re)allocate.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 1526ac755fafa54f7c2bd865d971253ad44254e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1526ac755fafa54f7c2bd865d97125… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 23 11:47:40 2022 +0100 ntdll: Compute block size before calling heap_(re)allocate. --- dlls/ntdll/heap.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 468fa11a547..6b94f9bbb6e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1481,7 +1481,7 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T { static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS | HEAP_ADD_USER_INFO; static const ULONG check_flags = HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED | HEAP_CHECKING_ENABLED; - SIZE_T overhead; + SIZE_T overhead, block_size; if ((flags & check_flags)) overhead = BLOCK_ALIGN; else overhead = sizeof(struct block); @@ -1490,19 +1490,19 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T if (flags & padd_flags) overhead += BLOCK_ALIGN; if (size < BLOCK_ALIGN) size = BLOCK_ALIGN; - return ROUND_SIZE( size + overhead, BLOCK_ALIGN - 1 ); + block_size = ROUND_SIZE( size + overhead, BLOCK_ALIGN - 1 ); + + if (block_size < size) return ~0U; /* overflow */ + if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; + return block_size; } -static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T size, void **ret ) +static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T block_size, SIZE_T size, void **ret ) { - SIZE_T old_block_size, block_size; + SIZE_T old_block_size; struct block *block; SUBHEAP *subheap; - block_size = heap_get_block_size( heap, flags, size ); - if (block_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; - if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (!(block = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; @@ -1533,16 +1533,19 @@ static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T size, void void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE_T size ) { struct heap *heap; + SIZE_T block_size; void *ptr = NULL; ULONG heap_flags; NTSTATUS status; if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) status = STATUS_INVALID_HANDLE; + else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + status = STATUS_NO_MEMORY; else { heap_lock( heap, heap_flags ); - status = heap_allocate( heap, heap_flags, size, &ptr ); + status = heap_allocate( heap, heap_flags, block_size, size, &ptr ); heap_unlock( heap, heap_flags ); } @@ -1594,17 +1597,14 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * } -static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE_T size, void **ret ) +static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, + SIZE_T block_size, SIZE_T size, void **ret ) { - SIZE_T old_block_size, old_size, block_size; + SIZE_T old_block_size, old_size; struct block *next, *block; SUBHEAP *subheap; NTSTATUS status; - block_size = heap_get_block_size( heap, flags, size ); - if (block_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (block_size < HEAP_MIN_BLOCK_SIZE) block_size = HEAP_MIN_BLOCK_SIZE; - if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (block_get_flags( block ) & BLOCK_FLAG_LARGE) { @@ -1632,7 +1632,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE else { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; - if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; + if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; valgrind_notify_alloc( *ret, size, 0 ); memcpy( *ret, block + 1, old_size ); if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); @@ -1659,6 +1659,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, SIZE void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T size ) { struct heap *heap; + SIZE_T block_size; ULONG heap_flags; void *ret = NULL; NTSTATUS status; @@ -1667,10 +1668,12 @@ void *WINAPI RtlReAllocateHeap( HANDLE handle, ULONG flags, void *ptr, SIZE_T si if (!(heap = unsafe_heap_from_handle( handle, flags, &heap_flags ))) status = STATUS_INVALID_HANDLE; + else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) + status = STATUS_NO_MEMORY; else { heap_lock( heap, heap_flags ); - status = heap_reallocate( heap, heap_flags, ptr, size, &ret ); + status = heap_reallocate( heap, heap_flags, ptr, block_size, size, &ret ); heap_unlock( heap, heap_flags ); }

1 0

Rémi Bernon : ntdll: Pass a heap block pointer to initialize_block.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 63b6ec5af312e552536a9da0b998e1b2d1fda9c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/63b6ec5af312e552536a9da0b998e1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 14 09:56:37 2022 +0200 ntdll: Pass a heap block pointer to initialize_block. --- dlls/ntdll/heap.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6b94f9bbb6e..cb1ff12c679 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -378,17 +378,21 @@ static inline void mark_block_tail( struct block *block, DWORD flags ) } /* initialize contents of a newly created block of memory */ -static inline void initialize_block( void *ptr, SIZE_T size, DWORD flags ) +static inline void initialize_block( struct block *block, SIZE_T old_size, SIZE_T size, DWORD flags ) { + char *data = (char *)(block + 1); + + if (size <= old_size) return; + if (flags & HEAP_ZERO_MEMORY) { - valgrind_make_writable( ptr, size ); - memset( ptr, 0, size ); + valgrind_make_writable( data + old_size, size - old_size ); + memset( data + old_size, 0, size - old_size ); } else if (flags & HEAP_FREE_CHECKING_ENABLED) { - valgrind_make_writable( ptr, size ); - memset( ptr, BLOCK_FILL_USED, size ); + valgrind_make_writable( data + old_size, size - old_size ); + memset( data + old_size, BLOCK_FILL_USED, size - old_size ); } } @@ -845,7 +849,7 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct { /* FIXME: we could remap zero-pages instead */ valgrind_notify_resize( data, old_size, size ); - if (size > old_size) initialize_block( data + old_size, size - old_size, flags ); + initialize_block( block, old_size, size, flags ); arena->data_size = size; valgrind_make_noaccess( (char *)block + sizeof(*block) + arena->data_size, @@ -1520,7 +1524,7 @@ static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T block_size block_set_type( block, BLOCK_TYPE_USED ); block_set_flags( block, ~0, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, subheap, block, old_block_size, block_size, size ); - initialize_block( block + 1, size, flags ); + initialize_block( block, 0, size, flags ); mark_block_tail( block, flags ); *ret = block + 1; @@ -1646,7 +1650,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, block_set_flags( block, BLOCK_FLAG_USER_MASK, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, subheap, block, old_block_size, block_size, size ); - if (size > old_size) initialize_block( (char *)(block + 1) + old_size, size - old_size, flags ); + initialize_block( block, old_size, size, flags ); mark_block_tail( block, flags ); *ret = block + 1;

1 0

Paul Gofman : wmic: Add nicconfig alias.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: e3d7a3e3f6a5ea1b507bd16930395d27922cb204 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3d7a3e3f6a5ea1b507bd16930395d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 22 18:58:03 2022 -0600 wmic: Add nicconfig alias. --- programs/wmic/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index ef3ca5fff4e..e0ba498e5f6 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -47,7 +47,8 @@ alias_map[] = { L"process", L"Win32_Process" }, { L"baseboard", L"Win32_BaseBoard" }, { L"diskdrive", L"Win32_DiskDrive" }, - { L"memorychip", L"Win32_PhysicalMemory" } + { L"memorychip", L"Win32_PhysicalMemory" }, + { L"nicconfig", L"Win32_NetworkAdapterConfiguration" }, }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Paul Gofman : wmic: Handle VariantChangeType() failures.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 97b9d8ddbec45ce674e5878802fa685bb8e21395 URL: https://gitlab.winehq.org/wine/wine/-/commit/97b9d8ddbec45ce674e5878802fa68… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 12:15:35 2022 -0600 wmic: Handle VariantChangeType() failures. wmic currently crashes on, e. g., VT_EMPTY or VT_ARRAY types returned. --- programs/wmic/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 72a54c09b57..ef3ca5fff4e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -165,6 +165,19 @@ static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *propli return hr; } +static void convert_to_bstr( VARIANT *v ) +{ + VARTYPE vt; + + if (SUCCEEDED(VariantChangeType( v, v, 0, VT_BSTR ))) return; + vt = V_VT(v); + VariantClear( v ); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString( L"" ); + if (vt != VT_NULL && vt != VT_EMPTY) + WINE_FIXME( "Could not convert variant, vt %u.\n", vt ); +} + static int query_prop( const WCHAR *class, const WCHAR *propnames ) { HRESULT hr; @@ -227,7 +240,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK) { - VariantChangeType( &v, &v, 0, VT_BSTR ); + convert_to_bstr( &v ); width = max( lstrlenW( V_BSTR( &v ) ), width ); VariantClear( &v ); SysFreeString( name ); @@ -261,7 +274,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK) { - VariantChangeType( &v, &v, 0, VT_BSTR ); + convert_to_bstr( &v ); output_text( V_BSTR( &v ), width ); VariantClear( &v ); }

1 0

Paul Gofman : wmic: Call _BeginEnumeration() before iterating class object.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 85b84a949c08c54a173492664c7d15c98e0dd9a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/85b84a949c08c54a173492664c7d15… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 12:01:07 2022 -0600 wmic: Call _BeginEnumeration() before iterating class object. Otherwise enumeration fails on Windows. --- programs/wmic/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 2eb2895031e..72a54c09b57 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -224,6 +224,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR ); @@ -241,6 +242,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (count) { + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, &name, NULL, NULL, NULL ) == S_OK) { output_text( name, width ); @@ -256,7 +258,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) { IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; - + IWbemClassObject_BeginEnumeration( obj, 0 ); while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR );

1 0

Paul Gofman : wmic: Don't set WBEM_FLAG_FORWARD_ONLY flag on query.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 6412b3dc3ac9d5b22fb68ff68c22e3b798f97bbb URL: https://gitlab.winehq.org/wine/wine/-/commit/6412b3dc3ac9d5b22fb68ff68c22e3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 11:58:20 2022 -0600 wmic: Don't set WBEM_FLAG_FORWARD_ONLY flag on query. The result access is not forward only. --- programs/wmic/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index cfc20e45ffd..2eb2895031e 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -171,7 +171,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames ) IWbemLocator *locator = NULL; IWbemServices *services = NULL; IEnumWbemClassObject *result = NULL; - LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; + LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY; BSTR path = NULL, wql = NULL, query = NULL, name, str = NULL; WCHAR *proplist = NULL; int len, ret = -1;

1 0

Alex Henrie : mshtml: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

1 0

Alexandre Julliard : wineusb.sys: Use the Unix call helpers.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: e7caf5a68728421c7514875d012dab7df6fc689a URL: https://gitlab.winehq.org/wine/wine/-/commit/e7caf5a68728421c7514875d012dab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 10:34:28 2022 +0100 wineusb.sys: Use the Unix call helpers. --- dlls/wineusb.sys/wineusb.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 63b723503c9..e9e91326a84 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -66,8 +66,6 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, DECLARE_CRITICAL_SECTION(wineusb_cs); -static unixlib_handle_t unix_handle; - static struct list device_list = LIST_INIT(device_list); struct usb_device @@ -99,7 +97,7 @@ static void destroy_unix_device(struct unix_device *unix_device) .device = unix_device, }; - __wine_unix_call(unix_handle, unix_usb_destroy_device, &params); + WINE_UNIX_CALL(unix_usb_destroy_device, &params); } static void add_unix_device(const struct usb_add_device_event *event) @@ -171,7 +169,7 @@ static HANDLE libusb_event_thread, event_thread; static DWORD CALLBACK libusb_event_thread_proc(void *arg) { - __wine_unix_call(unix_handle, unix_usb_main_loop, NULL); + WINE_UNIX_CALL(unix_usb_main_loop, NULL); return 0; } @@ -199,7 +197,7 @@ static DWORD CALLBACK event_thread_proc(void *arg) .event = &event, }; - __wine_unix_call(unix_handle, unix_usb_get_event, &params); + WINE_UNIX_CALL(unix_usb_get_event, &params); switch (event.type) { @@ -282,7 +280,7 @@ static NTSTATUS fdo_pnp(IRP *irp) { struct usb_device *device, *cursor; - __wine_unix_call(unix_handle, unix_usb_exit, NULL); + WINE_UNIX_CALL(unix_usb_exit, NULL); WaitForSingleObject(libusb_event_thread, INFINITE); CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); @@ -536,7 +534,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) .transfer = queued_irp->Tail.Overlay.DriverContext[0], }; - __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); + WINE_UNIX_CALL(unix_usb_cancel_transfer, &params); } LeaveCriticalSection(&wineusb_cs); @@ -560,7 +558,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) * completion between submitting and queuing, we won't try to * dequeue the IRP until it's actually been queued. */ EnterCriticalSection(&wineusb_cs); - status = __wine_unix_call(unix_handle, unix_usb_submit_urb, &params); + status = WINE_UNIX_CALL(unix_usb_submit_urb, &params); if (status == STATUS_PENDING) { IoMarkIrpPending(irp); @@ -644,13 +642,10 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { NTSTATUS status; - void *instance; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlPcToFileHeader(DriverEntry, &instance); - if ((status = NtQueryVirtualMemory(GetCurrentProcess(), instance, - MemoryWineUnixFuncs, &unix_handle, sizeof(unix_handle), NULL))) + if ((status = __wine_init_unix_call())) { ERR("Failed to initialize Unix library, status %#lx.\n", status); return status;

1 0