November 2022 - Wine-commits

Alex Henrie : dnsapi: Use the strdup and wcsdup functions instead of reimplementing them.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: b81a5718492f498b6b88dd927ba6dbf53f6db5c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b81a5718492f498b6b88dd927ba6db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 22:16:47 2022 -0700 dnsapi: Use the strdup and wcsdup functions instead of reimplementing them. --- dlls/dnsapi/dnsapi.h | 27 --------------------------- dlls/dnsapi/query.c | 2 +- dlls/dnsapi/record.c | 6 +++--- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index a81cb712f3e..250b0a1b4c3 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -25,33 +25,6 @@ #include "winternl.h" #include "wine/unixlib.h" -static inline char *strdup_a( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (lstrlenA( src ) + 1) * sizeof(char) ); - if (dst) lstrcpyA( dst, src ); - return dst; -} - -static inline char *strdup_u( const char *src ) -{ - char *dst; - if (!src) return NULL; - dst = malloc( (strlen( src ) + 1) * sizeof(char) ); - if (dst) strcpy( dst, src ); - return dst; -} - -static inline WCHAR *strdup_w( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ); - if (dst) lstrcpyW( dst, src ); - return dst; -} - static inline WCHAR *strdup_aw( const char *str ) { WCHAR *ret = NULL; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 0e2f1b39ece..90a3a3e9950 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -73,7 +73,7 @@ static DNS_STATUS do_query_netbios( PCSTR name, DNS_RECORDA **recp ) } else { - record->pName = strdup_u( name ); + record->pName = strdup( name ); if (!record->pName) { status = ERROR_NOT_ENOUGH_MEMORY; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 04694fc575c..01786842b73 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -455,7 +455,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { switch (out) { - case DnsCharSetUnicode: return strdup_w( src ); + case DnsCharSetUnicode: return wcsdup( src ); case DnsCharSetUtf8: return strdup_wu( src ); case DnsCharSetAnsi: return strdup_wa( src ); default: @@ -468,7 +468,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) switch (out) { case DnsCharSetUnicode: return strdup_uw( src ); - case DnsCharSetUtf8: return strdup_u( src ); + case DnsCharSetUtf8: return strdup( src ); case DnsCharSetAnsi: return strdup_ua( src ); default: WARN( "unhandled target charset: %d\n", out ); @@ -480,7 +480,7 @@ static LPVOID strdupX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) { case DnsCharSetUnicode: return strdup_aw( src ); case DnsCharSetUtf8: return strdup_au( src ); - case DnsCharSetAnsi: return strdup_a( src ); + case DnsCharSetAnsi: return strdup( src ); default: WARN( "unhandled target charset: %d\n", out ); break;

1 0

Jacek Caban : win32u: Remove __wine_get_wgl_driver PE entry point.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 65835e4b74f76f8e74e94c50558224993349bca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/65835e4b74f76f8e74e94c50558224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:43:24 2022 +0100 win32u: Remove __wine_get_wgl_driver PE entry point. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/win32u.spec | 3 --- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ 4 files changed, 11 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 81451399902..f88efbaa679 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1149,7 +1149,6 @@ static struct unix_funcs unix_funcs = __wine_get_brush_bitmap_info, __wine_get_file_outline_text_metric, __wine_get_icm_profile, - __wine_get_wgl_driver, __wine_send_input, }; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 3771dafcf76..c9c126ec2f3 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1323,9 +1323,6 @@ # Graphics drivers @ cdecl __wine_send_input(long ptr ptr) -# OpenGL -@ cdecl __wine_get_wgl_driver(long long) - # gdi32 @ stdcall SetDIBits(long long long long ptr ptr long) @ cdecl __wine_get_brush_bitmap_info(long ptr ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index f77a56d6d58..8fc00cf3296 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -207,7 +207,6 @@ struct unix_funcs BOOL (CDECL *get_brush_bitmap_info)( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ); BOOL (CDECL *get_file_outline_text_metric)( const WCHAR *path, OUTLINETEXTMETRICW *otm ); BOOL (CDECL *get_icm_profile)( HDC hdc, BOOL allow_default, DWORD *size, WCHAR *filename ); - struct opengl_funcs * (CDECL *get_wgl_driver)( HDC hdc, UINT version ); BOOL (CDECL *wine_send_input)( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ); }; diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index c5078c8a7f7..e128705ef37 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -798,12 +798,6 @@ BOOL CDECL __wine_get_file_outline_text_metric( const WCHAR *path, OUTLINETEXTME return unix_funcs->get_file_outline_text_metric( path, otm ); } -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) -{ - if (!unix_funcs) return NULL; - return unix_funcs->get_wgl_driver( hdc, version ); -} - BOOL CDECL __wine_send_input( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput ) { if (!unix_funcs) return FALSE;

1 0

Jacek Caban : win32u: Don't use CDECL for __wine_get_wgl_driver.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: c2a43defec3efca05d38cd83ffa53412766fdc80 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a43defec3efca05d38cd83ffa534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:46:14 2022 +0100 win32u: Don't use CDECL for __wine_get_wgl_driver. --- dlls/opengl32/make_opengl | 2 +- dlls/win32u/dc.c | 2 +- include/wine/gdi_driver.h | 2 -- include/wine/wgl_driver.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 5654ddfa824..5d995495abd 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -925,7 +925,7 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER; diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 2e59dc8dc9c..8379cd353ef 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1491,7 +1491,7 @@ BOOL CDECL __wine_get_icm_profile( HDC hdc, BOOL allow_default, DWORD *size, WCH /*********************************************************************** * __wine_get_wgl_driver (win32u.@) */ -struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ) +struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ) { BOOL is_display, is_memdc; DC *dc; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index edde473b4d1..d074c09cceb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -340,6 +340,4 @@ extern void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT #endif /* WINE_UNIX_LIB */ -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); - #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wine/wgl_driver.h b/include/wine/wgl_driver.h index 36b1f384ddf..c35847ff2e4 100644 --- a/include/wine/wgl_driver.h +++ b/include/wine/wgl_driver.h @@ -7,7 +7,7 @@ #define WINE_GLAPI #endif -#define WINE_WGL_DRIVER_VERSION 21 +#define WINE_WGL_DRIVER_VERSION 22 struct wgl_context; struct wgl_pbuffer; @@ -3405,6 +3405,6 @@ struct opengl_funcs USE_GL_FUNC(glVertexPointer) \ USE_GL_FUNC(glViewport) -extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version ); +extern struct opengl_funcs *__wine_get_wgl_driver( HDC hdc, UINT version ); #endif /* __WINE_WGL_DRIVER_H */

1 0

Martin Storsjö : ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: d6829bdcbabd5e1a32a2585604eb0aa96b2a6271 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6829bdcbabd5e1a32a2585604eb0a… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Nov 23 14:41:14 2022 +0200 ntdll: Avoid accidentally picking up ntdll's __wine_unix_call_funcs for other DLLs. When f7332ab4a6e199d03e4318d82c0b16a0396b935c switched load_so_dll over to a proper Unix syscall, ntdll.so started providing the symbol __wine_unix_call_funcs. When a DLL calls NtQueryVirtualMemory(MemoryWineUnixFuncs), it can do so speculatively, not knowing whether the corresponding unix lib actually does provide anything. When ntdll.so started providing this symbol, then such speculative calls to NtQueryVirtualMemory(MemoryWineUnixFuncs) would end up returning ntdll's __wine_unix_call_funcs if the intended DLL's unix library lacked one. This is the case with bcrypt, where the unix library doesn't provide __wine_unix_call_funcs if gnutls is unavailable. This fixes crashes after f7332ab4a6e199d03e4318d82c0b16a0396b935c, in builds without gnutls. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/unix_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a7fae7ab7ab..aad472faff8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -43,8 +43,8 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; extern WORD native_machine DECLSPEC_HIDDEN; extern HMODULE ntdll_module DECLSPEC_HIDDEN; -extern const unixlib_entry_t __wine_unix_call_funcs[]; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int));

1 0

Gabriel Ivăncescu : jscript: Initialize source and lastIndex for RegExp.prototype.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 3805eef49a323e5022329822cfd87dd32e7ce7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/3805eef49a323e5022329822cfd87d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Initialize source and lastIndex for RegExp.prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsregexp.c | 14 ++++++++------ dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index fa4759b972d..1cbc828ce09 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -585,7 +585,7 @@ static const builtin_info_t RegExpInst_info = { NULL }; -static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegExpInstance **ret) +static HRESULT alloc_regexp(script_ctx_t *ctx, jsstr_t *str, jsdisp_t *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; HRESULT hres; @@ -604,6 +604,9 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx return hres; } + regexp->str = jsstr_addref(str); + regexp->last_index_val = jsval_number(0); + *ret = regexp; return S_OK; } @@ -620,13 +623,10 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r TRACE("%s %lx\n", debugstr_wn(str, jsstr_length(src)), flags); - hres = alloc_regexp(ctx, NULL, &regexp); + hres = alloc_regexp(ctx, src, NULL, &regexp); if(FAILED(hres)) return hres; - regexp->str = jsstr_addref(src); - regexp->last_index_val = jsval_number(0); - regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("regexp_new failed\n"); @@ -959,10 +959,12 @@ static const builtin_info_t RegExpConstr_info = { HRESULT create_regexp_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) { + jsstr_t *str = jsstr_empty(); RegExpInstance *regexp; HRESULT hres; - hres = alloc_regexp(ctx, object_prototype, &regexp); + hres = alloc_regexp(ctx, str, object_prototype, &regexp); + jsstr_release(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c33791f1fb1..a3b2bbcbba5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -335,6 +335,8 @@ ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +ok(RegExp.prototype.source === "", "RegExp.prototype.source = " + RegExp.prototype.source); +ok(RegExp.prototype.lastIndex === 0, "RegExp.prototype.lastIndex = " + RegExp.prototype.lastIndex); String(); new String();

1 0

Gabriel Ivăncescu : jscript: Pass a jsval as the 'this' to jsdisp_call_value.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 9d4e93cfde176e679a467a9332725b1861687a05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4e93cfde176e679a467a9332725b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass a jsval as the 'this' to jsdisp_call_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 18 ++++++++++-------- dlls/jscript/function.c | 9 ++------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/json.c | 2 +- dlls/jscript/string.c | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index db92a6fe109..80ccfcacb73 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -631,7 +631,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, jsval_t v1, jsval jsval_t res; double n; - hres = jsdisp_call_value(cmp_func, NULL, DISPATCH_METHOD, 2, args, &res); + hres = jsdisp_call_value(cmp_func, jsval_undefined(), DISPATCH_METHOD, 2, args, &res); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 699e4c87b52..87b1d245aa7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -462,7 +462,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) break; case PROP_ACCESSOR: if(prop->u.accessor.getter) { - hres = jsdisp_call_value(prop->u.accessor.getter, to_disp(This), + hres = jsdisp_call_value(prop->u.accessor.getter, jsval_obj(This), DISPATCH_METHOD, 0, NULL, r); }else { *r = jsval_undefined(); @@ -529,7 +529,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) TRACE("no setter\n"); return S_OK; } - return jsdisp_call_value(prop->u.accessor.setter, to_disp(This), DISPATCH_METHOD, 1, &val, NULL); + return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(This), DISPATCH_METHOD, 1, &val, NULL); case PROP_IDX: if(!This->builtin_info->idx_put) { TRACE("no put_idx\n"); @@ -1602,16 +1602,18 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { jsval_t *argv, buf[6], r; + IDispatch *passed_this; unsigned argc; hres = convert_params(This->ctx, pdp, buf, &argc, &argv); if(FAILED(hres)) break; + passed_this = get_this(pdp); if(prop) - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + hres = invoke_prop_func(This, passed_this, prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); else - hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); + hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); if(argv != buf) free(argv); @@ -1991,14 +1993,14 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } -HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT jsdisp_call_value(jsdisp_t *jsfunc, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { HRESULT hres; assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); if(is_class(jsfunc, JSCLASS_FUNCTION)) { - hres = Function_invoke(jsfunc, jsthis, flags, argc, argv, r); + hres = Function_invoke(jsfunc, vthis, flags, argc, argv, r); }else { if(!jsfunc->builtin_info->call) { WARN("Not a function\n"); @@ -2009,7 +2011,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig return E_UNEXPECTED; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - hres = jsfunc->builtin_info->call(jsfunc->ctx, jsthis ? jsval_disp(jsthis) : jsval_null(), flags, argc, argv, r); + hres = jsfunc->builtin_info->call(jsfunc->ctx, vthis, flags, argc, argv, r); } return hres; } @@ -2202,7 +2204,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp = iface_to_jsdisp(disp); if(jsdisp && jsdisp->ctx == ctx) { - hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); + hres = jsdisp_call_value(jsdisp, jsthis ? jsval_disp(jsthis) : jsval_undefined(), flags, argc, argv, r); jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ef76766df7d..2a03fdd07ae 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,12 +247,11 @@ void detach_arguments_object(jsdisp_t *args_disp) jsdisp_release(frame->arguments_obj); } -HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) +HRESULT Function_invoke(jsdisp_t *func_this, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { FunctionInstance *function; - jsval_t vthis; - TRACE("func %p this %p\n", func_this, jsthis); + TRACE("func %p this %s\n", func_this, debugstr_jsval(vthis)); assert(is_class(func_this, JSCLASS_FUNCTION)); function = function_from_jsdisp(func_this); @@ -262,10 +261,6 @@ HRESULT Function_invoke(jsdisp_t *func_this, IDispatch *jsthis, WORD flags, unsi return E_UNEXPECTED; } - if(jsthis) - vthis = jsval_disp(jsthis); - else - vthis = function->dispex.ctx->version < SCRIPTLANGUAGEVERSION_ES5 ? jsval_null() : jsval_undefined(); return function->vtbl->call(function->dispex.ctx, function, vthis, flags, argc, argv, r); } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c46dd6ed682..48d7542e3cc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -226,7 +226,7 @@ HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,js HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_call_value(script_ctx_t*,IDispatch*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_value(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT jsdisp_call_value(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; @@ -255,7 +255,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 005422be426..a595a778324 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -775,7 +775,7 @@ static HRESULT stringify(stringify_ctx_t *ctx, jsdisp_t *object, const WCHAR *na } args[0] = jsval_string(name_str); args[1] = value; - hres = jsdisp_call_value(ctx->replacer, to_disp(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + hres = jsdisp_call_value(ctx->replacer, jsval_obj(object), DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); jsstr_release(name_str); jsval_release(value); if(FAILED(hres)) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 254ead61eef..14bcfbdaaf3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -702,7 +702,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, } if(SUCCEEDED(hres)) - hres = jsdisp_call_value(func, NULL, DISPATCH_METHOD, argc, argv, &val); + hres = jsdisp_call_value(func, jsval_undefined(), DISPATCH_METHOD, argc, argv, &val); for(i=0; i <= match->paren_count; i++) jsstr_release(get_string(argv[i]));

1 0

Gabriel Ivăncescu : jscript: Pass a jsval as the 'this' to disp_call_value.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: da842966ff5ca76040dd647975fe270dfc2cf5b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/da842966ff5ca76040dd647975fe27… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass a jsval as the 'this' to disp_call_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 37 +++++++++++++++++++++---------------- dlls/jscript/dispex.c | 18 ++++++++++++++---- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/function.c | 3 +-- dlls/jscript/jscript.h | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/set.c | 7 +++---- 7 files changed, 46 insertions(+), 33 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Pass correct 'this' to callbacks called by builtins.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 8cb5d74125329a10d79da8ffa129e183c282a6ed URL: https://gitlab.winehq.org/wine/wine/-/commit/8cb5d74125329a10d79da8ffa129e1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Pass correct 'this' to callbacks called by builtins. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 43 ++++++--------------------------------- dlls/jscript/set.c | 7 +------ dlls/mshtml/tests/documentmode.js | 6 ++++-- dlls/mshtml/tests/es5.js | 10 +++++++++ 4 files changed, 21 insertions(+), 45 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 27d85fdb22b..341505a335c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1048,14 +1048,8 @@ static HRESULT Array_every(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); @@ -1115,14 +1109,8 @@ static HRESULT Array_filter(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } hres = create_array(ctx, 0, &arr); if(FAILED(hres)) @@ -1189,14 +1177,8 @@ static HRESULT Array_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsig } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); @@ -1367,15 +1349,8 @@ static HRESULT Array_map(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned } callback = get_object(argv[0]); - if(argc > 1) { - if(is_object_instance(argv[1])) { - context_this = argv[1]; - }else if(!is_undefined(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } - } + if(argc > 1) + context_this = argv[1]; hres = create_array(ctx, length, &array); if(FAILED(hres)) @@ -1505,14 +1480,8 @@ static HRESULT Array_some(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned } callback = get_object(argv[0]); - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - hres = E_NOTIMPL; - goto done; - } + if(argc > 1) context_this = argv[1]; - } for(i = 0; i < length; i++) { hres = jsdisp_get_idx(jsthis, i, &value); diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 889b744b385..4e2c1ffb33f 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -192,13 +192,8 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j return E_FAIL; } - if(argc > 1 && !is_undefined(argv[1])) { - if(!is_object_instance(argv[1])) { - FIXME("Unsupported context this %s\n", debugstr_jsval(argv[1])); - return E_NOTIMPL; - } + if(argc > 1) context_this = argv[1]; - } while(iter) { struct jsval_map_entry *entry = LIST_ENTRY(iter, struct jsval_map_entry, list_entry); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 157a7337c04..f968fae00df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1293,7 +1293,8 @@ sync_test("set_obj", function() { r++; s.clear(); ok(s.size === 0, "size = " + s.size); - }); + ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); + }, 42); ok(r === 1, "r = " + r); }); @@ -1447,7 +1448,8 @@ sync_test("map_obj", function() { r++; s.clear(); ok(s.size === 0, "size = " + s.size); - }); + ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); + }, 42); ok(r === 1, "r = " + r); }); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e22f610e197..93ede87eeb0 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -280,6 +280,8 @@ sync_test("filter", function() { test(["a","b"], function(v) { if(v === "b") delete arr[0]; return typeof v === "string"; }); test(["b"], function(v) { if(arr[arr.length - 1] !== "c") arr.push("c"); return typeof v === "string"; }); test([true,"b",42,Math,arr[9],"c"], function(v) { return v; }, Object); + + [0].filter(function() { ok(this.valueOf() === "wine", "this.valueOf() = " + this.valueOf()); return true; }, "wine"); }); sync_test("every & some", function() { @@ -314,6 +316,9 @@ sync_test("every & some", function() { test(false, false, function(v) { return v; }); arr.push(1); test(false, true, function(v) { return v; }); + + [0].every(function() { ok(this.valueOf() === 42, "this.valueOf() = " + this.valueOf()); return true; }, 42); + [0].some(function() { ok(this.valueOf() === 137, "this.valueOf() = " + this.valueOf()); return false; }, 137); }); sync_test("forEach", function() { @@ -347,6 +352,8 @@ sync_test("forEach", function() { ok(array === a, "array != a"); ok(this === o, "this != o"); }, o); + + a.forEach(function() { ok(this.valueOf() === "foobar", "this.valueOf() = " + this.valueOf()); }, "foobar"); }); sync_test("isArray", function() { @@ -412,6 +419,9 @@ sync_test("array_map", function() { [1,2].map(function() { ok(this === window, "this != window"); }, undefined); + [1,2].map(function() { + ok(this.valueOf() === 137, "this.valueOf() = " + this.valueOf()); + }, 137); }); sync_test("array_sort", function() {

1 0

Gabriel Ivăncescu : jscript: Throw proper error when calling Map constructor as method.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 84f7f601925f261d8bacf9d031c579ccd65fbff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/84f7f601925f261d8bacf9d031c579… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Throw proper error when calling Map constructor as method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 3 +++ dlls/mshtml/tests/documentmode.js | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 4e2c1ffb33f..09f3746740c 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -417,6 +417,9 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns *r = jsval_obj(&map->dispex); return S_OK; + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"Map"); + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index f968fae00df..c6a12203af6 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1301,6 +1301,13 @@ sync_test("set_obj", function() { sync_test("map_obj", function() { if(!("Map" in window)) return; + try { + var s = Map(); + ok(false, "expected exception calling constructor as method"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "calling constructor as method threw " + e.number); + } + var s = new Map, r, i; ok(Object.getPrototypeOf(s) === Map.prototype, "unexpected Map prototype");

1 0

Gabriel Ivăncescu : jscript: Throw proper error when calling Set constructor as method.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 534b977c62c7deaa12fcfb99449f8f8ba5d9c6fc URL: https://gitlab.winehq.org/wine/wine/-/commit/534b977c62c7deaa12fcfb99449f8f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 22 18:53:20 2022 +0200 jscript: Throw proper error when calling Set constructor as method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 3 +++ dlls/mshtml/tests/documentmode.js | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 09f3746740c..535ecdc49a4 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -572,6 +572,9 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns *r = jsval_obj(&set->dispex); return S_OK; + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"Set"); + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c6a12203af6..3965c8ec41b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1201,6 +1201,13 @@ sync_test("func_scope", function() { sync_test("set_obj", function() { if(!("Set" in window)) return; + try { + var s = Set(); + ok(false, "expected exception calling constructor as method"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "calling constructor as method threw " + e.number); + } + var s = new Set, r; ok(Object.getPrototypeOf(s) === Set.prototype, "unexpected Set prototype");

1 0