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

Alexandre Julliard : ntdll: Use NtContinue() to restore context after an exception.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 7f28a1c521341399da1f3559358f2abf876d34be URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f28a1c521341399da1f3559… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:17:07 2020 +0200 ntdll: Use NtContinue() to restore context after an exception. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++-- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/signal_i386.c | 7 +++---- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 4 ++-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 291536ecb8..101912f7ec 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -528,10 +528,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4abcee5296..334c217b94 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -783,10 +783,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_function_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index ccdc8ec7f3..568fa34f18 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -757,10 +757,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); @@ -1978,8 +1978,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEn } frame = __wine_pop_frame( frame ); } - - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); } __ASM_STDCALL_FUNC( RtlUnwind, 16, "pushl %ebp\n\t" diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 18ae3dbf2c..e4c30f38a4 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -372,10 +372,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte } if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE ); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 961b6a9ab8..225cb981b0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2264,10 +2264,10 @@ NTSTATUS WINAPI KiUserExceptionDispatcher( EXCEPTION_RECORD *rec, CONTEXT *conte if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if ((status = call_stack_handlers( rec, context )) == STATUS_SUCCESS) - NtSetContextThread( GetCurrentThread(), context ); + NtContinue( context, FALSE ); if (status != STATUS_UNHANDLED_EXCEPTION) RtlRaiseStatus( status ); return NtRaiseException( rec, context, FALSE );

1 0

Alexandre Julliard : ntdll: Use NtContinue() to set the thread initial context.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 20c91c5e803090bd40fe3045a0d9fea0a68913e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c91c5e803090bd40fe3045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 15:41:24 2020 +0200 ntdll: Use NtContinue() to set the thread initial context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 3 -- dlls/ntdll/unix/signal_arm.c | 3 +- dlls/ntdll/unix/signal_arm64.c | 43 +++++------------------ dlls/ntdll/unix/signal_i386.c | 76 ++++++++++++++++++----------------------- dlls/ntdll/unix/signal_x86_64.c | 59 ++++++++++++++------------------ 5 files changed, 69 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20c91c5e803090bd40fe…

1 0

Alexandre Julliard : kernel32: Use a vectored exception handler to catch Ctrl-C.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 173644b08fae3f45149b7b6351f572ad22215e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=173644b08fae3f45149b7b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 16:43:48 2020 +0200 kernel32: Use a vectored exception handler to catch Ctrl-C. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++-------- dlls/kernel32/console_private.h | 3 +-- dlls/kernel32/kernel_main.c | 4 +--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4e1c15cb71..02aa0d6f6f 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -894,14 +894,15 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) * * Check whether the shall manipulate CtrlC events */ -int CONSOLE_HandleCtrlC(unsigned sig) +LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) { extern DWORD WINAPI CtrlRoutine( void *arg ); HANDLE thread; + if (eptr->ExceptionRecord->ExceptionCode != CONTROL_C_EXIT) return EXCEPTION_CONTINUE_SEARCH; + /* FIXME: better test whether a console is attached to this process ??? */ - extern unsigned CONSOLE_GetNumHistoryEntries(void); - if (CONSOLE_GetNumHistoryEntries() == (unsigned)-1) return 0; + if (CONSOLE_GetNumHistoryEntries() == (unsigned)-1) return EXCEPTION_CONTINUE_SEARCH; /* check if we have to ignore ctrl-C events */ if (!(NtCurrentTeb()->Peb->ProcessParameters->ConsoleFlags & 1)) @@ -916,12 +917,9 @@ int CONSOLE_HandleCtrlC(unsigned sig) * we can wait on this critical section */ thread = CreateThread(NULL, 0, CtrlRoutine, (void*)CTRL_C_EVENT, 0, NULL); - if (thread == NULL) - return 0; - - CloseHandle(thread); + if (thread) CloseHandle(thread); } - return 1; + return EXCEPTION_CONTINUE_EXECUTION; } /****************************************************************** diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index dc48700900..2943d48a60 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -22,8 +22,7 @@ #define __WINE_CONSOLE_PRIVATE_H /* console.c */ -extern int CONSOLE_HandleCtrlC(unsigned) DECLSPEC_HIDDEN; -/* console.c */ +extern LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) DECLSPEC_HIDDEN; extern int CONSOLE_GetHistory(int idx, WCHAR* buf, int buf_len) DECLSPEC_HIDDEN; extern BOOL CONSOLE_AppendHistory(const WCHAR *p) DECLSPEC_HIDDEN; extern unsigned CONSOLE_GetNumHistoryEntries(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index d312f11081..f7f87d2a70 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); -extern int CDECL __wine_set_signal_handler(unsigned, int (*)(unsigned)); - static STARTUPINFOA startup_infoA; /*********************************************************************** @@ -150,7 +148,7 @@ static BOOL process_attach( HMODULE module ) } /* finish the process initialisation for console bits, if needed */ - __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); + RtlAddVectoredExceptionHandler( FALSE, CONSOLE_HandleCtrlC ); if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) {

1 0

Alexandre Julliard : ntdll: Remove support for setting custom signal handlers.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 683583faf2f4b00874f702429393b127aca8eef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683583faf2f4b00874f70242… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 6 16:44:39 2020 +0200 ntdll: Remove support for setting custom signal handlers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 --- dlls/ntdll/signal_arm.c | 53 +++++++++++-------------------------------- dlls/ntdll/signal_arm64.c | 34 +++------------------------- dlls/ntdll/signal_i386.c | 39 +++----------------------------- dlls/ntdll/signal_powerpc.c | 55 +++++++++++---------------------------------- dlls/ntdll/signal_x86_64.c | 34 +++------------------------- 6 files changed, 35 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=683583faf2f4b00874f7…

1 0

Alexandre Julliard : Wine release 5.10
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: website Branch: master Commit: 0492d284f82b4708551ab6797f5c6d8c1fb5e1d8 URL: https://source.winehq.org/git/website.git/?a=commit;h=0492d284f82b4708551ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 21:17:09 2020 +0200 Wine release 5.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020060501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2020060501.xml b/news/en/2020060501.xml new file mode 100644 index 00000000..1a1d3126 --- /dev/null +++ b/news/en/2020060501.xml @@ -0,0 +1,18 @@ +<news> +<date>June 5, 2020</date> +<title>Wine 5.10 Released</title> +<body> + The Wine development release 5.10 is now available. + <a href="{$root}/announce/5.10">What's new</a> in this release: +<ul> + <li>More progress on the WineD3D Vulkan backend.</li> + <li>Beginnings of a separate Unix library for NTDLL.</li> + <li>Better support for anti-cheat kernel drivers.</li> + <li>More glyph substitutions in DirectWrite.</li> + <li>Support for DSS private keys.</li> + <li>ARM64 exception handling fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.10.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 : jscript: Support passing non-string pattern to RegExp constructor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 4e8874930aad89d13f007b6acc8384f4e49fb6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8874930aad89d13f007b6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:11 2020 +0200 jscript: Support passing non-string pattern to RegExp constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 33 +++++++++++++++------------------ dlls/jscript/tests/regexp.js | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 32800fe227..f9578195d9 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -674,7 +674,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg unsigned flags, opt_len = 0; const WCHAR *opt = NULL; jsstr_t *src; - HRESULT hres; + HRESULT hres = S_OK; if(is_object_instance(src_arg)) { jsdisp_t *obj; @@ -693,12 +693,12 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg } } - if(!is_string(src_arg)) { - FIXME("src_arg = %s\n", debugstr_jsval(src_arg)); - return E_NOTIMPL; - } - - src = get_string(src_arg); + if(is_undefined(src_arg)) + src = jsstr_empty(); + else + hres = to_string(ctx, src_arg, &src); + if(FAILED(hres)) + return hres; if(flags_arg) { jsstr_t *opt_str; @@ -710,16 +710,18 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg opt_str = get_string(*flags_arg); opt = jsstr_flatten(opt_str); - if(!opt) + if(!opt) { + jsstr_release(src); return E_OUTOFMEMORY; + } opt_len = jsstr_length(opt_str); } hres = parse_regexp_flags(opt, opt_len, &flags); - if(FAILED(hres)) - return hres; - - return create_regexp(ctx, src, flags, ret); + if(SUCCEEDED(hres)) + hres = create_regexp(ctx, src, flags, ret); + jsstr_release(src); + return hres; } HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *jsstr, jsval_t *r) @@ -953,12 +955,7 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags jsdisp_t *ret; HRESULT hres; - if(!argc) { - FIXME("no args\n"); - return E_NOTIMPL; - } - - hres = create_regexp_var(ctx, argv[0], argc > 1 ? argv+1 : NULL, &ret); + hres = create_regexp_var(ctx, argc ? argv[0] : jsval_undefined(), argc > 1 ? argv+1 : NULL, &ret); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index b20036426e..e261bf9d3a 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -677,4 +677,28 @@ ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === true, "re.multiline = " + re.multiline); ok(re.global === true, "re.global = " + re.global); +re = new RegExp(undefined); +ok(re.source === "", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp(); +ok(re.source === "", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp(true); +ok(re.source === "true", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp({ toString: function() { return "test"; } }); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + reportSuccess();

1 0

Jacek Caban : jscript: Support passing non-string flags to RegExp constructor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: fe0bd340cddd9c148af2501e7a3eabe5421ef243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0bd340cddd9c148af2501e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:25 2020 +0200 jscript: Support passing non-string flags to RegExp constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 24 ++++++++++-------------- dlls/jscript/tests/regexp.js | 12 ++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index f9578195d9..94abb6a3c9 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -671,7 +671,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg, jsdisp_t **ret) { - unsigned flags, opt_len = 0; + unsigned flags = 0; const WCHAR *opt = NULL; jsstr_t *src; HRESULT hres = S_OK; @@ -700,24 +700,20 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(FAILED(hres)) return hres; - if(flags_arg) { + if(flags_arg && !is_undefined(*flags_arg)) { jsstr_t *opt_str; - if(!is_string(*flags_arg)) { - FIXME("unimplemented for %s\n", debugstr_jsval(*flags_arg)); - return E_NOTIMPL; - } - - opt_str = get_string(*flags_arg); - opt = jsstr_flatten(opt_str); - if(!opt) { - jsstr_release(src); - return E_OUTOFMEMORY; + hres = to_string(ctx, *flags_arg, &opt_str); + if(SUCCEEDED(hres)) { + opt = jsstr_flatten(opt_str); + if(opt) + hres = parse_regexp_flags(opt, jsstr_length(opt_str), &flags); + else + hres = E_OUTOFMEMORY; + jsstr_release(opt_str); } - opt_len = jsstr_length(opt_str); } - hres = parse_regexp_flags(opt, opt_len, &flags); if(SUCCEEDED(hres)) hres = create_regexp(ctx, src, flags, ret); jsstr_release(src); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index e261bf9d3a..31b8321623 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -701,4 +701,16 @@ ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); ok(re.global === false, "re.global = " + re.global); +re = new RegExp("test", undefined); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); + +re = new RegExp("test", { toString: function() { return "mg"; } }); +ok(re.source === "test", "re.source = " + re.source); +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === true, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); + reportSuccess();

1 0

Jacek Caban : jscript: Add Object.preventExtensions semi-stub implementation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 2e767e81cc1682597b3d42a0ca1dcebdf909aaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e767e81cc1682597b3d42a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:26:39 2020 +0200 jscript: Add Object.preventExtensions semi-stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index bac79ebde2..1e94f16344 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -671,13 +671,35 @@ static HRESULT Object_keys(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } +static HRESULT Object_preventExtensions(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +{ + jsdisp_t *obj; + + if(!argc || !is_object_instance(argv[0]) || !get_object(argv[0])) { + FIXME("invalid arguments\n"); + return E_NOTIMPL; + } + + FIXME("(%s) semi-stub\n", debugstr_jsval(argv[0])); + + obj = to_jsdisp(get_object(argv[0])); + if(!obj) { + FIXME("Non-JS object\n"); + return E_NOTIMPL; + } + + if(r) *r = jsval_obj(jsdisp_addref(obj)); + return S_OK; +} + static const builtin_prop_t ObjectConstr_props[] = { {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1}, - {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1} + {L"keys", Object_keys, PROPF_ES5|PROPF_METHOD|1}, + {L"preventExtensions", Object_preventExtensions, PROPF_ES5|PROPF_METHOD|1}, }; static const builtin_info_t ObjectConstr_info = { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index f268eba24c..ded25df512 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -924,7 +924,28 @@ sync_test("reduce", function() { try { [].reduce(function(a) { return 0; }); ok(false, "expected exception"); - }catch(e) {trace(e.message);} + }catch(e) {} ok(Array.prototype.reduce.length === 1, "Array.prototype.reduce.length = " + Array.prototype.reduce.length); }); + +sync_test("preventExtensions", function() { + var o = {}; + var r = Object.preventExtensions(o); + ok(r === o, "r != o"); + o.x = 1; + todo_wine. + ok(!("x" in o), "x property added to o"); + try { + Object.defineProperty(o, "y", { value: true }); + todo_wine. + ok(false, "expected exception"); + }catch(e) { + ok(e.name === "TypeError", "got " + e.name + " exception"); + } + + r = Object.preventExtensions(o); + ok(r === o, "r != o"); + + ok(Object.preventExtensions.length === 1, "Object.preventExtensions.length = " + Object.preventExtensions.length); +});

1 0

Jacek Caban : mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 7f465761c2f898ca5dde5a357576b44ba47b8bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f465761c2f898ca5dde5a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:27:01 2020 +0200 mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 21 ++++----------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 981d93f9b4..a49f8162c0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -407,27 +407,14 @@ static HRESULT WINAPI HTMLBodyElement_put_bgColor(IHTMLBodyElement *iface, VARIA static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIANT *p) { HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - nsAString strColor; + nsAString nsstr; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_Init(&strColor, NULL); - nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &strColor); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *color; - - nsAString_GetData(&strColor, &color); - V_VT(p) = VT_BSTR; - hres = nscolor_to_str(color, &V_BSTR(p)); - }else { - ERR("SetBgColor failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&strColor); - return hres; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLBodyElement_GetBgColor(This->nsbody, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); } static HRESULT WINAPI HTMLBodyElement_put_text(IHTMLBodyElement *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 565a2428ba..7b2f927e19 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -982,6 +982,7 @@ UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; #define NSSTR_IMPLICIT_PX 0x01 +#define NSSTR_COLOR 0x02 HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2d1eb817dc..9a23785ca6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -964,14 +964,15 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) { + HRESULT hres = S_OK; + if(NS_FAILED(nsres)) { ERR("failed: %08x\n", nsres); nsAString_Finish(nsstr); - return E_FAIL; + return map_nsresult(nsres); } if(NS_StringGetIsVoid(nsstr)) { - TRACE("ret null\n"); V_VT(p) = VT_NULL; }else { const WCHAR *str; @@ -989,20 +990,23 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, V if(iter == str + len && dot) len = dot - str; } } - TRACE("ret %s\n", debugstr_wn(str, len)); - if(*str) { + if(flags & NSSTR_COLOR) { + hres = nscolor_to_str(str, &V_BSTR(p)); + }else if(*str) { V_BSTR(p) = SysAllocStringLen(str, len); - if(!V_BSTR(p)) { - nsAString_Finish(nsstr); - return E_OUTOFMEMORY; - } + if(!V_BSTR(p)) + hres = E_OUTOFMEMORY; }else { V_BSTR(p) = NULL; } - V_VT(p) = VT_BSTR; + if(SUCCEEDED(hres)) + V_VT(p) = VT_BSTR; } nsAString_Finish(nsstr); + if(FAILED(hres)) + return hres; + TRACE("ret %s\n", debugstr_variant(p)); return S_OK; }

1 0

Jacek Caban : mshtml: Use default white value in IHTMLDocument2::get_bgColor.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: d90c1e1c7fad0178a921d5737c9a4769c34046dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90c1e1c7fad0178a921d573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 5 18:28:37 2020 +0200 mshtml: Use default white value in IHTMLDocument2::get_bgColor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49062 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++---------------------- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a000884dc8..57ec662de8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -711,34 +711,26 @@ static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - IHTMLElement *element = NULL; - IHTMLBodyElement *body; - HRESULT hr; + nsAString nsstr; + nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hr = IHTMLDocument2_get_body(iface, &element); - if (FAILED(hr)) - { - ERR("Failed to get body (0x%08x)\n", hr); - return hr; - } - - if(!element) - { - FIXME("Empty body element.\n"); - return hr; + if(!This->doc_node->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - hr = IHTMLElement_QueryInterface(element, &IID_IHTMLBodyElement, (void**)&body); - if (SUCCEEDED(hr)) - { - hr = IHTMLBodyElement_get_bgColor(body, p); - IHTMLBodyElement_Release(body); + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + hres = return_nsstr_variant(nsres, &nsstr, NSSTR_COLOR, p); + if(hres == S_OK && V_VT(p) == VT_BSTR && !V_BSTR(p)) { + TRACE("default #ffffff"); + if(!(V_BSTR(p) = SysAllocString(L"#ffffff"))) + hres = E_OUTOFMEMORY; } - IHTMLElement_Release(element); - - return hr; + return hres; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 25b8b3536c..ff33ff76ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6695,6 +6695,10 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ffffff"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); + V_VT(&vbg) = VT_BSTR; V_BSTR(&vbg) = SysAllocString(L"red"); hres = IHTMLBodyElement_put_bgColor(body, vbg); @@ -6707,6 +6711,10 @@ static void test_body_funs(IHTMLBodyElement *body, IHTMLDocument2 *doc) ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vbg) == VT_BSTR && V_BSTR(&vbg) && !wcscmp(V_BSTR(&vbg), L"#ff0000"), "bgColor = %s\n", wine_dbgstr_variant(&vbg)); + hres = IHTMLDocument2_get_bgColor(doc, &vbg); ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); ok(V_VT(&vbg) == VT_BSTR, "V_VT(&vbg) != VT_BSTR\n");

1 0