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

[PATCH] qcap: Fix always wait for ReadThread to end when fiter_Stop.
by Jiajin Cui June 29, 2020

June 29, 2020

There is a very small probability that the ReadThread will always wait for run_event signal after filet_Stop calls qcap_driver_stop_stream, and then filter_Stop is stuck waiting for the ReadThread to exit when calling qcap_driver_cleanup_stream. This issue was found in the video call hang up of Tencent QQ application. Signed-off-by: Jiajin Cui <cuijiajin(a)uniontech.com> --- dlls/qcap/v4l.c | 1 + 1 file changed, 1 insertion(+)

2 4

[PATCH v2 1/4] qcap: Combine the internal header files.
by Zebediah Figura June 29, 2020

June 29, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/audiorecord.c | 15 +-------- dlls/qcap/avico.c | 13 +------- dlls/qcap/avimux.c | 14 +-------- dlls/qcap/capture.h | 42 -------------------------- dlls/qcap/capturegraph.c | 28 +---------------- dlls/qcap/filewriter.c | 6 +--- dlls/qcap/qcap_main.c | 23 ++------------ dlls/qcap/qcap_main.h | 36 ---------------------- dlls/qcap/qcap_private.h | 62 ++++++++++++++++++++++++++++++++++++++ dlls/qcap/smartteefilter.c | 15 +-------- dlls/qcap/v4l.c | 15 +-------- dlls/qcap/vfwcapture.c | 24 +-------------- 12 files changed, 72 insertions(+), 221 deletions(-) delete mode 100644 dlls/qcap/capture.h delete mode 100644 dlls/qcap/qcap_main.h create mode 100644 dlls/qcap/qcap_private.h diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 48be64b63f..7477cca6d6 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index fc5826b16f..7b3c1ea369 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -16,21 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" -#include "wine/heap.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f1e703bfb6..ea73e42040 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -16,22 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dshow.h" +#include "qcap_private.h" #include "vfw.h" #include "aviriff.h" -#include "qcap_main.h" - -#include "wine/debug.h" - WINE_DEFAULT_DEBUG_CHANNEL(qcap); #define MAX_PIN_NO 128 diff --git a/dlls/qcap/capture.h b/dlls/qcap/capture.h deleted file mode 100644 index 615988bda3..0000000000 --- a/dlls/qcap/capture.h +++ /dev/null @@ -1,42 +0,0 @@ -/* DirectShow private capture header (QCAP.DLL) - * - * Copyright 2005 Maarten Lankhorst - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __QCAP_CAPTURE_H__ -#define __QCAP_CAPTURE_H__ - -struct _Capture; -typedef struct _Capture Capture; - -Capture *qcap_driver_init(struct strmbase_source *,USHORT) DECLSPEC_HIDDEN; -HRESULT qcap_driver_destroy(Capture*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_check_format(Capture*,const AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_format(Capture*,AM_MEDIA_TYPE*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **pmt, - VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; -LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_format(const Capture*,AM_MEDIA_TYPE**) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop_range(Capture*,VideoProcAmpProperty,LONG*,LONG*,LONG*,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_get_prop(Capture*,VideoProcAmpProperty,LONG*,LONG*) DECLSPEC_HIDDEN; -HRESULT qcap_driver_set_prop(Capture*,VideoProcAmpProperty,LONG,LONG) DECLSPEC_HIDDEN; -void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; -void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; - -#endif /* __QCAP_CAPTURE_H__ */ diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 822f68754e..b4f83956f0 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -17,34 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" - -#include "evcode.h" -#include "strmif.h" -#include "control.h" -#include "vfwmsgs.h" -/* - *#include "amvideo.h" - *#include "mmreg.h" - *#include "dshow.h" - *#include "ddraw.h" - */ -#include "uuids.h" -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index af148d4aa1..be1e4e773a 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -18,11 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS -#include "dshow.h" -#include "qcap_main.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 00e0a9671f..411ef41ea2 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -19,28 +19,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "objbase.h" -#include "uuids.h" -#include "strmif.h" -#include "rpcproxy.h" - -#include "qcap_main.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include "qcap_private.h" +#include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/qcap_main.h b/dlls/qcap/qcap_main.h deleted file mode 100644 index 4197771c78..0000000000 --- a/dlls/qcap/qcap_main.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Qcap main header file - * - * Copyright (C) 2005 Rolf Kalbermatter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef _QCAP_MAIN_H_DEFINED -#define _QCAP_MAIN_H_DEFINED - -#include "wine/heap.h" -#include "wine/strmbase.h" - -extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; - -HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; - -#endif /* _QCAP_MAIN_H_DEFINED */ diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h new file mode 100644 index 0000000000..688bebb201 --- /dev/null +++ b/dlls/qcap/qcap_private.h @@ -0,0 +1,62 @@ +/* + * DirectShow capture + * + * Copyright (C) 2005 Rolf Kalbermatter + * Copyright 2005 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef _QCAP_PRIVATE_H_DEFINED +#define _QCAP_PRIVATE_H_DEFINED + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#include "dshow.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/strmbase.h" +#include "wine/unicode.h" + +extern DWORD ObjectRefCount(BOOL increment) DECLSPEC_HIDDEN; + +HRESULT audio_record_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_compressor_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_mux_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT capture_graph_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT file_writer_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT smart_tee_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT vfw_capture_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; + +typedef struct _Capture Capture; + +Capture *qcap_driver_init(struct strmbase_source *pin, USHORT card) DECLSPEC_HIDDEN; +HRESULT qcap_driver_destroy(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_check_format(Capture *device, const AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_format(Capture *device, AM_MEDIA_TYPE *mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_caps(Capture *device, LONG index, AM_MEDIA_TYPE **mt, + VIDEO_STREAM_CONFIG_CAPS *vscc) DECLSPEC_HIDDEN; +LONG qcap_driver_get_caps_count(Capture *device) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_format(const Capture *device, AM_MEDIA_TYPE **mt) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop_range(Capture *device, VideoProcAmpProperty property, + LONG *min, LONG *max, LONG *step, LONG *default_value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_get_prop(Capture *device, VideoProcAmpProperty property, LONG *value, LONG *flags) DECLSPEC_HIDDEN; +HRESULT qcap_driver_set_prop(Capture *device, VideoProcAmpProperty property, LONG value, LONG flags) DECLSPEC_HIDDEN; +void qcap_driver_init_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_start_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_stop_stream(Capture *device) DECLSPEC_HIDDEN; +void qcap_driver_cleanup_stream(Capture *device) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 46ec09ca7e..5b4add0b5d 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" - -#include "wine/debug.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 449951ad53..a8841272a3 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,8 +24,6 @@ #include "config.h" #include "wine/port.h" -#define COBJMACROS - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> @@ -49,18 +47,7 @@ #include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "wine/debug.h" - -#include "qcap_main.h" -#include "capture.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9430533ea1..b48b2316d7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -18,29 +18,7 @@ * */ -#define COBJMACROS - -#include "config.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" - -#include "qcap_main.h" -#include "wine/debug.h" - -#include "capture.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "strmif.h" -#include "ddraw.h" -#include "ocidl.h" -#include "oleauto.h" +#include "qcap_private.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); -- 2.27.0

1 3

[PATCH 1/3] mshtml: Return NULL in IHTMLDocument2::get_cookie if InternetGetCookieExW failes.
by Jacek Caban June 29, 2020

June 29, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 15 ++++----------- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 9 insertions(+), 11 deletions(-)

2 1

[PATCH v2 1/3] ntdll: Implement NtQueryInformationThread(ThreadTimes) using procfs.
by Zebediah Figura June 29, 2020

June 29, 2020

From: Sebastian Lackner <sebastian(a)fds-team.de> Based on a patch by Ray Hinchliffe <ray(a)pobox.co.uk>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20230 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Rebase onto current git (i.e. onto ntdll.so). This patch lets System Information Viewer, Ollydbg 1.x/2.x, and x64dbg display accurate values. While these values are available through host utilities such as ps(1), it is sometimes more useful to access them from within debuggers and utilities running under Wine. I have omitted NtQueryInformationProcess(ProcessTimes), since the obvious solution needs the server to pass back more data than it currently can, and I don't know what the preferred way to handle that is. dlls/ntdll/unix/thread.c | 82 +++++++++++++++++++++++++++++++--------- server/protocol.def | 2 + server/thread.c | 2 + 3 files changed, 69 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index f3dddd2b02..54483e1f99 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -29,6 +29,8 @@ #include <errno.h> #include <limits.h> #include <stdarg.h> +#include <stdio.h> +#include <string.h> #include <pthread.h> #include <signal.h> #include <sys/types.h> @@ -821,6 +823,59 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from ) #endif /* __x86_64__ */ +#ifdef linux +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK ); + unsigned long usr, sys; + const char *pos; + char buf[512]; + FILE *f; + int i; + + sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); + if (!(f = fopen( buf, "r" ))) + { + ERR("Failed to open %s: %s\n", buf, strerror(errno)); + return FALSE; + } + + pos = fgets( buf, sizeof(buf), f ); + fclose( f ); + + /* the process name is printed unescaped, so we have to skip to the last ')' + * to avoid misinterpreting the string */ + if (pos) pos = strrchr( pos, ')' ); + if (pos) pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + + /* skip over the following fields: state, ppid, pgid, sid, tty_nr, tty_pgrp, + * task->flags, min_flt, cmin_flt, maj_flt, cmaj_flt */ + for (i = 0; i < 11 && pos; i++) + { + pos = strchr( pos + 1, ' ' ); + if (pos) pos++; + } + + /* the next two values are user and system time */ + if (pos && (sscanf( pos, "%lu %lu", &usr, &sys ) == 2)) + { + kernel_time->QuadPart = (ULONGLONG)sys * 10000000 / clocks_per_sec; + user_time->QuadPart = (ULONGLONG)usr * 10000000 / clocks_per_sec; + return TRUE; + } + + ERR("Failed to parse %s\n", debugstr_a(buf)); + return FALSE; +} +#else +static BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time) +{ + static int once; + if (!once++) FIXME("not implemented on this platform\n"); + return FALSE; +} +#endif /****************************************************************************** * NtQueryInformationThread (NTDLL.@) @@ -886,6 +941,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadTimes: { KERNEL_USER_TIMES kusrt; + int unix_pid, unix_tid; SERVER_START_REQ( get_thread_times ) { @@ -895,15 +951,21 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { kusrt.CreateTime.QuadPart = reply->creation_time; kusrt.ExitTime.QuadPart = reply->exit_time; + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; } } SERVER_END_REQ; if (status == STATUS_SUCCESS) { - /* We call times(2) for kernel time or user time */ - /* We can only (portably) do this for the current thread */ - if (handle == GetCurrentThread()) + BOOL ret = FALSE; + + kusrt.KernelTime.QuadPart = kusrt.UserTime.QuadPart = 0; + if (unix_pid != -1 && unix_tid != -1) + ret = get_thread_times( unix_pid, unix_tid, &kusrt.KernelTime, &kusrt.UserTime ); + if (!ret && handle == GetCurrentThread()) { + /* fall back to process times */ struct tms time_buf; long clocks_per_sec = sysconf(_SC_CLK_TCK); @@ -911,20 +973,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, kusrt.KernelTime.QuadPart = (ULONGLONG)time_buf.tms_stime * 10000000 / clocks_per_sec; kusrt.UserTime.QuadPart = (ULONGLONG)time_buf.tms_utime * 10000000 / clocks_per_sec; } - else - { - static BOOL reported = FALSE; - - kusrt.KernelTime.QuadPart = 0; - kusrt.UserTime.QuadPart = 0; - if (reported) - TRACE("Cannot get kerneltime or usertime of other threads\n"); - else - { - FIXME("Cannot get kerneltime or usertime of other threads\n"); - reported = TRUE; - } - } if (data) memcpy( data, &kusrt, min( length, sizeof(kusrt) )); if (ret_len) *ret_len = min( length, sizeof(kusrt) ); } diff --git a/server/protocol.def b/server/protocol.def index c3442c06e9..54668a8cdc 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -967,6 +967,8 @@ struct rawinput_device @REPLY timeout_t creation_time; /* thread creation time */ timeout_t exit_time; /* thread exit time */ + int unix_pid; /* thread native pid */ + int unix_tid; /* thread native pid */ @END diff --git a/server/thread.c b/server/thread.c index e2bfa50c7b..3cf447b1a0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1554,6 +1554,8 @@ DECL_HANDLER(get_thread_times) { reply->creation_time = thread->creation_time; reply->exit_time = thread->exit_time; + reply->unix_pid = thread->unix_pid; + reply->unix_tid = thread->unix_tid; release_object( thread ); } -- 2.27.0

2 6

[PATCH 3/3] mshtml: Return success in :HTMLStyle3::scrollbar* setters.
by Jacek Caban June 29, 2020

June 29, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

1 0

[PATCH 2/3] mshtml: Add IHTMLRectCollection::item implementation.
by Jacek Caban June 29, 2020

June 29, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlelem.c | 30 ++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] evr: Add IMFVideoProcessor stub.
by Nikolay Sivov June 29, 2020

June 29, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/mixer.c | 134 +++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 8 +-- include/evr9.idl | 2 +- 3 files changed, 137 insertions(+), 7 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 006427b77af..e8905f633ab 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -49,6 +49,7 @@ struct video_mixer IMFGetService IMFGetService_iface; IMFVideoMixerBitmap IMFVideoMixerBitmap_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoProcessor IMFVideoProcessor_iface; LONG refcount; struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; @@ -95,6 +96,11 @@ static struct video_mixer *impl_from_IMFVideoPositionMapper(IMFVideoPositionMapp return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoPositionMapper_iface); } +static struct video_mixer *impl_from_IMFVideoProcessor(IMFVideoProcessor *iface) +{ + return CONTAINING_RECORD(iface, struct video_mixer, IMFVideoProcessor_iface); +} + static int video_mixer_compare_input_id(const void *a, const void *b) { const unsigned int *key = a; @@ -152,6 +158,10 @@ static HRESULT WINAPI video_mixer_transform_QueryInterface(IMFTransform *iface, { *obj = &mixer->IMFVideoPositionMapper_iface; } + else if (IsEqualIID(riid, &IID_IMFVideoProcessor)) + { + *obj = &mixer->IMFVideoProcessor_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -914,6 +924,129 @@ static const IMFVideoPositionMapperVtbl video_mixer_position_mapper_vtbl = video_mixer_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_mixer_processor_QueryInterface(IMFVideoProcessor *iface, REFIID riid, void **obj) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_QueryInterface(&mixer->IMFTransform_iface, riid, obj); +} + +static ULONG WINAPI video_mixer_processor_AddRef(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_AddRef(&mixer->IMFTransform_iface); +} + +static ULONG WINAPI video_mixer_processor_Release(IMFVideoProcessor *iface) +{ + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); + return IMFTransform_Release(&mixer->IMFTransform_iface); +} + +static HRESULT WINAPI video_mixer_processor_GetAvailableVideoProcessorModes(IMFVideoProcessor *iface, UINT *count, + GUID **modes) +{ + FIXME("%p, %p, %p.\n", iface, count, modes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorCaps(IMFVideoProcessor *iface, GUID *mode, + DXVA2_VideoProcessorCaps *caps) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(mode), caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %p.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetVideoProcessorMode(IMFVideoProcessor *iface, GUID *mode) +{ + FIXME("%p, %s.\n", iface, debugstr_guid(mode)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetProcAmpValues(IMFVideoProcessor *iface, DWORD flags, DXVA2_ProcAmpValues *values) +{ + FIXME("%p, %#x, %p.\n", iface, flags, values); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringRange(IMFVideoProcessor *iface, DWORD prop, DXVA2_ValueRange *range) +{ + FIXME("%p, %#x, %p.\n", iface, prop, range); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor *iface, DWORD prop, DXVA2_Fixed32 *value) +{ + FIXME("%p, %#x, %p.\n", iface, prop, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) +{ + FIXME("%p, %p.\n", iface, color); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) +{ + FIXME("%p, %#x.\n", iface, color); + + return E_NOTIMPL; +} + +static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = +{ + video_mixer_processor_QueryInterface, + video_mixer_processor_AddRef, + video_mixer_processor_Release, + video_mixer_processor_GetAvailableVideoProcessorModes, + video_mixer_processor_GetVideoProcessorCaps, + video_mixer_processor_GetVideoProcessorMode, + video_mixer_processor_SetVideoProcessorMode, + video_mixer_processor_GetProcAmpRange, + video_mixer_processor_GetProcAmpValues, + video_mixer_processor_SetProcAmpValues, + video_mixer_processor_GetFilteringRange, + video_mixer_processor_GetFilteringValue, + video_mixer_processor_SetFilteringValue, + video_mixer_processor_GetBackgroundColor, + video_mixer_processor_SetBackgroundColor, +}; + HRESULT WINAPI MFCreateVideoMixer(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -943,6 +1076,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->IMFGetService_iface.lpVtbl = &video_mixer_getservice_vtbl; object->IMFVideoMixerBitmap_iface.lpVtbl = &video_mixer_bitmap_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_mixer_position_mapper_vtbl; + object->IMFVideoProcessor_iface.lpVtbl = &video_mixer_processor_vtbl; object->refcount = 1; object->input_count = 1; video_mixer_init_input(&object->inputs[0]); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bfa87014d8..c37f921b09e 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -405,10 +405,8 @@ static void test_default_mixer(void) IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -425,10 +423,8 @@ todo_wine IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoMixerControl, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/evr9.idl b/include/evr9.idl index 1572d878387..b3d363cdee9 100644 --- a/include/evr9.idl +++ b/include/evr9.idl @@ -62,7 +62,7 @@ interface IMFVideoMixerBitmap : IUnknown [ object, - uuid(6AB0000C-FECE-4d1f-A2AC-A9573530656E), + uuid(6ab0000c-fece-4d1f-a2ac-a9573530656e), pointer_default(unique) ] interface IMFVideoProcessor : IUnknown -- 2.27.0

2 7

[PATCH 4/4] winhttp: Stop the send queue before sending the close message.
by Hans Leidekker June 29, 2020

June 29, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 14 ++++++++++++-- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7cb07b5c10..e31803ccfe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -138,6 +138,14 @@ static DWORD start_queue( struct queue *queue ) return ERROR_SUCCESS; } +void stop_queue( struct queue *queue ) +{ + if (!queue->pool) return; + CloseThreadpool( queue->pool ); + queue->pool = NULL; + TRACE("stopped %p\n", queue); +} + static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx ) { TP_WORK *work; @@ -3037,8 +3045,8 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); - if (socket->send_q.pool) CloseThreadpool( socket->send_q.pool ); - if (socket->recv_q.pool) CloseThreadpool( socket->recv_q.pool ); + stop_queue( &socket->send_q ); + stop_queue( &socket->recv_q ); release_object( &socket->request->hdr ); heap_free( socket ); @@ -3526,6 +3534,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; + stop_queue( &socket->send_q ); if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; @@ -3609,6 +3618,7 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (socket->state < SOCKET_STATE_SHUTDOWN) { + stop_queue( &socket->send_q ); if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f3ab8c9b95..080837eb1e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -578,7 +578,7 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->queue.pool) CloseThreadpool( request->queue.pool ); + stop_queue( &request->queue ); release_object( &request->connect->hdr ); if (request->cred_handle_initialized) FreeCredentialsHandle( &request->cred_handle ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9d0b9c308a..23aba00780 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -317,6 +317,7 @@ BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( struct request * ) DECLSPEC_HIDDEN; +void stop_queue( struct queue * ) DECLSPEC_HIDDEN; void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 3/4] winhttp: Add support for ping and pong messages.
by Hans Leidekker June 29, 2020

June 29, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 177 +++++++++++++++++++++++++++++++---------- 1 file changed, 136 insertions(+), 41 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 06588d6f60..7cb07b5c10 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3112,29 +3112,18 @@ static DWORD send_bytes( struct netconn *netconn, char *bytes, int len ) return (count == len) ? ERROR_SUCCESS : ERROR_INTERNAL_ERROR; } -static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) -{ - switch (type) - { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; - default: - FIXME("buffer type %u not supported\n", type); - return SOCKET_OPCODE_INVALID; - } -} - #define FIN_BIT (1 << 7) #define MASK_BIT (1 << 7) #define RESERVED_BIT (7 << 4) +#define CONTROL_BIT (1 << 3) -static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, USHORT status, const char *buf, +static DWORD send_frame( struct netconn *netconn, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final ) { DWORD i = 0, j, ret, offset = 2, len = buflen; - enum socket_opcode opcode = map_buffer_type( type ); - char hdr[14], byte, *mask; + char hdr[14], byte, *mask = NULL; + + TRACE("sending %02x frame\n", opcode); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3159,9 +3148,14 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE hdr[9] = len & 0xff; offset += 8; } - mask = &hdr[offset]; - RtlGenRandom( mask, 4 ); - if ((ret = send_bytes( netconn, hdr, offset + 4 ))) return ret; + + if ((ret = send_bytes( netconn, hdr, offset ))) return ret; + if (len) + { + mask = &hdr[offset]; + RtlGenRandom( mask, 4 ); + if ((ret = send_bytes( netconn, mask, 4 ))) return ret; + } if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { @@ -3181,12 +3175,26 @@ static DWORD send_frame( struct netconn *netconn, WINHTTP_WEB_SOCKET_BUFFER_TYPE return ERROR_SUCCESS; } +static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +{ + switch (type) + { + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; + default: + FIXME("buffer type %u not supported\n", type); + return SOCKET_OPCODE_INVALID; + } +} + static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, BOOL async ) { + enum socket_opcode opcode = map_buffer_type( type ); DWORD ret; - ret = send_frame( socket->request->netconn, type, 0, buf, len, TRUE ); + ret = send_frame( socket->request->netconn, opcode, 0, buf, len, TRUE ); if (async) { if (!ret) @@ -3276,24 +3284,19 @@ static DWORD receive_bytes( struct netconn *netconn, char *buf, DWORD len, DWORD return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +static BOOL is_supported_opcode( enum socket_opcode opcode ) { switch (opcode) { case SOCKET_OPCODE_TEXT: - if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_BINARY: - if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; - return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; - case SOCKET_OPCODE_CLOSE: - return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; - + case SOCKET_OPCODE_PING: + case SOCKET_OPCODE_PONG: + return TRUE; default: - FIXME("opcode %u not handled\n", opcode); - return ~0u; + FIXME( "opcode %02x not handled\n", opcode ); + return FALSE; } } @@ -3303,11 +3306,12 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket char hdr[2]; if ((ret = receive_bytes( netconn, hdr, sizeof(hdr), &count ))) return ret; - if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || (map_opcode( hdr[0] & 0xf, FALSE ) == ~0u)) + if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } *opcode = hdr[0] & 0xf; + TRACE("received %02x frame\n", *opcode); len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3328,13 +3332,109 @@ static DWORD receive_frame( struct netconn *netconn, DWORD *ret_len, enum socket return ERROR_SUCCESS; } +static void CALLBACK task_socket_send_pong( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +{ + struct socket_send *s = ctx; + + TRACE("running %p\n", work); + send_frame( s->socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); + + release_object( &s->socket->hdr ); + heap_free( s ); +} + +static DWORD socket_send_pong( struct socket *socket ) +{ + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + { + struct socket_send *s; + DWORD ret; + + if (!(s = heap_alloc( sizeof(*s) ))) return ERROR_OUTOFMEMORY; + s->socket = socket; + + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_send_pong, s ))) + { + release_object( &socket->hdr ); + heap_free( s ); + } + return ret; + } + return send_frame( socket->request->netconn, SOCKET_OPCODE_PONG, 0, NULL, 0, TRUE ); +} + +static DWORD socket_drain( struct socket *socket ) +{ + struct netconn *netconn = socket->request->netconn; + DWORD ret, count; + + while (socket->read_size) + { + char buf[1024]; + if ((ret = receive_bytes( netconn, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + socket->read_size -= count; + } + return ERROR_SUCCESS; +} + +static DWORD handle_control_frame( struct socket *socket ) +{ + switch (socket->opcode) + { + case SOCKET_OPCODE_PING: + return socket_send_pong( socket ); + + case SOCKET_OPCODE_PONG: + return socket_drain( socket ); + + default: + ERR("unhandled control opcode %02x\n", socket->opcode); + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } + + return ERROR_SUCCESS; +} + +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +{ + switch (opcode) + { + case SOCKET_OPCODE_TEXT: + if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_BINARY: + if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + + case SOCKET_OPCODE_CLOSE: + return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; + + default: + FIXME("opcode %02x not handled\n", opcode); + return ~0u; + } +} + static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) { struct netconn *netconn = socket->request->netconn; DWORD count, ret = ERROR_SUCCESS; - if (!socket->read_size) ret = receive_frame( netconn, &socket->read_size, &socket->opcode ); + if (!socket->read_size) + { + for (;;) + { + if (!(ret = receive_frame( netconn, &socket->read_size, &socket->opcode ))) + { + if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket ))) break; + } + else if (ret == WSAETIMEDOUT) ret = socket_send_pong( socket ); + if (ret) break; + } + } if (!ret) ret = receive_bytes( netconn, buf, min(len, socket->read_size), &count ); if (!ret) { @@ -3426,7 +3526,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; - if (!(ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) + if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; } @@ -3505,16 +3605,11 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea 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 ((ret = socket_drain( socket ))) goto done; if (socket->state < SOCKET_STATE_SHUTDOWN) { - if ((ret = send_frame( netconn, WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE, status, reason, len, TRUE ))) goto done; + if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } -- 2.20.1

1 0

[PATCH 2/4] winhttp: Copy the reason buffer.
by Hans Leidekker June 29, 2020

June 29, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/tests/winhttp.c | 6 ++++++ dlls/winhttp/winhttp_private.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bc3d365f7c..06588d6f60 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3463,7 +3463,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3484,7 +3484,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); @@ -3569,7 +3569,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3590,7 +3590,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 12f5136973..84063fdc82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3356,6 +3356,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); ok(!error, "got %u\n", error); @@ -3363,6 +3366,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); ok(!error, "got %u\n", error); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ac7e9ff09b..9d0b9c308a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -244,7 +244,7 @@ struct socket enum socket_opcode opcode; DWORD read_size; USHORT status; - char reason[128]; + char reason[123]; DWORD reason_len; }; @@ -305,7 +305,7 @@ struct socket_shutdown { struct socket *socket; USHORT status; - const void *reason; + char reason[123]; DWORD len; }; -- 2.20.1

1 0