wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Rémi Bernon : ntdll: Compute effective flags in unsafe_heap_from_handle.
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: e7827fc85349e01da892c7839f7615f4a296cece URL: https://gitlab.winehq.org/wine/wine/-/commit/e7827fc85349e01da892c7839f7615… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 23 11:47:00 2022 +0100 ntdll: Compute effective flags in unsafe_heap_from_handle. --- dlls/ntdll/heap.c | 158 +++++++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 73 deletions(-)

1 0

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

24 Nov '22

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: Rename heap block ALIGNMENT macro to BLOCK_ALIGN.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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

Paul Gofman : wmic: Support array of BSTRs in convert_to_bstr().
by Alexandre Julliard 24 Nov '22

24 Nov '22

Module: wine Branch: master Commit: eec6aea10a9210737f884ca31b1bcc6d96572b5a URL: https://gitlab.winehq.org/wine/wine/-/commit/eec6aea10a9210737f884ca31b1bcc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 12:52:48 2022 -0600 wmic: Support array of BSTRs in convert_to_bstr(). --- programs/wmic/main.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index e0ba498e5f6..e49300c9cbc 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -168,14 +168,53 @@ static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *propli static void convert_to_bstr( VARIANT *v ) { + BSTR out = NULL; VARTYPE vt; if (SUCCEEDED(VariantChangeType( v, v, 0, VT_BSTR ))) return; vt = V_VT(v); + if (vt == (VT_ARRAY | VT_BSTR)) + { + unsigned int i, count, len; + BSTR *strings; + WCHAR *ptr; + + if (FAILED(SafeArrayAccessData( V_ARRAY(v), (void **)&strings ))) + { + WINE_ERR( "Could not access array.\n" ); + goto done; + } + count = V_ARRAY(v)->rgsabound->cElements; + len = 0; + for (i = 0; i < count; ++i) + len += wcslen( strings[i] ); + len += count * 2 + 2; + if (count) len += 2 * (count - 1); + out = SysAllocStringLen( NULL, len ); + ptr = out; + *ptr++ = '{'; + for (i = 0; i < count; ++i) + { + if (i) + { + memcpy( ptr, L", ", 2 * sizeof(*ptr) ); + ptr += 2; + } + *ptr++ = '\"'; + len = wcslen( strings[i] ); + memcpy( ptr, strings[i], len * sizeof(*ptr) ); + ptr += len; + *ptr++ = '\"'; + } + *ptr++ = '}'; + *ptr = 0; + SafeArrayUnaccessData( V_ARRAY(v) ); + } +done: VariantClear( v ); V_VT(v) = VT_BSTR; - V_BSTR(v) = SysAllocString( L"" ); - if (vt != VT_NULL && vt != VT_EMPTY) + V_BSTR(v) = out ? out : SysAllocString( L"" ); + if (vt != VT_NULL && vt != VT_EMPTY && !out) WINE_FIXME( "Could not convert variant, vt %u.\n", vt ); }

1 0

Paul Gofman : wmic: Add nicconfig alias.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

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 24 Nov '22

24 Nov '22

1 0

Alexandre Julliard : wineusb.sys: Use the Unix call helpers.
by Alexandre Julliard 24 Nov '22

24 Nov '22

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

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 November 2022