July 2024 - Wine-Commits - list.winehq.org

Connor McAdams : d3dx9/tests: Add more DDS header tests for cube texture files.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: d36e2a5c3ab5298f652833f076801333b37cae57 URL: https://gitlab.winehq.org/wine/wine/-/commit/d36e2a5c3ab5298f652833f0768013… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jul 1 06:33:36 2024 -0400 d3dx9/tests: Add more DDS header tests for cube texture files. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 7c1a33ad2b1..ebca259e551 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -375,31 +375,40 @@ static void test_dds_header_handling(void) D3DRESOURCETYPE resource_type; } expected; - BOOL todo; + BOOL todo_hr; + BOOL todo_info; uint32_t pixel_data_size; } info_tests[] = { /* Depth value set to 4, but no caps bits are set. Depth is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* The volume texture caps2 field is ignored. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), DDS_CAPS2_VOLUME, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_TEXTURE, }, FALSE, FALSE, 292 }, /* * The DDS_DEPTH flag is the only thing checked to determine if a DDS * file represents a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* Even if the depth field is set to 0, it's still a volume texture. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 0, (4 * 4), 3, 0, 0, - { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, 292 }, + { D3D_OK, 4, 4, 1, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, 292 }, /* The DDS_DEPTH flag overrides cubemap caps. */ { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT | DDS_DEPTH), 4, 4, 4, (4 * 4), 3, (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), - { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, (292 * 6) }, + { D3D_OK, 4, 4, 4, 3, D3DRTYPE_VOLUMETEXTURE, }, FALSE, FALSE, (292 * 6) }, + /* Cubemap where width field does not equal height. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 5, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_ALL_FACES), + { D3D_OK, 4, 5, 1, 1, D3DRTYPE_CUBETEXTURE, }, FALSE, FALSE, (80 * 6) }, + /* Partial cubemaps are not supported. */ + { (DDS_CAPS | DDS_WIDTH | DDS_HEIGHT | DDS_PIXELFORMAT), 4, 4, 1, (4 * 4), 1, + (DDS_CAPS_TEXTURE | DDS_CAPS_COMPLEX), (DDS_CAPS2_CUBEMAP | DDS_CAPS2_CUBEMAP_POSITIVEX), + { D3DXERR_INVALIDDATA, }, TRUE, FALSE, (64 * 6) }, }; dds = calloc(1, sizeof(*dds)); @@ -452,12 +461,12 @@ static void test_dds_header_handling(void) memset(&info, 0, sizeof(info)); hr = D3DXGetImageInfoFromFileInMemory(dds, file_size, &info); - ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); + todo_wine_if(info_tests[i].todo_hr) ok(hr == info_tests[i].expected.hr, "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(info_tests[i].expected.hr)) { check_image_info(&info, info_tests[i].expected.width, info_tests[i].expected.height, info_tests[i].expected.depth, info_tests[i].expected.mip_levels, D3DFMT_X8R8G8B8, - info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo); + info_tests[i].expected.resource_type, D3DXIFF_DDS, info_tests[i].todo_info); } winetest_pop_context(); }

1 0

Jacek Caban : mshtml: Pass an optional script global window to init_dispatch.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: b600236da674a0f76232265dd178375faaa1efd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b600236da674a0f76232265dd17837… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 15:19:59 2024 +0200 mshtml: Pass an optional script global window to init_dispatch. Based on patch by Gabriel Ivăncescu. --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmlattr.c | 2 +- dlls/mshtml/htmlelem.c | 12 +++++++----- dlls/mshtml/htmlelemcol.c | 2 +- dlls/mshtml/htmlevent.c | 6 +++--- dlls/mshtml/htmlimg.c | 3 ++- dlls/mshtml/htmllocation.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlselect.c | 3 ++- dlls/mshtml/htmlstorage.c | 3 ++- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstylesheet.c | 8 ++++---- dlls/mshtml/mshtml_private.h | 22 ++++++++++------------ dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/omnavigator.c | 30 ++++++++++++++++++------------ dlls/mshtml/range.c | 5 +++-- dlls/mshtml/selection.c | 3 ++- dlls/mshtml/xmlhttprequest.c | 3 ++- 18 files changed, 64 insertions(+), 52 deletions(-)

1 0

Jacek Caban : jscript: Use jsdisp_t internally for host objects that support it.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 5df59b6406beeb3cb1098d234aef60162a2781d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5df59b6406beeb3cb1098d234aef60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 13:56:24 2024 +0200 jscript: Use jsdisp_t internally for host objects that support it. Based on patch by Gabriel Ivăncescu. --- dlls/jscript/jsutils.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 12f41acd398..cb139977a84 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -279,15 +279,33 @@ HRESULT variant_to_jsval(script_ctx_t *ctx, VARIANT *var, jsval_t *r) *r = jsval_string(str); return S_OK; } - case VT_DISPATCH: { + case VT_DISPATCH: if(!V_DISPATCH(var)) { *r = ctx->html_mode ? jsval_null() : jsval_null_disp(); return S_OK; } + if(ctx->version >= SCRIPTLANGUAGEVERSION_ES5) { + IWineJSDispatchHost *disp_host; + HRESULT hres; + hres = IDispatch_QueryInterface(V_DISPATCH(var), &IID_IWineJSDispatchHost, (void **)&disp_host); + if(SUCCEEDED(hres)) { + IWineJSDispatch *jsdisp_iface; + hres = IWineJSDispatchHost_GetJSDispatch(disp_host, &jsdisp_iface); + IWineJSDispatchHost_Release(disp_host); + if(SUCCEEDED(hres)) { + jsdisp_t *jsdisp = to_jsdisp((IDispatch *)jsdisp_iface); + if(jsdisp->ctx == ctx) { + *r = jsval_obj(jsdisp); + return S_OK; + }else { + jsdisp_release(jsdisp); + } + } + } + } IDispatch_AddRef(V_DISPATCH(var)); *r = jsval_disp(V_DISPATCH(var)); return S_OK; - } case VT_I1: *r = jsval_number(V_I1(var)); return S_OK; @@ -356,11 +374,18 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) } V_VT(retv) = VT_NULL; return S_OK; - case JSV_OBJECT: + case JSV_OBJECT: { + IWineJSDispatchHost *host_disp = get_host_dispatch(get_object(val)); V_VT(retv) = VT_DISPATCH; + if(host_disp) { + V_DISPATCH(retv) = (IDispatch *)host_disp; + return S_OK; + } + V_DISPATCH(retv) = get_object(val); IDispatch_AddRef(get_object(val)); return S_OK; + } case JSV_STRING: V_VT(retv) = VT_BSTR; return jsstr_to_bstr(get_string(val), &V_BSTR(retv));

1 0

Connor McAdams : d3dx9/tests: Add tests for DDS skip mip level bits.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: a8f5992bf4b55330b3c305d77922fd2e79671fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f5992bf4b55330b3c305d77922fd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Jun 30 08:25:57 2024 -0400 d3dx9/tests: Add tests for DDS skip mip level bits. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 47ac46e9d3b..60a8dfb0fcd 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2202,6 +2202,15 @@ static void test_D3DXCreateTextureFromFileInMemoryEx(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); + /* Skip level bits are bits 30-26. Bit 31 needs to be ignored. */ + hr = D3DXCreateTextureFromFileInMemoryEx(device, dds_24bit, sizeof(dds_24bit), D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 2, 2, 1, 2, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + IDirect3DTexture9_Release(texture); + /* * The values returned in the D3DXIMAGE_INFO structure represent the mip * level the texture data was retrieved from, i.e if we skip the first mip @@ -2471,6 +2480,23 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev D3DX_DEFAULT, 0, NULL, NULL, &volume_texture); ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#lx.\n", hr); + /* Skip level bits are bits 30-26. Bit 31 needs to be ignored. */ + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_FILTER_POINT | (0x20u << D3DX_SKIP_DDS_MIP_LEVELS_SHIFT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, TRUE); + IDirect3DVolumeTexture9_Release(texture); + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), + D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_SKIP_DDS_MIP_LEVELS(1, D3DX_FILTER_POINT), 0, &img_info, NULL, &texture); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + check_image_info(&img_info, 4, 4, 1, 3, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); + IDirect3DVolumeTexture9_Release(texture); + /* Load a 2D texture DDS file with multiple mips into a volume texture. */ hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, dds_24bit_8_8, sizeof(dds_24bit_8_8), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DUSAGE_DYNAMIC, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT,

1 0

Jacek Caban : jscript: Support host objects in disp_cmp.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: dd5ac4c6afd68ad965cdaa285ab51ca7b5bd36d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd5ac4c6afd68ad965cdaa285ab51c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jun 30 23:24:21 2024 +0200 jscript: Support host objects in disp_cmp. Based on patch by Gabriel Ivăncescu. --- dlls/jscript/dispex.c | 15 +++++++++++++++ dlls/jscript/engine.c | 20 +++++++++++++------- dlls/jscript/jscript.h | 1 + 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8c499fbd37b..26d89ab2b5e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -3393,3 +3393,18 @@ HRESULT init_host_object(script_ctx_t *ctx, IWineJSDispatchHost *host_iface, IWi *ret = &host_obj->jsdisp.IWineJSDispatch_iface; return S_OK; } + +IWineJSDispatchHost *get_host_dispatch(IDispatch *disp) +{ + HostObject *host_obj; + jsdisp_t *jsdisp; + + if(!(jsdisp = to_jsdisp(disp))) + return NULL; + if(jsdisp->builtin_info != &HostObject_info) + return NULL; + + host_obj = HostObject_from_jsdisp(jsdisp); + IWineJSDispatchHost_AddRef(host_obj->host_iface); + return host_obj->host_iface; +} diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2be22a9b526..12e53435f16 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -637,14 +637,20 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) return S_OK; } - hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); - if(FAILED(hres)) - return hres; + unk1 = (IUnknown *)get_host_dispatch(disp1); + if(!unk1) { + hres = IDispatch_QueryInterface(disp1, &IID_IUnknown, (void**)&unk1); + if(FAILED(hres)) + return hres; + } - hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); - if(FAILED(hres)) { - IUnknown_Release(unk1); - return hres; + unk2 = (IUnknown *)get_host_dispatch(disp2); + if(!unk2) { + hres = IDispatch_QueryInterface(disp2, &IID_IUnknown, (void**)&unk2); + if(FAILED(hres)) { + IUnknown_Release(unk1); + return hres; + } } if(unk1 == unk2) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a36291204b6..fdcead4a064 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,6 +225,7 @@ static inline IDispatchEx *to_dispex(jsdisp_t *jsdisp) jsdisp_t *as_jsdisp(IDispatch*); jsdisp_t *to_jsdisp(IDispatch*); +IWineJSDispatchHost *get_host_dispatch(IDispatch*); jsdisp_t *jsdisp_addref(jsdisp_t*); ULONG jsdisp_release(jsdisp_t*);

1 0

Jacek Caban : mshtml: Use IWineJSDispatch for screen object script bindings.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 398d98fec4a0a5c73694ff98184d6545721942e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/398d98fec4a0a5c73694ff98184d65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 16:35:17 2024 +0200 mshtml: Use IWineJSDispatch for screen object script bindings. --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 5 +++-- dlls/mshtml/tests/documentmode.js | 2 +- dlls/mshtml/tests/es5.js | 45 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 31976b73d04..7cf4bf9738b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1216,7 +1216,7 @@ static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen ** if(!window->screen) { HRESULT hres; - hres = create_html_screen(dispex_compat_mode(&window->event_target.dispex), &window->screen); + hres = create_html_screen(window, &window->screen); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 461eb3a93f2..a5e0f309ed9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1040,7 +1040,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory* HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**); HRESULT create_location(HTMLOuterWindow*,HTMLLocation**); HRESULT create_navigator(compat_mode_t,IOmNavigator**); -HRESULT create_html_screen(compat_mode_t,IHTMLScreen**); +HRESULT create_html_screen(HTMLInnerWindow*,IHTMLScreen**); HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**); HRESULT create_history(HTMLInnerWindow*,OmHistory**); HRESULT create_namespace_collection(compat_mode_t,IHTMLNamespaceCollection**); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 4ee76a585a1..88dfa1b5bf9 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -425,7 +425,7 @@ static dispex_static_data_t HTMLScreen_dispex = { HTMLScreen_iface_tids }; -HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret) +HRESULT create_html_screen(HTMLInnerWindow *window, IHTMLScreen **ret) { HTMLScreen *screen; @@ -435,7 +435,8 @@ HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret) screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl; - init_dispatch(&screen->dispex, &HTMLScreen_dispex, NULL, compat_mode); + init_dispatch(&screen->dispex, &HTMLScreen_dispex, window, + dispex_compat_mode(&window->event_target.dispex)); *ret = &screen->IHTMLScreen_iface; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index c8ce01b0443..2cffff79479 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -242,7 +242,7 @@ sync_test("builtin_toString", function() { ok(s === (tostr ? tostr : (v < 9 ? "[object]" : "[object " + name + "]")), msg + " toString returned " + s); } s = Object.prototype.toString.call(obj); - todo_wine_if(v >= 9 && name != "Object"). + todo_wine_if(v >= 9 && name != "Object" && name != "Screen"). ok(s === (v < 9 ? "[object Object]" : "[object " + name + "]"), msg + " Object.toString returned " + s); } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 353d0b0b5c0..b1340918fad 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -2601,3 +2601,48 @@ sync_test("initProgressEvent", function() { ok(e.loaded === 99, "loaded after re-init = " + e.loaded); ok(e.total === 50, "total after re-init = " + e.total); }); + +sync_test("screen", function() { + var o = screen; + + ok(typeof(o) == "object", "typeof(o) = " + typeof(o)); + ok(o instanceof Object, "o is not an instance of Object"); + + o.prop = 1; + ok(o.prop === 1, "o.prop = " + o.prop); + ok(o.hasOwnProperty("prop"), 'o.hasOwnProperty("prop") = ' + o.hasOwnProperty("prop")); + test_own_data_prop_desc(o, "prop", true, true, true); + + Object.defineProperty(o, "defprop", {writable: false, enumerable: false, configurable: true, value: 2}); + ok(o.defprop === 2, "o.prop = " + o.prop); + test_own_data_prop_desc(o, "defprop", false, false, true); + + ok(typeof(Object.keys(o)) === "object", "Object.keys(o) = " + Object.keys(o)); + ok(Object.isExtensible(o) === true, "Object.isExtensible(o) = " + Object.isExtensible(o)); + ok(Object.isFrozen(o) === false, "Object.isFrozen(o) = " + Object.isFrozen(o)); + ok(Object.isSealed(o) === false, "Object.isSealed(o) = " + Object.isSealed(o)); + + Object.seal(o); + test_own_data_prop_desc(o, "prop", true, true, false); + test_own_data_prop_desc(o, "defprop", false, false, false); + ok(Object.isExtensible(o) === false, "Object.isExtensible(o) = " + Object.isExtensible(o)); + ok(Object.isFrozen(o) === false, "Object.isFrozen(o) = " + Object.isFrozen(o)); + ok(Object.isSealed(o) === true, "Object.isSealed(o) = " + Object.isSealed(o)); + + o.prop2 = 3; + ok(!("prop2" in o), "o.prop2 = " + o.prop2); + + function check_enum(o, name) { + var ret = 0; + for(var iter in o) { + if(iter == name) ret++; + } + ok(ret < 2, name + " enumerated " + ret + " times"); + return ret != 0; + } + ok(check_enum(o, "width"), "width not enumerated"); + ok(check_enum(o, "height"), "height not enumerated"); + ok(check_enum(o, "prop"), "prop not enumerated"); + ok(!check_enum(o, "defprop"), "defprop enumerated"); + ok(!check_enum(o, "prop2"), "prop2 enumerated"); +});

1 0

Jacek Caban : mshtml: Support using IWineJSDispatch for DispatchEx implementation.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: fa0525e8436416fb0ca37a46132979f89e4a8f15 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa0525e8436416fb0ca37a46132979… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 15:52:00 2024 +0200 mshtml: Support using IWineJSDispatch for DispatchEx implementation. Based on patch by Gabriel Ivăncescu. --- dlls/mshtml/dispex.c | 53 +++++++++++++++++++++++++++++++++++++++----- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/script.c | 17 ++++++++++++++ 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ef83b508bde..61e7dae650e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlscript.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1710,14 +1711,31 @@ HRESULT dispex_to_string(DispatchEx *dispex, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } -static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) +static dispex_data_t *ensure_dispex_info(DispatchEx *dispex, dispex_static_data_t *desc, + compat_mode_t compat_mode, HTMLInnerWindow *script_global) { + HRESULT hres; + if(!desc->info_cache[compat_mode]) { EnterCriticalSection(&cs_dispex_static_data); if(!desc->info_cache[compat_mode]) desc->info_cache[compat_mode] = preprocess_dispex_data(desc, compat_mode); LeaveCriticalSection(&cs_dispex_static_data); + if(!desc->info_cache[compat_mode]) + return NULL; } + + if(compat_mode >= COMPAT_MODE_IE9 && script_global) { + if(!script_global->jscript) + initialize_script_global(script_global); + if(script_global->jscript) { + hres = IWineJScript_InitHostObject(script_global->jscript, &dispex->IWineJSDispatchHost_iface, + &dispex->jsdisp); + if(FAILED(hres)) + ERR("Failed to initialize jsdisp: %08lx\n", hres); + } + } + return desc->info_cache[compat_mode]; } @@ -1726,7 +1744,7 @@ static BOOL ensure_real_info(DispatchEx *dispex) if(dispex->info != dispex->info->desc->delayed_init_info) return TRUE; - dispex->info = ensure_dispex_info(dispex->info->desc, dispex_compat_mode(dispex)); + dispex->info = ensure_dispex_info(dispex, dispex->info->desc, dispex_compat_mode(dispex), NULL); return dispex->info != NULL; } @@ -1872,6 +1890,8 @@ static HRESULT WINAPI DispatchEx_GetDispID(IWineJSDispatchHost *iface, BSTR bstr if(!ensure_real_info(This)) return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_GetDispID(This->jsdisp, bstrName, grfdex, pid); hres = get_builtin_id(This, bstrName, grfdex, pid); if(hres != DISP_E_UNKNOWNNAME) @@ -2048,6 +2068,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatchHost *iface, DISPID id, return hres; } + if(This->jsdisp) + return IWineJSDispatch_InvokeEx(This->jsdisp, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + switch(wFlags) { case DISPATCH_PROPERTYGET: if(!pvarRes) @@ -2076,6 +2099,10 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IWineJSDispatchHost *iface, TRACE("%s (%p)->(%s %lx)\n", This->info->desc->name, This, debugstr_w(name), grfdex); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_DeleteMemberByName(This->jsdisp, name, grfdex); if(dispex_compat_mode(This) < COMPAT_MODE_IE8 && !This->info->desc->vtbl->delete) return E_NOTIMPL; @@ -2096,6 +2123,10 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IWineJSDispatchHost *iface TRACE("%s (%p)->(%lx)\n", This->info->desc->name, This, id); + if(!ensure_real_info(This)) + return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_DeleteMemberByDispID(This->jsdisp, id); if(is_custom_dispid(id) && This->info->desc->vtbl->delete) return This->info->desc->vtbl->delete(This, id); @@ -2137,6 +2168,8 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IWineJSDispatchHost *iface, DISPI if(!ensure_real_info(This)) return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_GetMemberName(This->jsdisp, id, pbstrName); if(is_custom_dispid(id)) { if(This->info->desc->vtbl->get_name) @@ -2192,6 +2225,8 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IWineJSDispatchHost *iface, DWORD if(!ensure_real_info(This)) return E_OUTOFMEMORY; + if(This->jsdisp) + return IWineJSDispatch_GetNextDispID(This->jsdisp, grfdex, id, pid); if(is_dynamic_dispid(id)) { DWORD idx = id - DISPID_DYNPROP_0; @@ -2246,8 +2281,12 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IWineJSDispatchHost *iface, static HRESULT WINAPI JSDispatchHost_GetJSDispatch(IWineJSDispatchHost *iface, IWineJSDispatch **ret) { DispatchEx *This = impl_from_IWineJSDispatchHost(iface); - FIXME("%p\n", This); - return E_NOINTERFACE; + + if(!This->jsdisp) + return E_NOINTERFACE; + *ret = This->jsdisp; + IWineJSDispatch_AddRef(*ret); + return S_OK; } static HRESULT WINAPI JSDispatchHost_LookupProperty(IWineJSDispatchHost *iface, const WCHAR *name, DWORD flags, @@ -2449,6 +2488,7 @@ static nsresult NSAPI dispex_unlink(void *p) static void NSAPI dispex_delete_cycle_collectable(void *p) { DispatchEx *This = impl_from_IWineJSDispatchHost(p); + IWineJSDispatch *jsdisp = This->jsdisp; dynamic_prop_t *prop; if(This->info->desc->vtbl->unlink) @@ -2482,6 +2522,8 @@ static void NSAPI dispex_delete_cycle_collectable(void *p) destructor: This->info->desc->vtbl->destructor(This); + if(jsdisp) + IWineJSDispatch_Free(jsdisp); } void init_dispex_cc(void) @@ -2505,6 +2547,7 @@ void init_dispatch(DispatchEx *dispex, dispex_static_data_t *data, HTMLInnerWind dispex->IWineJSDispatchHost_iface.lpVtbl = &JSDispatchHostVtbl; dispex->dynamic_data = NULL; + dispex->jsdisp = NULL; ccref_init(&dispex->ccref, 1); if(data->vtbl->get_compat_mode) { @@ -2522,6 +2565,6 @@ void init_dispatch(DispatchEx *dispex, dispex_static_data_t *data, HTMLInnerWind } dispex->info = data->delayed_init_info; }else { - dispex->info = ensure_dispex_info(data, compat_mode); + dispex->info = ensure_dispex_info(dispex, data, compat_mode, script_global); } } diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 8384ace573a..37a7b8d1f50 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -50,3 +50,4 @@ void update_browser_script_mode(GeckoBrowser*,IUri*); BOOL find_global_prop(HTMLInnerWindow*,BSTR,DWORD,ScriptHost**,DISPID*); IDispatch *get_script_disp(ScriptHost*); IActiveScriptSite *get_first_script_site(HTMLInnerWindow*); +void initialize_script_global(HTMLInnerWindow*); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 59abd1a857e..31976b73d04 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -135,6 +135,7 @@ static void detach_inner_window(HTMLInnerWindow *window) abort_window_bindings(window); remove_target_tasks(window->task_magic); release_script_hosts(window); + unlink_ref(&window->jscript); window->base.outer_window = NULL; if(outer_window && outer_window->base.inner_window == window) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c14551ac5c1..461eb3a93f2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -427,6 +427,7 @@ struct DispatchEx { nsCycleCollectingAutoRefCnt ccref; + IWineJSDispatch *jsdisp; dispex_data_t *info; dispex_dynamic_data_t *dynamic_data; }; @@ -631,6 +632,7 @@ struct HTMLInnerWindow { struct list children; struct list script_hosts; + IWineJScript *jscript; IHTMLEventObj *event; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index b1f24f9d8d3..6a542defa8c 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1388,6 +1388,23 @@ static ScriptHost *get_script_host(HTMLInnerWindow *window, const GUID *guid) return create_script_host(window, guid); } +void initialize_script_global(HTMLInnerWindow *script_global) +{ + ScriptHost *script_host; + HRESULT hres; + + if(script_global->jscript) + return; + + script_host = get_script_host(script_global, &CLSID_JScript); + if(!script_host) + return; + + hres = IActiveScript_QueryInterface(script_host->script, &IID_IWineJScript, (void **)&script_global->jscript); + if(FAILED(hres)) + ERR("Could not get IWineJScript, don't use native jscript.dll\n"); +} + static ScriptHost *get_elem_script_host(HTMLInnerWindow *window, HTMLScriptElement *script_elem) { GUID guid;

1 0

Jacek Caban : mshtml: Implement jscript IWineJSDispatchHost.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: ac889d36a65eb0161b6158941b3cea7e64cac7dd URL: https://gitlab.winehq.org/wine/wine/-/commit/ac889d36a65eb0161b6158941b3cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 14:22:14 2024 +0200 mshtml: Implement jscript IWineJSDispatchHost. Based on patch by Gabriel Ivăncescu. --- dlls/mshtml/dispex.c | 102 ++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlwindow.c | 55 +++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 10 ---- 4 files changed, 156 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 2e436b364c4..a5526f2901c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -2243,7 +2243,90 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IWineJSDispatchHost *iface, return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_CallFunction(IWineJSDispatchHost *iface, DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, +static HRESULT WINAPI JSDispatchHost_GetJSDispatch(IWineJSDispatchHost *iface, IWineJSDispatch **ret) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + FIXME("%p\n", This); + return E_NOINTERFACE; +} + +static HRESULT WINAPI JSDispatchHost_LookupProperty(IWineJSDispatchHost *iface, const WCHAR *name, DWORD flags, + struct property_info *desc) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + func_info_t *func; + DISPID id; + HRESULT hres; + + TRACE("%s (%p)->(%s)\n", This->info->desc->name, This, debugstr_w(name)); + + /* FIXME: name cast works as long as the object doesn't require the actual BSTR for its custom + * properties, we will need to fix it properly. */ + hres = get_builtin_id(This, (BSTR)name, flags, &id); + if(FAILED(hres)) + return hres; + + hres = get_builtin_func(This->info, id, &func); + if(FAILED(hres)) + return hres; + desc->id = id; + desc->flags = PROPF_WRITABLE | PROPF_CONFIGURABLE; + if(func->func_disp_idx < 0) + desc->flags |= PROPF_ENUMERABLE; + desc->name = func->name; + return S_OK; +} + +static HRESULT WINAPI JSDispatchHost_NextProperty(IWineJSDispatchHost *iface, DISPID id, struct property_info *desc) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + func_info_t *func; + HRESULT hres; + + TRACE("%s (%p)->(%lx)\n", This->info->desc->name, This, id); + + if(id == DISPID_STARTENUM) { + func = This->info->funcs; + }else { + hres = get_builtin_func(This->info, id, &func); + if(FAILED(hres)) + return hres; + func++; + } + + while(func < This->info->funcs + This->info->func_cnt) { + if(func->func_disp_idx == -1) { + desc->id = func->id; + desc->name = func->name; + desc->flags = PROPF_WRITABLE | PROPF_CONFIGURABLE | PROPF_ENUMERABLE; + return S_OK; + } + func++; + } + return S_FALSE; +} + +static HRESULT WINAPI JSDispatchHost_GetProperty(IWineJSDispatchHost *iface, DISPID id, LCID lcid, VARIANT *r, + EXCEPINFO *ei, IServiceProvider *caller) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%lx)\n", This->info->desc->name, This, id); + + return dispex_prop_get(This, id, lcid, r, ei, caller); +} + +static HRESULT WINAPI JSDispatchHost_SetProperty(IWineJSDispatchHost *iface, DISPID id, LCID lcid, VARIANT *v, + EXCEPINFO *ei, IServiceProvider *caller) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)->(%lx)\n", This->info->desc->name, This, id); + + return dispex_prop_put(This, id, lcid, v, ei, caller); +} + +static HRESULT WINAPI JSDispatchHost_CallFunction(IWineJSDispatchHost *iface, DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller) { DispatchEx *This = impl_from_IWineJSDispatchHost(iface); @@ -2260,6 +2343,15 @@ static HRESULT WINAPI DispatchEx_CallFunction(IWineJSDispatchHost *iface, DISPID return call_builtin_function(This, func, dp, ret, ei, caller); } +static HRESULT WINAPI JSDispatchHost_ToString(IWineJSDispatchHost *iface, BSTR *str) +{ + DispatchEx *This = impl_from_IWineJSDispatchHost(iface); + + TRACE("%s (%p)\n", This->info->desc->name, This); + + return dispex_to_string(This, str); +} + static IWineJSDispatchHostVtbl JSDispatchHostVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, @@ -2276,7 +2368,13 @@ static IWineJSDispatchHostVtbl JSDispatchHostVtbl = { DispatchEx_GetMemberName, DispatchEx_GetNextDispID, DispatchEx_GetNameSpaceParent, - DispatchEx_CallFunction, + JSDispatchHost_GetJSDispatch, + JSDispatchHost_LookupProperty, + JSDispatchHost_NextProperty, + JSDispatchHost_GetProperty, + JSDispatchHost_SetProperty, + JSDispatchHost_CallFunction, + JSDispatchHost_ToString, }; static nsresult NSAPI dispex_traverse(void *ccp, void *p, nsCycleCollectionTraversalCallback *cb) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index cf0920783d7..59abd1a857e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3440,6 +3440,48 @@ static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IWineJSDispatchHost *iface return S_OK; } +static HRESULT WINAPI WindowDispEx_GetJSDispatch(IWineJSDispatchHost *iface, IWineJSDispatch **ret) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_GetJSDispatch(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, ret); +} + +static HRESULT WINAPI WindowDispEx_LookupProperty(IWineJSDispatchHost *iface, const WCHAR *name, DWORD flags, + struct property_info *desc) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_LookupProperty(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, + name, flags, desc); +} + +static HRESULT WINAPI WindowDispEx_NextProperty(IWineJSDispatchHost *iface, DISPID id, struct property_info *desc) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_NextProperty(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, + id, desc); +} + +static HRESULT WINAPI WindowDispEx_GetProperty(IWineJSDispatchHost *iface, DISPID id, LCID lcid, VARIANT *r, + EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_GetProperty(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, + id, lcid, r, ei, caller); +} + +static HRESULT WINAPI WindowDispEx_SetProperty(IWineJSDispatchHost *iface, DISPID id, LCID lcid, VARIANT *v, + EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_SetProperty(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, + id, lcid, v, ei, caller); +} + static HRESULT WINAPI WindowDispEx_CallFunction(IWineJSDispatchHost *iface, DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller) { @@ -3449,6 +3491,13 @@ static HRESULT WINAPI WindowDispEx_CallFunction(IWineJSDispatchHost *iface, DISP id, iid, dp, ret, ei, caller); } +static HRESULT WINAPI WindowDispEx_ToString(IWineJSDispatchHost *iface, BSTR *str) +{ + HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface); + + return IWineJSDispatchHost_ToString(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, str); +} + static const IWineJSDispatchHostVtbl WindowDispExVtbl = { WindowDispEx_QueryInterface, WindowDispEx_AddRef, @@ -3465,7 +3514,13 @@ static const IWineJSDispatchHostVtbl WindowDispExVtbl = { WindowDispEx_GetMemberName, WindowDispEx_GetNextDispID, WindowDispEx_GetNameSpaceParent, + WindowDispEx_GetJSDispatch, + WindowDispEx_LookupProperty, + WindowDispEx_NextProperty, + WindowDispEx_GetProperty, + WindowDispEx_SetProperty, WindowDispEx_CallFunction, + WindowDispEx_ToString, }; static inline HTMLOuterWindow *impl_from_IEventTarget(IEventTarget *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1a8c666ae57..8520c2711eb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,7 @@ #include "nsiface.h" #include "mshtml_private_iface.h" +#include "../jscript/jsdisp.h" #include <assert.h> diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index f4292e298d0..503593d1c25 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -258,13 +258,3 @@ interface IWineXMLHttpRequestPrivate : IDispatch } } /* library MSHTML_private */ - -[ - object, - uuid(d359f2fe-5531-741b-a41a-5cf92edc971b), - local -] -interface IWineJSDispatchHost : IDispatchEx -{ - HRESULT CallFunction(DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller); -}

1 0

Jacek Caban : jscript: Support converting host objects to string.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: a3d2ad1c2ea138a04f890b3a5864f3e8306884ca URL: https://gitlab.winehq.org/wine/wine/-/commit/a3d2ad1c2ea138a04f890b3a5864f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 13:39:38 2024 +0200 jscript: Support converting host objects to string. --- dlls/jscript/dispex.c | 16 ++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jsdisp.idl | 1 + dlls/jscript/object.c | 16 +++++++++++----- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b684b9edd99..8c499fbd37b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -3349,6 +3349,21 @@ static HRESULT HostObject_next_prop(jsdisp_t *jsdisp, unsigned id, struct proper return IWineJSDispatchHost_NextProperty(This->host_iface, id, desc); } +static HRESULT HostObject_to_string(jsdisp_t *jsdisp, jsstr_t **ret) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + BSTR str; + HRESULT hres; + + hres = IWineJSDispatchHost_ToString(This->host_iface, &str); + if(FAILED(hres)) + return hres; + + *ret = jsstr_alloc(str); + SysFreeString(str); + return *ret ? S_OK : E_OUTOFMEMORY; +} + static const builtin_info_t HostObject_info = { .class = JSCLASS_OBJECT, .addref = HostObject_addref, @@ -3357,6 +3372,7 @@ static const builtin_info_t HostObject_info = { .prop_get = HostObject_prop_get, .prop_put = HostObject_prop_put, .next_prop = HostObject_next_prop, + .to_string = HostObject_to_string, }; HRESULT init_host_object(script_ctx_t *ctx, IWineJSDispatchHost *host_iface, IWineJSDispatch **ret) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 29dec3297ca..a36291204b6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -189,6 +189,7 @@ typedef struct { HRESULT (*next_prop)(jsdisp_t*,unsigned,struct property_info*); HRESULT (*prop_get)(jsdisp_t*,unsigned,jsval_t*); HRESULT (*prop_put)(jsdisp_t*,unsigned,jsval_t); + HRESULT (*to_string)(jsdisp_t*,jsstr_t**); HRESULT (*gc_traverse)(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*); } builtin_info_t; diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index a794dbebe67..533677f6cad 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -56,6 +56,7 @@ interface IWineJSDispatchHost : IDispatchEx HRESULT GetProperty(DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller); HRESULT SetProperty(DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); HRESULT CallFunction(DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT ToString(BSTR *str); } [ diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 382f4107c45..da544c6b1c3 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -27,8 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *str = NULL; + jsstr_t *ret = NULL; jsdisp_t *jsdisp; - const WCHAR *str; IDispatch *disp; HRESULT hres; @@ -74,6 +75,8 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns jsdisp = to_jsdisp(disp); if(!jsdisp) { str = L"[object Object]"; + }else if(jsdisp->builtin_info->to_string) { + hres = jsdisp->builtin_info->to_string(jsdisp, &ret); }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { @@ -87,11 +90,14 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns set_output: if(r) { - jsstr_t *ret; - ret = jsstr_alloc(str); - if(!ret) - return E_OUTOFMEMORY; + if(!ret) { + ret = jsstr_alloc(str); + if(!ret) + return E_OUTOFMEMORY; + } *r = jsval_string(ret); + }else if(ret) { + jsstr_release(ret); } return S_OK;

1 0

Hans Leidekker : msi: Load DrLocator table in ITERATE_AppSearch().
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: d527cd305b1aa251401c0968344db2c0acb3d64c URL: https://gitlab.winehq.org/wine/wine/-/commit/d527cd305b1aa251401c0968344db2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 9 15:02:22 2024 +0200 msi: Load DrLocator table in ITERATE_AppSearch(). --- dlls/msi/appsearch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 5813549bdb5..88450087196 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -965,6 +965,8 @@ static UINT load_all_drlocators( MSIPACKAGE *package ) MSIQUERY *view; UINT r; + if (!list_empty( &package->drlocators )) return ERROR_SUCCESS; + r = MSI_DatabaseOpenViewW( package->db, L"SELECT * FROM `DrLocator`", &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -997,12 +999,10 @@ static UINT search_dr( MSIPACKAGE *package, WCHAR **app_value, struct signature WCHAR path[MAX_PATH], expanded[MAX_PATH], *parent = NULL; MSIDRLOCATOR *locator = NULL; DWORD attr; - UINT rc; + UINT rc = ERROR_SUCCESS; TRACE("%s\n", debugstr_w(sig->Name)); - if ((rc = load_all_drlocators( package ))) return rc; - *app_value = NULL; LIST_FOR_EACH_ENTRY( locator, &package->drlocators, MSIDRLOCATOR, entry ) @@ -1055,7 +1055,6 @@ static UINT search_dr( MSIPACKAGE *package, WCHAR **app_value, struct signature rc = search_directory( package, sig, path, locator->Depth, app_value ); done: - free_drlocators( package ); free( parent ); TRACE("returning %u\n", rc); return rc; @@ -1099,6 +1098,8 @@ static UINT ITERATE_AppSearch(MSIRECORD *row, LPVOID param) TRACE("%s %s\n", debugstr_w(propName), debugstr_w(sigName)); + if ((r = load_all_drlocators( package ))) return r; + r = search_sig_name( package, sigName, &sig, &value ); if (value) { @@ -1116,6 +1117,7 @@ static UINT ITERATE_AppSearch(MSIRECORD *row, LPVOID param) MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); msiobj_release( &uirow->hdr ); + free_drlocators( package ); return r; } @@ -1153,6 +1155,8 @@ static UINT ITERATE_CCPSearch(MSIRECORD *row, LPVOID param) TRACE("%s\n", debugstr_w(signature)); + if ((r = load_all_drlocators( package ))) return r; + search_sig_name( package, signature, &sig, &value ); if (value) { @@ -1163,6 +1167,7 @@ static UINT ITERATE_CCPSearch(MSIRECORD *row, LPVOID param) } free_signature(&sig); + free_drlocators( package ); return r; }

1 0