November 2022 - Wine-Commits

Nikolay Sivov : oleaut32/safearray: Fix an error code when trying to redim fixed arrays.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 7f01fdb6d4600308d811213323c579b838f649fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7f01fdb6d4600308d811213323c579… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 07:11:05 2022 +0300 oleaut32/safearray: Fix an error code when trying to redim fixed arrays. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/safearray.c | 4 +- dlls/oleaut32/tests/safearray.c | 102 ++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 92d55752e8a..92a73c768da 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1460,10 +1460,10 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) TRACE("(%p,%p)\n", psa, psabound); - if (!psa || psa->fFeatures & FADF_FIXEDSIZE || !psabound) + if (!psa || !psabound) return E_INVALIDARG; - if (psa->cLocks > 0) + if (psa->fFeatures & FADF_FIXEDSIZE || psa->cLocks) return DISP_E_ARRAYISLOCKED; hr = SafeArrayLock(psa); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index dbbe86994f5..9bbb59193e4 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1291,35 +1291,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) ok(xtunk.ref == 2,"Failed to decrement refcount of iface.\n"); } -static void test_SafeArrayRedim_IUnknown(void) -{ - SAFEARRAYBOUND sab; - LONG indices[1]; - SAFEARRAY *sa; - HRESULT hres; - - sab.lLbound = 1; - sab.cElements = 2; - sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); - ok(sa != NULL, "UNKNOWN test couldn't create array\n"); - if (!sa) - return; - - ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - - indices[0] = 2; - xtunk.ref = 1; - hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); - ok(hres == S_OK, "Failed to put IUnknown element hres 0x%lx\n", hres); - ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); - sab.cElements = 1; - hres = SafeArrayRedim(sa, &sab); - ok(hres == S_OK, "Failed to shrink array hres 0x%lx\n", hres); - ok(xtunk.ref == 1, "Failed to decrement refcount\n"); - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08lx\n", hres); -} - static void test_SafeArrayGetPutElement_VARIANT(void) { SAFEARRAYBOUND sab; @@ -2063,6 +2034,77 @@ static void test_safearray_layout(void) IRecordInfo_Release(&irec->IRecordInfo_iface); } +static void test_SafeArrayRedim(void) +{ + SAFEARRAYBOUND sab; + LONG indices[1]; + SAFEARRAY *sa; + HRESULT hres; + + sab.lLbound = 1; + sab.cElements = 2; + hres = SafeArrayRedim(NULL, &sab); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayRedim(sa, NULL); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* VT_UNKNOWN */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + ok(sa->cbElements == sizeof(IUnknown *), "Unexpected element size.\n"); + + indices[0] = 2; + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); + sab.cElements = 1; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 1, "Failed to decrement refcount\n"); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* FADF_FIXEDSIZE */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 4; + sa->fFeatures |= FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + sa->fFeatures &= ~FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* Locked array */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayLock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayUnlock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); +} + START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -2089,7 +2131,7 @@ START_TEST(safearray) test_SafeArrayGetPutElement(); test_SafeArrayGetPutElement_BSTR(); test_SafeArrayGetPutElement_IUnknown(); - test_SafeArrayRedim_IUnknown(); + test_SafeArrayRedim(); test_SafeArrayGetPutElement_VARIANT(); test_safearray_layout(); }

1 0

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

Nov. 23, 2022

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 Nov. 23, 2022

Nov. 23, 2022

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

Zebediah Figura : ntdll: Add a get_free_list_block_size() helper.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: c9cf44a3638e07b2e57fc467158cb5064de626fe URL: https://gitlab.winehq.org/wine/wine/-/commit/c9cf44a3638e07b2e57fc467158cb5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:11:42 2022 -0600 ntdll: Add a get_free_list_block_size() helper. --- dlls/ntdll/heap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 11c07d2e332..a6db3444374 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -488,26 +488,28 @@ static void heap_set_status( const struct heap *heap, ULONG flags, NTSTATUS stat if (status) RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); } +static size_t get_free_list_block_size( unsigned int index ) +{ + if (index < HEAP_NB_SMALL_FREE_LISTS) + return index * ALIGNMENT + HEAP_MIN_BLOCK_SIZE; + return free_list_sizes[index - HEAP_NB_SMALL_FREE_LISTS]; +} + static void heap_dump( const struct heap *heap ) { const struct block *block; const ARENA_LARGE *large; const SUBHEAP *subheap; unsigned int i; - SIZE_T size; TRACE( "heap: %p\n", heap ); TRACE( " next %p\n", LIST_ENTRY( heap->entry.next, struct heap, entry ) ); TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - { - if (i < HEAP_NB_SMALL_FREE_LISTS) size = HEAP_MIN_BLOCK_SIZE + i * ALIGNMENT; - else size = free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]; - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, size, + TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); - } TRACE( " subheaps: %p\n", &heap->subheap_list ); LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry )

1 0

Alex Henrie : urlmon: Use standard C functions for memory allocation.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 80175e41da9ced0b5fbaa250e9dab4d4a69400f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/80175e41da9ced0b5fbaa250e9dab4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 22 22:33:41 2022 -0700 urlmon: Use standard C functions for memory allocation. --- dlls/urlmon/axinstall.c | 14 +++--- dlls/urlmon/bindctx.c | 8 ++-- dlls/urlmon/binding.c | 46 ++++++++++---------- dlls/urlmon/bindprot.c | 50 ++++++++++----------- dlls/urlmon/download.c | 22 +++++----- dlls/urlmon/file.c | 4 +- dlls/urlmon/format.c | 8 ++-- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/gopher.c | 4 +- dlls/urlmon/http.c | 22 +++++----- dlls/urlmon/mimefilter.c | 8 ++-- dlls/urlmon/mk.c | 12 +++--- dlls/urlmon/protocol.c | 6 +-- dlls/urlmon/sec_mgr.c | 57 ++++++++++++------------ dlls/urlmon/session.c | 38 ++++++++-------- dlls/urlmon/umon.c | 18 ++++---- dlls/urlmon/umstream.c | 8 ++-- dlls/urlmon/uri.c | 108 +++++++++++++++++++++++----------------------- dlls/urlmon/urlmon_main.c | 6 +-- dlls/urlmon/urlmon_main.h | 30 ++----------- dlls/urlmon/usrmarshal.c | 4 +- 21 files changed, 229 insertions(+), 248 deletions(-)

1 0

Rémi Bernon : rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free).
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: f810a57590fa84f6684300516e1d160cb3109082 URL: https://gitlab.winehq.org/wine/wine/-/commit/f810a57590fa84f6684300516e1d16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 18 18:37:44 2022 +0100 rpcss: Use I_Rpc(Free|Allocate) in MIDL_user_(allocate|free). In ept_map, rpcss uses TowerConstruct to allocate tower array elements. The array is later released by the generated stub code, and each element is ultimately freed using MIDL_user_free. TowerConstruct always allocate memory using I_RpcAllocate, we must use I_RpcFree to free it. --- programs/rpcss/irotp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index daf48daf0a7..357a7f84cd9 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -368,10 +368,10 @@ void __RPC_USER IrotContextHandle_rundown(IrotContextHandle ctxt_handle) void * __RPC_USER MIDL_user_allocate(SIZE_T size) { - return malloc(size); + return I_RpcAllocate(size); } void __RPC_USER MIDL_user_free(void * p) { - free(p); + I_RpcFree(p); }

1 0

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

Nov. 23, 2022

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 Nov. 23, 2022

Nov. 23, 2022

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

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

Nov. 23, 2022

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 Nov. 23, 2022

Nov. 23, 2022

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