wine-devel June 2020

wine-devel@winehq.org

75 participants
814 discussions

[PATCH 1/8] winhttp: Implement WinHttpWebSocketSend.
by Hans Leidekker 24 Jun '20

24 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 184 ++++++++++++++++++++++++++++++++- dlls/winhttp/winhttp_private.h | 17 +++ 2 files changed, 199 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0c038289f8..4ffb2c7bf6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3061,7 +3061,16 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); + if (socket->send_q.proc_running) + { + socket->send_q.proc_running = FALSE; + SetEvent( socket->send_q.cancel ); + return; + } release_object( &socket->request->hdr ); + + socket->send_q.cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &socket->send_q.cs ); heap_free( socket ); } @@ -3109,6 +3118,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.callback = request->hdr.callback; socket->hdr.notify_mask = request->hdr.notify_mask; socket->hdr.context = context; + InitializeCriticalSection( &socket->send_q.cs ); + socket->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.send_q.cs"); addref_object( &request->hdr ); socket->request = request; @@ -3125,10 +3136,179 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR return hsocket; } +static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) +{ + int count; + DWORD err; + if ((err = netconn_send( netconn, bytes, len, &count ))) return err; + return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; +} + +/* rfc6455 */ +enum opcode +{ + OPCODE_CONTINUE = 0x00, + OPCODE_TEXT = 0x01, + OPCODE_BINARY = 0x02, + OPCODE_RESERVED3 = 0x03, + OPCODE_RESERVED4 = 0x04, + OPCODE_RESERVED5 = 0x05, + OPCODE_RESERVED6 = 0x06, + OPCODE_RESERVED7 = 0x07, + OPCODE_CLOSE = 0x08, + OPCODE_PING = 0x09, + OPCODE_PONG = 0x0a, + OPCODE_INVALID = 0xff, +}; + +static enum opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +{ + switch (type) + { + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return OPCODE_CLOSE; + default: + FIXME("buffer type %u not supported\n", type); + return OPCODE_INVALID; + } +} + +#define FIN_BIT (1 << 7) +#define MASK_BIT (1 << 7) +#define RESERVED_BIT (7 << 4) + +static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, USHORT status, const char *buf, + DWORD buflen, BOOL final ) +{ + DWORD i = 0, j, ret, offset = 2, len = buflen; + enum opcode opcode = map_buffer_type( type ); + char hdr[14], byte, *mask; + + if (opcode == OPCODE_CLOSE) len += sizeof(status); + + hdr[0] = final ? FIN_BIT : 0; + hdr[0] |= opcode; + hdr[1] = MASK_BIT; + if (len < 126) hdr[1] |= len; + else if (len < 65536) + { + hdr[1] |= 126; + hdr[2] = len >> 8; + hdr[3] = len & 0xff; + offset += 2; + } + else + { + hdr[1] |= 127; + hdr[2] = hdr[3] = hdr[4] = hdr[5] = 0; + hdr[6] = len >> 24; + hdr[7] = (len >> 16) & 0xff; + hdr[8] = (len >> 8) & 0xff; + hdr[9] = len & 0xff; + offset += 8; + } + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; + + if (opcode == OPCODE_CLOSE) /* prepend status code */ + { + byte = (status >> 8) ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + + byte = (status & 0xff) ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + } + + for (j = 0; j < buflen; j++) + { + byte = buf[j] ^ mask[i++ % 4]; + if ((ret = send_bytes( netconn, &byte, 1 ))) return ret; + } + + return ERROR_SUCCESS; +} + +static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, + BOOL async ) +{ + DWORD ret; + + ret = send_frame( socket->request->netconn, type, 0, buf, len, TRUE ); + if (async) + { + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = len; + status.eBufferType = type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SEND_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + return ret; +} + +static void task_socket_send( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_send *s = (struct socket_send *)task; + + socket_send( socket, s->type, s->buf, s->len, TRUE ); +} + DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) { - FIXME("%p, %u, %p, %u\n", hsocket, type, buf, len); - return ERROR_INVALID_PARAMETER; + struct socket *socket; + DWORD ret; + + TRACE("%p, %u, %p, %u\n", hsocket, type, buf, len); + + if (len && !buf) return ERROR_INVALID_PARAMETER; + if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) + { + FIXME("buffer type %u not supported\n", type); + return ERROR_NOT_SUPPORTED; + } + + 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_OPEN) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_send *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; + s->hdr.object = &socket->hdr; + s->hdr.proc = task_socket_send; + s->type = type; + s->buf = buf; + s->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->send_q, (struct task_header *)s ); + } + else ret = socket_send( socket, type, buf, len, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *read, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 207696e674..d9e99651ab 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -214,10 +214,19 @@ struct request } creds[TARGET_MAX][SCHEME_MAX]; }; +enum socket_state +{ + SOCKET_STATE_OPEN = 0, + SOCKET_STATE_SHUTDOWN = 1, + SOCKET_STATE_CLOSED = 2, +}; + struct socket { struct object_header hdr; struct request *request; + enum socket_state state; + struct queue send_q; }; struct task_header @@ -265,6 +274,14 @@ struct write_data DWORD *written; }; +struct socket_send +{ + struct task_header hdr; + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; + const void *buf; + DWORD len; +}; + struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN; struct object_header *grab_object( HINTERNET ) DECLSPEC_HIDDEN; void release_object( struct object_header * ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH v3] ntdll: Leave some space around DbgBreakPoint and DbgUserBreakPoint.
by Rémi Bernon 24 Jun '20

24 Jun '20

CoD: Black Ops 3 and CoD: WWII modify these (and several others) and expect to have enough space for a few instructions. It then verifies later that the patches are still in place, and terminates if the byte sequence do not match. Having small symbols can make the patches to overlap and the check to fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/signal_arm64.c | 8 ++++++-- dlls/ntdll/signal_i386.c | 8 ++++++-- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 0159888f7ab..ddced4e0baa 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1358,12 +1358,16 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "brk #0; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "brk #0; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * NtCurrentTeb (NTDLL.@) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bda19bf4632..d91d19f043a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -555,12 +555,16 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * NtCurrentTeb (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 52f7b73f8bf..284522ffae7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2751,11 +2751,15 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, /********************************************************************** * DbgBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); /********************************************************************** * DbgUserBreakPoint (NTDLL.@) */ -__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +__ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret" + "\n\tnop; nop; nop; nop; nop; nop; nop; nop" + "\n\tnop; nop; nop; nop; nop; nop" ); #endif /* __x86_64__ */ -- 2.27.0

1 0

[PATCH 1/3] ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs.
by Rémi Bernon 24 Jun '20

24 Jun '20

CoD: Black Ops 3 and CoD: WWII do each one of these calls and terminate if they return unexpected results. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 14 ++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf3f7b9f6f2..eaf2f1a45b7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,6 +2346,7 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; + ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2450,6 +2451,32 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + if (status == STATUS_INVALID_INFO_CLASS) + win_skip("ThreadHideFromDebugger not available\n"); + else + { + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + } } static void test_NtGetCurrentProcessorNumber(void) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d26e0a98cac..2e2e5a3882d 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -831,6 +831,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len); + switch (class) { case ThreadBasicInformation: @@ -1063,6 +1065,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, #endif } + case ThreadHideFromDebugger: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + if (handle != GetCurrentThread()) return STATUS_ACCESS_DENIED; + *(BOOLEAN*)data = TRUE; + if (ret_len) *ret_len = sizeof(BOOLEAN); + return STATUS_SUCCESS; + case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1088,6 +1098,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x)\n", handle, class, data, length); + switch (class) { case ThreadZeroTlsCell: @@ -1152,6 +1164,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadHideFromDebugger: + if (length) return STATUS_INFO_LENGTH_MISMATCH; + if (handle != GetCurrentThread()) return STATUS_INVALID_HANDLE; /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS; -- 2.27.0

3 9

[PATCH 2/2] winhttp: Semi-stub WinHttpWebSocketQueryCloseStatus
by Alistair Leslie-Hughes 24 Jun '20

24 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 26 ++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 10 ++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7ca2dfe864..e7c2184ab0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3185,8 +3185,30 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, DWORD *consumed ) { - FIXME("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, consumed); - return ERROR_INVALID_PARAMETER; + struct socket *sock; + + FIXME("%p, %p, %p, %u, %p Semi-stub\n", hsocket, status, reason, len, consumed); + + if (!(sock = (struct socket *)grab_object( hsocket ))) + { + return ERROR_INVALID_HANDLE; + } + + if (sock->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + ERR("Incorrect handle type\n"); + release_object( &sock->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + + if (reason) + *(char*)reason = 0; + *consumed = 0; + *status = WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS; + + release_object( &sock->hdr ); + + return NO_ERROR; } enum request_state diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 44f156ba39..804d4fbca9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -39,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void *,DWORD); static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); +static DWORD (WINAPI *pWinHttpWebSocketQueryCloseStatus)(HINTERNET,USHORT*,void*,DWORD,DWORD*); static BOOL proxy_active(void) { @@ -3104,6 +3105,7 @@ static void test_websocket(int port) WCHAR header[32]; char buf[128]; BOOL ret; + USHORT closestatus; if (!pWinHttpWebSocketCompleteUpgrade) { @@ -3252,6 +3254,13 @@ static void test_websocket(int port) ret = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 0); ok(ret == NO_ERROR, "got %u\n", GetLastError()); + size = sizeof(buf); + closestatus = WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS; + ret = pWinHttpWebSocketQueryCloseStatus(socket, &closestatus, NULL, 0, &size); + ok(ret == NO_ERROR, "got %u\n", GetLastError()); + ok(size == 0, "got %u\n", size); + ok(closestatus == WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, "got %u\n", closestatus); + /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); @@ -4948,6 +4957,7 @@ START_TEST (winhttp) pWinHttpWebSocketClose = (void *)GetProcAddress(mod, "WinHttpWebSocketClose"); pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); + pWinHttpWebSocketQueryCloseStatus = (void *)GetProcAddress(mod, "WinHttpWebSocketQueryCloseStatus"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); -- 2.27.0

2 1

[PATCH 1/2] winhttp: Semi-stub WinHttpWebSocketClose
by Alistair Leslie-Hughes 24 Jun '20

24 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/request.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 5 +++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0c038289f8..7ca2dfe864 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3146,8 +3146,40 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r 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 *sock; + DWORD ret; + int i; + /* FIN and Close (0x88), Mask bit (0x80), 4 bits blank mask. */ + unsigned char simple[6] = {0x88, 0x80, 0x00, 0x00, 0x00, 0x00}; + + FIXME("%p, %u, %p, %u Semi-stub\n", hsocket, status, reason, len); + + if (len > WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH || (!len && reason)) + return ERROR_INVALID_PARAMETER; + + if (!(sock = (struct socket *)grab_object( hsocket ))) + { + return ERROR_INVALID_HANDLE; + } + + if (sock->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) + { + ERR("Incorrect handle type\n"); + release_object( &sock->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_TYPE; + } + + if (len || status != WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS) + { + WARN("User supplied error message %d currently not supported.\n", status); + } + + i = 0; + /* Just send the simplest close message we have to */ + ret = netconn_send(sock->request->netconn, simple, ARRAY_SIZE(simple), &i); + + release_object( &sock->request->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index be02bbe250..44f156ba39 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,6 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static DWORD (WINAPI *pWinHttpWebSocketClose)(HINTERNET,USHORT,void *,DWORD); static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); static BOOL proxy_active(void) @@ -3248,6 +3249,9 @@ static void test_websocket(int port) ret = WinHttpCloseHandle(connection); ok(ret, "got %u\n", GetLastError()); + ret = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 0); + ok(ret == NO_ERROR, "got %u\n", GetLastError()); + /* request handle is still valid */ size = sizeof(ctx); ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &ctx, &size); @@ -4942,6 +4946,7 @@ START_TEST (winhttp) DWORD ret; HMODULE mod = GetModuleHandleA("winhttp.dll"); + pWinHttpWebSocketClose = (void *)GetProcAddress(mod, "WinHttpWebSocketClose"); pWinHttpWebSocketCompleteUpgrade = (void *)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); test_WinHttpOpenRequest(); -- 2.27.0

2 1

[PATCH] include: Add missing device GUIDs and fsfilter GUIDs.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] directmanipulation: Implement IDirectManipulationCompositor2 stub interface.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 3/4] directmanipulation: Fake success from IDirectManipulationViewPort2::SetViewPortRect.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/4] directmanipulation: Fake success from IDirectManipulationContent::SetContentRect.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] directmanipulation: Fake success from IDirectManipulationViewport2::ActivateConfiguration.
by Vijay Kiran Kamuju 23 Jun '20

23 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel June 2020