July 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : wineusb.sys: Move the libusb_cancel_transfer() call to a new Unix library.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: e61498c0f2d9df92893b07818ad7843e76f86100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e61498c0f2d9df92893b0781… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 15:41:19 2022 -0500 wineusb.sys: Move the libusb_cancel_transfer() call to a new Unix library. --- dlls/wineusb.sys/Makefile.in | 2 ++ dlls/wineusb.sys/unixlib.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 38 +++++++++++++++++++++++++++++++++ dlls/wineusb.sys/wineusb.c | 21 +++++++++++++++++-- 4 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 8145213fbef..ee3bfffdbeb 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -1,5 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineusb.sys +UNIXLIB = wineusb.so IMPORTS = ntoskrnl UNIX_LIBS = $(USB_LIBS) UNIX_CFLAGS = $(USB_CFLAGS) @@ -7,6 +8,7 @@ UNIX_CFLAGS = $(USB_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin C_SRCS = \ + unixlib.c \ wineusb.c RC_SRCS = wineusb.rc diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c new file mode 100644 index 00000000000..cdc84d98ede --- /dev/null +++ b/dlls/wineusb.sys/unixlib.c @@ -0,0 +1,50 @@ +/* + * libusb backend + * + * Copyright 2020 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include <libusb.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "wine/debug.h" +#include "wine/list.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wineusb); + +static NTSTATUS usb_cancel_transfer(void *args) +{ + const struct usb_cancel_transfer_params *params = args; + int ret; + + if ((ret = libusb_cancel_transfer(params->transfer)) < 0) + ERR("Failed to cancel transfer: %s\n", libusb_strerror(ret)); + + return STATUS_SUCCESS; +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ +#define X(name) [unix_ ## name] = name + X(usb_cancel_transfer), +}; diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h new file mode 100644 index 00000000000..d046062cd5f --- /dev/null +++ b/dlls/wineusb.sys/unixlib.h @@ -0,0 +1,38 @@ +/* + * wineusb Unix library interface + * + * Copyright 2022 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEUSB_UNIXLIB_H +#define __WINE_WINEUSB_UNIXLIB_H + +#include "windef.h" +#include "winternl.h" +#include "wine/unixlib.h" + +struct usb_cancel_transfer_params +{ + void *transfer; +}; + +enum unix_funcs +{ + unix_usb_cancel_transfer, +}; + +#endif diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 87669b5c65d..1f3435b67a4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -36,6 +36,8 @@ #include "wine/list.h" #include "wine/unicode.h" +#include "unixlib.h" + WINE_DEFAULT_DEBUG_CHANNEL(wineusb); #ifdef __ASM_USE_FASTCALL_WRAPPER @@ -64,6 +66,8 @@ __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 @@ -712,9 +716,12 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) for (entry = mark->Flink; entry != mark; entry = entry->Flink) { IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + struct usb_cancel_transfer_params params = + { + .transfer = queued_irp->Tail.Overlay.DriverContext[0], + }; - if ((ret = libusb_cancel_transfer(queued_irp->Tail.Overlay.DriverContext[0])) < 0) - ERR("Failed to cancel transfer: %s\n", libusb_strerror(ret)); + __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); } LeaveCriticalSection(&wineusb_cs); @@ -930,10 +937,20 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { + NTSTATUS status; + void *instance; int err; 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))) + { + ERR("Failed to initialize Unix library, status %#x.\n", status); + return status; + } + driver_obj = driver; if ((err = libusb_init(NULL)))

1 0

Zhiyi Zhang : winex11.drv: Use a global Vulkan instance in X11DRV_D3DKMTOpenAdapterFromLuid().
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 00eff14f33233a7aa2330d9242e1f3584cc3b4e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00eff14f33233a7aa2330d92… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 29 17:39:30 2022 +0800 winex11.drv: Use a global Vulkan instance in X11DRV_D3DKMTOpenAdapterFromLuid(). This avoids opening multiple Vulkan instances when multiple D3D kernel mode adapters are open. Some tests that leak reference to D3D adapters crash because of out of memory errors before this patch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53201 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53231 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53235 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 62 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index dc987ae70a2..4e908f2918b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -107,7 +107,6 @@ static pthread_mutex_t error_mutex = PTHREAD_MUTEX_INITIALIZER; struct x11_d3dkmt_adapter { D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ - VkInstance vk_instance; /* Vulkan instance */ VkPhysicalDevice vk_device; /* Vulkan physical device */ struct list entry; /* List entry */ }; @@ -120,6 +119,7 @@ struct d3dkmt_vidpn_source struct list entry; /* List entry */ }; +static VkInstance d3dkmt_vk_instance; /* Vulkan instance for D3DKMT functions */ static struct list x11_d3dkmt_adapters = LIST_INIT( x11_d3dkmt_adapters ); static struct list d3dkmt_vidpn_sources = LIST_INIT( d3dkmt_vidpn_sources ); /* VidPN source information list */ @@ -862,12 +862,17 @@ NTSTATUS CDECL X11DRV_D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) { if (adapter->handle == desc->hAdapter) { - vulkan_funcs->p_vkDestroyInstance(adapter->vk_instance, NULL); list_remove(&adapter->entry); free(adapter); break; } } + + if (list_empty(&x11_d3dkmt_adapters)) + { + vulkan_funcs->p_vkDestroyInstance(d3dkmt_vk_instance, NULL); + d3dkmt_vk_instance = NULL; + } pthread_mutex_unlock(&d3dkmt_mutex); return STATUS_SUCCESS; } @@ -1134,7 +1139,6 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des struct x11_d3dkmt_adapter *adapter; VkInstanceCreateInfo create_info; VkPhysicalDeviceIDProperties id; - VkInstance vk_instance = NULL; VkResult vr; GUID uuid; @@ -1152,30 +1156,35 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des return STATUS_UNSUCCESSFUL; } - memset(&create_info, 0, sizeof(create_info)); - create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - create_info.enabledExtensionCount = ARRAY_SIZE(extensions); - create_info.ppEnabledExtensionNames = extensions; + pthread_mutex_lock(&d3dkmt_mutex); - vr = vulkan_funcs->p_vkCreateInstance(&create_info, NULL, &vk_instance); - if (vr != VK_SUCCESS) + if (!d3dkmt_vk_instance) { - WARN("Failed to create a Vulkan instance, vr %d.\n", vr); - goto done; + memset(&create_info, 0, sizeof(create_info)); + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + + vr = vulkan_funcs->p_vkCreateInstance(&create_info, NULL, &d3dkmt_vk_instance); + if (vr != VK_SUCCESS) + { + WARN("Failed to create a Vulkan instance, vr %d.\n", vr); + goto done; + } } -#define LOAD_VK_FUNC(f) \ - if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(vk_instance, #f))) \ - { \ - WARN("Failed to load " #f ".\n"); \ - goto done; \ +#define LOAD_VK_FUNC(f) \ + if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(d3dkmt_vk_instance, #f))) \ + { \ + WARN("Failed to load " #f ".\n"); \ + goto done; \ } LOAD_VK_FUNC(vkEnumeratePhysicalDevices) LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2KHR) #undef LOAD_VK_FUNC - vr = pvkEnumeratePhysicalDevices(vk_instance, &device_count, NULL); + vr = pvkEnumeratePhysicalDevices(d3dkmt_vk_instance, &device_count, NULL); if (vr != VK_SUCCESS || !device_count) { WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); @@ -1185,7 +1194,7 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des if (!(vk_physical_devices = calloc(device_count, sizeof(*vk_physical_devices)))) goto done; - vr = pvkEnumeratePhysicalDevices(vk_instance, &device_count, vk_physical_devices); + vr = pvkEnumeratePhysicalDevices(d3dkmt_vk_instance, &device_count, vk_physical_devices); if (vr != VK_SUCCESS) { WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); @@ -1210,19 +1219,20 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des } adapter->handle = desc->hAdapter; - adapter->vk_instance = vk_instance; adapter->vk_device = vk_physical_devices[device_idx]; - pthread_mutex_lock(&d3dkmt_mutex); list_add_head(&x11_d3dkmt_adapters, &adapter->entry); - pthread_mutex_unlock(&d3dkmt_mutex); - free(vk_physical_devices); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } done: + if (d3dkmt_vk_instance && list_empty(&x11_d3dkmt_adapters)) + { + vulkan_funcs->p_vkDestroyInstance(d3dkmt_vk_instance, NULL); + d3dkmt_vk_instance = NULL; + } + pthread_mutex_unlock(&d3dkmt_mutex); free(vk_physical_devices); - if (vk_instance) - vulkan_funcs->p_vkDestroyInstance(vk_instance, NULL); return status; } @@ -1253,7 +1263,7 @@ NTSTATUS CDECL X11DRV_D3DKMTQueryVideoMemoryInfo( D3DKMT_QUERYVIDEOMEMORYINFO *d if (adapter->handle != desc->hAdapter) continue; - if (!(pvkGetPhysicalDeviceMemoryProperties2KHR = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(adapter->vk_instance, "vkGetPhysicalDeviceMemoryProperties2KHR"))) + if (!(pvkGetPhysicalDeviceMemoryProperties2KHR = (void *)vulkan_funcs->p_vkGetInstanceProcAddr(d3dkmt_vk_instance, "vkGetPhysicalDeviceMemoryProperties2KHR"))) { WARN("Failed to load vkGetPhysicalDeviceMemoryProperties2KHR.\n"); status = STATUS_UNSUCCESSFUL;

1 0

Alexandre Julliard : ntdll: Add _vscprintf and _vscwprintf.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 607a38246b2690014fb5cf36bca8818119742e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=607a38246b2690014fb5cf36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 16:24:30 2022 +0200 ntdll: Add _vscprintf and _vscwprintf. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +++- dlls/ntdll/printf.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 26dd6c33879..165d7a31a2b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1523,7 +1523,6 @@ @ varargs _snprintf_s(ptr long long str) @ varargs _snwprintf(ptr long wstr) @ varargs _snwprintf_s(ptr long long wstr) -@ varargs _swprintf(ptr wstr) NTDLL_swprintf @ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) @ cdecl _strcmpi(str str) _stricmp @@ -1533,6 +1532,7 @@ @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) @ cdecl _strupr_s(str long) +@ varargs _swprintf(ptr wstr) NTDLL_swprintf @ cdecl _tolower(long) @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) @@ -1543,6 +1543,8 @@ @ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) @ cdecl _ultow_s(long ptr long long) +@ cdecl _vscprintf(str ptr) +@ cdecl _vscwprintf(wstr ptr) @ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnprintf_s(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index cb7c1ebcae4..37419ea1e83 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -21,6 +21,7 @@ #include <assert.h> #include <ctype.h> +#include <limits.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -75,6 +76,24 @@ int CDECL _vsnwprintf( WCHAR *str, size_t len, const WCHAR *format, va_list args } +/********************************************************************* + * _vscprintf (NTDLL.@) + */ +int CDECL _vscprintf( const char *format, va_list valist ) +{ + return _vsnprintf( NULL, INT_MAX, format, valist ); +} + + +/********************************************************************* + * _vscwprintf (NTDLL.@) + */ +int CDECL _vscwprintf( const wchar_t *format, va_list args ) +{ + return _vsnwprintf( NULL, INT_MAX, format, args ); +} + + /********************************************************************* * _snprintf (NTDLL.@) */

1 0

Zebediah Figura : wineusb.sys: Do not store a reference to the libusb device in the usb_device structure.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 0b02f2e9504fa12488186c2683391586a460cf29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b02f2e9504fa12488186c26… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 18:12:25 2022 -0500 wineusb.sys: Do not store a reference to the libusb device in the usb_device structure. Retrieve it from the handle if necessary. For simplicity. --- dlls/wineusb.sys/wineusb.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index f5c727fa823..59d8bd93fc4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -86,7 +86,6 @@ struct usb_device uint16_t vendor, product, revision; - libusb_device *libusb_device; libusb_device_handle *handle; LIST_ENTRY irp_list; @@ -114,7 +113,6 @@ static void add_usb_interface(struct usb_device *parent, const struct libusb_int device->device_obj = device_obj; device->parent = parent; device->handle = parent->handle; - device->libusb_device = parent->libusb_device; device->interface_index = desc->bInterfaceNumber; device->class = desc->bInterfaceClass; device->subclass = desc->bInterfaceSubClass; @@ -166,7 +164,6 @@ static void add_usb_device(libusb_device *libusb_device) device = device_obj->DeviceExtension; device->device_obj = device_obj; - device->libusb_device = libusb_ref_device(libusb_device); device->handle = handle; InitializeListHead(&device->irp_list); @@ -227,7 +224,7 @@ static void remove_usb_device(libusb_device *libusb_device) EnterCriticalSection(&wineusb_cs); LIST_FOR_EACH_ENTRY(device, &device_list, struct usb_device, entry) { - if (device->libusb_device == libusb_device) + if (libusb_get_device(device->handle) == libusb_device) { if (!device->removed) { @@ -364,10 +361,7 @@ static NTSTATUS fdo_pnp(IRP *irp) { assert(!device->removed); if (!device->parent) - { - libusb_unref_device(device->libusb_device); libusb_close(device->handle); - } list_remove(&device->entry); IoDeleteDevice(device->device_obj); } @@ -564,10 +558,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) remove_pending_irps(device); if (!device->parent) - { - libusb_unref_device(device->libusb_device); libusb_close(device->handle); - } IoDeleteDevice(device->device_obj); ret = STATUS_SUCCESS;

1 0

Alexandre Julliard : ntdll: Add qsort_s.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: d1cc31cebbdfc599907275cde9054d4fe8128756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1cc31cebbdfc599907275cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 16:14:52 2022 +0200 ntdll: Add qsort_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 154 +++++++++++++++++++++++++++++++++++++--------- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/string.c | 2 - 3 files changed, 127 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index bce8d7db54e..ab89ccb39d6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -37,49 +37,147 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) return debugstr_wn(us->Buffer, us->Length / sizeof(WCHAR)); } -static void -NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), - size_t left, size_t right ) -{ - if(right>left) { - size_t i, j, k, m; - m=left+(right-left)/2; - NTDLL_mergesort( arr, barr, elemsize, compar, left, m); - NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right); - -#define X(a,i) ((char*)a+elemsize*(i)) - for (k=left, i=left, j=m+1; i<=m && j<=right; k++) { - if (compar(X(arr, i), X(arr,j)) <= 0) { - memcpy(X(barr,k), X(arr, i), elemsize); - i++; - } else { - memcpy(X(barr,k), X(arr, j), elemsize); - j++; +static int __cdecl compare_wrapper(void *ctx, const void *e1, const void *e2) +{ + int (__cdecl *compare)( const void *, const void * ) = ctx; + return compare( e1, e2 ); +} + +static inline void swap(char *l, char *r, size_t size) +{ + char tmp; + + while(size--) { + tmp = *l; + *l++ = *r; + *r++ = tmp; + } +} + +static void small_sort(void *base, size_t nmemb, size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) +{ + size_t e, i; + char *max, *p; + + for(e=nmemb; e>1; e--) { + max = base; + for(i=1; i<e; i++) { + p = (char*)base + i*size; + if(compar(context, p, max) > 0) + max = p; + } + + if(p != max) + swap(p, max, size); + } +} + +static void quick_sort(void *base, size_t nmemb, size_t size, + int (CDECL *compar)(void *, const void *, const void *), void *context) +{ + size_t stack_lo[8*sizeof(size_t)], stack_hi[8*sizeof(size_t)]; + size_t beg, end, lo, hi, med; + int stack_pos; + + stack_pos = 0; + stack_lo[stack_pos] = 0; + stack_hi[stack_pos] = nmemb-1; + +#define X(i) ((char*)base+size*(i)) + while(stack_pos >= 0) { + beg = stack_lo[stack_pos]; + end = stack_hi[stack_pos--]; + + if(end-beg < 8) { + small_sort(X(beg), end-beg+1, size, compar, context); + continue; + } + + lo = beg; + hi = end; + med = lo + (hi-lo+1)/2; + if(compar(context, X(lo), X(med)) > 0) + swap(X(lo), X(med), size); + if(compar(context, X(lo), X(hi)) > 0) + swap(X(lo), X(hi), size); + if(compar(context, X(med), X(hi)) > 0) + swap(X(med), X(hi), size); + + lo++; + hi--; + while(1) { + while(lo <= hi) { + if(lo!=med && compar(context, X(lo), X(med))>0) + break; + lo++; } + + while(med != hi) { + if(compar(context, X(hi), X(med)) <= 0) + break; + hi--; + } + + if(hi < lo) + break; + + swap(X(lo), X(hi), size); + if(hi == med) + med = lo; + lo++; + hi--; + } + + while(hi > beg) { + if(hi!=med && compar(context, X(hi), X(med))!=0) + break; + hi--; } - if (i<=m) - memcpy(X(barr,k), X(arr,i), (m-i+1)*elemsize); - else - memcpy(X(barr,k), X(arr,j), (right-j+1)*elemsize); - memcpy(X(arr, left), X(barr, left), (right-left+1)*elemsize); + if(hi-beg >= end-lo) { + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + }else { + stack_lo[++stack_pos] = lo; + stack_hi[stack_pos] = end; + stack_lo[++stack_pos] = beg; + stack_hi[stack_pos] = hi; + } } #undef X } + +/********************************************************************* + * qsort_s (NTDLL.@) + */ +void __cdecl qsort_s( void *base, size_t nmemb, size_t size, + int (__cdecl *compar)(void *, const void *, const void *), void *context ) +{ + const size_t total_size = nmemb * size; + + if (!base && nmemb) return; + if (!size) return; + if (!compar) return; + if (total_size / size != nmemb) return; + if (nmemb < 2) return; + quick_sort( base, nmemb, size, compar, context ); +} + + /********************************************************************* * qsort (NTDLL.@) */ void __cdecl qsort( void *base, size_t nmemb, size_t size, int (__cdecl *compar)(const void *, const void *) ) { - void *secondarr; - if (nmemb < 2 || size == 0) return; - secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); - NTDLL_mergesort( base, secondarr, size, compar, 0, nmemb-1 ); - RtlFreeHeap (GetProcessHeap(),0, secondarr); + qsort_s( base, nmemb, size, compare_wrapper, compar ); } + /********************************************************************* * bsearch (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a4494f79452..c10ca903190 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1603,6 +1603,7 @@ @ cdecl memset(ptr long long) @ cdecl pow(double double) @ cdecl qsort(ptr long long ptr) +@ cdecl qsort_s(ptr long long ptr ptr) @ cdecl sin(double) @ varargs sprintf(ptr str) NTDLL_sprintf @ varargs sprintf_s(ptr long str) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b9c6465dbee..d4ef5b0f54f 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1452,11 +1452,9 @@ static void test_qsort(void) ok(!strcmp(strarr2[0], "!"), "badly sorted, strar2r[0] is %s\n", strarr2[0]); ok(!strcmp(strarr2[1], "Hello"), "badly sorted, strarr2[1] is %s\n", strarr2[1]); ok(!strcmp(strarr2[2], "Sorted"), "badly sorted, strarr2[2] is %s\n", strarr2[2]); -todo_wine { ok(!strcmp(strarr2[3], "wine"), "badly sorted, strarr2[3] is %s\n", strarr2[3]); ok(!strcmp(strarr2[4], "WINE"), "badly sorted, strarr2[4] is %s\n", strarr2[4]); ok(!strcmp(strarr2[5], "Wine"), "badly sorted, strarr2[5] is %s\n", strarr2[5]); -} ok(!strcmp(strarr2[6], "World"), "badly sorted, strarr2[6] is %s\n", strarr2[6]); }

1 0

Alexandre Julliard : ntdll: Add bsearch_s.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 5b36a00b4dc8ae90edd1f9590ccb85cb8226338d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b36a00b4dc8ae90edd1f959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 1 16:15:12 2022 +0200 ntdll: Add bsearch_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 22 ++++++++++++++++++---- dlls/ntdll/ntdll.spec | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index ab89ccb39d6..d4371166869 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -179,18 +179,21 @@ void __cdecl qsort( void *base, size_t nmemb, size_t size, /********************************************************************* - * bsearch (NTDLL.@) + * bsearch_s (NTDLL.@) */ -void * __cdecl bsearch( const void *key, const void *base, size_t nmemb, - size_t size, int (__cdecl *compar)(const void *, const void *) ) +void * __cdecl bsearch_s( const void *key, const void *base, size_t nmemb, size_t size, + int (__cdecl *compare)(void *, const void *, const void *), void *ctx ) { ssize_t min = 0; ssize_t max = nmemb - 1; + if (!size) return NULL; + if (!compare) return NULL; + while (min <= max) { ssize_t cursor = min + (max - min) / 2; - int ret = compar(key,(const char *)base+(cursor*size)); + int ret = compare(ctx, key,(const char *)base+(cursor*size)); if (!ret) return (char*)base+(cursor*size); if (ret < 0) @@ -202,6 +205,17 @@ void * __cdecl bsearch( const void *key, const void *base, size_t nmemb, } +/********************************************************************* + * bsearch (NTDLL.@) + */ +void * __cdecl bsearch( const void *key, const void *base, size_t nmemb, + size_t size, int (__cdecl *compar)(const void *, const void *) ) +{ + return bsearch_s( key, base, nmemb, size, compare_wrapper, compar ); +} + + + /********************************************************************* * _lfind (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c10ca903190..26dd6c33879 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1566,6 +1566,7 @@ @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) +@ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl ceil(double) @ cdecl cos(double) @ cdecl fabs(double)

1 0

Zebediah Figura : wineusb.sys: Cache members of the device descriptor in the usb_device structure.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 8599b204d480792d2002dca5696016dda1a12a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8599b204d480792d2002dca5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 18:10:48 2022 -0500 wineusb.sys: Cache members of the device descriptor in the usb_device structure. These are already cached by libusb, but for convenience we want to cache them on the PE side. --- dlls/wineusb.sys/wineusb.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 1f3435b67a4..f5c727fa823 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -84,6 +84,8 @@ struct usb_device uint8_t class, subclass, protocol; + uint16_t vendor, product, revision; + libusb_device *libusb_device; libusb_device_handle *handle; @@ -117,6 +119,9 @@ static void add_usb_interface(struct usb_device *parent, const struct libusb_int device->class = desc->bInterfaceClass; device->subclass = desc->bInterfaceSubClass; device->protocol = desc->bInterfaceProtocol; + device->vendor = parent->vendor; + device->product = parent->product; + device->revision = parent->revision; InitializeListHead(&device->irp_list); EnterCriticalSection(&wineusb_cs); @@ -173,6 +178,9 @@ static void add_usb_device(libusb_device *libusb_device) device->class = device_desc.bDeviceClass; device->subclass = device_desc.bDeviceSubClass; device->protocol = device_desc.bDeviceProtocol; + device->vendor = device_desc.idVendor; + device->product = device_desc.idProduct; + device->revision = device_desc.bcdDevice; if (!(ret = libusb_get_active_config_descriptor(libusb_device, &config_desc))) { @@ -423,13 +431,11 @@ static void get_device_id(const struct usb_device *device, struct string_buffer '&','P','I','D','_','%','0','4','X','&','M','I','_','%','0','2','X',0}; static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X',0}; - struct libusb_device_descriptor desc; - libusb_get_device_descriptor(device->libusb_device, &desc); if (device->parent) - append_id(buffer, interface_formatW, desc.idVendor, desc.idProduct, device->interface_index); + append_id(buffer, interface_formatW, device->vendor, device->product, device->interface_index); else - append_id(buffer, formatW, desc.idVendor, desc.idProduct); + append_id(buffer, formatW, device->vendor, device->product); } static void get_hardware_ids(const struct usb_device *device, struct string_buffer *buffer) @@ -438,14 +444,11 @@ static void get_hardware_ids(const struct usb_device *device, struct string_buff '&','P','I','D','_','%','0','4','X','&','R','E','V','_','%','0','4','X','&','M','I','_','%','0','2','X',0}; static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X','&','R','E','V','_','%','0','4','X',0}; - struct libusb_device_descriptor desc; - - libusb_get_device_descriptor(device->libusb_device, &desc); if (device->parent) - append_id(buffer, interface_formatW, desc.idVendor, desc.idProduct, desc.bcdDevice, device->interface_index); + append_id(buffer, interface_formatW, device->vendor, device->product, device->revision, device->interface_index); else - append_id(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice); + append_id(buffer, formatW, device->vendor, device->product, device->revision); get_device_id(device, buffer); append_id(buffer, emptyW); }

1 0

Zebediah Figura : wineusb.sys: Create a separate unix_device struct to wrap the libusb device handle.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: a4aabcd1b545a7f87416be9857ee933b14070a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4aabcd1b545a7f87416be98… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:31:27 2022 -0500 wineusb.sys: Create a separate unix_device struct to wrap the libusb device handle. Keep unix_device objects in a separate list. --- dlls/wineusb.sys/Makefile.in | 2 +- dlls/wineusb.sys/wineusb.c | 100 +++++++++++++++++++++++++++++++++---------- 2 files changed, 78 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4aabcd1b545a7f87416…

1 0

Nikolay Sivov : d2d1/tests: Add some tests for enum property structure.
by Alexandre Julliard July 1, 2022

July 1, 2022

Module: wine Branch: master Commit: 9513f8a1840d747955c210a55d2bd3839d0c03bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9513f8a1840d747955c210a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 1 10:23:20 2022 +0300 d2d1/tests: Add some tests for enum property structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 78f255c1f99..9dfe1e760ba 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11343,6 +11343,72 @@ static void test_effect_properties(BOOL d3d11) release_test_context(&ctx); } +static void check_enum_property(ID2D1Effect *effect, UINT32 property, + const UINT32 *values, UINT32 count) +{ + ID2D1Properties *subproperties, *fields_subproperties, *field_subproperties; + D2D1_PROPERTY_TYPE prop_type; + UINT32 prop_count, value; + WCHAR buffer[64]; + unsigned int i; + HRESULT hr; + + prop_type = ID2D1Effect_GetType(effect, property); + ok(prop_type == D2D1_PROPERTY_TYPE_ENUM, "Unexpected type %d.\n", prop_type); + + hr = ID2D1Effect_GetSubProperties(effect, property, &subproperties); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + prop_type = ID2D1Properties_GetType(subproperties, D2D1_SUBPROPERTY_FIELDS); + ok(prop_type == D2D1_PROPERTY_TYPE_ARRAY, "Unexpected type %d.\n", prop_type); + + /* Number of enum members. */ + hr = ID2D1Properties_GetValue(subproperties, D2D1_SUBPROPERTY_FIELDS, D2D1_PROPERTY_TYPE_ARRAY, + (BYTE *)&value, sizeof(value)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(value == count, "Unexpected value %u.\n", value); + + prop_count = ID2D1Properties_GetPropertyCount(subproperties); + ok(!prop_count, "Got unexpected property count %u.\n", count); + + /* Fields is an array of strings providing display names for members. */ + hr = ID2D1Properties_GetSubProperties(subproperties, D2D1_SUBPROPERTY_FIELDS, + &fields_subproperties); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + prop_count = ID2D1Properties_GetPropertyCount(fields_subproperties); + ok(prop_count == count, "Got unexpected property count %u.\n", count); + + for (i = 0; i < prop_count; ++i) + { + winetest_push_context("Test %u", i); + + prop_type = ID2D1Properties_GetType(fields_subproperties, i); + ok(prop_type == D2D1_PROPERTY_TYPE_STRING, "Unexpected type %d.\n", prop_type); + + /* Field names are localized. */ + hr = ID2D1Properties_GetSubProperties(fields_subproperties, i, &field_subproperties); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + prop_count = ID2D1Properties_GetPropertyCount(field_subproperties); + ok(prop_count == 1, "Got unexpected property count %u.\n", count); + + prop_type = ID2D1Properties_GetType(field_subproperties, 0); + ok(prop_type == D2D1_PROPERTY_TYPE_UINT32, "Unexpected type %d.\n", prop_type); + hr = ID2D1Properties_GetPropertyName(field_subproperties, 0, buffer, ARRAY_SIZE(buffer)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(!wcscmp(buffer, L"Index"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); + hr = ID2D1Properties_GetValue(field_subproperties, 0, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&value, sizeof(value)); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(value == values[i], "Unexpected value %u, expected %u.\n", value, values[i]); + + ID2D1Properties_Release(field_subproperties); + + winetest_pop_context(); + } + + ID2D1Properties_Release(fields_subproperties); + ID2D1Properties_Release(subproperties); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11357,6 +11423,7 @@ static void test_effect_2d_affine(BOOL d3d11) ID2D1Bitmap1 *bitmap; ID2D1Effect *effect; ID2D1Image *output; + UINT32 value; BOOL match; HRESULT hr; @@ -11400,6 +11467,22 @@ static void test_effect_2d_affine(BOOL d3d11) "BgEfAQQBIQECASMChAEA"}, }; + static const unsigned int border_modes[] = + { + D2D1_BORDER_MODE_SOFT, + D2D1_BORDER_MODE_HARD, + }; + + static const unsigned int interp_modes[] = + { + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_NEAREST_NEIGHBOR, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_CUBIC, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_MULTI_SAMPLE_LINEAR, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_ANISOTROPIC, + D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC, + }; + memset(image_16x16, 0xff, sizeof(image_16x16)); set_matrix_identity(&rotate); set_matrix_identity(&scale); @@ -11432,6 +11515,28 @@ static void test_effect_2d_affine(BOOL d3d11) count = ID2D1Effect_GetPropertyCount(effect); todo_wine ok(count == 4, "Got unexpected property count %u.\n", count); + hr = ID2D1Effect_GetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE, + D2D1_PROPERTY_TYPE_ENUM, (BYTE *)&value, sizeof(value)); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + { + ok(value == D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE_LINEAR, "Unexpected value %u.\n", value); + check_enum_property(effect, D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE, interp_modes, + ARRAY_SIZE(interp_modes)); + } + + hr = ID2D1Effect_GetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE, D2D1_PROPERTY_TYPE_ENUM, + (BYTE *)&value, sizeof(value)); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + { + ok(value == D2D1_BORDER_MODE_SOFT, "Unexpected value %u.\n", value); + check_enum_property(effect, D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE, border_modes, + ARRAY_SIZE(border_modes)); + } + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) { const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i];

1 0