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

Alistair Leslie-Hughes : directmanipulation: Fake success from IDirectManipulationViewport2::ActivateConfiguration.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: b2c3d26ee5fa7cc89243831b8d5882411026ddb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c3d26ee5fa7cc89243831b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 30 09:30:41 2019 +1000 directmanipulation: Fake success from IDirectManipulationViewport2::ActivateConfiguration. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index dd2fdda69a..796e906d64 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -631,7 +631,7 @@ static HRESULT WINAPI viewport_ActivateConfiguration(IDirectManipulationViewport { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %d\n", This, configuration); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_SetManualGesture(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_GESTURE_CONFIGURATION configuration)

1 0

Alistair Leslie-Hughes : directmanipulation: Fake success from IDirectManipulationContent::SetContentRect.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: d0275d4671a811597f57f332c628501301e8cf18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0275d4671a811597f57f332… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 24 00:47:29 2020 +0200 directmanipulation: Fake success from IDirectManipulationContent::SetContentRect. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 796e906d64..1460872020 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -357,7 +357,7 @@ static HRESULT WINAPI content_SetContentRect(IDirectManipulationContent *iface, { struct primarycontext *This = impl_from_IDirectManipulationContent(iface); FIXME("%p, %p\n", This, size); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI content_GetViewport(IDirectManipulationContent *iface, REFIID riid, void **object)

1 0

Alistair Leslie-Hughes : directmanipulation: Fake success from IDirectManipulationViewPort2::SetViewPortRect.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: b228983abdb8de82861f2b94712463c013107119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b228983abdb8de82861f2b94… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 24 00:50:39 2020 +0200 directmanipulation: Fake success from IDirectManipulationViewPort2::SetViewPortRect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 1460872020..053955ec3a 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -540,7 +540,7 @@ static HRESULT WINAPI viewport_SetViewportRect(IDirectManipulationViewport2 *ifa { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %p\n", This, viewport); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_ZoomToRect(IDirectManipulationViewport2 *iface, const float left,

1 0

Vijay Kiran Kamuju : directmanipulation: Implement IDirectManipulationCompositor2 stub interface.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 774bb38fd5d515d81d84d6527cde55138562e280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=774bb38fd5d515d81d84d652… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 24 00:58:18 2020 +0200 directmanipulation: Implement IDirectManipulationCompositor2 stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanip.idl | 1 + dlls/directmanipulation/directmanipulation.c | 62 ++++++++++++++++------------ include/directmanipulation.idl | 13 ++++++ 3 files changed, 50 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=774bb38fd5d515d81d84…

1 0

Vijay Kiran Kamuju : include: Add missing device GUIDs and fsfilter GUIDs.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 59ff149a299891bc7245ef9c051b9a21155a0050 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ff149a299891bc7245ef9c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 24 01:15:04 2020 +0200 include: Add missing device GUIDs and fsfilter GUIDs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/devguid.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59ff149a299891bc7245…

1 0

Alexandre Julliard : ntdll: Store home directory and username at init time in the Unix library.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 36e55720b66743d161330183693949e4f8503cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e55720b66743d161330183… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 24 09:20:33 2020 +0200 ntdll: Store home directory and username at init time in the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 38 +++++++++++++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 2 ++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 73c24eff54..1045870f9b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -123,9 +123,11 @@ static const char *dll_dir; static const char **dll_paths; static SIZE_T dll_path_maxlen; +const char *home_dir = NULL; const char *data_dir = NULL; const char *build_dir = NULL; const char *config_dir = NULL; +const char *user_name = NULL; HMODULE ntdll_module = NULL; struct file_id @@ -285,6 +287,29 @@ static void set_dll_path(void) } +static void set_home_dir(void) +{ + const char *home = getenv( "HOME" ); + const char *name = getenv( "USER" ); + const char *p; + + if (!home || !name) + { + struct passwd *pwd = getpwuid( getuid() ); + if (pwd) + { + if (!home) home = pwd->pw_dir; + if (!name) name = pwd->pw_name; + } + if (!name) name = "wine"; + } + if ((p = strrchr( name, '/' ))) name = p + 1; + if ((p = strrchr( name, '\\' ))) name = p + 1; + home_dir = strdup( home ); + user_name = strdup( name ); +} + + static void set_config_dir(void) { char *p, *dir; @@ -299,15 +324,9 @@ static void set_config_dir(void) } else { - const char *home = getenv( "HOME" ); - if (!home) - { - struct passwd *pwd = getpwuid( getuid() ); - if (pwd) home = pwd->pw_dir; - } - if (!home) fatal_error( "could not determine your home directory\n" ); - if (home[0] != '/') fatal_error( "your home directory %s is not an absolute path\n", home ); - config_dir = build_path( home, ".wine" ); + if (!home_dir) fatal_error( "could not determine your home directory\n" ); + if (home_dir[0] != '/') fatal_error( "the home directory %s is not an absolute path\n", home_dir ); + config_dir = build_path( home_dir, ".wine" ); } } @@ -334,6 +353,7 @@ static void init_paths( int argc, char *argv[], char *envp[] ) } set_dll_path(); + set_home_dir(); set_config_dir(); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 7dbfde43b3..7942aaf62e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -124,9 +124,11 @@ extern NTSTATUS CDECL nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_ST extern NTSTATUS CDECL unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ) DECLSPEC_HIDDEN; extern void CDECL set_show_dot_files( BOOL enable ) DECLSPEC_HIDDEN; +extern const char *home_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *build_dir DECLSPEC_HIDDEN; extern const char *config_dir DECLSPEC_HIDDEN; +extern const char *user_name DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Set the Wine paths environment variables from the Unix library.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 438abad27c797ca806938188f725fb0e36aa9fb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=438abad27c797ca806938188… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 24 09:21:48 2020 +0200 ntdll: Set the Wine paths environment variables from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 163 +++++------------------------------------ dlls/ntdll/ntdll_misc.h | 4 - dlls/ntdll/server.c | 4 - dlls/ntdll/thread.c | 1 - dlls/ntdll/unix/env.c | 82 +++++++++++++++++++++ dlls/ntdll/unix/loader.c | 30 +------- dlls/ntdll/unix/unix_private.h | 2 + dlls/ntdll/unixlib.h | 5 +- 8 files changed, 105 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=438abad27c797ca80693…

1 0

Rémi Bernon : ntdll: Leave some space around DbgBreakPoint and DbgUserBreakPoint.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: f5a8ed47a3fb4cdb9066899303f03565001b4cc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a8ed47a3fb4cdb90668993… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 24 10:03:10 2020 +0200 ntdll: Leave some space around DbgBreakPoint and DbgUserBreakPoint. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0159888f7a..ddced4e0ba 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 bda19bf463..d91d19f043 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 52f7b73f8b..284522ffae 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__ */

1 0

Hans Leidekker : winhttp: Implement WinHttpWebSocketSend.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: 68b44e305504c5e0fa8e9917478df96f8a08b62f URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b44e305504c5e0fa8e9917… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 10:33:03 2020 +0200 winhttp: Implement WinHttpWebSocketSend. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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..9ac3c6e89e 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 ? (char)FIN_BIT : 0; + hdr[0] |= opcode; + hdr[1] = (char)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;

1 0

Hans Leidekker : winhttp: Implement WinHttpWebSocketReceive.
by Alexandre Julliard 24 Jun '20

24 Jun '20

Module: wine Branch: master Commit: f18cbfcd5d1ce72b9869f35bb5bd81ea0e5ea8d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f18cbfcd5d1ce72b9869f35b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 24 10:33:04 2020 +0200 winhttp: Implement WinHttpWebSocketReceive. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 159 +++++++++++++++++++++++++++++++++++++++-- dlls/winhttp/winhttp_private.h | 10 +++ 2 files changed, 165 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9ac3c6e89e..e6dd6d9068 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -34,6 +34,7 @@ #include "schannel.h" #include "winhttp.h" #include "ntsecapi.h" +#include "winternl.h" #include "wine/debug.h" #include "winhttp_private.h" @@ -3067,10 +3068,19 @@ static void socket_destroy( struct object_header *hdr ) SetEvent( socket->send_q.cancel ); return; } + if (socket->recv_q.proc_running) + { + socket->recv_q.proc_running = FALSE; + SetEvent( socket->recv_q.cancel ); + return; + } release_object( &socket->request->hdr ); socket->send_q.cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &socket->send_q.cs ); + + socket->recv_q.cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &socket->recv_q.cs ); heap_free( socket ); } @@ -3120,6 +3130,8 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.context = context; InitializeCriticalSection( &socket->send_q.cs ); socket->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.send_q.cs"); + InitializeCriticalSection( &socket->recv_q.cs ); + socket->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": socket.recv_q.cs"); addref_object( &request->hdr ); socket->request = request; @@ -3311,11 +3323,150 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ret; } -DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *read, - WINHTTP_WEB_SOCKET_BUFFER_TYPE *type ) +static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD *ret_len ) { - FIXME("%p, %p, %u, %p, %p\n", hsocket, buf, len, read, type); - return ERROR_INVALID_PARAMETER; + DWORD err; + if ((err = netconn_recv( netconn, buf, len, 0, (int *)ret_len ))) return err; + if (len && !*ret_len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + return ERROR_SUCCESS; +} + +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum opcode opcode ) +{ + switch (opcode) + { + case OPCODE_TEXT: return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + case OPCODE_BINARY: return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + case OPCODE_CLOSE: return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + default: + ERR("opcode %u not handled\n", opcode); + return ~0u; + } +} + +static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) +{ + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; + DWORD ret, len, count; + enum opcode opcode; + char hdr[2]; + + if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; + if (count != sizeof(hdr) || (hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT)) + { + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + opcode = hdr[0] & 0xf; + type = map_opcode( opcode ); + + len = hdr[1] & ~MASK_BIT; + if (len == 126) + { + USHORT len16; + if ((ret = receive_bytes( netconn, (char *)&len16, sizeof(len16), &count ))) return ret; + if (count != sizeof(len16)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + len = RtlUshortByteSwap( len16 ); + } + else if (len == 127) + { + ULONGLONG len64; + if ((ret = receive_bytes( netconn, (char *)&len64, sizeof(len64), &count ))) return ret; + if (count != sizeof(len64)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; + len = len64; + } + + *ret_len = len; + *ret_type = type; + return ERROR_SUCCESS; +} + +static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) +{ + DWORD count, ret = ERROR_SUCCESS; + + if (!socket->read_size) ret = receive_frame( socket->request->netconn, &socket->read_size, &socket->buf_type ); + if (!ret) ret = receive_bytes( socket->request->netconn, buf, min(len, socket->read_size), &count ); + if (!ret) + { + socket->read_size -= count; + if (!async) + { + *ret_len = count; + *ret_type = socket->buf_type; + } + } + + if (async) + { + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = count; + status.eBufferType = socket->buf_type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + return ret; +} + +static void task_socket_receive( struct task_header *task ) +{ + struct socket *socket = (struct socket *)task->object; + struct socket_receive *r = (struct socket_receive *)task; + + socket_receive( socket, r->buf, r->len, NULL, NULL, TRUE ); +} + +DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) +{ + struct socket *socket; + DWORD ret; + + TRACE("%p, %p, %u, %p, %p\n", hsocket, buf, len, ret_len, ret_type); + + if (!buf || !len) 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_OPEN) + { + release_object( &socket->hdr ); + return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + } + + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_receive *r; + + if (!(r = heap_alloc( sizeof(*r) ))) return FALSE; + r->hdr.object = &socket->hdr; + r->hdr.proc = task_socket_receive; + r->buf = buf; + r->len = len; + + addref_object( &socket->hdr ); + ret = queue_task( &socket->hdr, &socket->recv_q, (struct task_header *)r ); + } + else ret = socket_receive( socket, buf, len, ret_len, ret_type, FALSE ); + + release_object( &socket->hdr ); + return ret; } DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d9e99651ab..9cf9c396cb 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -227,6 +227,9 @@ struct socket struct request *request; enum socket_state state; struct queue send_q; + struct queue recv_q; + WINHTTP_WEB_SOCKET_BUFFER_TYPE buf_type; + DWORD read_size; }; struct task_header @@ -282,6 +285,13 @@ struct socket_send DWORD len; }; +struct socket_receive +{ + struct task_header hdr; + 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;

1 0