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

Alfred Agrell : include: Fix typo in IID_IDWriteStringList.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: b9e48e8b8ad49e156366102a92d2f1d952d0b624 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9e48e8b8ad49e156366102a92d2f1… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IDWriteStringList. --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index e67c8ab6364..7412c3f5857 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -174,7 +174,7 @@ interface IDWriteRenderingParams3 : IDWriteRenderingParams2 [ local, object, - uuid(cfee3140-1257-47ca-8b85-31bfcf3f2d0e) + uuid(cfee3140-1157-47ca-8b85-31bfcf3f2d0e) ] interface IDWriteStringList : IUnknown {

1 0

Alfred Agrell : include: Fix typo in IID_IAudioLoudness.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: 32d92b004bd0507b2dd808696e8f26ea9c26f660 URL: https://gitlab.winehq.org/wine/wine/-/commit/32d92b004bd0507b2dd808696e8f26… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IAudioLoudness. --- include/devicetopology.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 7e89d541ad6..1b4b87bd6c3 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -296,7 +296,7 @@ interface IAudioChannelConfig : IUnknown [ pointer_default(unique), nonextensible, - uuid(7d8b1437-dd53-4350-9c1b-1ee2890bf938), + uuid(7d8b1437-dd53-4350-9c1b-1ee2890bd938), local, object ]

1 0

Alfred Agrell : include: Fix typo in GUID_DEVCLASS_1394DEBUG.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: c89884bc3f7fe1581efa60f480ca6c9537d1cf63 URL: https://gitlab.winehq.org/wine/wine/-/commit/c89884bc3f7fe1581efa60f480ca6c… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in GUID_DEVCLASS_1394DEBUG. --- include/devguid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/devguid.h b/include/devguid.h index 7a99ba0e6f7..b309bcaafa5 100644 --- a/include/devguid.h +++ b/include/devguid.h @@ -21,7 +21,7 @@ DEFINE_GUID( GUID_DEVCLASS_1394, 0x6BDD1FC1, 0x810F, 0x11D0, 0xBE, 0xC7, 0x08, 0x00, 0x2B, 0xE2, 0x09, 0x2F ); DEFINE_GUID( GUID_DEVCLASS_1394DEBUG, - 0x66F250D6, 0x7810, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); + 0x66F250D6, 0x7801, 0x4A64, 0xB1, 0x39, 0xEE, 0xA8, 0x0A, 0x45, 0x0B, 0x24 ); DEFINE_GUID( GUID_DEVCLASS_61883, 0x7EBEFBC0, 0x3200, 0x11D2, 0xB4, 0xC2, 0x00, 0xA0, 0xC9, 0x69, 0x7D, 0x07 ); DEFINE_GUID( GUID_DEVCLASS_ADAPTER,

1 0

Alfred Agrell : include: Fix typo in IID_IRemoteDebugApplication.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: wine Branch: master Commit: abee495f54c7f8ac2ecbeb4f0d95e4617c691f43 URL: https://gitlab.winehq.org/wine/wine/-/commit/abee495f54c7f8ac2ecbeb4f0d95e4… Author: Alfred Agrell <floating(a)muncher.se> Date: Sun May 5 01:35:54 2024 +0200 include: Fix typo in IID_IRemoteDebugApplication. --- include/activdbg.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/activdbg.idl b/include/activdbg.idl index e10066c1f26..475469ebb05 100644 --- a/include/activdbg.idl +++ b/include/activdbg.idl @@ -295,7 +295,7 @@ interface IRemoteDebugApplicationThread : IUnknown */ [ object, - uuid(51973c30-cb0c-11d0-b5c9-00a0244Aae7a), + uuid(51973c30-cb0c-11d0-b5c9-00a0244a0e7a), pointer_default(unique) ] interface IRemoteDebugApplication : IUnknown

1 0

Victor Chiletto : vkd3d-shader/d3dbc: Fix implicit enum conversion warning.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: vkd3d Branch: master Commit: 67c690aa070ac447cd95aafb1e7daca1659b9ac7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/67c690aa070ac447cd95aafb1e7da… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Tue Jul 9 18:37:36 2024 -0300 vkd3d-shader/d3dbc: Fix implicit enum conversion warning. This slipped through and broke CI. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index ea9fe775..4522d56c 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2670,11 +2670,11 @@ static void d3dbc_write_resource_load(struct d3dbc_compiler *d3dbc, const struct case HLSL_RESOURCE_SAMPLE_GRAD: sm1_instr.opcode = D3DSIO_TEXLDD; - sm1_instr.srcs[2].type = D3DSPR_TEMP; + sm1_instr.srcs[2].type = VKD3DSPR_TEMP; sm1_instr.srcs[2].reg = ddx->reg.id; sm1_instr.srcs[2].swizzle = hlsl_swizzle_from_writemask(ddx->reg.writemask); - sm1_instr.srcs[3].type = D3DSPR_TEMP; + sm1_instr.srcs[3].type = VKD3DSPR_TEMP; sm1_instr.srcs[3].reg = ddy->reg.id; sm1_instr.srcs[3].swizzle = hlsl_swizzle_from_writemask(ddy->reg.writemask);

1 0

Jacek Caban : jscript: Support host objects in disp_cmp.
by Alexandre Julliard 09 Jul '24

09 Jul '24

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 : jscript: Use jsdisp_t internally for host objects that support it.
by Alexandre Julliard 09 Jul '24

09 Jul '24

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

Jacek Caban : mshtml: Implement jscript IWineJSDispatchHost.
by Alexandre Julliard 09 Jul '24

09 Jul '24

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 : mshtml: Pass an optional script global window to init_dispatch.
by Alexandre Julliard 09 Jul '24

09 Jul '24

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 : mshtml: Support using IWineJSDispatch for DispatchEx implementation.
by Alexandre Julliard 09 Jul '24

09 Jul '24

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