November 2019 - Wine-Commits

Zebediah Figura : strmbase/transform: Reimplement IQualityControl for the source pin.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: cdeb55a8f94f1cfe3af01a6349d70c905b06583a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdeb55a8f94f1cfe3af01a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 2 22:33:14 2019 -0500 strmbase/transform: Reimplement IQualityControl for the source pin. There is not enough common code between renderers and transforms to be worth duplicating. This fixes a regression introduced by db7eb3327. The wrong impl_from_*() helper was used in IQualityControl::Notify(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 105 +++++++++++++++++++++++++++++++++------------- include/wine/strmbase.h | 5 ++- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 266232f57a..f4c2c4be72 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -28,7 +28,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface ) { @@ -149,7 +148,6 @@ static void transform_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); FreeMediaType(&filter->pmt); - QualityControlImpl_Destroy(filter->qcimpl); IUnknown_Release(filter->seekthru_unk); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -225,7 +223,7 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo TransformFilter *filter = impl_from_source_IPin(&iface->IPin_iface); if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); else @@ -265,6 +263,80 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; +static TransformFilter *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, TransformFilter, source_IQualityControl_iface); +} + +static HRESULT WINAPI transform_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI transform_source_qc_AddRef(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI transform_source_qc_Release(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality q) +{ + IQualityControl *peer; + HRESULT hr = S_FALSE; + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI transform_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->pFuncsTable->pfnNotify) + return filter->pFuncsTable->pfnNotify(filter, sender, q); + return TransformFilterImpl_Notify(filter, sender, q); +} + +static HRESULT WINAPI transform_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + transform_source_qc_QueryInterface, + transform_source_qc_AddRef, + transform_source_qc_Release, + transform_source_qc_Notify, + transform_source_qc_SetSink, +}; + static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { @@ -285,9 +357,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, strmbase_source_init(&filter->source, &TransformFilter_OutputPin_Vtbl, &filter->filter, wcsOutputPinName, &source_ops); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; + filter->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; filter->seekthru_unk = NULL; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&filter->filter.IBaseFilter_iface, @@ -335,11 +405,6 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) -{ - return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { TransformFilter *filter = impl_from_sink_IPin(iface); @@ -479,21 +544,3 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; - -static HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *qc = (QualityControlImpl*)iface; - TransformFilter *This = impl_from_source_IPin(&qc->pin->IPin_iface); - - if (This->pFuncsTable->pfnNotify) - return This->pFuncsTable->pfnNotify(This, sender, qm); - else - return TransformFilterImpl_Notify(This, sender, qm); -} - -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - TransformFilter_QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a4920054e6..f92a375a56 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,14 +204,17 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter); typedef struct TransformFilter { struct strmbase_filter filter; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + BaseInputPin sink; AM_MEDIA_TYPE pmt; CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; - struct QualityControlImpl *qcimpl; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; } TransformFilter;

1 0

Piotr Caban : msvcrt: Improve printf %I format support.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 1309e11ea1c5863616de7638731d00d6ab90b295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1309e11ea1c5863616de7638… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 2 14:39:23 2019 +0100 msvcrt: Improve printf %I format support. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 975977087d..20bd77e792 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -509,10 +509,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API p += 3; } else if(*(p+1)=='3' && *(p+2)=='2') p += 3; - else if(isdigit(*(p+1)) || !*(p+1)) - break; - else + else if(p[1] && strchr("diouxX", p[1])) flags.IntegerNative = *p++; + else + break; } else if(*p == 'w') flags.WideString = *p++; #if _MSVCR_VER >= 140 diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ac5c37a59c..d1fe292143 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -159,6 +159,8 @@ static void test_sprintf( void ) " 00000000000000000000000000000000000000000000000000000000000000000000000000000001", 0, INT_ARG, 1 }, { "%I", "I", 0, INT_ARG, 1 }, + { "%Iq", "Iq", 0, INT_ARG, 1 }, + { "%Ihd", "Ihd", 0, INT_ARG, 1 }, { "%I0d", "I0d", 0, INT_ARG, 1 }, { "%I64D", "D", 0, ULONGLONG_ARG, 0, -1 }, { "%zx", "1", "zx", TODO_FLAG | INT_ARG, 1 }, @@ -256,6 +258,7 @@ static void test_sprintf( void ) int i, x, r; for (i=0; i<ARRAY_SIZE(tests); i++) { + memset(buffer, 'x', sizeof(buffer)); switch(tests[i].type & 0xff) { case NO_ARG: r = p_sprintf(buffer, tests[i].format);

1 0

Alexandre Julliard : wrc: Add --sysroot option.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: 9240ffbb293a0ca998368f082dbda15767e8fa5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9240ffbb293a0ca998368f08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 13:33:36 2019 +0100 wrc: Add --sysroot option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 +- tools/wrc/wrc.c | 17 +++++++++++++++-- tools/wrc/wrc.man.in | 3 +++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 500d5c1278..d502e4b7da 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -15,7 +15,7 @@ C_SRCS = \ LEX_SRCS = parser.l BISON_SRCS = parser.y -wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}/wine\"" +wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index ea8bfe07a7..014b177291 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -74,6 +74,7 @@ static const char usage[] = " --po-dir=DIR Directory containing po files for translations\n" " --preprocessor Specifies the preprocessor to use, including arguments\n" " -r Ignored for compatibility with rc\n" + " --sysroot=DIR Prefix include paths with DIR\n" " -U, --undefine id Undefine preprocessor identifier id\n" " --use-temp-file Ignored for compatibility with windres\n" " -v, --verbose Enable verbose mode\n" @@ -172,6 +173,7 @@ enum long_options_values LONG_OPT_NOTMPFILE, LONG_OPT_PO_DIR, LONG_OPT_PREPROCESSOR, + LONG_OPT_SYSROOT, LONG_OPT_VERSION, LONG_OPT_DEBUG, LONG_OPT_ENDIANNESS, @@ -197,6 +199,7 @@ static const struct option long_options[] = { { "pedantic", 0, NULL, LONG_OPT_PEDANTIC }, { "po-dir", 1, NULL, LONG_OPT_PO_DIR }, { "preprocessor", 1, NULL, LONG_OPT_PREPROCESSOR }, + { "sysroot", 1, NULL, LONG_OPT_SYSROOT }, { "target", 1, NULL, 'F' }, { "undefine", 1, NULL, 'U' }, { "use-temp-file", 0, NULL, LONG_OPT_TMPFILE }, @@ -335,6 +338,7 @@ int main(int argc,char *argv[]) int cmdlen; int po_mode = 0; char *po_dir = NULL; + const char *sysroot = ""; char **files = xmalloc( argc * sizeof(*files) ); signal(SIGSEGV, segvhandler); @@ -384,6 +388,9 @@ int main(int argc,char *argv[]) if (strcmp(optarg, "cat") == 0) no_preprocess = 1; else fprintf(stderr, "-P option not yet supported, ignored.\n"); break; + case LONG_OPT_SYSROOT: + sysroot = xstrdup( optarg ); + break; case LONG_OPT_VERSION: printf(version_string); exit(0); @@ -499,8 +506,14 @@ int main(int argc,char *argv[]) /* If we do need to search standard includes, add them to the path */ if (stdinc) { - wpp_add_include_path(INCLUDEDIR"/msvcrt"); - wpp_add_include_path(INCLUDEDIR"/windows"); + static const char *incl_dirs[] = { INCLUDEDIR, "/usr/include", "/usr/local/include" }; + + for (i = 0; i < ARRAY_SIZE(incl_dirs); i++) + { + if (i && !strcmp( incl_dirs[i], incl_dirs[0] )) continue; + wpp_add_include_path( strmake( "%s%s/wine/msvcrt", sysroot, incl_dirs[i] )); + wpp_add_include_path( strmake( "%s%s/wine/windows", sysroot, incl_dirs[i] )); + } } /* Kill io buffering when some kind of debuglevel is enabled */ diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index c671ad7382..80fcd04c5b 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -121,6 +121,9 @@ This option may be used to specify the preprocessor to use, including any leading arguments. If not specified, \fBwrc\fR uses its builtin processor. To disable preprocessing, use \fB--preprocessor=cat\fR. .TP +.I \fB\-\-sysroot=\fIdir\fR +Prefix the standard include paths with \fIdir\fR. +.TP .I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR Undefine preprocessor identifier \fIid\fR. Please note that only macros defined up to this point are undefined by this command. However, these

1 0

Alexandre Julliard : ucrtbase/tests: Avoid C99 for loop.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: wine Branch: master Commit: f282b4980210b1125e2af58b91752055edc59798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f282b4980210b1125e2af58b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 2 09:22:49 2019 +0100 ucrtbase/tests: Avoid C99 for loop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 2af29322bf..9c6ece9808 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -639,10 +639,11 @@ static void test_printf_legacy_three_digit_exp(void) static void test_printf_c99(void) { char buf[30]; + int i; /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted * as size_t size for integers. */ - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { unsigned __int64 options = (i == 0) ? 0 : UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY;

1 0

Francois Gouget : testbot/web: Disable indexing of the TestBot site.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: tools Branch: master Commit: dd327eaf94647fc7e3fab28061c42d691e91a298 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd327eaf94647fc7e3fab28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:40:57 2019 +0100 testbot/web: Disable indexing of the TestBot site. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/robots.txt b/testbot/web/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/testbot/web/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Francois Gouget : winetest: Disable indexing of the WineTest website.
by Alexandre Julliard Nov. 4, 2019

Nov. 4, 2019

Module: tools Branch: master Commit: 847a480e9d9597407ac33c27cf65505a8d688163 URL: https://source.winehq.org/git/tools.git/?a=commit;h=847a480e9d9597407ac33c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Nov 3 00:44:22 2019 +0100 winetest: Disable indexing of the WineTest website. All the data on the website is transient in nature and not worth indexing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/robots.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/robots.txt b/winetest/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/winetest/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /

1 0

Alexandre Julliard : Wine release 4.19
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: website Branch: master Commit: 925f6be9da4197aad5822c9a73a6e70bbe9c704c URL: https://source.winehq.org/git/website.git/?a=commit;h=925f6be9da4197aad5822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 1 21:38:05 2019 +0100 Wine release 4.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019110101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019110101.xml b/news/en/2019110101.xml new file mode 100644 index 00000000..99e92e0f --- /dev/null +++ b/news/en/2019110101.xml @@ -0,0 +1,15 @@ +<news> +<date>November 1, 2019</date> +<title>Wine 4.19 Released</title> +<body> + The Wine development release 4.19 is now available. + <a href="{$root}/announce/4.19">What's new</a> in this release: +<ul> + <li>A number of additional VBScript features.</li> + <li>More stateblock support in WineD3D.</li> + <li>Some fixes for ARM64 support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : vbscript: Allow 'with' as an identifier.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 37e27296076ee1067f5409d3fd408a11ef4e69b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e27296076ee1067f5409d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:50:45 2019 +0100 vbscript: Allow 'with' as an identifier. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/tests/run.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ffa12b2c4e..8bb99f9f9a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -536,6 +536,7 @@ DotIdentifier | tON { $$ = $1; } | tRESUME { $$ = $1; } | tGOTO { $$ = $1; } + | tWITH { $$ = $1; } /* Most statements accept both new line and ':' as separators */ StSep diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0520038a02..8a6fa7834b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1522,6 +1522,7 @@ sub test_dotIdentifiers Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10") Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10") Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10") + Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 765a0353d1..527055f83b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -855,7 +855,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"next", DISPID_TESTOBJ_KEYWORD }, { L"on", DISPID_TESTOBJ_KEYWORD }, { L"resume", DISPID_TESTOBJ_KEYWORD }, - { L"goto", DISPID_TESTOBJ_KEYWORD } + { L"goto", DISPID_TESTOBJ_KEYWORD }, + { L"with", DISPID_TESTOBJ_KEYWORD } }; test_grfdex(grfdex, fdexNameCaseInsensitive);

1 0

Jacek Caban : vbscript: Support using function return value in expressions.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: ef737598e6b029a1af6c61e4cf8905c48ff63d23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef737598e6b029a1af6c61e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 1 17:55:31 2019 +0100 vbscript: Support using function return value in expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8568b7098c..7339f42aba 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,9 +104,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if(invoke_type == VBDISP_LET - && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) - && !wcsicmp(name, ctx->func->name)) { + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d8e02a7ab..4623a08e2b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1621,4 +1621,13 @@ with new TestPropSyntax ok .prop = 1, ".prop = "&.prop end with +function testsetresult(x, y) + set testsetresult = new TestPropSyntax + testsetresult.prop = x + y = testsetresult.prop + 1 +end function + +set x = testsetresult(1, 2) +ok x.prop = 1, "x.prop = " & x.prop + reportSuccess()

1 0

Zhiyi Zhang : winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Alexandre Julliard Nov. 1, 2019

Nov. 1, 2019

Module: wine Branch: master Commit: 9ae8da6bb4a8f66d55975fa0f14e5e413756d324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae8da6bb4a8f66d55975fa0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 1 21:19:34 2019 +0800 winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI. So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 160 ++++++++++++++++++++++++++++++--------------- 1 file changed, 107 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..a323b795b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,132 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ +static HKEY video_key; static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime = {0}; + HANDLE mutex = NULL; + DWORD i = 0; + INT result; + DWORD type; + BOOL ret = FALSE; + + EnterCriticalSection(&screen_section); + if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) + { + LeaveCriticalSection(&screen_section); + return FALSE; + } + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + WARN("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +420,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +444,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +492,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +507,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +518,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +569,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters)

1 0