wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Zebediah Figura : wineusb.sys: Build with msvcrt.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: c63294fd89c87e080e9dc28e09d556b6e6649703 URL: https://gitlab.winehq.org/wine/wine/-/commit/c63294fd89c87e080e9dc28e09d556… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 18:08:54 2022 -0500 wineusb.sys: Build with msvcrt. --- dlls/wineusb.sys/Makefile.in | 2 +- dlls/wineusb.sys/wineusb.c | 52 +++++++++++++++----------------------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in index 5547200596e..66a9f56b213 100644 --- a/dlls/wineusb.sys/Makefile.in +++ b/dlls/wineusb.sys/Makefile.in @@ -5,7 +5,7 @@ IMPORTS = ntoskrnl UNIX_LIBS = $(USB_LIBS) $(PTHREAD_LIBS) UNIX_CFLAGS = $(USB_CFLAGS) -EXTRADLLFLAGS = -Wl,--subsystem,native -mcygwin +EXTRADLLFLAGS = -Wl,--subsystem,native C_SRCS = \ unixlib.c \ diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index d432bdc5666..2f918cdeeb7 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -21,9 +21,8 @@ #include <assert.h> #include <stdarg.h> #include <stdbool.h> +#include <stdint.h> #include <stdlib.h> -#include <pthread.h> -#include <libusb.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -36,7 +35,6 @@ #include "wine/asm.h" #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "unixlib.h" @@ -106,7 +104,6 @@ static void destroy_unix_device(struct unix_device *unix_device) static void add_unix_device(const struct usb_add_device_event *event) { - static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; static unsigned int name_index; struct usb_device *device; DEVICE_OBJECT *device_obj; @@ -117,7 +114,7 @@ static void add_unix_device(const struct usb_add_device_event *event) TRACE("Adding new device %p, vendor %04x, product %04x.\n", event->device, event->vendor, event->product); - sprintfW(name, formatW, name_index++); + swprintf(name, ARRAY_SIZE(name), L"\\Device\\USBPDO-%u", name_index++); RtlInitUnicodeString(&string, name); if ((status = IoCreateDevice(driver_obj, sizeof(*device), &string, FILE_DEVICE_USB, 0, FALSE, &device_obj))) @@ -366,54 +363,39 @@ static void WINAPIV append_id(struct string_buffer *buffer, const WCHAR *format, __ms_va_end(args); } -static const WCHAR emptyW[] = {0}; - static void get_device_id(const struct usb_device *device, struct string_buffer *buffer) { - static const WCHAR interface_formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', - '&','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}; - if (device->interface) - append_id(buffer, interface_formatW, device->vendor, device->product, device->interface_index); + append_id(buffer, L"USB\\VID_%04X&PID_%04X&MI_%02X", + device->vendor, device->product, device->interface_index); else - append_id(buffer, formatW, device->vendor, device->product); + append_id(buffer, L"USB\\VID_%04X&PID_%04X", device->vendor, device->product); } static void get_hardware_ids(const struct usb_device *device, struct string_buffer *buffer) { - static const WCHAR interface_formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', - '&','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}; - if (device->interface) - append_id(buffer, interface_formatW, device->vendor, device->product, device->revision, device->interface_index); + append_id(buffer, L"USB\\VID_%04X&PID_%04X&REV_%04X&MI_%02X", + device->vendor, device->product, device->revision, device->interface_index); else - append_id(buffer, formatW, device->vendor, device->product, device->revision); + append_id(buffer, L"USB\\VID_%04X&PID_%04X&REV_%04X", + device->vendor, device->product, device->revision); + get_device_id(device, buffer); - append_id(buffer, emptyW); + append_id(buffer, L""); } static void get_compatible_ids(const struct usb_device *device, struct string_buffer *buffer) { - static const WCHAR prot_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x', - '&','S','u','b','C','l','a','s','s','_','%','0','2','x', - '&','P','r','o','t','_','%','0','2','x',0}; - static const WCHAR subclass_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x', - '&','S','u','b','C','l','a','s','s','_','%','0','2','x',0}; - static const WCHAR class_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x',0}; - - append_id(buffer, prot_format, device->class, device->subclass, device->protocol); - append_id(buffer, subclass_format, device->class, device->subclass); - append_id(buffer, class_format, device->class); - append_id(buffer, emptyW); + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", + device->class, device->subclass, device->protocol); + append_id(buffer, L"USB\\Class_%02x&SubClass_%02x", device->class, device->subclass); + append_id(buffer, L"USB\\Class_%02x", device->class); + append_id(buffer, L""); } static NTSTATUS query_id(struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { - static const WCHAR instance_idW[] = {'0',0}; struct string_buffer buffer = {0}; TRACE("type %#x.\n", type); @@ -425,7 +407,7 @@ static NTSTATUS query_id(struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE break; case BusQueryInstanceID: - append_id(&buffer, instance_idW); + append_id(&buffer, L"0"); break; case BusQueryHardwareIDs:

1 0

Zebediah Figura : wineusb.sys: Create separate unix devices for each interface.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: b41fe10fd487ca18183a65ff33090801ff80dfb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b41fe10fd487ca18183a65ff330908… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 18:03:11 2022 -0500 wineusb.sys: Create separate unix devices for each interface. --- dlls/wineusb.sys/unixlib.c | 65 +++++++++++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 9 ++---- dlls/wineusb.sys/wineusb.c | 81 +++------------------------------------------- 3 files changed, 72 insertions(+), 83 deletions(-)

1 0

Zebediah Figura : wineusb.sys: Pass the device descriptor as part of the event data.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: c698dc6e3634f94da24905ba56d9315133ccc13d URL: https://gitlab.winehq.org/wine/wine/-/commit/c698dc6e3634f94da24905ba56d931… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 17:37:37 2022 -0500 wineusb.sys: Pass the device descriptor as part of the event data. --- dlls/wineusb.sys/unixlib.c | 8 +++++++- dlls/wineusb.sys/unixlib.h | 7 ++++++- dlls/wineusb.sys/wineusb.c | 27 ++++++++++++--------------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index cfced53d9bf..90847bc6a7d 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -133,7 +133,13 @@ static void add_usb_device(libusb_device *libusb_device) pthread_mutex_unlock(&device_mutex); usb_event.type = USB_EVENT_ADD_DEVICE; - usb_event.u.added_device = unix_device; + usb_event.u.added_device.device = unix_device; + usb_event.u.added_device.vendor = device_desc.idVendor; + usb_event.u.added_device.product = device_desc.idProduct; + usb_event.u.added_device.revision = device_desc.bcdDevice; + usb_event.u.added_device.class = device_desc.bDeviceClass; + usb_event.u.added_device.subclass = device_desc.bDeviceSubClass; + usb_event.u.added_device.protocol = device_desc.bDeviceProtocol; queue_event(&usb_event); } diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index e8e2850c57a..d76818cc907 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -47,7 +47,12 @@ struct usb_event union { - struct unix_device *added_device; + struct usb_add_device_event + { + struct unix_device *device; + UINT16 vendor, product, revision; + UINT8 class, subclass, protocol; + } added_device; struct unix_device *removed_device; IRP *completed_irp; } u; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 474ee6e96a6..b833dbc9824 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -137,12 +137,11 @@ static void add_usb_interface(struct usb_device *parent, const struct libusb_int LeaveCriticalSection(&wineusb_cs); } -static void add_unix_device(struct unix_device *unix_device) +static void add_unix_device(const struct usb_add_device_event *event) { static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; - libusb_device *libusb_device = libusb_get_device(unix_device->handle); + libusb_device *libusb_device = libusb_get_device(event->device->handle); struct libusb_config_descriptor *config_desc; - struct libusb_device_descriptor device_desc; static unsigned int name_index; struct usb_device *device; DEVICE_OBJECT *device_obj; @@ -151,10 +150,8 @@ static void add_unix_device(struct unix_device *unix_device) WCHAR name[26]; int ret; - libusb_get_device_descriptor(libusb_device, &device_desc); - - TRACE("Adding new device %p, vendor %04x, product %04x.\n", unix_device, - device_desc.idVendor, device_desc.idProduct); + TRACE("Adding new device %p, vendor %04x, product %04x.\n", event->device, + event->vendor, event->product); sprintfW(name, formatW, name_index++); RtlInitUnicodeString(&string, name); @@ -167,16 +164,16 @@ static void add_unix_device(struct unix_device *unix_device) device = device_obj->DeviceExtension; device->device_obj = device_obj; - device->unix_device = unix_device; + device->unix_device = event->device; InitializeListHead(&device->irp_list); device->removed = FALSE; - 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; + device->class = event->class; + device->subclass = event->subclass; + device->protocol = event->protocol; + device->vendor = event->vendor; + device->product = event->product; + device->revision = event->revision; EnterCriticalSection(&wineusb_cs); list_add_tail(&device_list, &device->entry); @@ -279,7 +276,7 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { case USB_EVENT_ADD_DEVICE: - add_unix_device(event.u.added_device); + add_unix_device(&event.u.added_device); break; case USB_EVENT_REMOVE_DEVICE:

1 0

Zebediah Figura : wineusb.sys: Move the libusb_init() and libusb_exit() calls to the Unix library.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 05fe2f3f82df8713a9fc69db17c6ec71dd663c98 URL: https://gitlab.winehq.org/wine/wine/-/commit/05fe2f3f82df8713a9fc69db17c6ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:55:48 2022 -0500 wineusb.sys: Move the libusb_init() and libusb_exit() calls to the Unix library. --- dlls/wineusb.sys/unixlib.c | 9 +++++++++ dlls/wineusb.sys/wineusb.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 091d85d1ef1..cfced53d9bf 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -173,12 +173,19 @@ static NTSTATUS usb_main_loop(void *args) TRACE("Starting libusb event thread.\n"); + if ((ret = libusb_init(NULL))) + { + ERR("Failed to initialize libusb: %s\n", libusb_strerror(ret)); + return STATUS_UNSUCCESSFUL; + } + if ((ret = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY, hotplug_cb, NULL, &hotplug_cb_handle))) { ERR("Failed to register callback: %s\n", libusb_strerror(ret)); + libusb_exit(NULL); return STATUS_UNSUCCESSFUL; } @@ -188,6 +195,8 @@ static NTSTATUS usb_main_loop(void *args) ERR("Error handling events: %s\n", libusb_strerror(ret)); } + libusb_exit(NULL); + queue_event(&shutdown_event); TRACE("Shutting down libusb event thread.\n"); diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 49033c76213..474ee6e96a6 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -731,14 +731,12 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *p static void WINAPI driver_unload(DRIVER_OBJECT *driver) { - libusb_exit(NULL); } 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)); @@ -752,12 +750,6 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) driver_obj = driver; - if ((err = libusb_init(NULL))) - { - ERR("Failed to initialize libusb: %s\n", libusb_strerror(err)); - return STATUS_UNSUCCESSFUL; - } - driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp;

1 0

Zebediah Figura : ntoskrnl/tests: Fix a test failure.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 03034f2c0ef23964891d60e5995d167a113f2d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/03034f2c0ef23964891d60e5995d16… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 12 21:26:07 2022 -0500 ntoskrnl/tests: Fix a test failure. --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 9727292d65d..1f22c4b9997 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -700,7 +700,8 @@ static NTSTATUS fdo_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG code) * handles to the device are closed (and the user-space thread is * currently blocked in this ioctl and won't close its handle * yet.) */ - ok(!remove_device_count, "Got %u remove events.\n", remove_device_count); + todo_wine_if (remove_device_count) + ok(!remove_device_count, "Got %u remove events.\n", remove_device_count); return STATUS_SUCCESS; }

1 0

Zebediah Figura : ddraw/tests: Build ddraw7.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 7375e8a9fcbaaf0c4016f973c5f926a5a76ad772 URL: https://gitlab.winehq.org/wine/wine/-/commit/7375e8a9fcbaaf0c4016f973c5f926… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 22:20:47 2022 -0500 ddraw/tests: Build ddraw7.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw7.c | 5232 ++++++++++++++++++++++----------------------- 1 file changed, 2599 insertions(+), 2633 deletions(-)

1 0

Zebediah Figura : ddraw/tests: Build ddraw4.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: b176b9dab1f019b99126da40aff71d218f8079f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b176b9dab1f019b99126da40aff71d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 22:20:41 2022 -0500 ddraw/tests: Build ddraw4.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw4.c | 5409 ++++++++++++++++++++++----------------------- 1 file changed, 2689 insertions(+), 2720 deletions(-)

1 0

Zhiyi Zhang : uxtheme/tests: Use the GetDpiForSystem() function pointer.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: c1c3c68e9fcd7b9d8981a314f02761c4061abfe3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1c3c68e9fcd7b9d8981a314f02761… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 13 17:35:48 2022 +0800 uxtheme/tests: Use the GetDpiForSystem() function pointer. GetDpiForSystem() requires Windows 10 1607+. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53341 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 22762ecd4a9..debc712a73c 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -52,6 +52,7 @@ static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR, UINT, UINT *, UINT *); +static UINT (WINAPI *pGetDpiForSystem)(void); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); @@ -94,6 +95,7 @@ static void init_funcs(void) GET_PROC(user32, DisplayConfigGetDeviceInfo) GET_PROC(user32, DisplayConfigSetDeviceInfo) GET_PROC(user32, GetDpiForMonitorInternal) + GET_PROC(user32, GetDpiForSystem) GET_PROC(user32, SetThreadDpiAwarenessContext) GET_PROC(gdi32, D3DKMTCloseAdapter) @@ -1073,9 +1075,9 @@ static void test_GetThemePartSize(void) HRESULT hr; SIZE size; - if (!pSetThreadDpiAwarenessContext) + if (!pSetThreadDpiAwarenessContext || !pGetDpiForSystem) { - win_skip("SetThreadDpiAwarenessContext is unavailable.\n"); + win_skip("SetThreadDpiAwarenessContext() or GetDpiForSystem() is unavailable.\n"); return; } @@ -1088,7 +1090,7 @@ static void test_GetThemePartSize(void) old_context = pSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); current_dpi = get_primary_monitor_effective_dpi(); old_dpi = current_dpi; - system_dpi = GetDpiForSystem(); + system_dpi = pGetDpiForSystem(); target_dpi = system_dpi; hwnd = CreateWindowA("Button", "Test", WS_POPUP, 100, 100, 100, 100, NULL, NULL, NULL, NULL);

1 0

Hans Leidekker : secur32: Simplify lsa_AcquireCredentialsHandleA().
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: ea930bec2bde8c58549f389c5388645da9bf3807 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea930bec2bde8c58549f389c538864… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 12 16:59:23 2022 +0200 secur32: Simplify lsa_AcquireCredentialsHandleA(). --- dlls/secur32/lsa.c | 68 ++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index f69a2a74511..9368d3728e4 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -349,13 +349,12 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) { SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; - int len_user = 0, len_domain = 0, len_passwd = 0; - SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; - SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; - SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + SEC_WCHAR *principalW = NULL, *packageW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = auth_data; + SEC_WINNT_AUTH_IDENTITY_W idW = {}; TRACE("%s %s %#lx %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), - credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); if (principal) { @@ -369,51 +368,38 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( if (!(packageW = malloc( len * sizeof(SEC_WCHAR) ))) goto done; MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); } - if (auth_data) + if (id && (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI)) { - id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; - - if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + if (id->UserLength) { - if (!(auth_dataW = malloc( sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; - if (id->UserLength) - { - len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); - if (!(user = malloc( len_user * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); - } - if (id->DomainLength) - { - len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); - if (!(domain = malloc( len_domain * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); - } - if (id->PasswordLength) - { - len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); - if (!(passwd = malloc( len_passwd * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); - } - auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; - auth_dataW->User = user; - auth_dataW->UserLength = len_user; - auth_dataW->Domain = domain; - auth_dataW->DomainLength = len_domain; - auth_dataW->Password = passwd; - auth_dataW->PasswordLength = len_passwd; + idW.UserLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(idW.User = malloc( idW.UserLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, idW.User, idW.UserLength ); + } + if (id->DomainLength) + { + idW.DomainLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(idW.Domain = malloc( idW.DomainLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, idW.Domain, idW.DomainLength ); + } + if (id->PasswordLength) + { + idW.PasswordLength = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(idW.Password = malloc( idW.PasswordLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, idW.Password, idW.PasswordLength ); } - else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_data = &idW; } - status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); done: - if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) free( auth_dataW ); free( packageW ); free( principalW ); - free( user ); - free( domain ); - free( passwd ); + free( idW.User ); + free( idW.Domain ); + free( idW.Password ); return status; }

1 0

Hans Leidekker : secur32: Simplify nego_AcquireCredentialsHandleA() and fix an invalid free.
by Alexandre Julliard 13 Jul '22

13 Jul '22

Module: wine Branch: master Commit: 4c9d30a12150679bbfecd2fbfe6dff83eff5512a URL: https://gitlab.winehq.org/wine/wine/-/commit/4c9d30a12150679bbfecd2fbfe6dff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 12 16:58:21 2022 +0200 secur32: Simplify nego_AcquireCredentialsHandleA() and fix an invalid free. --- dlls/secur32/negotiate.c | 69 +++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 50 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index d01419ce9c7..a63e458750f 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -117,8 +117,9 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { SECURITY_STATUS ret = SEC_E_INSUFFICIENT_MEMORY; - SEC_WCHAR *user = NULL, *domain = NULL, *passwd = NULL, *package = NULL; - SEC_WINNT_AUTH_IDENTITY_W *identityW = NULL; + SEC_WCHAR *package = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = pAuthData; + SEC_WINNT_AUTH_IDENTITY_W idW = {}; TRACE("%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, @@ -130,60 +131,28 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA( if (!(package = malloc( package_len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; MultiByteToWideChar( CP_ACP, 0, pszPackage, -1, package, package_len ); } - if (pAuthData) + if (id && id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) { - SEC_WINNT_AUTH_IDENTITY_A *identity = pAuthData; - int user_len, domain_len, passwd_len; + idW.UserLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->User, id->UserLength, NULL, 0 ); + if (!(idW.User = malloc( idW.UserLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->User, id->UserLength, idW.User, idW.UserLength ); - if (identity->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) - { - if (!(identityW = malloc( sizeof(*identityW) ))) goto done; - - if (!identity->UserLength) user_len = 0; - else - { - user_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->User, - identity->UserLength, NULL, 0 ); - if (!(user = malloc( user_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->User, identity->UserLength, - user, user_len ); - } - if (!identity->DomainLength) domain_len = 0; - else - { - domain_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Domain, - identity->DomainLength, NULL, 0 ); - if (!(domain = malloc( domain_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Domain, identity->DomainLength, - domain, domain_len ); - } - if (!identity->PasswordLength) passwd_len = 0; - else - { - passwd_len = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Password, - identity->PasswordLength, NULL, 0 ); - if (!(passwd = malloc( passwd_len * sizeof(SEC_WCHAR) ))) goto done; - MultiByteToWideChar( CP_ACP, 0, (LPCSTR)identity->Password, identity->PasswordLength, - passwd, passwd_len ); - } - identityW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; - identityW->User = user; - identityW->UserLength = user_len; - identityW->Domain = domain; - identityW->DomainLength = domain_len; - identityW->Password = passwd; - identityW->PasswordLength = passwd_len; - } - else identityW = (SEC_WINNT_AUTH_IDENTITY_W *)identity; + idW.DomainLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(idW.Domain = malloc( idW.DomainLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->Domain, id->DomainLength, idW.Domain, idW.DomainLength ); + + idW.PasswordLength = MultiByteToWideChar( CP_ACP, 0, (const char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(idW.Password = malloc( idW.PasswordLength * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (const char *)id->Password, id->PasswordLength, idW.Password, idW.PasswordLength ); + + idW.Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + pAuthData = &idW; } - ret = nego_AcquireCredentialsHandleW( NULL, package, fCredentialUse, pLogonID, identityW, + + ret = nego_AcquireCredentialsHandleW( NULL, package, fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry ); done: free( package ); - free( user ); - free( domain ); - free( passwd ); - free( identityW ); return ret; }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022