July 2021 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Only set valid render states in wined3d_device_context_set_state().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 87ed274d98ffb9e98f1de760fdbccb2acfcd9e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87ed274d98ffb9e98f1de760… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:33 2021 +0200 wined3d: Only set valid render states in wined3d_device_context_set_state(). Somewhat similar to commit 0170bb0e548d33e4fa014b73cd2c75ce7ea0dc82, setting invalid render states ends up invalidating invalid state IDs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 96657141419..4aaaee75c93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,7 +1774,8 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) { - wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); + if (context->device->state_table[STATE_RENDER(i)].representative) + wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); } wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask);

1 0

Henri Verbeet : wined3d: Only set valid transform states in wined3d_device_context_set_state().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 107fa122cce9209c161fa0c80f4e6c325264aba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107fa122cce9209c161fa0c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:34 2021 +0200 wined3d: Only set valid transform states in wined3d_device_context_set_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4aaaee75c93..701041962e5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1750,7 +1750,8 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) { - wined3d_device_context_emit_set_transform(context, i, state->transforms + i); + if (context->device->state_table[STATE_TRANSFORM(i)].representative) + wined3d_device_context_emit_set_transform(context, i, state->transforms + i); } for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i)

1 0

Rémi Bernon : wineusb.sys: Introduce new remove_pending_irps helper.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b38db8a69c1921b0d97da4b56ff222e5998a8f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38db8a69c1921b0d97da4b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 09:51:22 2021 +0200 wineusb.sys: Introduce new remove_pending_irps helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b8cefdaff5e..8fb1d75f121 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -363,6 +363,20 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID return STATUS_SUCCESS; } +static void remove_pending_irps(struct usb_device *device) +{ + LIST_ENTRY *entry; + IRP *irp; + + while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) + { + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irp->IoStatus.Status = STATUS_DELETE_PENDING; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -393,17 +407,8 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) break; case IRP_MN_REMOVE_DEVICE: - { - LIST_ENTRY *entry; - EnterCriticalSection(&wineusb_cs); - while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) - { - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irp->IoStatus.Status = STATUS_DELETE_PENDING; - irp->IoStatus.Information = 0; - IoCompleteRequest(irp, IO_NO_INCREMENT); - } + remove_pending_irps(device); LeaveCriticalSection(&wineusb_cs); if (device->removed) @@ -419,7 +424,6 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) ret = STATUS_SUCCESS; break; - } default: FIXME("Unhandled minor function %#x.\n", stack->MinorFunction);

1 0

Rémi Bernon : wineusb.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 84c9206ca75a71622d061c63215230dd37673761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84c9206ca75a71622d061c63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 09:51:23 2021 +0200 wineusb.sys: Handle IRP_MN_SURPRISE_REMOVAL and set removed flag. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 8fb1d75f121..a72095409ff 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -145,7 +145,6 @@ static void remove_usb_device(libusb_device *libusb_device) if (device->libusb_device == libusb_device) { list_remove(&device->entry); - device->removed = TRUE; break; } } @@ -402,26 +401,24 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) } case IRP_MN_START_DEVICE: - case IRP_MN_SURPRISE_REMOVAL: ret = STATUS_SUCCESS; break; - case IRP_MN_REMOVE_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: EnterCriticalSection(&wineusb_cs); remove_pending_irps(device); + device->removed = TRUE; LeaveCriticalSection(&wineusb_cs); + ret = STATUS_SUCCESS; + break; - if (device->removed) - { - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); + case IRP_MN_REMOVE_DEVICE: + remove_pending_irps(device); - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); - IoDeleteDevice(device->device_obj); - return STATUS_SUCCESS; - } + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + IoDeleteDevice(device->device_obj); ret = STATUS_SUCCESS; break;

1 0

Rémi Bernon : wineusb.sys: Return STATUS_DELETE_PENDING when device is removed.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 0b9d1d9ffbec57fa0642d33c06a4ff6a5bf54f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9d1d9ffbec57fa0642d33c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 09:51:24 2021 +0200 wineusb.sys: Return STATUS_DELETE_PENDING when device is removed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index a72095409ff..fae297915fc 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -726,9 +726,21 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp ULONG code = stack->Parameters.DeviceIoControl.IoControlCode; struct usb_device *device = device_obj->DeviceExtension; NTSTATUS status = STATUS_NOT_IMPLEMENTED; + BOOL removed; TRACE("device_obj %p, irp %p, code %#x.\n", device_obj, irp, code); + EnterCriticalSection(&wineusb_cs); + removed = device->removed; + LeaveCriticalSection(&wineusb_cs); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + switch (code) { case IOCTL_INTERNAL_USB_SUBMIT_URB:

1 0

Rémi Bernon : hidclass.sys: Stop accepting IRPs after device removal.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: fb7a5e660e354c9a87b4f32a4779cf65adc5bb50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb7a5e660e354c9a87b4f32a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 1 18:53:25 2021 +0200 hidclass.sys: Stop accepting IRPs after device removal. Handle IRP_MN_SURPRISE_REMOVAL and notify device thread to stop it, but only wait for it in IRP_MN_REMOVE_DEVICE, as it's probably waiting for an IRP sent to the lower driver, which needs to be notified of removal too first. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/hidclass.sys/hid.h | 3 +++ dlls/hidclass.sys/pnp.c | 31 ++++++++++++++++++++++--------- 3 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 82366ad1888..d3f5fa90fc7 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -431,11 +431,24 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) NTSTATUS rc = STATUS_SUCCESS; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + BOOL removed; + KIRQL irql; irp->IoStatus.Information = 0; TRACE("device %p ioctl(%x)\n", device, irpsp->Parameters.DeviceIoControl.IoControlCode); + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + switch (irpsp->Parameters.DeviceIoControl.IoControlCode) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: @@ -588,6 +601,19 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS rc = STATUS_SUCCESS; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); int ptr = -1; + BOOL removed; + KIRQL irql; + + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } packet = malloc(buffer_size); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); @@ -662,7 +688,20 @@ NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) const WINE_HIDP_PREPARSED_DATA *data = ext->u.pdo.preparsed_data; HID_XFER_PACKET packet; ULONG max_len; + BOOL removed; NTSTATUS rc; + KIRQL irql; + + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + removed = ext->u.pdo.removed; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + if (removed) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } irp->IoStatus.Information = 0; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 5a502840691..19ac7091065 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -67,6 +67,9 @@ typedef struct _BASE_DEVICE_EXTENSION KSPIN_LOCK irp_queue_lock; LIST_ENTRY irp_queue; + KSPIN_LOCK lock; + BOOL removed; + BOOL is_mouse; UNICODE_STRING mouse_link_name; BOOL is_keyboard; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5f59257cdf7..2f5fe5de4eb 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -359,11 +359,23 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) } } +static void remove_pending_irps(BASE_DEVICE_EXTENSION *ext) +{ + IRP *irp; + + while ((irp = pop_irp_from_queue(ext))) + { + irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.Status; + KIRQL irql; TRACE("irp %p, minor function %#x.\n", irp, irpsp->MinorFunction); @@ -453,12 +465,13 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) IoSetDeviceInterfaceState(&ext->u.pdo.mouse_link_name, TRUE); if (ext->u.pdo.is_keyboard) IoSetDeviceInterfaceState(&ext->u.pdo.keyboard_link_name, TRUE); + + ext->u.pdo.removed = FALSE; status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: - { - IRP *queued_irp; + remove_pending_irps(ext); send_wm_input_device_change(ext, GIDC_REMOVAL); @@ -479,21 +492,21 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) if (ext->u.pdo.ring_buffer) RingBuffer_Destroy(ext->u.pdo.ring_buffer); - while ((queued_irp = pop_irp_from_queue(ext))) - { - queued_irp->IoStatus.Status = STATUS_DEVICE_REMOVED; - IoCompleteRequest(queued_irp, IO_NO_INCREMENT); - } - RtlFreeUnicodeString(&ext->u.pdo.link_name); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); IoDeleteDevice(device); return STATUS_SUCCESS; - } case IRP_MN_SURPRISE_REMOVAL: + KeAcquireSpinLock(&ext->u.pdo.lock, &irql); + ext->u.pdo.removed = TRUE; + KeReleaseSpinLock(&ext->u.pdo.lock, irql); + + remove_pending_irps(ext); + + SetEvent(ext->u.pdo.halt_event); status = STATUS_SUCCESS; break;

1 0

Alexandre Julliard : ntdll: Implement RtlWow64GetThreadSelectorEntry().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 3469ebf90e80290aefff07a988d4da717ab616b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3469ebf90e80290aefff07a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 08:57:35 2021 +0200 ntdll: Implement RtlWow64GetThreadSelectorEntry(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 67 +++++++++++++++++++++ dlls/ntdll/tests/wow64.c | 137 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 2 +- include/winternl.h | 1 + 5 files changed, 207 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3469ebf90e80290aefff…

1 0

Alexandre Julliard : ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 8794879335652df5785203f30253866239f8590e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8794879335652df5785203f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 09:00:08 2021 +0200 ntdll: Clear the 32-bit TLS for ZeroTlsCell in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2484450055d..34b332a613c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3017,6 +3017,11 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry ) { TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch ); +#ifdef _WIN64 + WOW_TEB *wow_teb = get_wow_teb( teb ); + if (wow_teb) wow_teb->TlsSlots[index] = 0; + else +#endif teb->TlsSlots[index] = 0; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3030,6 +3035,15 @@ NTSTATUS virtual_clear_tls_index( ULONG index ) LIST_FOR_EACH_ENTRY( thread_data, &teb_list, struct ntdll_thread_data, entry ) { TEB *teb = CONTAINING_RECORD( thread_data, TEB, GdiTebBatch ); +#ifdef _WIN64 + WOW_TEB *wow_teb = get_wow_teb( teb ); + if (wow_teb) + { + if (wow_teb->TlsExpansionSlots) + ((ULONG *)ULongToPtr( wow_teb->TlsExpansionSlots ))[index] = 0; + } + else +#endif if (teb->TlsExpansionSlots) teb->TlsExpansionSlots[index] = 0; } server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : ntdll: Add a helper function to retrieve the CPU area context on the Unix side.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: bedfb31d7cfe0f1683e142ab6b0c1575cfc4c933 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bedfb31d7cfe0f1683e142ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:16:27 2021 +0200 ntdll: Add a helper function to retrieve the CPU area context on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 6 +----- dlls/ntdll/unix/signal_i386.c | 6 +----- dlls/ntdll/unix/thread.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index e3ad240c718..a86805b113c 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -921,11 +921,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.Sp = (DWORD)teb->Tib.StackBase; context.Pc = (DWORD)pRtlUserThreadStart; if (context.Pc & 1) context.Cpsr |= 0x20; /* thumb mode */ - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_ARMNT ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 1560251e3a1..72aff4614ca 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -2337,11 +2337,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B context.FloatSave.ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->ControlWord = 0x27f; ((XSAVE_FORMAT *)context.ExtendedRegisters)->MxCsr = 0x1f80; - if (NtCurrentTeb64()) - { - WOW64_CPURESERVED *cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); - memcpy( cpu + 1, &context, sizeof(context) ); - } + if ((ctx = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) *ctx = context; if (suspend) wait_suspend( &context ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 05c412620f6..4383a4779be 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1097,6 +1097,35 @@ static SIZE_T get_machine_context_size( USHORT machine ) } +/*********************************************************************** + * get_cpu_area + * + * cf. RtlWow64GetCurrentCpuArea + */ +void *get_cpu_area( USHORT machine ) +{ + WOW64_CPURESERVED *cpu; + ULONG align; + + if (!NtCurrentTeb()->WowTebOffset) return NULL; +#ifdef _WIN64 + cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; +#else + cpu = ULongToPtr( NtCurrentTeb64()->TlsSlots[WOW64_TLS_CPURESERVED] ); +#endif + if (cpu->Machine != machine) return NULL; + switch (cpu->Machine) + { + case IMAGE_FILE_MACHINE_I386: align = TYPE_ALIGNMENT(I386_CONTEXT); break; + case IMAGE_FILE_MACHINE_AMD64: align = TYPE_ALIGNMENT(ARM_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARMNT: align = TYPE_ALIGNMENT(AMD64_CONTEXT); break; + case IMAGE_FILE_MACHINE_ARM64: align = TYPE_ALIGNMENT(ARM64_NT_CONTEXT); break; + default: return NULL; + } + return (void *)(((ULONG_PTR)(cpu + 1) + align - 1) & ~(align - 1)); +} + + /*********************************************************************** * set_thread_id */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 20b78e2a266..3ab546eb254 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -181,6 +181,7 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; +extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Initialize the Wow64 context on x86-64.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 4acecd8619219b750fa5f2d0d233cd246fe498fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4acecd8619219b750fa5f2d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 11:46:05 2021 +0200 ntdll: Initialize the Wow64 context on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 5901d9cf867..f9e82d72190 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -362,6 +362,9 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) context->ContextFlags |= CONTEXT_XSTATE; } +static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ +static USHORT cs64_sel; /* selector for %cs in 64-bit mode */ +static USHORT ds64_sel; /* selector for %ds/%es/%ss in 64-bit mode */ /*********************************************************************** * Definitions for Dwarf unwind tables @@ -2479,6 +2482,8 @@ NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_E */ void signal_init_threading(void) { + __asm__( "movw %%cs,%0" : "=m" (cs64_sel) ); + __asm__( "movw %%ss,%0" : "=m" (ds64_sel) ); } @@ -2607,6 +2612,13 @@ void signal_init_process(void) if (cpu_info.ProcessorFeatureBits & CPU_FEATURE_XSAVE) __wine_syscall_flags |= SYSCALL_HAVE_XSAVE; if (xstate_compaction_enabled) __wine_syscall_flags |= SYSCALL_HAVE_XSAVEC; +#ifdef __linux__ + if (NtCurrentTeb()->WowTebOffset) + { + cs32_sel = 0x23; + } +#endif + sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; @@ -2642,17 +2654,39 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B struct amd64_thread_data *thread_data = (struct amd64_thread_data *)&teb->GdiTebBatch; struct syscall_frame *frame = thread_data->syscall_frame; CONTEXT *ctx, context = { 0 }; + I386_CONTEXT *wow_context; context.ContextFlags = CONTEXT_ALL; context.Rcx = (ULONG_PTR)entry; context.Rdx = (ULONG_PTR)arg; context.Rsp = (ULONG_PTR)teb->Tib.StackBase - 0x28; context.Rip = (ULONG_PTR)pRtlUserThreadStart; + context.SegCs = cs64_sel; + context.SegDs = ds64_sel; + context.SegEs = ds64_sel; + context.SegGs = ds64_sel; + context.SegSs = ds64_sel; context.EFlags = 0x200; context.u.FltSave.ControlWord = 0x27f; context.u.FltSave.MxCsr = context.MxCsr = 0x1f80; - __asm__( "movw %%cs,%0" : "=m" (context.SegCs) ); - __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); + + if ((wow_context = get_cpu_area( IMAGE_FILE_MACHINE_I386 ))) + { + wow_context->ContextFlags = CONTEXT_I386_ALL; + wow_context->Eax = (ULONG_PTR)entry; + wow_context->Ebx = (ULONG_PTR)arg; + wow_context->Esp = get_wow_teb( teb )->Tib.StackBase - 16; + wow_context->Eip = (ULONG_PTR)pRtlUserThreadStart; + wow_context->SegCs = cs32_sel; + wow_context->SegDs = context.SegDs; + wow_context->SegEs = context.SegEs; + wow_context->SegFs = context.SegFs; + wow_context->SegGs = context.SegGs; + wow_context->SegSs = context.SegSs; + wow_context->EFlags = 0x202; + wow_context->FloatSave.ControlWord = context.u.FltSave.ControlWord; + *(XSAVE_FORMAT *)wow_context->ExtendedRegisters = context.u.FltSave; + } if (suspend) wait_suspend( &context );

1 0