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

Alexandre Julliard : wineboot: Restart 64-bit version from the system32 directory.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: 59165212ca6afec1c2ab2fff727c4013e934fc2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=59165212ca6afec1c2ab2fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:22 2021 +0200 wineboot: Restart 64-bit version from the system32 directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51006 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 9427448b612..3dfa39ad7c0 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1624,7 +1624,8 @@ int __cdecl main( int argc, char *argv[] ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + wcscat( filename, L"\\wineboot.exe" ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Hans Leidekker : wldap32: Move support for init functions to the Unix library.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: b2ac9f4b751269c179f0f10ec9ec943590a403a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2ac9f4b751269c179f0f10e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:14 2021 +0200 wldap32: Move support for init functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 218 ++++++++++------------------------------- dlls/wldap32/libldap.c | 18 ++++ dlls/wldap32/libldap.h | 6 ++ dlls/wldap32/winldap_private.h | 4 + 4 files changed, 78 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2ac9f4b751269c179f0…

1 0

Alexandre Julliard : winedbg: Restart 64-bit version from the system32 directory.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: 9dcdb90f42bc437b80169d913b07ef2cb730fef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dcdb90f42bc437b80169d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:39 2021 +0200 winedbg: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 838089e8628..5e433bbb699 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -640,6 +640,7 @@ static void restart_if_wow64(void) if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { + static const WCHAR winedbgW[] = {'\\','w','i','n','e','d','b','g','.','e','x','e',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR filename[MAX_PATH]; @@ -648,7 +649,8 @@ static void restart_if_wow64(void) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + lstrcatW( filename, winedbgW ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Zebediah Figura : hidclass.sys: Use GUID_DEVINTERFACE_HID directly.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: 902696de93b2da37b4d43daaf887460657018a45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=902696de93b2da37b4d43daa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 15 21:04:00 2021 -0500 hidclass.sys: Use GUID_DEVINTERFACE_HID directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 +- dlls/hidclass.sys/device.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index b1b26dba70b..58bb2b5088f 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl -DELAYIMPORTS = setupapi hid +DELAYIMPORTS = setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index df20b60fcee..9c3fbdb66b0 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -21,6 +21,7 @@ #include <stdarg.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "initguid.h" #include "hid.h" #include "winreg.h" #include "winuser.h" @@ -30,8 +31,6 @@ #include "ddk/hidsdi.h" #include "ddk/hidtypes.h" #include "ddk/wdm.h" - -#include "initguid.h" #include "devguid.h" #include "ntddmou.h" @@ -86,10 +85,8 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) SP_DEVINFO_DATA Data; NTSTATUS status; HDEVINFO devinfo; - GUID hidGuid; BASE_DEVICE_EXTENSION *ext; - HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; lstrcpyW(device_instance_id, ext->device_id); @@ -118,7 +115,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) } SetupDiDestroyDeviceInfoList(devinfo); - status = IoRegisterDeviceInterface(device, &hidGuid, NULL, &ext->link_name); + status = IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_HID, NULL, &ext->link_name); if (status != STATUS_SUCCESS) { FIXME( "failed to register device interface %x\n", status );

1 0

Zebediah Figura : hidclass.sys: Remove the unused device_name field.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: a85d0f576a18be9a661b5c9dcf52b74199900c20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a85d0f576a18be9a661b5c9d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 15 21:03:59 2021 -0500 hidclass.sys: Remove the unused device_name field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 7 ------- dlls/hidclass.sys/hid.h | 1 - 2 files changed, 8 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 11d3936ad07..df20b60fcee 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -62,8 +62,6 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT ext->deviceExtension.MiniDeviceExtension = ext + 1; ext->deviceExtension.PhysicalDeviceObject = *device; ext->deviceExtension.NextDeviceObject = native_device; - ext->device_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(dev_name) + 1) * sizeof(WCHAR)); - lstrcpyW(ext->device_name, dev_name); ext->link_name.Buffer = NULL; IoAttachDeviceToDeviceStack(*device, native_device); @@ -86,7 +84,6 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; SP_DEVINFO_DATA Data; - UNICODE_STRING nameW; NTSTATUS status; HDEVINFO devinfo; GUID hidGuid; @@ -95,8 +92,6 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; - RtlInitUnicodeString( &nameW, ext->device_name); - lstrcpyW(device_instance_id, ext->device_id); lstrcatW(device_instance_id, L"\\"); lstrcatW(device_instance_id, ext->instance_id); @@ -220,8 +215,6 @@ void HID_DeleteDevice(DEVICE_OBJECT *device) IoCompleteRequest(irp, IO_NO_INCREMENT); } - TRACE("Delete device(%p) %s\n", device, debugstr_w(ext->device_name)); - HeapFree(GetProcessHeap(), 0, ext->device_name); RtlFreeUnicodeString(&ext->link_name); IoDetachDevice(ext->deviceExtension.NextDeviceObject); diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 03eeff9fb92..ccbcd8ffb0b 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -44,7 +44,6 @@ typedef struct _BASE_DEVICE_EXTENSION { WINE_HIDP_PREPARSED_DATA *preparseData; ULONG poll_interval; - WCHAR *device_name; UNICODE_STRING link_name; WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN];

1 0

Zebediah Figura : hidclass.sys: Merge main.c into pnp.c.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: e30a14525e3b791037c2228d018be9dc18ac0ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e30a14525e3b791037c2228d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 15 21:03:58 2021 -0500 hidclass.sys: Merge main.c into pnp.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/hid.h | 5 --- dlls/hidclass.sys/main.c | 102 ------------------------------------------ dlls/hidclass.sys/pnp.c | 79 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 111 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index be4af747853..b1b26dba70b 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -9,5 +9,4 @@ C_SRCS = \ buffer.c \ descriptor.c \ device.c \ - main.c \ pnp.c diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 41f3766a535..03eeff9fb92 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -86,7 +86,6 @@ typedef struct _minidriver } minidriver; NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; -minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN; /* Internal device functions */ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; @@ -99,10 +98,6 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN NTSTATUS WINAPI HID_Device_write(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_create(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; NTSTATUS WINAPI HID_Device_close(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; -NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; - -/* Pseudo-Plug and Play support*/ -NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c deleted file mode 100644 index 50657b80f5e..00000000000 --- a/dlls/hidclass.sys/main.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * WINE Hid device services - * - * Copyright 2015 Aric Stewart - * - * 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 - */ - -#define NONAMELESSUNION -#include <unistd.h> -#include <stdarg.h> -#include "hid.h" -#include "wine/debug.h" -#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(hid); - -static struct list minidriver_list = LIST_INIT(minidriver_list); - -minidriver* find_minidriver(DRIVER_OBJECT *driver) -{ - minidriver *md; - LIST_FOR_EACH_ENTRY(md, &minidriver_list, minidriver, entry) - { - if (md->minidriver.DriverObject == driver) - return md; - } - return NULL; -} - -static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) -{ - minidriver *md; - - TRACE("Driver Unload\n"); - md = find_minidriver(driver); - if (md) - { - if (md->DriverUnload) - md->DriverUnload(md->minidriver.DriverObject); - list_remove(&md->entry); - HeapFree( GetProcessHeap(), 0, md ); - } -} - -NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) -{ - minidriver *driver; - driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)); - - if (!driver) - return STATUS_NO_MEMORY; - - driver->DriverUnload = registration->DriverObject->DriverUnload; - registration->DriverObject->DriverUnload = UnloadDriver; - - registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; - registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; - registration->DriverObject->MajorFunction[IRP_MJ_WRITE] = HID_Device_write; - registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; - registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close; - - driver->PNPDispatch = registration->DriverObject->MajorFunction[IRP_MJ_PNP]; - registration->DriverObject->MajorFunction[IRP_MJ_PNP] = HID_PNP_Dispatch; - - driver->AddDevice = registration->DriverObject->DriverExtension->AddDevice; - registration->DriverObject->DriverExtension->AddDevice = PNP_AddDevice; - - driver->minidriver = *registration; - list_add_tail(&minidriver_list, &driver->entry); - - return STATUS_SUCCESS; -} - -NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) -{ - IRP *irp; - IO_STATUS_BLOCK io; - KEVENT event; - - KeInitializeEvent(&event, NotificationEvent, FALSE); - - irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, - out_buff, out_size, TRUE, &event, &io); - - if (IoCallDriver(device, irp) == STATUS_PENDING) - KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - - return io.u.Status; -} diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index f7985d298d8..bb2035cac21 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -1,5 +1,5 @@ /* - * WINE HID Pseudo-Plug and Play support + * Human Interface Device class driver * * Copyright 2015 Aric Stewart * @@ -30,6 +30,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +static struct list minidriver_list = LIST_INIT(minidriver_list); + +static minidriver *find_minidriver(DRIVER_OBJECT *driver) +{ + minidriver *md; + LIST_FOR_EACH_ENTRY(md, &minidriver_list, minidriver, entry) + { + if (md->minidriver.DriverObject == driver) + return md; + } + return NULL; +} + static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) { @@ -69,7 +82,7 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH return status; } -NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) +static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; DEVICE_OBJECT *device = NULL; @@ -211,7 +224,7 @@ static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP return rc; } -NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS rc = STATUS_NOT_SUPPORTED; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); @@ -296,3 +309,63 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest( irp, IO_NO_INCREMENT ); return rc; } + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + minidriver *md; + + TRACE("\n"); + + if ((md = find_minidriver(driver))) + { + if (md->DriverUnload) + md->DriverUnload(md->minidriver.DriverObject); + list_remove(&md->entry); + HeapFree(GetProcessHeap(), 0, md); + } +} + +NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) +{ + minidriver *driver; + + if (!(driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)))) + return STATUS_NO_MEMORY; + + driver->DriverUnload = registration->DriverObject->DriverUnload; + registration->DriverObject->DriverUnload = driver_unload; + + registration->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = HID_Device_ioctl; + registration->DriverObject->MajorFunction[IRP_MJ_READ] = HID_Device_read; + registration->DriverObject->MajorFunction[IRP_MJ_WRITE] = HID_Device_write; + registration->DriverObject->MajorFunction[IRP_MJ_CREATE] = HID_Device_create; + registration->DriverObject->MajorFunction[IRP_MJ_CLOSE] = HID_Device_close; + + driver->PNPDispatch = registration->DriverObject->MajorFunction[IRP_MJ_PNP]; + registration->DriverObject->MajorFunction[IRP_MJ_PNP] = driver_pnp; + + driver->AddDevice = registration->DriverObject->DriverExtension->AddDevice; + registration->DriverObject->DriverExtension->AddDevice = driver_add_device; + + driver->minidriver = *registration; + list_add_tail(&minidriver_list, &driver->entry); + + return STATUS_SUCCESS; +} + +NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) +{ + IRP *irp; + IO_STATUS_BLOCK io; + KEVENT event; + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + irp = IoBuildDeviceIoControlRequest(code, device, in_buff, in_size, + out_buff, out_size, TRUE, &event, &io); + + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); + + return io.u.Status; +}

1 0

Zebediah Figura : hidclass.sys: Pass a KEVENT to IoBuildDeviceIoControlRequest() in hid_device_thread().
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: 5cc9c5ab5107a1aff2c1694f4dd2903672fe725a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc9c5ab5107a1aff2c1694f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 15 21:03:57 2021 -0500 hidclass.sys: Pass a KEVENT to IoBuildDeviceIoControlRequest() in hid_device_thread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 55 ++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 7d198b99b34..11d3936ad07 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -290,13 +290,6 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, packet); } -static NTSTATUS WINAPI read_Completion(DEVICE_OBJECT *deviceObject, IRP *irp, void *context) -{ - HANDLE event = context; - SetEvent(event); - return STATUS_MORE_PROCESSING_REQUIRED; -} - static DWORD CALLBACK hid_device_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; @@ -305,11 +298,8 @@ static DWORD CALLBACK hid_device_thread(void *args) IO_STATUS_BLOCK irp_status; HID_XFER_PACKET *packet; DWORD rc; - HANDLE event; - NTSTATUS ntrc; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - event = CreateEventA(NULL, TRUE, FALSE, NULL); packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + ext->preparseData->caps.InputReportByteLength); packet->reportBuffer = (BYTE *)packet + sizeof(*packet); @@ -318,29 +308,25 @@ static DWORD CALLBACK hid_device_thread(void *args) { while(1) { - ResetEvent(event); + KEVENT event; + + KeInitializeEvent(&event, NotificationEvent, FALSE); packet->reportBufferLen = ext->preparseData->caps.InputReportByteLength; packet->reportId = 0; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, - device, NULL, 0, packet, sizeof(*packet), TRUE, NULL, - &irp_status); - - IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); - ntrc = IoCallDriver(device, irp); + irp = IoBuildDeviceIoControlRequest(IOCTL_HID_GET_INPUT_REPORT, device, + NULL, 0, packet, sizeof(*packet), TRUE, &event, &irp_status); - if (ntrc == STATUS_PENDING) - WaitForSingleObject(event, INFINITE); + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - if (irp->IoStatus.u.Status == STATUS_SUCCESS) + if (irp_status.u.Status == STATUS_SUCCESS) { RingBuffer_Write(ext->ring_buffer, packet); HID_Device_processQueue(device); } - IoCompleteRequest(irp, IO_NO_INCREMENT ); - rc = WaitForSingleObject(ext->halt_event, ext->poll_interval ? ext->poll_interval : DEFAULT_POLL_INTERVAL); if (rc == WAIT_OBJECT_0) @@ -355,28 +341,23 @@ static DWORD CALLBACK hid_device_thread(void *args) while(1) { - ResetEvent(event); + KEVENT event; - irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, - device, NULL, 0, packet->reportBuffer, - ext->preparseData->caps.InputReportByteLength, TRUE, NULL, - &irp_status); + KeInitializeEvent(&event, NotificationEvent, FALSE); - IoSetCompletionRoutine(irp, read_Completion, event, TRUE, TRUE, TRUE); - ntrc = IoCallDriver(device, irp); + irp = IoBuildDeviceIoControlRequest(IOCTL_HID_READ_REPORT, device, NULL, 0, packet->reportBuffer, + ext->preparseData->caps.InputReportByteLength, TRUE, &event, &irp_status); - if (ntrc == STATUS_PENDING) - { - WaitForSingleObject(event, INFINITE); - } + if (IoCallDriver(device, irp) == STATUS_PENDING) + KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); rc = WaitForSingleObject(ext->halt_event, 0); if (rc == WAIT_OBJECT_0) exit_now = TRUE; - if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) + if (!exit_now && irp_status.u.Status == STATUS_SUCCESS) { - packet->reportBufferLen = irp->IoStatus.Information; + packet->reportBufferLen = irp_status.Information; if (ext->preparseData->reports[0].reportID) packet->reportId = packet->reportBuffer[0]; else @@ -385,15 +366,11 @@ static DWORD CALLBACK hid_device_thread(void *args) HID_Device_processQueue(device); } - IoCompleteRequest(irp, IO_NO_INCREMENT ); - if (exit_now) break; } } - CloseHandle(event); - TRACE("Device thread exiting\n"); return 1; }

1 0

Alexandre Julliard : server: Pass the NT process flags to the new_process request.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: 828077e3b3a55943e0044914f74730647afaa760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=828077e3b3a55943e0044914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:43:14 2021 +0200 server: Pass the NT process flags to the new_process request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 33 ++++++++++++++++++--------------- dlls/ntdll/unix/process.c | 3 +-- include/wine/server_protocol.h | 6 ++---- server/process.c | 21 +++++++++++---------- server/process.h | 2 +- server/protocol.def | 3 +-- server/request.h | 15 +++++++-------- server/trace.c | 3 +-- 8 files changed, 42 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=828077e3b3a55943e004…

1 0

Alexandre Julliard : wine.inf: Don't install 64-bit only programs in syswow64.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: a1bba82861a71357ce62431ed127ed33ace11890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1bba82861a71357ce62431e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 12:02:29 2021 +0200 wine.inf: Don't install 64-bit only programs in syswow64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 50156644d5f..ad699469ba4 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2641,6 +2641,11 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,regasm.exe,- 11,,servicemodelreg.exe,- 11,,presentationfontcache.exe,- +; some programs are 64-bit only +11,,conhost.exe,- +11,,services.exe,- +11,,spoolsv.exe,- +11,,winemenubuilder.exe,- ; registration order matters for these 11,,msxml.dll 11,,msxml2.dll

1 0

Alexandre Julliard : wusa: Restart 64-bit version from the system32 directory.
by Alexandre Julliard April 16, 2021

April 16, 2021

Module: wine Branch: master Commit: c5c610e3640b0613ffb7ea074b848380e88db909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c610e3640b0613ffb7ea07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:44 2021 +0200 wusa: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 49e7dc75302..bcb795a80fa 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1023,7 +1023,8 @@ static void restart_as_x86_64(void) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - GetModuleFileNameW(0, filename, MAX_PATH); + GetSystemDirectoryW( filename, MAX_PATH ); + wcscat( filename, L"\\wusa.exe" ); Wow64DisableWow64FsRedirection(&redir); if (CreateProcessW(filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))

1 0