- Wine-Devel - list.winehq.org

[PATCH 4/7] widl: generate deterministic temporary filenames
by Marko Semet June 24, 2020

June 24, 2020

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/parser.l | 4 +- tools/widl/utils.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 6 ++ tools/widl/widl.c | 3 +- 4 files changed, 166 insertions(+), 3 deletions(-)

1 0

[PATCH 5/7] winegcc: support optional output for random state debugging
by Marko Semet June 24, 2020

June 24, 2020

Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winegcc/utils.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)

1 0

[PATCH 3/7] widl: use 'SOURCE_DATA_EPOCH' besides 'WIDL_TIME_OVERRIDE'
by Marko Semet June 24, 2020

June 24, 2020

Helps to support reproducible builds. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/widl/widl.c | 12 +++++++++++- tools/widl/write_msft.c | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-)

1 0

[PATCH 2/7] winebuild: generate deterministic temporary filenames
by Marko Semet June 24, 2020

June 24, 2020

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winebuild/build.h | 6 ++ tools/winebuild/main.c | 1 + tools/winebuild/utils.c | 160 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 165 insertions(+), 2 deletions(-)

1 0

[PATCH 1/7] winegcc: generate deterministic temporary filenames
by Marko Semet June 24, 2020

June 24, 2020

Using xorshift* as pseudorandom number generator. It get initialised with the environment (sorted by name) and arguments. Signed-off-by: Marko Semet <marko(a)marko10-000.de> --- tools/winegcc/utils.c | 156 ++++++++++++++++++++++++++++++++++++++++ tools/winegcc/utils.h | 7 ++ tools/winegcc/winegcc.c | 5 +- 3 files changed, 166 insertions(+), 2 deletions(-)

1 0

[PATCH 1/4] evr: Implement MFT_MESSAGE_SET_D3D_MANAGER for default mixer.
by Nikolay Sivov June 24, 2020

June 24, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index eaea037b693..931554b5479 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "evr.h" #include "d3d9.h" +#include "dxva2api.h" #include "mfapi.h" #include "mferror.h" @@ -47,6 +48,9 @@ struct video_mixer struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; unsigned int input_ids[MAX_MIXER_INPUT_STREAMS]; unsigned int input_count; + + IDirect3DDeviceManager9 *device_manager; + CRITICAL_SECTION cs; }; @@ -151,6 +155,8 @@ static ULONG WINAPI video_mixer_transform_Release(IMFTransform *iface) if (mixer->inputs[i].attributes) IMFAttributes_Release(mixer->inputs[i].attributes); } + if (mixer->device_manager) + IDirect3DDeviceManager9_Release(mixer->device_manager); DeleteCriticalSection(&mixer->cs); free(mixer); } @@ -444,9 +450,32 @@ static HRESULT WINAPI video_mixer_transform_ProcessEvent(IMFTransform *iface, DW static HRESULT WINAPI video_mixer_transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %u, %#lx.\n", iface, message, param); + struct video_mixer *mixer = impl_from_IMFTransform(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %#lx.\n", iface, message, param); + + switch (message) + { + case MFT_MESSAGE_SET_D3D_MANAGER: + + EnterCriticalSection(&mixer->cs); + + if (mixer->device_manager) + IDirect3DDeviceManager9_Release(mixer->device_manager); + mixer->device_manager = NULL; + if (param) + hr = IUnknown_QueryInterface((IUnknown *)param, &IID_IDirect3DDeviceManager9, (void **)&mixer->device_manager); + + LeaveCriticalSection(&mixer->cs); + + break; + default: + WARN("Message not handled %d.\n", message); + hr = E_NOTIMPL; + } + + return hr; } static HRESULT WINAPI video_mixer_transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) -- 2.27.0

1 3

[PATCH v3 1/6] user32/tests: Add inter-desktop rawinput message tests.
by Rémi Bernon June 24, 2020

June 24, 2020

Another thread is created to execute the tests, for SetThreadDesktop to succeed consistently. It seems to fail spuriously if it is called from a thread that already created some windows before. This shows that rawinput messages may be dispatched across desktops, but only if the subscribing process has a window in the input desktop, and it is the foreground process (even if the target window may be in another desktop). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add a cross-desktop test and rewrite queue_rawinput_message to be less suspicious, hopefully. Only enumerate processes when actually needed, ie: when implementing RIDEV_INPUTSINK flag support. dlls/user32/tests/input.c | 119 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9ec829860af..01733317b2b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -50,6 +50,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "ddk/hidsdi.h" @@ -60,6 +61,8 @@ static HWND hWndTest; static LONG timetag = 0x10000000; +#define DESKTOP_ALL_ACCESS 0x01ff + static struct { LONG last_key_down; LONG last_key_up; @@ -1891,6 +1894,11 @@ struct rawinput_test rawinput_tests[] = { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, { TRUE, TRUE, RIDEV_EXINPUTSINK, FALSE, TRUE, FALSE, /* todos: */ FALSE, TRUE, FALSE }, + + /* cross-desktop foreground tests */ + { TRUE, FALSE, 0, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, 0, FALSE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_INPUTSINK, FALSE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, }; static void rawinput_test_process(void) @@ -1927,6 +1935,7 @@ static void rawinput_test_process(void) case 11: case 12: case 13: + case 16: GetCursorPos(&pt); hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, @@ -1960,6 +1969,9 @@ static void rawinput_test_process(void) rawinput_test_received_raw = FALSE; rawinput_test_received_rawfg = FALSE; + /* fallthrough */ + case 14: + case 15: if (i != 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); break; @@ -1998,19 +2010,87 @@ static void rawinput_test_process(void) struct rawinput_test_thread_params { + HDESK desk; HANDLE ready; HANDLE start; HANDLE done; }; +static DWORD WINAPI rawinput_test_desk_thread(void *arg) +{ + struct rawinput_test_thread_params *params = arg; + RAWINPUTDEVICE raw_devices[1]; + DWORD ret; + POINT pt; + HWND hwnd = NULL; + MSG msg; + int i; + + ok( SetThreadDesktop( params->desk ), "SetThreadDesktop failed\n" ); + + for (i = 14; i < ARRAY_SIZE(rawinput_tests); ++i) + { + WaitForSingleObject(params->ready, INFINITE); + ResetEvent(params->ready); + + switch (i) + { + case 14: + case 15: + case 16: + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = rawinput_tests[i].register_flags; + raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + break; + } + + SetEvent(params->start); + + while (MsgWaitForMultipleObjects(1, &params->done, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + ResetEvent(params->done); + if (hwnd) DestroyWindow(hwnd); + } + + return 0; +} + static DWORD WINAPI rawinput_test_thread(void *arg) { struct rawinput_test_thread_params *params = arg; + HANDLE thread; POINT pt; HWND hwnd = NULL; int i; - for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + for (i = 0; i < 14; ++i) { WaitForSingleObject(params->ready, INFINITE); ResetEvent(params->ready); @@ -2046,6 +2126,11 @@ static DWORD WINAPI rawinput_test_thread(void *arg) if (hwnd) DestroyWindow(hwnd); } + thread = CreateThread(NULL, 0, rawinput_test_desk_thread, params, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + return 0; } @@ -2063,6 +2148,9 @@ static void test_rawinput(const char* argv0) char path[MAX_PATH]; int i; + params.desk = CreateDesktopA( "rawinput_test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( params.desk != NULL, "CreateDesktopA failed, last error: %u\n", GetLastError() ); + params.ready = CreateEventA(NULL, FALSE, FALSE, NULL); ok(params.ready != NULL, "CreateEvent failed\n"); @@ -2103,7 +2191,8 @@ static void test_rawinput(const char* argv0) hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); ok(hwnd != 0, "CreateWindow failed\n"); - SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + if (i != 14 && i != 15 && i != 16) + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); empty_message_queue(); /* FIXME: Try to workaround X11/Win32 focus inconsistencies and @@ -2135,14 +2224,30 @@ static void test_rawinput(const char* argv0) ok(!skipped, "%d: RegisterRawInputDevices failed: %u\n", i, GetLastError()); } - SetEvent(process_ready); - WaitForSingleObject(process_start, INFINITE); - ResetEvent(process_start); - SetEvent(params.ready); WaitForSingleObject(params.start, INFINITE); ResetEvent(params.start); + /* we need the main window to be over the other thread window, as although + * it is in another desktop, it will receive the messages directly otherwise */ + switch (i) + { + case 14: + case 15: + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + empty_message_queue(); + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + break; + } + + SetEvent(process_ready); + WaitForSingleObject(process_start, INFINITE); + ResetEvent(process_start); + if (i <= 3 || i == 8) mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); empty_message_queue(); @@ -2192,6 +2297,8 @@ static void test_rawinput(const char* argv0) CloseHandle(params.start); CloseHandle(params.ready); CloseHandle(thread); + + CloseDesktop(params.desk); } static void test_key_map(void) -- 2.27.0

2 9

[PATCH] netio.sys: Fill socket addresses when accepting connection.
by Paul Gofman June 24, 2020

June 24, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/netio.c | 35 ++++++++++++++++++++++--------- dlls/ntoskrnl.exe/tests/driver4.c | 18 ++++++++++++++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index dd6d2f48140..b54819664de 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -46,6 +46,7 @@ struct _WSK_CLIENT struct listen_socket_callback_context { + SOCKADDR *local_address; SOCKADDR *remote_address; const void *client_dispatch; void *client_context; @@ -53,15 +54,6 @@ struct listen_socket_callback_context SOCKET acceptor; }; -struct connect_socket_callback_context -{ - struct wsk_socket_internal *socket; - SOCKADDR *remote_address; - const void *client_dispatch; - void *client_context; - IRP *pending_irp; -}; - #define MAX_PENDING_IO 10 struct wsk_pending_io @@ -96,6 +88,7 @@ struct wsk_socket_internal }; static LPFN_ACCEPTEX pAcceptEx; +static LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs; static LPFN_CONNECTEX pConnectEx; static const WSK_PROVIDER_CONNECTION_DISPATCH wsk_provider_connection_dispatch; @@ -319,6 +312,8 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ { struct listen_socket_callback_context *context = &socket->callback_context.listen_socket_callback_context; + INT local_address_len, remote_address_len; + SOCKADDR *local_address, *remote_address; struct wsk_socket_internal *accept_socket; if (!(accept_socket = heap_alloc_zero(sizeof(*accept_socket)))) @@ -338,7 +333,17 @@ static void create_accept_socket(struct wsk_socket_internal *socket, struct wsk_ accept_socket->protocol = socket->protocol; accept_socket->flags = WSK_FLAG_CONNECTION_SOCKET; socket_init(accept_socket); - /* TODO: fill local and remote addresses. */ + + pGetAcceptExSockaddrs(context->addr_buffer, 0, sizeof(SOCKADDR) + 16, sizeof(SOCKADDR) + 16, + &local_address, &local_address_len, &remote_address, &remote_address_len); + + if (context->local_address) + memcpy(context->local_address, local_address, + min(sizeof(*context->local_address), local_address_len)); + + if (context->remote_address) + memcpy(context->remote_address, remote_address, + min(sizeof(*context->remote_address), remote_address_len)); dispatch_pending_io(io, STATUS_SUCCESS, (ULONG_PTR)&accept_socket->wsk_socket); } @@ -373,6 +378,7 @@ static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_ static BOOL WINAPI init_accept_functions(INIT_ONCE *once, void *param, void **context) { + GUID get_acceptex_guid = WSAID_GETACCEPTEXSOCKADDRS; GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET s = (SOCKET)param; DWORD size; @@ -383,6 +389,14 @@ static BOOL WINAPI init_accept_functions(INIT_ONCE *once, void *param, void **co ERR("Could not get AcceptEx address, error %u.\n", WSAGetLastError()); return FALSE; } + + if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &get_acceptex_guid, sizeof(get_acceptex_guid), + &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &size, NULL, NULL)) + { + ERR("Could not get AcceptEx address, error %u.\n", WSAGetLastError()); + return FALSE; + } + return TRUE; } @@ -430,6 +444,7 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * return STATUS_PENDING; } + context->local_address = local_address; context->remote_address = remote_address; context->client_dispatch = accept_socket_dispatch; context->client_context = accept_socket_context; diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver4.c index dad1d6a04fd..48de151f31f 100644 --- a/dlls/ntoskrnl.exe/tests/driver4.c +++ b/dlls/ntoskrnl.exe/tests/driver4.c @@ -177,10 +177,10 @@ static void test_wsk_listen_socket(void) static const WSK_CLIENT_LISTEN_DISPATCH client_listen_dispatch; const WSK_PROVIDER_CONNECTION_DISPATCH *accept_dispatch; WSK_SOCKET *tcp_socket, *udp_socket, *accept_socket; + struct sockaddr_in addr, local_addr, remote_addr; struct socket_context context; WSK_BUF wsk_buf1, wsk_buf2; void *buffer1, *buffer2; - struct sockaddr_in addr; LARGE_INTEGER timeout; MDL *mdl1, *mdl2; NTSTATUS status; @@ -287,7 +287,10 @@ static void test_wsk_listen_socket(void) IoReuseIrp(wsk_irp, STATUS_UNSUCCESSFUL); IoSetCompletionRoutine(wsk_irp, irp_completion_routine, &irp_complete_event, TRUE, TRUE, TRUE); - status = tcp_dispatch->WskAccept(tcp_socket, 0, NULL, NULL, NULL, NULL, wsk_irp); + memset(&local_addr, 0, sizeof(local_addr)); + memset(&remote_addr, 0, sizeof(remote_addr)); + status = tcp_dispatch->WskAccept(tcp_socket, 0, NULL, NULL, + (SOCKADDR *)&local_addr, (SOCKADDR *)&remote_addr, wsk_irp); ok(status == STATUS_PENDING, "Got unexpected status %#x.\n", status); if (0) @@ -306,6 +309,17 @@ static void test_wsk_listen_socket(void) if (status == STATUS_SUCCESS && wsk_irp->IoStatus.Status == STATUS_SUCCESS) { + ok(local_addr.sin_family == AF_INET, "Got unexpected sin_family %u.\n", local_addr.sin_family); + ok(local_addr.sin_port == htons(SERVER_LISTEN_PORT), "Got unexpected sin_port %u.\n", + ntohs(local_addr.sin_port)); + ok(local_addr.sin_addr.s_addr == htonl(0x7f000001), "Got unexpected sin_addr %#x.\n", + ntohl(local_addr.sin_addr.s_addr)); + + ok(remote_addr.sin_family == AF_INET, "Got unexpected sin_family %u.\n", remote_addr.sin_family); + ok(remote_addr.sin_port, "Got zero sin_port.\n"); + ok(remote_addr.sin_addr.s_addr == htonl(0x7f000001), "Got unexpected sin_addr %#x.\n", + ntohl(remote_addr.sin_addr.s_addr)); + accept_socket = (WSK_SOCKET *)wsk_irp->IoStatus.Information; accept_dispatch = accept_socket->Dispatch; -- 2.26.2

1 0

[PATCH 4/8] winhttp: Implement WinHttpWebSocketClose.
by Hans Leidekker June 24, 2020

June 24, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 99 +++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 3 ++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7f1c727cba..51aa755404 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3540,10 +3540,105 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r return ret; } +static DWORD socket_close( struct socket *socket, USHORT status, const void *reason, DWORD len, BOOL async ) +{ + struct netconn *netconn = socket->request->netconn; + DWORD ret, count; + + while (socket->read_size) /* drain any pending data */ + { + char buf[1024]; + if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) goto done; + socket->read_size -= count; + } + + if (socket->state < SOCKET_STATE_SHUTDOWN) + { + if ((ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) goto done; + socket->state = SOCKET_STATE_SHUTDOWN; + } + + if ((ret = receive_frame( netconn, &count, &socket->buf_type ))) goto done; + if (socket->buf_type != WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE || (count && count > sizeof(socket->reason))) + { + ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + goto done; + } + + if ((ret = receive_bytes( netconn, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + if (count != sizeof(socket->status)) + { + ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + goto done; + } + socket->status = RtlUshortByteSwap( socket->status ); + ret = receive_bytes( netconn, socket->reason, sizeof(socket->reason), &socket->reason_len ); + +done: + if (async) + { + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */ + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (!ret) socket->state = SOCKET_STATE_CLOSED; + return ret; +} + +static void task_socket_close( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_shutdown *s = (struct socket_shutdown *)task; + + socket_close( socket, s->status, s->reason, s->len, TRUE ); +} + DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); + + if (len && !reason) return ERROR_INVALID_PARAMETER; + + if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; + if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + if (socket->state >= SOCKET_STATE_CLOSED) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_shutdown *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &socket->hdr; + s->hdr.proc = task_socket_close; + s->status = status; + s->reason = reason; + s->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)s ); + } + else ret = socket_close( socket, status, reason, len, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7d81e35934..41ada14c0c 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -230,6 +230,9 @@ struct socket struct queue recv_q; WINHTTP_WEB_SOCKET_BUFFER_TYPE buf_type; DWORD read_size; + USHORT status; + char reason[128]; + DWORD reason_len; }; struct task_header -- 2.20.1

2 2

[PATCH v2 3/3] server: Don't allow an empty desktop name.
by Huw Davies June 24, 2020

June 24, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/tests/winstation.c | 2 -- server/winstation.c | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index d239ead6e98..76aa8a533b9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -296,9 +296,7 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - todo_wine ok( !d2, "create empty desktop succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); diff --git a/server/winstation.c b/server/winstation.c index 43d112334d4..2962ea0df4a 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -513,6 +513,11 @@ DECL_HANDLER(create_desktop) struct unicode_str name = get_req_unicode_str(); reply->handle = 0; + if (!name.len) + { + set_error( STATUS_INVALID_HANDLE ); + return; + } if ((winstation = get_process_winstation( current->process, WINSTA_CREATEDESKTOP ))) { if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation ))) -- 2.23.0

2 1