February 2021 - Wine-devel - list.winehq.org

[PATCH 1/2] wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format().
by Zebediah Figura 12 Feb '21

12 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/directx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 600ad02a427..6296b833709 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1777,6 +1777,19 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_BUFFER: + if (wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_RTYPE_BUFFER, but format %s is typeless.\n", debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + + allowed_usage = WINED3DUSAGE_DYNAMIC; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; + break; + default: FIXME("Unhandled resource type %s.\n", debug_d3dresourcetype(resource_type)); return WINED3DERR_NOTAVAILABLE; -- 2.20.1

3 4

[PATCH] winebuild: Don't use llvm-lib to build static libs containing importlibs.
by Jacek Caban 12 Feb '21

12 Feb '21

It's not supported by LLVM 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50653 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/import.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)

1 0

[PATCH 1/5] server: Add process argument to find_rawinput_device.
by Rémi Bernon 12 Feb '21

12 Feb '21

We need to be able to iterate all registered rawinput devices for foreign processes, not only the current one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This series implements rawinput message support for HID gamepads, needed by several games when not using XInput compatible gamepads (such as DualShock or Wiimotes controllers). It will allow us to read HID reports in a more efficient way than reading the device files, as the rawinput messages are pushed by winedevice.exe to the listening applications instead of requiring ioctl roundtrips between the application, wineserver, and winedevice.exe. It could help for instance, for DInput over HID, or to optimize XInput, which I believe is currently also reading HID reports. The series has been tested in Wine Staging and Proton for a while now. server/queue.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index e47980a4aa8..1735d0d6d26 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1489,11 +1489,11 @@ static user_handle_t find_hardware_message_window( struct desktop *desktop, stru return win; } -static struct rawinput_device_entry *find_rawinput_device( unsigned short usage_page, unsigned short usage ) +static struct rawinput_device_entry *find_rawinput_device( struct process *process, unsigned short usage_page, unsigned short usage ) { struct rawinput_device_entry *e; - LIST_FOR_EACH_ENTRY( e, &current->process->rawinput_devices, struct rawinput_device_entry, entry ) + LIST_FOR_EACH_ENTRY( e, &process->rawinput_devices, struct rawinput_device_entry, entry ) { if (e->device.usage_page != usage_page || e->device.usage != usage) continue; return e; @@ -1506,7 +1506,7 @@ static void update_rawinput_device(const struct rawinput_device *device) { struct rawinput_device_entry *e; - if (!(e = find_rawinput_device( device->usage_page, device->usage ))) + if (!(e = find_rawinput_device( current->process, device->usage_page, device->usage ))) { if (!(e = mem_alloc( sizeof(*e) ))) return; list_add_tail( &current->process->rawinput_devices, &e->entry ); @@ -3313,9 +3313,9 @@ DECL_HANDLER(update_rawinput_devices) update_rawinput_device(&devices[i]); } - e = find_rawinput_device( 1, 2 ); + e = find_rawinput_device( current->process, 1, 2 ); current->process->rawinput_mouse = e ? &e->device : NULL; - e = find_rawinput_device( 1, 6 ); + e = find_rawinput_device( current->process, 1, 6 ); current->process->rawinput_kbd = e ? &e->device : NULL; } -- 2.30.0

3 8

[PATCH] winex11.drv: Do not call old_error_handler if it is NULL.
by Giovanni Mascellani 12 Feb '21

12 Feb '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winex11.drv/x11drv_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9ec4c7a98f6..58fab96c034 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -304,7 +304,10 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) error_evt->serial, error_evt->request_code ); DebugBreak(); /* force an entry in the debugger */ } - old_error_handler( display, error_evt ); + /* Xlib never returns a NULL previous error handler, but other + implementations, like Steam's overlay, do. */ + if (old_error_handler) + old_error_handler( display, error_evt ); return 0; } -- 2.30.0

1 0

[PATCH 3/3] advapi32/tests: Add another key unloading test with NtUnloadKey.
by Akihiro Sagawa 12 Feb '21

12 Feb '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/tests/registry.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

1 0

[PATCH 2/3] server: Prevent unloading a registry hive while the key is in use.
by Akihiro Sagawa 12 Feb '21

12 Feb '21

Otherwise, RegUnLoadKey(HKEY_USERS, "S-1-5-21-0-0-0-1000") erases all HKCU registry. The call is actually done by a certain installer. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- server/registry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 1/3] ntdll: ObjectName should also be used in NtUnloadKey.
by Akihiro Sagawa 12 Feb '21

12 Feb '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernelbase/registry.c | 9 ++------- dlls/ntdll/unix/registry.c | 8 +++++++- include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 4 +++- server/registry.c | 17 +++++++++++++---- server/request.h | 5 +++-- server/trace.c | 4 +++- 7 files changed, 36 insertions(+), 18 deletions(-)

1 0

[PATCH] ntdll: Always use MAP_FAILED as mmap()'s error value.
by Brendan Shanks 12 Feb '21

12 Feb '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 26a3ca0d2dd..e0346a28ea3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1807,7 +1807,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != MAP_FAILED) goto done; switch (errno) @@ -1970,7 +1970,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) if (!*removable) { - if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != (void *)-1) + if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != MAP_FAILED) return STATUS_SUCCESS; switch (errno) -- 2.26.2

1 0

[PATCH v2 1/5] winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES.
by Zebediah Figura 12 Feb '21

12 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winebus.sys/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2388033ceda..396a9d07123 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -600,16 +600,17 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp); - irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_CAPABILITIES: TRACE("IRP_MN_QUERY_CAPABILITIES\n"); + status = STATUS_SUCCESS; break; default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); break; } + irp->IoStatus.u.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); return status; } -- 2.20.1

1 4

[PATCH 1/5] winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES.
by Zebediah Figura 11 Feb '21

11 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winebus.sys/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2388033ceda..396a9d07123 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -600,16 +600,17 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp); - irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_CAPABILITIES: TRACE("IRP_MN_QUERY_CAPABILITIES\n"); + status = STATUS_SUCCESS; break; default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); break; } + irp->IoStatus.u.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); return status; } -- 2.20.1

2 6