wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Mohamad Al-Jaf : windows.system.profile.systemmanufacturers: Add stub DLL.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: db684bff7fc9b918fe80d8b2c68ab41ae78a094d URL: https://gitlab.winehq.org/wine/wine/-/commit/db684bff7fc9b918fe80d8b2c68ab4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Nov 19 20:42:14 2022 -0500 windows.system.profile.systemmanufacturers: Add stub DLL. --- configure | 3 + configure.ac | 2 + .../Makefile.in | 8 ++ .../classes.idl | 23 ++++ .../main.c | 148 +++++++++++++++++++++ .../private.h | 31 +++++ .../tests/Makefile.in | 5 + .../tests/smbios.c | 83 ++++++++++++ ...windows.system.profile.systemmanufacturers.spec | 3 + 9 files changed, 306 insertions(+)

1 0

Mohamad Al-Jaf : include: Add windows.system.profile.systemmanufacturers.idl file.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: e8ebab396dafafb92177023eaef69847c5bbce87 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ebab396dafafb92177023eaef698… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Nov 18 02:15:39 2022 -0500 include: Add windows.system.profile.systemmanufacturers.idl file. --- include/Makefile.in | 1 + .../windows.system.profile.systemmanufacturers.idl | 60 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 40d9bf44fdd..9b5f2a5ae02 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -819,6 +819,7 @@ SOURCES = \ windows.storage.streams.idl \ windows.system.idl \ windows.system.power.idl \ + windows.system.profile.systemmanufacturers.idl \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.idl \ diff --git a/include/windows.system.profile.systemmanufacturers.idl b/include/windows.system.profile.systemmanufacturers.idl new file mode 100644 index 00000000000..644a664020b --- /dev/null +++ b/include/windows.system.profile.systemmanufacturers.idl @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.System.Profile.SystemManufacturers +{ + apicontract SystemManufacturersContract; + interface ISmbiosInformationStatics; + runtimeclass SmbiosInformation; + + [ + contractversion(3.0) + ] + apicontract SystemManufacturersContract + { + } + + [ + contract(Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0), + exclusiveto(Windows.System.Profile.SystemManufacturers.SmbiosInformation), + uuid(080cca7c-637c-48c4-b728-f9273812db8e) + ] + interface ISmbiosInformationStatics : IInspectable + { + [propget] HRESULT SerialNumber([out, retval] HSTRING *value); + } + + [ + contract(Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0), + marshaling_behavior(agile), + static(Windows.System.Profile.SystemManufacturers.ISmbiosInformationStatics, Windows.System.Profile.SystemManufacturers.SystemManufacturersContract, 1.0) + ] + runtimeclass SmbiosInformation + { + } +}

1 0

Alistair Leslie-Hughes : include: Add D3DKMT_ENUMADAPTERS2 structure.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 84d38ef306bfe39bf4e353b65831bbaee489c04e URL: https://gitlab.winehq.org/wine/wine/-/commit/84d38ef306bfe39bf4e353b65831bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 6 12:10:22 2023 +1100 include: Add D3DKMT_ENUMADAPTERS2 structure. --- include/ddk/d3dkmthk.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index b65fcb8c9c6..69239a45fd9 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -667,6 +667,20 @@ typedef struct _D3DKMT_ESCAPE D3DKMT_HANDLE hContext; } D3DKMT_ESCAPE; +typedef struct _D3DKMT_ADAPTERINFO +{ + D3DKMT_HANDLE hAdapter; + LUID AdapterLuid; + ULONG NumOfSources; + BOOL bPrecisePresentRegionsPreferred; +} D3DKMT_ADAPTERINFO; + +typedef struct _D3DKMT_ENUMADAPTERS2 +{ + ULONG NumAdapters; + D3DKMT_ADAPTERINFO *pAdapters; +} D3DKMT_ENUMADAPTERS2; + #ifdef __cplusplus extern "C" {

1 0

Paul Gofman : msauddecmft: Add stub dll.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: a0456fb31a90c7f5bd23eab4b733bb000cc797ee URL: https://gitlab.winehq.org/wine/wine/-/commit/a0456fb31a90c7f5bd23eab4b733bb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Dec 30 21:19:12 2022 -0600 msauddecmft: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/msauddecmft/Makefile.in | 1 + dlls/msauddecmft/msauddecmft.spec | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/configure b/configure index eb8512993f1..4168d4ec03f 100755 --- a/configure +++ b/configure @@ -1210,6 +1210,7 @@ enable_msacm32 enable_msado15 enable_msadp32_acm enable_msasn1 +enable_msauddecmft enable_mscat32 enable_mscms enable_mscoree @@ -21358,6 +21359,7 @@ wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 wine_fn_config_makefile dlls/msasn1/tests enable_tests +wine_fn_config_makefile dlls/msauddecmft enable_msauddecmft wine_fn_config_makefile dlls/mscat32 enable_mscat32 wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests diff --git a/configure.ac b/configure.ac index 39ad3c89cc6..14a41c84739 100644 --- a/configure.ac +++ b/configure.ac @@ -2732,6 +2732,7 @@ WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) WINE_CONFIG_MAKEFILE(dlls/msasn1/tests) +WINE_CONFIG_MAKEFILE(dlls/msauddecmft) WINE_CONFIG_MAKEFILE(dlls/mscat32) WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) diff --git a/dlls/msauddecmft/Makefile.in b/dlls/msauddecmft/Makefile.in new file mode 100644 index 00000000000..abce4d1cfe4 --- /dev/null +++ b/dlls/msauddecmft/Makefile.in @@ -0,0 +1 @@ +MODULE = msauddecmft.dll diff --git a/dlls/msauddecmft/msauddecmft.spec b/dlls/msauddecmft/msauddecmft.spec new file mode 100644 index 00000000000..a9b7505d360 --- /dev/null +++ b/dlls/msauddecmft/msauddecmft.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Paul Gofman : msmpeg2vdec: Add stub dll.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: f0e3e38aca81933a8262f3115973fdcc8c2d1c2d URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e3e38aca81933a8262f3115973fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Dec 30 21:11:51 2022 -0600 msmpeg2vdec: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/msmpeg2vdec/Makefile.in | 1 + dlls/msmpeg2vdec/msmpeg2vdec.spec | 8 ++++++++ 4 files changed, 12 insertions(+) diff --git a/configure b/configure index 1e3ffabaebb..eb8512993f1 100755 --- a/configure +++ b/configure @@ -1235,6 +1235,7 @@ enable_msimtf enable_msisip enable_msisys_ocx enable_msls31 +enable_msmpeg2vdec enable_msnet32 enable_mspatcha enable_msports @@ -21390,6 +21391,7 @@ wine_fn_config_makefile dlls/msimtf enable_msimtf wine_fn_config_makefile dlls/msisip enable_msisip wine_fn_config_makefile dlls/msisys.ocx enable_msisys_ocx wine_fn_config_makefile dlls/msls31 enable_msls31 +wine_fn_config_makefile dlls/msmpeg2vdec enable_msmpeg2vdec wine_fn_config_makefile dlls/msnet32 enable_msnet32 wine_fn_config_makefile dlls/mspatcha enable_mspatcha wine_fn_config_makefile dlls/mspatcha/tests enable_tests diff --git a/configure.ac b/configure.ac index c7217274b80..39ad3c89cc6 100644 --- a/configure.ac +++ b/configure.ac @@ -2765,6 +2765,7 @@ WINE_CONFIG_MAKEFILE(dlls/msimtf) WINE_CONFIG_MAKEFILE(dlls/msisip) WINE_CONFIG_MAKEFILE(dlls/msisys.ocx) WINE_CONFIG_MAKEFILE(dlls/msls31) +WINE_CONFIG_MAKEFILE(dlls/msmpeg2vdec) WINE_CONFIG_MAKEFILE(dlls/msnet32) WINE_CONFIG_MAKEFILE(dlls/mspatcha) WINE_CONFIG_MAKEFILE(dlls/mspatcha/tests) diff --git a/dlls/msmpeg2vdec/Makefile.in b/dlls/msmpeg2vdec/Makefile.in new file mode 100644 index 00000000000..d2dbf5adda0 --- /dev/null +++ b/dlls/msmpeg2vdec/Makefile.in @@ -0,0 +1 @@ +MODULE = msmpeg2vdec.dll diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec new file mode 100644 index 00000000000..2ba3ab602f1 --- /dev/null +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -0,0 +1,8 @@ +@ stub GetH264DecoderFunctionTable +@ stub ?GetSurface@CVIDEOfilter@@QEAAJHPEAEJ@Z +@ stub ?GetSurfaceSize@CVIDEOfilter@@QEAAJHPEAJ@Z +@ stub ?LoadSurface@CVIDEOfilter@@QEAAJHPEAEK@Z +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Gabriel Ivăncescu : vbscript: Implement SID_GetCaller for QueryService.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 5e23b8a910750a6a2bc48146e67b2e44e024384a URL: https://gitlab.winehq.org/wine/wine/-/commit/5e23b8a910750a6a2bc48146e67b2e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 26 17:58:17 2023 +0200 vbscript: Implement SID_GetCaller for QueryService. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/tests/Makefile.in | 1 + dlls/vbscript/tests/caller.c | 551 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 45 +++- dlls/vbscript/vbscript.c | 17 +- dlls/vbscript/vbscript.h | 4 + 5 files changed, 609 insertions(+), 9 deletions(-)

1 0

Gabriel Ivăncescu : vbscript: Add a ServiceProvider stub.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: c8f81ccede77e59cd6878ca7d10392ee6a76649d URL: https://gitlab.winehq.org/wine/wine/-/commit/c8f81ccede77e59cd6878ca7d10392… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 26 17:58:17 2023 +0200 vbscript: Add a ServiceProvider stub. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbdisp.c | 4 +-- dlls/vbscript/vbscript.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 7 ++++ 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index e19ed2b53d4..13236ad4b29 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1661,7 +1661,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, &ctx->vbcaller->IServiceProvider_iface); IDispatchEx_Release(dispex); }else { UINT err = 0; @@ -1699,7 +1699,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, &ctx->vbcaller->IServiceProvider_iface); IDispatchEx_Release(dispex); }else { UINT err = 0; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b6364410931..d010ba4b51d 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -366,6 +366,80 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) } } +static inline struct vbcaller *vbcaller_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, struct vbcaller, IServiceProvider_iface); +} + +static HRESULT WINAPI vbcaller_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + struct vbcaller *This = vbcaller_from_IServiceProvider(iface); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IServiceProvider, riid)) { + *ppv = &This->IServiceProvider_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI vbcaller_AddRef(IServiceProvider *iface) +{ + struct vbcaller *This = vbcaller_from_IServiceProvider(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI vbcaller_Release(IServiceProvider *iface) +{ + struct vbcaller *This = vbcaller_from_IServiceProvider(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) + free(This); + + return ref; +} + +static HRESULT WINAPI vbcaller_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + struct vbcaller *This = vbcaller_from_IServiceProvider(iface); + + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + vbcaller_QueryInterface, + vbcaller_AddRef, + vbcaller_Release, + vbcaller_QueryService +}; + +static struct vbcaller *create_vbcaller(void) +{ + struct vbcaller *ret; + + ret = malloc(sizeof(*ret)); + if(ret) { + ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; + ret->ref = 1; + } + return ret; +} + static inline VBScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) { return CONTAINING_RECORD(iface, VBScriptError, IActiveScriptError_iface); @@ -545,6 +619,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); detach_global_objects(This->ctx); + IServiceProvider_Release(&This->ctx->vbcaller->IServiceProvider_iface); free(This->ctx); free(This); } @@ -1102,6 +1177,7 @@ static const IObjectSafetyVtbl VBScriptSafetyVtbl = { HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { + struct vbcaller *vbcaller; script_ctx_t *ctx; VBScript *ret; HRESULT hres; @@ -1112,6 +1188,11 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU if(!ret) return E_OUTOFMEMORY; + if(!(vbcaller = create_vbcaller())) { + free(ret); + return E_OUTOFMEMORY; + } + ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; ret->IActiveScriptDebug_iface.lpVtbl = &VBScriptDebugVtbl; ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; @@ -1123,10 +1204,12 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ctx = ret->ctx = calloc(1, sizeof(*ctx)); if(!ctx) { + IServiceProvider_Release(&vbcaller->IServiceProvider_iface); free(ret); return E_OUTOFMEMORY; } + ctx->vbcaller = vbcaller; ctx->safeopt = INTERFACE_USES_DISPEX; list_init(&ctx->objects); list_init(&ctx->code_list); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8286b37bbab..c42b0d31391 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -180,12 +180,19 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) return dp->rgvarg + dp->cArgs-i-1; } +struct vbcaller { + IServiceProvider IServiceProvider_iface; + + LONG ref; +}; + struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; UINT codepage; IInternetHostSecurityManager *secmgr; + struct vbcaller *vbcaller; DWORD safeopt; ScriptDisp *script_obj;

1 0

Gabriel Ivăncescu : jscript: Implement SID_GetCaller for QueryService.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 6deee88a6cd7b7c4429313699b53c03480df012b URL: https://gitlab.winehq.org/wine/wine/-/commit/6deee88a6cd7b7c4429313699b53c0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 26 17:58:17 2023 +0200 jscript: Implement SID_GetCaller for QueryService. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 9 ++ dlls/jscript/jscript.c | 17 +++- dlls/jscript/jscript.h | 3 + dlls/jscript/jsutils.c | 9 ++ dlls/jscript/tests/caller.c | 212 ++++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 241 insertions(+), 9 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Set SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION properly.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: a9a3c65cd0b0575815ac9988cc0a934d737ee0d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9a3c65cd0b0575815ac9988cc0a93… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 26 17:58:17 2023 +0200 mshtml: Set SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION properly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/script.c | 24 +++ dlls/mshtml/tests/script.c | 412 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 413 insertions(+), 23 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Defer populating the IActiveScript field until it's fully initialized.
by Alexandre Julliard 27 Jan '23

27 Jan '23

Module: wine Branch: master Commit: 34209915a34fa1e42db03d52ee60d725b44208d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/34209915a34fa1e42db03d52ee60d7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 26 17:58:17 2023 +0200 mshtml: Defer populating the IActiveScript field until it's fully initialized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/script.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 5321080a8f9..32005728bd6 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -91,12 +91,12 @@ struct ScriptHost { static ScriptHost *get_elem_script_host(HTMLInnerWindow*,HTMLScriptElement*); -static BOOL set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *val) +static BOOL set_script_prop(IActiveScript *script, DWORD property, VARIANT *val) { IActiveScriptProperty *script_prop; HRESULT hres; - hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptProperty, + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptProperty, (void**)&script_prop); if(FAILED(hres)) { WARN("Could not get IActiveScriptProperty iface: %08lx\n", hres); @@ -113,7 +113,7 @@ static BOOL set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *va return TRUE; } -static BOOL init_script_engine(ScriptHost *script_host) +static BOOL init_script_engine(ScriptHost *script_host, IActiveScript *script) { compat_mode_t compat_mode; IObjectSafety *safety; @@ -122,13 +122,13 @@ static BOOL init_script_engine(ScriptHost *script_host) VARIANT var; HRESULT hres; - hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParse, (void**)&script_host->parse); + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&script_host->parse); if(FAILED(hres)) { WARN("Could not get IActiveScriptParse: %08lx\n", hres); return FALSE; } - hres = IActiveScript_QueryInterface(script_host->script, &IID_IObjectSafety, (void**)&safety); + hres = IActiveScript_QueryInterface(script, &IID_IObjectSafety, (void**)&safety); if(FAILED(hres)) { FIXME("Could not get IObjectSafety: %08lx\n", hres); return FALSE; @@ -162,16 +162,16 @@ static BOOL init_script_engine(ScriptHost *script_host) } V_VT(&var) = VT_I4; V_I4(&var) = script_mode; - if(!set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var) && (script_mode & SCRIPTLANGUAGEVERSION_HTML)) { + if(!set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &var) && (script_mode & SCRIPTLANGUAGEVERSION_HTML)) { /* If this failed, we're most likely using native jscript. */ WARN("Failed to set script mode to HTML version.\n"); V_I4(&var) = compat_mode < COMPAT_MODE_IE8 ? SCRIPTLANGUAGEVERSION_5_7 : SCRIPTLANGUAGEVERSION_5_8; - set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var); + set_script_prop(script, SCRIPTPROP_INVOKEVERSIONING, &var); } V_VT(&var) = VT_BOOL; V_BOOL(&var) = VARIANT_TRUE; - set_script_prop(script_host, SCRIPTPROP_HACK_TRIDENTEVENTSINK, &var); + set_script_prop(script, SCRIPTPROP_HACK_TRIDENTEVENTSINK, &var); hres = IActiveScriptParse_InitNew(script_host->parse); if(FAILED(hres)) { @@ -179,36 +179,36 @@ static BOOL init_script_engine(ScriptHost *script_host) return FALSE; } - hres = IActiveScript_SetScriptSite(script_host->script, &script_host->IActiveScriptSite_iface); + hres = IActiveScript_SetScriptSite(script, &script_host->IActiveScriptSite_iface); if(FAILED(hres)) { WARN("SetScriptSite failed: %08lx\n", hres); - IActiveScript_Close(script_host->script); + IActiveScript_Close(script); return FALSE; } - hres = IActiveScript_GetScriptState(script_host->script, &state); + hres = IActiveScript_GetScriptState(script, &state); if(FAILED(hres)) WARN("GetScriptState failed: %08lx\n", hres); else if(state != SCRIPTSTATE_INITIALIZED) FIXME("state = %x\n", state); - hres = IActiveScript_SetScriptState(script_host->script, SCRIPTSTATE_STARTED); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); if(FAILED(hres)) { WARN("Starting script failed: %08lx\n", hres); return FALSE; } - hres = IActiveScript_AddNamedItem(script_host->script, L"window", + hres = IActiveScript_AddNamedItem(script, L"window", SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); if(SUCCEEDED(hres)) { V_VT(&var) = VT_BOOL; V_BOOL(&var) = VARIANT_TRUE; - set_script_prop(script_host, SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION, &var); + set_script_prop(script, SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION, &var); }else { WARN("AddNamedItem failed: %08lx\n", hres); } - hres = IActiveScript_QueryInterface(script_host->script, &IID_IActiveScriptParseProcedure2, + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&script_host->parse_proc); if(FAILED(hres)) { /* FIXME: QI for IActiveScriptParseProcedure */ @@ -690,6 +690,7 @@ static const IServiceProviderVtbl ASServiceProviderVtbl = { static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) { + IActiveScript *script; ScriptHost *ret; HRESULT hres; @@ -711,11 +712,15 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) list_add_tail(&window->script_hosts, &ret->entry); hres = CoCreateInstance(&ret->guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IActiveScript, (void**)&ret->script); + &IID_IActiveScript, (void**)&script); if(FAILED(hres)) WARN("Could not load script engine: %08lx\n", hres); - else if(!init_script_engine(ret)) - release_script_engine(ret); + else { + BOOL succeeded = init_script_engine(ret, script); + ret->script = script; + if(!succeeded) + release_script_engine(ret); + } return ret; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2023