November 2019 - Wine-Commits

Jeff Smith : ucrtbase: Extend range for seconds to allow for leap-second.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 15bbe646099bd9babbf5be672960ee4e458eb33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bbe646099bd9babbf5be67… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:07 2019 -0600 ucrtbase: Extend range for seconds to allow for leap-second. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 12 +++++++++--- dlls/ucrtbase/tests/misc.c | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 8534738406..802032d79e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -54,6 +54,12 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; +#if _MSVCR_VER>=140 +static const int MAX_SECONDS = 60; +#else +static const int MAX_SECONDS = 59; +#endif + static inline BOOL IsLeapYear(int Year) { return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); @@ -1141,7 +1147,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR if(count > 2) ret = strftime_nstr(str, pos, max, format, count-2); if(ret) - ret = strftime_int(str, pos, max, mstm->tm_sec, count == 1 ? 0 : 2, 0, 59); + ret = strftime_int(str, pos, max, mstm->tm_sec, count == 1 ? 0 : 2, 0, MAX_SECONDS); break; case 'a': case 'A': @@ -1381,7 +1387,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #endif case 'S': - if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) return 0; break; #if _MSVCR_VER>=140 @@ -1397,7 +1403,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; if(ret < max) str[ret++] = ':'; - if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) return 0; break; case 'u': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9c5045b66a..154781dd33 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1004,7 +1004,7 @@ static void test_strftime(void) {"%#x", "", { 0, 0, 0, 30, 12, 70, 4, 0, 0 }}, {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }}, - {"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }, TRUE}, + {"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }}, }; const struct {

1 0

Jeff Smith : ucrtbase: Treat year more consistently in strftime.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: a0be8d49f2e869d38e7e989f134362b4412349e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0be8d49f2e869d38e7e989f… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:06 2019 -0600 ucrtbase: Treat year more consistently in strftime. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 27 ++++++++++++++------------- dlls/ucrtbase/tests/misc.c | 12 ++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4248fe4f85..8534738406 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1190,6 +1190,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, { MSVCRT_size_t ret, tmp; BOOL alternate; + int year = mstm ? mstm->tm_year + 1900 : -1; if(!str || !format) { if(str && max) @@ -1272,8 +1273,9 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #if _MSVCR_VER>=140 case 'C': - tmp = (1900+mstm->tm_year)/100; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) + goto einval_error; + if(!strftime_int(str, &ret, max, year/100, alternate ? 0 : 2, 0, 99)) return 0; break; #endif @@ -1283,6 +1285,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #if _MSVCR_VER>=140 case 'D': + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) + goto einval_error; if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) return 0; if(ret < max) @@ -1291,7 +1295,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; if(ret < max) str[ret++] = '/'; - if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) + if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99)) return 0; break; case 'e': @@ -1301,8 +1305,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, str[ret-2] = ' '; break; case 'F': - tmp = 1900+mstm->tm_year; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999)) return 0; if(ret < max) str[ret++] = '-'; @@ -1315,7 +1318,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; case 'g': case 'G': - tmp = 1900 + mstm->tm_year; + tmp = year; if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) tmp--; else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) @@ -1409,18 +1412,16 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; case 'y': #if _MSVCR_VER>=140 - if(!MSVCRT_CHECK_PMT(mstm->tm_year>=-1900 && mstm->tm_year<=8099)) - goto einval_error; - tmp = (mstm->tm_year+1900)%100; + if(!MSVCRT_CHECK_PMT(year>=0 && year<=9999)) #else - tmp = mstm->tm_year%100; + if(!MSVCRT_CHECK_PMT(year>=1900)) #endif - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + goto einval_error; + if(!strftime_int(str, &ret, max, year%100, alternate ? 0 : 2, 0, 99)) return 0; break; case 'Y': - tmp = 1900+mstm->tm_year; - if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + if(!strftime_int(str, &ret, max, year, alternate ? 0 : 4, 0, 9999)) return 0; break; case 'z': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index debf0b87a0..9c5045b66a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -930,23 +930,23 @@ static void test_strftime(void) BOOL todo; BOOL todo_handler; } tests[] = { - {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }, FALSE, TRUE}, - {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE}, + {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }}, + {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%C", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, {"%C", "18", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, - {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, FALSE, TRUE}, + {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, - {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, FALSE, TRUE}, + {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, - {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }, TRUE}, + {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, {"%D", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, - {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE}, + {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},

1 0

Alexandre Julliard : makefiles: Create source dir symlinks from the makefiles.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 4152f944f653713fa9cf380470391d660f10bd6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4152f944f653713fa9cf3804… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 14:35:08 2019 +0100 makefiles: Create source dir symlinks from the makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 10 ++++------ configure | 16 ---------------- configure.ac | 6 ++---- tools/makedep.c | 22 ++++++++++++++++++++++ 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 194b3a9d93..577bf7a37c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -282,14 +282,12 @@ AC_DEFUN([WINE_APPEND_RULE],[AC_REQUIRE([WINE_CONFIG_HELPERS])wine_fn_append_rul dnl **** Create symlinks from config.status **** dnl -dnl Usage: WINE_CONFIG_SYMLINK(target,src,files,enable,srcfile) +dnl Usage: WINE_CONFIG_SYMLINK(target,src,enable) dnl AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_REQUIRE([WINE_CONFIG_HELPERS])dnl -m4_ifval([$4],[if test $4; then -])m4_foreach([f],[$3], -[AC_CONFIG_LINKS(m4_ifval([$1],[$1/])f[:]m4_ifval([$2],[$2/])m4_ifval([$5],[$5],f))])dnl -m4_if([$1],[$2],[test "$srcdir" = "." || ])dnl -wine_fn_config_symlink[]m4_foreach([f],[$3],[ ]m4_ifval([$1],[$1/])f)m4_ifval([$4],[ +m4_ifval([$3],[if test $3; then +])AC_CONFIG_LINKS([$1:$2])dnl +wine_fn_config_symlink[ $1]m4_ifval([$3],[ fi])[]dnl ])]) diff --git a/configure b/configure index 4de04f3575..22e0932b00 100755 --- a/configure +++ b/configure @@ -19947,16 +19947,6 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)" -if test "x$enable_fonts" != xno; then -ac_config_links="$ac_config_links fonts/marlett.ttf:fonts/marlett.ttf" -ac_config_links="$ac_config_links fonts/symbol.ttf:fonts/symbol.ttf" -ac_config_links="$ac_config_links fonts/tahoma.ttf:fonts/tahoma.ttf" -ac_config_links="$ac_config_links fonts/tahomabd.ttf:fonts/tahomabd.ttf" -ac_config_links="$ac_config_links fonts/wingding.ttf:fonts/wingding.ttf" -test "$srcdir" = "." || wine_fn_config_symlink fonts/marlett.ttf fonts/symbol.ttf fonts/tahoma.ttf fonts/tahomabd.ttf fonts/wingding.ttf -fi -ac_config_links="$ac_config_links loader/l_intl.nls:loader/l_intl.nls" -test "$srcdir" = "." || wine_fn_config_symlink loader/l_intl.nls ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine if test "x$enable_win64" != xno -o -n "$with_wine64"; then @@ -21973,12 +21963,6 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; - "fonts/marlett.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/marlett.ttf:fonts/marlett.ttf" ;; - "fonts/symbol.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/symbol.ttf:fonts/symbol.ttf" ;; - "fonts/tahoma.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahoma.ttf:fonts/tahoma.ttf" ;; - "fonts/tahomabd.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/tahomabd.ttf:fonts/tahomabd.ttf" ;; - "fonts/wingding.ttf") CONFIG_LINKS="$CONFIG_LINKS fonts/wingding.ttf:fonts/wingding.ttf" ;; - "loader/l_intl.nls") CONFIG_LINKS="$CONFIG_LINKS loader/l_intl.nls:loader/l_intl.nls" ;; "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "wine64") CONFIG_LINKS="$CONFIG_LINKS wine64:tools/winewrapper" ;; "tools/makedep") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/makedep" ;; diff --git a/configure.ac b/configure.ac index 93a74a27c8..bbea41416a 100644 --- a/configure.ac +++ b/configure.ac @@ -2806,10 +2806,8 @@ Makefile: $srcdir/Makefile.in config.status \$(MAKEDEP) depend: \$(MAKEDEP) dummy \$(MAKEDEP)]) -WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf,wingding.ttf],["x$enable_fonts" != xno]) -WINE_CONFIG_SYMLINK(loader,loader,[l_intl.nls]) -WINE_CONFIG_SYMLINK(,tools,[wine],,winewrapper) -WINE_CONFIG_SYMLINK(,tools,[wine64],["x$enable_win64" != xno -o -n "$with_wine64"],winewrapper) +WINE_CONFIG_SYMLINK(wine,tools/winewrapper) +WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["x$enable_win64" != xno -o -n "$with_wine64"]) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui) diff --git a/tools/makedep.c b/tools/makedep.c index 27b33eb276..d0e963f759 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2386,6 +2386,24 @@ static void output_symlink_rule( const char *src_name, const char *link_name ) } +/******************************************************************* + * output_srcdir_symlink + * + * Output rule to create a symlink back to the source directory, for source files + * that are needed at run-time. + */ +static void output_srcdir_symlink( struct makefile *make, const char *obj ) +{ + char *src_file; + + if (!make->src_dir) return; + src_file = src_dir_path( make, obj ); + output( "%s: %s\n", obj, src_file ); + output_symlink_rule( src_file, obj ); + strarray_add( &make->all_targets, obj ); +} + + /******************************************************************* * output_install_commands */ @@ -2862,7 +2880,10 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } if (source->file->flags & FLAG_INSTALL) + { add_install_rule( make, source->name, ttf_obj, strmake( "D$(fontdir)/%s", ttf_obj )); + output_srcdir_symlink( make, ttf_obj ); + } if (source->file->flags & FLAG_SFD_FONTS) { @@ -2913,6 +2934,7 @@ static void output_source_nls( struct makefile *make, struct incl_file *source, { add_install_rule( make, source->name, source->name, strmake( "D$(datadir)/wine/%s", source->name )); + output_srcdir_symlink( make, strmake( "%s.nls", obj )); }

1 0

Francois Gouget : urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 7786d376498da643eb63ebe287541325b21ba3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7786d376498da643eb63ebe2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 22 12:56:17 2019 +0100 urlmon/tests: Fix CoInternetCombineIUri tests on Windows 10 1607 to 1709. It does not check the relative path and thus will accept non-sensical % codes. This is fixed in Windows 10 1809. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9069a9c176..29a70ad481 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10584,10 +10584,11 @@ static void test_CoInternetCombineIUri(void) { hr = pCoInternetCombineIUri(base, relative, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {

1 0

Gabriel Ivăncescu : vbscript: Add script TypeInfo stub.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 0a121bdddd43a3eb546f4e36541428b15edbbee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a121bdddd43a3eb546f4e36… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 22 12:35:13 2019 +0100 vbscript: Add script TypeInfo stub. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 12626e0275..a5e5d2cbee 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -527,6 +527,254 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } +typedef struct { + ITypeInfo ITypeInfo_iface; + LONG ref; +} ScriptTypeInfo; + +static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); +} + +static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeInfo, riid)) + *ppv = &This->ITypeInfo_iface; + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptTypeInfo_AddRef(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTypeAttr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, ppTComp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, + UINT cMaxNames, UINT *pcNames) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pRefType); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames, + MEMBERID *pMemId) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, + BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p %p)\n", This, ppTLib, pIndex); + + return E_NOTIMPL; +} + +static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pTypeAttr); +} + +static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pFuncDesc); +} + +static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + + FIXME("(%p)->(%p)\n", This, pVarDesc); +} + +static const ITypeInfoVtbl ScriptTypeInfoVtbl = { + ScriptTypeInfo_QueryInterface, + ScriptTypeInfo_AddRef, + ScriptTypeInfo_Release, + ScriptTypeInfo_GetTypeAttr, + ScriptTypeInfo_GetTypeComp, + ScriptTypeInfo_GetFuncDesc, + ScriptTypeInfo_GetVarDesc, + ScriptTypeInfo_GetNames, + ScriptTypeInfo_GetRefTypeOfImplType, + ScriptTypeInfo_GetImplTypeFlags, + ScriptTypeInfo_GetIDsOfNames, + ScriptTypeInfo_Invoke, + ScriptTypeInfo_GetDocumentation, + ScriptTypeInfo_GetDllEntry, + ScriptTypeInfo_GetRefTypeInfo, + ScriptTypeInfo_AddressOfMember, + ScriptTypeInfo_CreateInstance, + ScriptTypeInfo_GetMops, + ScriptTypeInfo_GetContainingTypeLib, + ScriptTypeInfo_ReleaseTypeAttr, + ScriptTypeInfo_ReleaseFuncDesc, + ScriptTypeInfo_ReleaseVarDesc +}; + static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -590,12 +838,24 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return S_OK; } -static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ret) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ScriptTypeInfo *type_info; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ret); + + if(iTInfo) + return DISP_E_BADINDEX; + + if(!(type_info = heap_alloc(sizeof(*type_info)))) + return E_OUTOFMEMORY; + + type_info->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; + type_info->ref = 1; + + *ret = &type_info->ITypeInfo_iface; + return S_OK; } static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid,

1 0

Sven Baars : urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: e59b2579b976efcfc8f71813c890def41d8f3589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e59b2579b976efcfc8f71813… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 22 12:23:41 2019 +0100 urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 13 +++++++++++-- include/urlmon.idl | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 85ef7d05c2..5788ff9160 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -92,6 +92,7 @@ DEFINE_EXPECT(GetBindString_USER_AGENT); DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(GetBindString_URL); DEFINE_EXPECT(GetBindString_ROOTDOC_URL); +DEFINE_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(QueryService_HttpSecurity); @@ -662,8 +663,10 @@ static void call_continue(PROTOCOLDATA *protocol_data) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) { CHECK_CALLED(ReportProgress_REDIRECTING); + CLEAR_CALLED(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */ + } state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } @@ -1508,6 +1511,10 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS case BINDSTRING_ENTERPRISE_ID: ok(cEl == 1, "cEl=%d, expected 1\n", cEl); return E_NOTIMPL; + case BINDSTRING_SAMESITE_COOKIE_LEVEL: + CHECK_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + return E_NOTIMPL; default: ok(0, "unexpected ulStringType %d\n", ulStringType); } @@ -3375,8 +3382,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym SET_EXPECT(ReportProgress_CONNECTING); } SET_EXPECT(ReportProgress_SENDINGREQUEST); - if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) { SET_EXPECT(ReportProgress_REDIRECTING); + SET_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */ + } SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); diff --git a/include/urlmon.idl b/include/urlmon.idl index f1088e7c99..fd8d6ce7bc 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -766,7 +766,9 @@ interface IInternetBindInfo : IUnknown BINDSTRING_INITIAL_FILENAME, BINDSTRING_PROXY_USERNAME, BINDSTRING_PROXY_PASSWORD, - BINDSTRING_ENTERPRISE_ID + BINDSTRING_ENTERPRISE_ID, + BINDSTRING_DOC_URL, + BINDSTRING_SAMESITE_COOKIE_LEVEL } BINDSTRING; HRESULT GetBindInfo(

1 0

Zebediah Figura : quartz/vmr9: Wait in Receive() while paused.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 19826fd6b7be5a6cdf4bffb394e6104047648c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19826fd6b7be5a6cdf4bffb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:27 2019 -0600 quartz/vmr9: Wait in Receive() while paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 10 +++++----- dlls/quartz/tests/vmr9.c | 10 +++++----- dlls/quartz/vmr9.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 50a1521f6e..22ddb63746 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1106,7 +1106,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1139,7 +1139,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1165,7 +1165,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1240,7 +1240,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1264,7 +1264,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 93885e184d..d0ae25a969 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1110,7 +1110,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1143,7 +1143,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1169,7 +1169,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1244,7 +1244,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1268,7 +1268,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 36c91c2ef7..994e309165 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -86,6 +86,8 @@ struct quartz_vmr RECT target_rect; LONG VideoWidth; LONG VideoHeight; + + HANDLE run_event; }; static inline struct quartz_vmr *impl_from_BaseWindow(BaseWindow *wnd) @@ -259,6 +261,7 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -318,6 +321,13 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); IDirect3DSurface9_Release(info.lpSurf); + if (This->renderer.filter.state == State_Paused) + { + LeaveCriticalSection(&This->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&This->renderer.csRenderLock); + } + return hr; } @@ -428,6 +438,7 @@ static void vmr_start_stream(struct strmbase_renderer *iface) SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->target_rect); + SetEvent(This->run_event); } static void vmr_stop_stream(struct strmbase_renderer *iface) @@ -438,6 +449,7 @@ static void vmr_stop_stream(struct strmbase_renderer *iface) if (This->renderer.filter.state == State_Running) IVMRImagePresenter9_StopPresenting(This->presenter, This->cookie); + ResetEvent(This->run_event); } static HRESULT WINAPI VMR9_ShouldDrawSampleNow(struct strmbase_renderer *iface, @@ -502,6 +514,7 @@ static void vmr_destroy(struct strmbase_renderer *iface) filter->allocator_d3d9_dev = NULL; } + CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); @@ -2243,6 +2256,8 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) if (FAILED(hr)) goto fail; + pVMR->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + *out = &pVMR->renderer.filter.IUnknown_inner; ZeroMemory(&pVMR->source_rect, sizeof(RECT)); ZeroMemory(&pVMR->target_rect, sizeof(RECT));

1 0

Zebediah Figura : quartz/videorenderer: Wait in Receive() while paused.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 6014c0a99784ce7948f0504caa9f63a8eee2eb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6014c0a99784ce7948f0504c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:26 2019 -0600 quartz/videorenderer: Wait in Receive() while paused. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 10 +++++----- dlls/quartz/videorenderer.c | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e7c0e15edd..046d94b0b8 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -744,7 +744,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -777,7 +777,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -803,7 +803,7 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -868,7 +868,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) ok(hr == S_FALSE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -892,7 +892,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); thread = send_frame(input); - todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index db889bb661..bd228277cb 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -54,6 +54,8 @@ typedef struct VideoRendererImpl LONG FullScreenMode; DWORD saved_style; + + HANDLE run_event; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -176,6 +178,15 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + if (filter->renderer.filter.state == State_Paused) + { + const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + + LeaveCriticalSection(&filter->renderer.csRenderLock); + WaitForMultipleObjects(2, events, FALSE, INFINITE); + EnterCriticalSection(&filter->renderer.csRenderLock); + } + return S_OK; } @@ -234,7 +245,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - + CloseHandle(filter->run_event); strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -267,6 +278,13 @@ static HRESULT video_renderer_pin_query_interface(struct strmbase_renderer *ifac return S_OK; } +static void video_renderer_start_stream(struct strmbase_renderer *iface) +{ + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + + SetEvent(filter->run_event); +} + static void video_renderer_stop_stream(struct strmbase_renderer *iface) { VideoRendererImpl *This = impl_from_strmbase_renderer(iface); @@ -276,6 +294,8 @@ static void video_renderer_stop_stream(struct strmbase_renderer *iface) if (This->baseControlWindow.AutoShow) /* Black it out */ RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); + + ResetEvent(This->run_event); } static void video_renderer_init_stream(struct strmbase_renderer *iface) @@ -315,6 +335,7 @@ static const struct strmbase_renderer_ops renderer_ops = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, + .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, @@ -722,6 +743,8 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow))) goto fail; + pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + *out = &pVideoRenderer->renderer.filter.IUnknown_inner; return S_OK;

1 0

Zebediah Figura : quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample().
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 0af834681ca30fd77aa6b37f9afabffb961e37da URL: https://source.winehq.org/git/wine.git/?a=commit;h=0af834681ca30fd77aa6b37f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 21 18:11:24 2019 -0600 quartz/videorenderer: Get rid of filter state checks in VideoRenderer_DoRenderSample(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 65 ++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e38a773239..bc5791dd5c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -134,34 +134,6 @@ static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_SHOW); } -static void VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) -{ - const AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; - BITMAPINFOHEADER *bmiHeader; - HDC dc; - - TRACE("(%p)->(%p, %d)\n", This, data, size); - - if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) - { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; - } - - TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); - TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); - - dc = GetDC(This->baseControlWindow.baseWindow.hWnd); - StretchDIBits(dc, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, - This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, - This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, - data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); - ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); -} - static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) { @@ -173,12 +145,15 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { - VideoRendererImpl *This = impl_from_strmbase_renderer(iface); + VideoRendererImpl *filter = impl_from_strmbase_renderer(iface); + const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; + BITMAPINFOHEADER *bih; LONG cbSrcStream = 0; HRESULT hr; + HDC dc; - TRACE("(%p)->(%p)\n", This, pSample); + TRACE("filter %p, sample %p.\n", filter, pSample); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) @@ -204,21 +179,21 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa } #endif - if (This->renderer.filter.state == State_Paused) - { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Paused) - { - /* Flushing */ - return S_OK; - } - if (This->renderer.filter.state == State_Stopped) - { - return VFW_E_WRONG_STATE; - } - } else { - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - } + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + + dc = GetDC(filter->baseControlWindow.baseWindow.hWnd); + StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, + filter->DestRect.right - filter->DestRect.left, + filter->DestRect.bottom - filter->DestRect.top, + filter->SourceRect.left, filter->SourceRect.top, + filter->SourceRect.right - filter->SourceRect.left, + filter->SourceRect.bottom - filter->SourceRect.top, + pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(filter->baseControlWindow.baseWindow.hWnd, dc); + return S_OK; }

1 0

Gabriel Ivăncescu : jscript: Fix a copy-paste mistake.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: a4db4606e1d8db56e13eee27d0ae8caac2d265d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4db4606e1d8db56e13eee27… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 14 18:11:09 2019 +0200 jscript: Fix a copy-paste mistake. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 60711fce10..67138da8ee 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -130,7 +130,7 @@ static void clear_script_queue(JScript *This) static void clear_persistent_code_list(JScript *This) { - while(!list_empty(&This->queued_code)) + while(!list_empty(&This->persistent_code)) { bytecode_t *iter = LIST_ENTRY(list_head(&This->persistent_code), bytecode_t, entry); list_remove(&iter->entry);

1 0