April 2020 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3d10: Remove superfluous TRUE : FALSE conditional expression.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 4ffc5e66ea31e8b831513bc8e462c876cdfdcb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ffc5e66ea31e8b831513bc8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Apr 16 00:08:29 2020 +0200 d3d10: Remove superfluous TRUE : FALSE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04376efe9c..86ef50aac0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5337,7 +5337,7 @@ static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *dst = dst_void; unsigned int row, col; @@ -5415,7 +5415,7 @@ static void read_matrix_from_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *src = src_void; unsigned int row, col;

1 0

Zebediah Figura : wineusb.sys: Implement device and instance IDs.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: a66d44b96e81750d33bb1e36cb30239d65e83e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66d44b96e81750d33bb1e36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 19:58:15 2020 -0500 wineusb.sys: Implement device and instance IDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b60d496e9e..918c7a584b 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -278,15 +278,58 @@ static NTSTATUS fdo_pnp(IRP *irp) return IoCallDriver(bus_pdo, irp); } +static void get_device_id(const struct usb_device *device, WCHAR *buffer) +{ + 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); + sprintfW(buffer, formatW, desc.idVendor, desc.idProduct); +} + +static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) +{ + WCHAR *id = NULL; + + switch (type) + { + case BusQueryDeviceID: + if ((id = ExAllocatePool(PagedPool, 28 * sizeof(WCHAR)))) + get_device_id(device, id); + break; + + case BusQueryInstanceID: + if ((id = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)))) + { + id[0] = '0'; + id[1] = 0; + } + break; + + default: + FIXME("Unhandled ID query type %#x.\n", type); + return irp->IoStatus.Status; + } + + irp->IoStatus.Information = (ULONG_PTR)id; + return STATUS_SUCCESS; +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct usb_device *device = device_obj->DeviceExtension; NTSTATUS ret = irp->IoStatus.Status; TRACE("device_obj %p, irp %p, minor function %#x.\n", device_obj, irp, stack->MinorFunction); switch (stack->MinorFunction) { + case IRP_MN_QUERY_ID: + ret = query_id(device, irp, stack->Parameters.QueryId.IdType); + break; + case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: ret = STATUS_SUCCESS;

1 0

Zebediah Figura : wineusb.sys: Implement hardware IDs.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 01315d5286bb09097ad8c96aed267ef6d4b171f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01315d5286bb09097ad8c96a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 19:58:16 2020 -0500 wineusb.sys: Implement hardware IDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 918c7a584b..8798645f2f 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -288,6 +288,19 @@ static void get_device_id(const struct usb_device *device, WCHAR *buffer) sprintfW(buffer, formatW, desc.idVendor, desc.idProduct); } +static void get_hardware_ids(const struct usb_device *device, WCHAR *buffer) +{ + 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); + buffer += sprintfW(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice) + 1; + get_device_id(device, buffer); + buffer += strlenW(buffer) + 1; + *buffer = 0; +} + static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { WCHAR *id = NULL; @@ -307,6 +320,11 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID } break; + case BusQueryHardwareIDs: + if ((id = ExAllocatePool(PagedPool, (28 + 37 + 1) * sizeof(WCHAR)))) + get_hardware_ids(device, id); + break; + default: FIXME("Unhandled ID query type %#x.\n", type); return irp->IoStatus.Status;

1 0

Zebediah Figura : wineusb.sys: Return compatible IDs.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 2710aa17667737010621f97e352eb53aa9a83494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2710aa17667737010621f97e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 19:58:17 2020 -0500 wineusb.sys: Return compatible IDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 8798645f2f..eb1b7a261f 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -301,6 +301,26 @@ static void get_hardware_ids(const struct usb_device *device, WCHAR *buffer) *buffer = 0; } +static void get_compatible_ids(const struct usb_device *device, WCHAR *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}; + + struct libusb_device_descriptor device_desc; + + libusb_get_device_descriptor(device->libusb_device, &device_desc); + + buffer += sprintfW(buffer, prot_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass, + device_desc.bDeviceProtocol) + 1; + buffer += sprintfW(buffer, subclass_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass) + 1; + buffer += sprintfW(buffer, class_format, device_desc.bDeviceClass) + 1; + *buffer = 0; +} + static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { WCHAR *id = NULL; @@ -325,6 +345,11 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID get_hardware_ids(device, id); break; + case BusQueryCompatibleIDs: + if ((id = ExAllocatePool(PagedPool, (33 + 25 + 13 + 1) * sizeof(WCHAR)))) + get_compatible_ids(device, id); + break; + default: FIXME("Unhandled ID query type %#x.\n", type); return irp->IoStatus.Status;

1 0

Zebediah Figura : wineusb.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 5b47a2db6c8496e05cd7ee9c39eb818fcd54b8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b47a2db6c8496e05cd7ee9c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 15 09:43:23 2020 -0500 wineusb.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 22804d8657..b60d496e9e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -38,6 +38,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); +#if defined(__i386__) && !defined(_WIN32) + +extern void * WINAPI wrap_fastcall_func1( void *func, const void *a ); +__ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, + "popl %ecx\n\t" + "popl %eax\n\t" + "xchgl (%esp),%ecx\n\t" + "jmp *%eax" ); + +#define call_fastcall_func1(func,a) wrap_fastcall_func1(func,a) + +#else + +#define call_fastcall_func1(func,a) func(a) + +#endif + #define DECLARE_CRITICAL_SECTION(cs) \ static CRITICAL_SECTION cs; \ static CRITICAL_SECTION_DEBUG cs##_debug = \ @@ -172,6 +189,42 @@ static NTSTATUS fdo_pnp(IRP *irp) switch (stack->MinorFunction) { + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + struct usb_device *device; + DEVICE_RELATIONS *devices; + unsigned int i = 0; + + if (stack->Parameters.QueryDeviceRelations.Type != BusRelations) + { + FIXME("Unhandled device relations type %#x.\n", stack->Parameters.QueryDeviceRelations.Type); + break; + } + + EnterCriticalSection(&wineusb_cs); + + if (!(devices = ExAllocatePool(PagedPool, + offsetof(DEVICE_RELATIONS, Objects[list_count(&device_list)])))) + { + LeaveCriticalSection(&wineusb_cs); + irp->IoStatus.Status = STATUS_NO_MEMORY; + break; + } + + LIST_FOR_EACH_ENTRY(device, &device_list, struct usb_device, entry) + { + devices->Objects[i++] = device->device_obj; + call_fastcall_func1(ObfReferenceObject, device->device_obj); + } + + LeaveCriticalSection(&wineusb_cs); + + devices->Count = i; + irp->IoStatus.Information = (ULONG_PTR)devices; + irp->IoStatus.Status = STATUS_SUCCESS; + break; + } + case IRP_MN_START_DEVICE: if ((ret = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT,

1 0

Brendan Shanks : cmd: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: e8f16fcbcc6a168e8f1e526beb3e07d0beeea3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f16fcbcc6a168e8f1e526b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 16 11:12:58 2020 -0700 cmd: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index b0769bd839..112fc1a1ea 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -22,6 +22,7 @@ #define IDI_ICON1 1 #include <windows.h> #include <windef.h> +#include <winternl.h> #ifndef RC_INVOKED #include <string.h> #include <stdlib.h> diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5cad22b7ee..2834986bf9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2437,7 +2437,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; WCHAR comspec[MAX_PATH]; CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - OSVERSIONINFOW osv; + RTL_OSVERSIONINFOEXW osv; char osver[50]; STARTUPINFOW startupInfo; @@ -2452,7 +2452,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Get the windows version being emulated */ osv.dwOSVersionInfoSize = sizeof(osv); - GetVersionExW(&osv); + RtlGetVersion(&osv); /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY));

1 0

Brendan Shanks : winedbg: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: c18152630362c1bff1813fe8ad5c75ffb8dbb7cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18152630362c1bff1813fe8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 16 11:13:27 2020 -0700 winedbg: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/tgt_active.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2b38ce95de..91dea2f9d8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -728,11 +728,11 @@ version_table[] = static const char *get_windows_version(void) { - OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; + RTL_OSVERSIONINFOEXW info = { sizeof(RTL_OSVERSIONINFOEXW) }; static char str[64]; int i; - GetVersionExW( (OSVERSIONINFOW *)&info ); + RtlGetVersion( &info ); for (i = 0; i < ARRAY_SIZE(version_table); i++) {

1 0

Jacek Caban : ntdll: Use select request to pass suspend context to server.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 5e7ccd182e7dbcf2ef531835c6a87ad672641056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e7ccd182e7dbcf2ef531835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:14 2020 +0200 ntdll: Use select request to pass suspend context to server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 14 ++------------ dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 16 ++++++++++++++-- dlls/ntdll/sync.c | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7854ad97c6..fe3af73d34 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -115,18 +115,8 @@ void wait_suspend( CONTEXT *context ) context_t server_context; DWORD flags = context->ContextFlags; - context_to_server( &server_context, context ); - - /* store the context we got at suspend time */ - SERVER_START_REQ( set_suspend_context ) - { - wine_server_add_data( req, &server_context, sizeof(server_context) ); - wine_server_call( req ); - } - SERVER_END_REQ; - /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context ) @@ -183,7 +173,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL ); SERVER_START_REQ( get_exception_status ) { diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f18ab1f227..336d7c0463 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -117,7 +117,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, user_apc_t *user_apc ) DECLSPEC_HIDDEN; + timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 7e178aa745..9103941e1b 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -602,16 +602,23 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, user_apc_t *user_apc ) + timeout_t abs_timeout, CONTEXT *context, user_apc_t *user_apc ) { unsigned int ret; int cookie; obj_handle_t apc_handle = 0; + context_t server_context; + BOOL suspend_context = FALSE; apc_call_t call; apc_result_t result; sigset_t old_set; memset( &result, 0, sizeof(result) ); + if (context) + { + suspend_context = TRUE; + context_to_server( &server_context, context ); + } do { @@ -627,6 +634,11 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT req->size = size; wine_server_add_data( req, &result, sizeof(result) ); wine_server_add_data( req, select_op, size ); + if (suspend_context) + { + wine_server_add_data( req, &server_context, sizeof(server_context) ); + suspend_context = FALSE; /* server owns the context now */ + } ret = server_call_unlocked( req ); apc_handle = reply->apc_handle; call = reply->call; @@ -673,7 +685,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f for (;;) { - ret = server_select( select_op, size, flags, abs_timeout, &apc ); + ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc ); if (ret != STATUS_USER_APC) break; invoke_apc( &apc ); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index eaee7030de..be00ac75d0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2585,7 +2585,7 @@ NTSTATUS WINAPI RtlWaitOnAddress( const void *addr, const void *cmp, SIZE_T size if (!compare_addr( addr, cmp, size )) ret = STATUS_SUCCESS; else - ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, &apc ); + ret = server_select( &select_op, sizeof(select_op.keyed_event), SELECT_INTERRUPTIBLE, abs_timeout, NULL, &apc ); RtlLeaveCriticalSection( &addr_section ); if (ret != STATUS_USER_APC) break;

1 0

Jacek Caban : ntdll: Use select request instead of get_suspend_context to transfer context back to client.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: 96cc6950f07350c1bd19ccea7877074b8fc0ebca URL: https://source.winehq.org/git/wine.git/?a=commit;h=96cc6950f07350c1bd19ccea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:22 2020 +0200 ntdll: Use select request instead of get_suspend_context to transfer context back to client. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 15 --------------- dlls/ntdll/server.c | 7 +++++++ server/thread.c | 24 ++++++++++++++++++++++++ server/thread.h | 1 + 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index fe3af73d34..589ceab390 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -112,25 +112,10 @@ static ULONG remove_vectored_handler( struct list *handler_list, VECTORED_HANDLE void wait_suspend( CONTEXT *context ) { int saved_errno = errno; - context_t server_context; - DWORD flags = context->ContextFlags; /* wait with 0 timeout, will only return once the thread is no longer suspended */ server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL ); - /* retrieve the new context */ - SERVER_START_REQ( get_suspend_context ) - { - wine_server_set_reply( req, &server_context, sizeof(server_context) ); - wine_server_call( req ); - if (wine_server_reply_size( reply )) - { - context_from_server( context, &server_context ); - context->ContextFlags |= flags; /* unchanged registers are still available */ - } - } - SERVER_END_REQ; - errno = saved_errno; } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9103941e1b..be080a9f73 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -639,9 +639,16 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT wine_server_add_data( req, &server_context, sizeof(server_context) ); suspend_context = FALSE; /* server owns the context now */ } + if (context) wine_server_set_reply( req, &server_context, sizeof(server_context) ); ret = server_call_unlocked( req ); apc_handle = reply->apc_handle; call = reply->call; + if (wine_server_reply_size( reply )) + { + DWORD context_flags = context->ContextFlags; /* unchanged registers are still available */ + context_from_server( context, &server_context ); + context->ContextFlags |= context_flags; + } } SERVER_END_REQ; diff --git a/server/thread.c b/server/thread.c index d75dc238d5..b93e91cefd 100644 --- a/server/thread.c +++ b/server/thread.c @@ -780,6 +780,19 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s struct wake_up_reply reply; int ret; + /* check if we're waking current suspend wait */ + if (thread->suspend_context && thread->suspend_cookie == cookie + && signaled != STATUS_KERNEL_APC && signaled != STATUS_USER_APC) + { + if (!thread->suspend_context->flags) + { + if (current->context == current->suspend_context) thread->context = NULL; + free( thread->suspend_context ); + thread->suspend_context = NULL; + } + else signaled = STATUS_KERNEL_APC; /* signal a fake APC so that client calls select to get a new context */ + } + memset( &reply, 0, sizeof(reply) ); reply.cookie = cookie; reply.signaled = signaled; @@ -1557,6 +1570,7 @@ DECL_HANDLER(select) memcpy( current->suspend_context, context, sizeof(*context) ); current->suspend_context->flags = 0; /* to keep track of what is modified */ current->context = current->suspend_context; + current->suspend_cookie = req->cookie; } if (!req->cookie) @@ -1627,6 +1641,16 @@ DECL_HANDLER(select) } release_object( apc ); } + else if(get_error() != STATUS_PENDING && get_reply_max_size() == sizeof(context_t) + && current->suspend_context && current->suspend_cookie == req->cookie) + { + if (current->suspend_context->flags) + set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); + else + free( current->suspend_context ); + if (current->context == current->suspend_context) current->context = NULL; + current->suspend_context = NULL; + } } /* queue an APC for a thread or process */ diff --git a/server/thread.h b/server/thread.h index 66e35603d3..9aabcaca99 100644 --- a/server/thread.h +++ b/server/thread.h @@ -77,6 +77,7 @@ struct thread int unix_tid; /* Unix tid of client */ context_t *context; /* current context if in an exception handler */ context_t *suspend_context; /* current context if suspended */ + client_ptr_t suspend_cookie;/* wait cookie of suspending select */ client_ptr_t teb; /* TEB address (in client address space) */ client_ptr_t entry_point; /* entry point (in client address space) */ affinity_t affinity; /* affinity mask */

1 0

Jacek Caban : server: Get rid of no longer needed get_suspend_context and set_suspend_context requests.
by Alexandre Julliard 16 Apr '20

16 Apr '20

Module: wine Branch: master Commit: dbe7694c533ce8bc454248255a2abad66f221e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbe7694c533ce8bc45424825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 15 14:55:30 2020 +0200 server: Get rid of no longer needed get_suspend_context and set_suspend_context requests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 34 +---------------------------- server/protocol.def | 13 ----------- server/request.h | 7 ------ server/thread.c | 49 ------------------------------------------ server/trace.c | 20 ----------------- 5 files changed, 1 insertion(+), 122 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 77f62afb72..ba43aa07ed 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5657,32 +5657,6 @@ struct update_rawinput_devices_reply -struct get_suspend_context_request -{ - struct request_header __header; - char __pad_12[4]; -}; -struct get_suspend_context_reply -{ - struct reply_header __header; - /* VARARG(context,context); */ -}; - - - -struct set_suspend_context_request -{ - struct request_header __header; - /* VARARG(context,context); */ - char __pad_12[4]; -}; -struct set_suspend_context_reply -{ - struct reply_header __header; -}; - - - struct create_job_request { struct request_header __header; @@ -6097,8 +6071,6 @@ enum request REQ_free_user_handle, REQ_set_cursor, REQ_update_rawinput_devices, - REQ_get_suspend_context, - REQ_set_suspend_context, REQ_create_job, REQ_open_job, REQ_assign_job, @@ -6401,8 +6373,6 @@ union generic_request struct free_user_handle_request free_user_handle_request; struct set_cursor_request set_cursor_request; struct update_rawinput_devices_request update_rawinput_devices_request; - struct get_suspend_context_request get_suspend_context_request; - struct set_suspend_context_request set_suspend_context_request; struct create_job_request create_job_request; struct open_job_request open_job_request; struct assign_job_request assign_job_request; @@ -6703,8 +6673,6 @@ union generic_reply struct free_user_handle_reply free_user_handle_reply; struct set_cursor_reply set_cursor_reply; struct update_rawinput_devices_reply update_rawinput_devices_reply; - struct get_suspend_context_reply get_suspend_context_reply; - struct set_suspend_context_reply set_suspend_context_reply; struct create_job_reply create_job_reply; struct open_job_reply open_job_reply; struct assign_job_reply assign_job_reply; @@ -6718,7 +6686,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 599 +#define SERVER_PROTOCOL_VERSION 600 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 318c3b0b83..7b92ffd374 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3889,19 +3889,6 @@ struct handle_info @END -/* Retrieve the suspended context of a thread */ -(a)REQ(get_suspend_context) -(a)REPLY - VARARG(context,context); /* thread context */ -(a)END - - -/* Store the suspend context of a thread */ -(a)REQ(set_suspend_context) - VARARG(context,context); /* thread context */ -(a)END - - /* Create a new job object */ @REQ(create_job) unsigned int access; /* wanted access rights */ diff --git a/server/request.h b/server/request.h index c1f4fc6b39..dff5edc893 100644 --- a/server/request.h +++ b/server/request.h @@ -405,8 +405,6 @@ DECL_HANDLER(alloc_user_handle); DECL_HANDLER(free_user_handle); DECL_HANDLER(set_cursor); DECL_HANDLER(update_rawinput_devices); -DECL_HANDLER(get_suspend_context); -DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(open_job); DECL_HANDLER(assign_job); @@ -708,8 +706,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_free_user_handle, (req_handler)req_set_cursor, (req_handler)req_update_rawinput_devices, - (req_handler)req_get_suspend_context, - (req_handler)req_set_suspend_context, (req_handler)req_create_job, (req_handler)req_open_job, (req_handler)req_assign_job, @@ -2420,9 +2416,6 @@ C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, new_clip) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_cursor_reply, last_change) == 48 ); C_ASSERT( sizeof(struct set_cursor_reply) == 56 ); C_ASSERT( sizeof(struct update_rawinput_devices_request) == 16 ); -C_ASSERT( sizeof(struct get_suspend_context_request) == 16 ); -C_ASSERT( sizeof(struct get_suspend_context_reply) == 8 ); -C_ASSERT( sizeof(struct set_suspend_context_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_job_request, access) == 12 ); C_ASSERT( sizeof(struct create_job_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_job_reply, handle) == 8 ); diff --git a/server/thread.c b/server/thread.c index b93e91cefd..762ddb3580 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1836,55 +1836,6 @@ DECL_HANDLER(set_thread_context) release_object( thread ); } -/* retrieve the suspended context of a thread */ -DECL_HANDLER(get_suspend_context) -{ - if (get_reply_max_size() < sizeof(context_t)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - if (current->suspend_context) - { - if (current->suspend_context->flags) - set_reply_data_ptr( current->suspend_context, sizeof(context_t) ); - else - free( current->suspend_context ); - if (current->context == current->suspend_context) - { - current->context = NULL; - stop_thread_if_suspended( current ); - } - current->suspend_context = NULL; - } - else set_error( STATUS_INVALID_PARAMETER ); /* not suspended, shouldn't happen */ -} - -/* store the suspended context of a thread */ -DECL_HANDLER(set_suspend_context) -{ - const context_t *context = get_req_data(); - - if (get_req_data_size() < sizeof(context_t)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - if (current->context || context->cpu != current->process->cpu) - { - /* nested suspend or exception, shouldn't happen */ - set_error( STATUS_INVALID_PARAMETER ); - } - else if ((current->suspend_context = mem_alloc( sizeof(context_t) ))) - { - memcpy( current->suspend_context, get_req_data(), sizeof(context_t) ); - current->suspend_context->flags = 0; /* to keep track of what is modified */ - current->context = current->suspend_context; - } -} - /* fetch a selector entry for a thread */ DECL_HANDLER(get_selector_entry) { diff --git a/server/trace.c b/server/trace.c index 9dd7ab73a1..e762cd56a0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4537,20 +4537,6 @@ static void dump_update_rawinput_devices_request( const struct update_rawinput_d dump_varargs_rawinput_devices( " devices=", cur_size ); } -static void dump_get_suspend_context_request( const struct get_suspend_context_request *req ) -{ -} - -static void dump_get_suspend_context_reply( const struct get_suspend_context_reply *req ) -{ - dump_varargs_context( " context=", cur_size ); -} - -static void dump_set_suspend_context_request( const struct set_suspend_context_request *req ) -{ - dump_varargs_context( " context=", cur_size ); -} - static void dump_create_job_request( const struct create_job_request *req ) { fprintf( stderr, " access=%08x", req->access ); @@ -4903,8 +4889,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_free_user_handle_request, (dump_func)dump_set_cursor_request, (dump_func)dump_update_rawinput_devices_request, - (dump_func)dump_get_suspend_context_request, - (dump_func)dump_set_suspend_context_request, (dump_func)dump_create_job_request, (dump_func)dump_open_job_request, (dump_func)dump_assign_job_request, @@ -5203,8 +5187,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_set_cursor_reply, NULL, - (dump_func)dump_get_suspend_context_reply, - NULL, (dump_func)dump_create_job_reply, (dump_func)dump_open_job_reply, NULL, @@ -5503,8 +5485,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "free_user_handle", "set_cursor", "update_rawinput_devices", - "get_suspend_context", - "set_suspend_context", "create_job", "open_job", "assign_job",

1 0