wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Jacek Caban : stdio.h: Add ucrt version of vsnprintf inline wrapper.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: c60b21926ef2966835483d7f06202e33569c091f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c60b21926ef2966835483d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:29 2020 +0100 stdio.h: Add ucrt version of vsnprintf inline wrapper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/misc.c | 10 ---------- include/msvcrt/stdio.h | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index 028bde5b3d..cc64175438 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,10 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, - _locale_t locale, __ms_va_list valist); - int* CDECL __processing_throw(void); /********************************************************************* @@ -58,9 +54,3 @@ int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); } - -int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) -{ - return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, - buf, size, fmt, NULL, args ); -} diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 2a66f008fa..7477ac171a 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -95,7 +95,6 @@ char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); -int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); @@ -173,6 +172,31 @@ int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); +#ifdef _UCRT + +_ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); + +static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, + buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +#else /* _UCRT */ + +int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); +static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } + +#endif /* _UCRT */ + #endif /* _STDIO_DEFINED */ #ifdef __cplusplus @@ -191,7 +215,6 @@ static inline char* tempnam(const char *dir, const char *prefix) { return _tempn static inline int unlink(const char* path) { return _unlink(path); } #define _UNLINK_DEFINED #endif -static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...) {

1 0

Jacek Caban : makedep: Define _UCRT in modules that link to ucrtbase.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 229c33791f0a4690f01550d7138b038d52f17f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=229c33791f0a4690f01550d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:13 2020 +0100 makedep: Define _UCRT in modules that link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1e33b1c673..6dec1b3900 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4172,7 +4172,7 @@ static void load_sources( struct makefile *make ) "MANPAGES", NULL }; - const char **var; + const char **var, *crt_dll = NULL; unsigned int i; struct strarray value; struct incl_file *file; @@ -4265,11 +4265,23 @@ static void load_sources( struct makefile *make ) make->is_cross = crosstarget && make->use_msvcrt; + if (make->use_msvcrt) + { + for (i = 0; i < make->imports.count; i++) + { + if (strncmp( make->imports.str[i], "msvcr", 5 ) && strncmp( make->imports.str[i], "ucrt", 4 )) continue; + if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); + crt_dll = make->imports.str[i]; + } + if (!crt_dll) crt_dll = "msvcrt"; + if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + } + if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

Jacek Caban : stdio.h: Add snprintf inline wrapper.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 0eb79209d14624173b9354e020d70a52ac45a1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb79209d14624173b9354e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:02 2020 +0100 stdio.h: Add snprintf inline wrapper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8a31835bea..2a66f008fa 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -192,7 +192,17 @@ static inline int unlink(const char* path) { return _unlink(path); } #define _UNLINK_DEFINED #endif static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } -#define snprintf _snprintf + +static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = vsnprintf(buffer, size, format, args); + __ms_va_end(args); + return ret; +} static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *format, ...) {

1 0

Nikolay Sivov : mfplat: Fix media type compare logic regarding user data.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: ad4c734c37c36a57a7a3d34fe55787b053a2f311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad4c734c37c36a57a7a3d34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 18 17:18:28 2020 +0300 mfplat: Fix media type compare logic regarding user data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 7 ++++--- dlls/mfplat/tests/mfplat.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 893eb3e778..382f066327 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -514,13 +514,14 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, PropVariantInit(&right.value); right.hr = IMFAttributes_GetItem(right.type, &MF_MT_USER_DATA, &right.value); - if (SUCCEEDED(left.hr) && SUCCEEDED(left.hr)) + /* Compare user data if both types have it, otherwise simply check if both don't. */ + if (SUCCEEDED(left.hr) && SUCCEEDED(right.hr)) { result = FALSE; IMFAttributes_CompareItem(left.type, &MF_MT_USER_DATA, &left.value, &result); } - else if (FAILED(left.hr) && FAILED(left.hr)) - result = TRUE; + else + result = FAILED(left.hr) && FAILED(right.hr); PropVariantClear(&left.value); PropVariantClear(&right.value); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6800441ba2..896cd93a46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -762,6 +762,19 @@ if(0) ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags); + /* Different user data. */ + hr = IMFMediaType_SetBlob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)&flags, sizeof(flags)); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + flags = 0; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA), + "Unexpected flags %#x.\n", flags); + + hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_USER_DATA); + ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set subtype, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : ole32: Correct MkParseDisplayName spec entry.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: d38bd69b15d693be363d275dd3d7a901ebcadb23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d38bd69b15d693be363d275d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 18 19:33:51 2020 +0800 ole32: Correct MkParseDisplayName spec entry. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index dd10d65b78..2c4428edf0 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -179,7 +179,7 @@ @ stdcall IsValidInterface(ptr) @ stub IsValidPtrIn @ stub IsValidPtrOut -@ stdcall MkParseDisplayName(ptr ptr ptr ptr) +@ stdcall MkParseDisplayName(ptr wstr ptr ptr) @ stdcall MonikerCommonPrefixWith(ptr ptr ptr) @ stub MonikerRelativePathTo @ stdcall OleBuildVersion()

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_wa() in protocol.c.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 20f5410799dcfccbfa1338bda07c8257b639e804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f5410799dcfccbfa1338bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 17 20:54:09 2020 +0100 urlmon/tests: Get rid of strcmp_wa() in protocol.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 84dd5345be..6fc864f777 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -223,13 +223,6 @@ static LONG obj_refcount(void *obj) return IUnknown_Release((IUnknown *)obj); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static const char *w2a(LPCWSTR str) { static char buf[INTERNET_MAX_URL_LENGTH]; @@ -859,7 +852,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), "szStatusText != text/plain\n"); else if(empty_file) - ok(!strcmp_wa(szStatusText, "application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else if((pi & PI_MIMEVERIFICATION) && emulate_prot && !mimefilter_test && tested_protocol==HTTP_TEST && !short_read) ok(lstrlenW(gifW) <= lstrlenW(szStatusText) && @@ -915,7 +908,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!strcmp_wa(szStatusText, "text/html"), "szStatusText != text/html\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); @@ -929,13 +922,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); if(test_redirect) - ok(!strcmp_wa(szStatusText, "http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ENCODING: CHECK_EXPECT(ReportProgress_ENCODING); - ok(!strcmp_wa(szStatusText, "gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ACCEPTRANGES: CHECK_EXPECT(ReportProgress_ACCEPTRANGES); @@ -1200,7 +1193,7 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR "dwError == ERROR_SUCCESS\n"); if(hrResult == INET_E_REDIRECT_FAILED) - ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + ok(!lstrcmpW(szResult, L"http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); else ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult));

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_wa() in misc.c.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 1a1efa330be28b1d8f51404503d069c56a7efebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1efa330be28b1d8f514045… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 17 20:54:08 2020 +0100 urlmon/tests: Get rid of strcmp_wa() in misc.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 289 +++++++++++++++++++++++------------------------ 1 file changed, 141 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a1efa330be28b1d8f51…

1 0

Michael Stefaniuc : msxml3/tests: Just use a wchar string literal instead of _bstr_().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 8b8460de0795840248cb6a9383b60c29e2817cd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8460de0795840248cb6a93… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 21:24:38 2020 +0100 msxml3/tests: Just use a wchar string literal instead of _bstr_(). lstrcmpW and memcmp can deal just fine with WCHAR* and don't need a BSTR. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 326 +++++++++++++++++++++--------------------- dlls/msxml3/tests/httpreq.c | 4 +- dlls/msxml3/tests/saxreader.c | 76 +++++----- 3 files changed, 203 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b8460de0795840248cb…

1 0

Michael Stefaniuc : msxml3/tests: Get rid of a2bstr().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 077224622db0ced84224bf84ea0b9365bf4c2486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077224622db0ced84224bf84… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 21:24:37 2020 +0100 msxml3/tests: Get rid of a2bstr(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ae0a95a2f1..33e6bd6581 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -130,21 +130,6 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - /* test IHTMLElementCollection */ static HRESULT WINAPI htmlecoll_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppvObject) @@ -496,7 +481,7 @@ static HRESULT WINAPI htmldoc2_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI htmldoc2_get_URL(IHTMLDocument2 *iface, BSTR *p) { CHECK_EXPECT2(htmldoc2_get_url); - *p = a2bstr("http://test.winehq.org/"); + *p = SysAllocString(L"http://test.winehq.org/"); return S_OK; } @@ -1747,7 +1732,7 @@ static void test_XMLHTTP(void) set_xhr_site(xhr); test_open(xhr, "GET", "tests/referer.php", S_OK); - str1 = a2bstr("http://test.winehq.org/"); + str1 = SysAllocString(L"http://test.winehq.org/"); V_VT(&varbody) = VT_EMPTY; hr = IXMLHttpRequest_send(xhr, varbody);

1 0

Gabriel Ivăncescu : vbscript: Return the dispatch object directly in retval, rather than its value.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 0809a2859fefaaad7c2d803342c43e1082cb894f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0809a2859fefaaad7c2d8033… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 14 15:57:16 2020 +0200 vbscript: Return the dispatch object directly in retval, rather than its value. 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/interp.c | 4 +--- dlls/vbscript/tests/run.c | 13 +++++++++++++ dlls/vbscript/tests/vbscript.c | 20 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4f5e4631ae..b0046cb3ae 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1494,9 +1494,7 @@ static HRESULT interp_retval(exec_ctx_t *ctx) TRACE("\n"); - hres = stack_pop_val(ctx, &val); - if(FAILED(hres)) - return hres; + stack_pop_deref(ctx, &val); if(val.owned) { VariantClear(&ctx->ret_val); diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8acf220f9f..474fe1d452 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2685,6 +2685,7 @@ static void test_isexpression(void) { IActiveScriptParse *parser; IActiveScript *engine; + IDispatch *disp; SCRIPTSTATE ss; HRESULT hres; VARIANT var; @@ -2747,6 +2748,18 @@ static void test_isexpression(void) VariantClear(&var); SysFreeString(str); + /* Without a global host or named item context, "me" returns the script dispatch */ + hres = IActiveScript_GetScriptDispatch(engine, NULL, &disp); + ok(hres == S_OK, "GetScriptDispatch failed: %08x\n", hres); + str = a2bstr("me"); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "Expected VT_DISPATCH, got %s\n", vt2a(&var)); + ok(V_DISPATCH(&var) == disp, "Wrong dispatch returned for 'me'\n"); + IDispatch_Release(disp); + VariantClear(&var); + SysFreeString(str); + /* An expression can also refer to a variable, function, class, etc previously set */ V_VT(&var) = VT_I2; str = a2bstr("If True Then foo = 42 Else foo = 0\n"); diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index ac458f1fc6..19689b5f6d 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1767,6 +1767,7 @@ static void test_named_items(void) IActiveScriptParse *parse; IActiveScript *script; IDispatch *disp; + VARIANT var; unsigned i; DISPID id; ULONG ref; @@ -1981,6 +1982,25 @@ static void test_named_items(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == &global_named_item, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parse, L"me", L"codeOnlyItem", NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == (IDispatch*)script_disp2, + "Unexpected 'me': V_VT = %d, V_DISPATCH = %p\n", V_VT(&var), V_DISPATCH(&var)); + VariantClear(&var); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + IDispatchEx_Release(script_disp2); IDispatchEx_Release(script_disp);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020