December 2019 - Wine-commits

Jacek Caban : mshtml: Update to Wine Gecko 2.47.1.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 5f0b5d350566a46f0f999e4cff7ad9e280fcfa05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f0b5d350566a46f0f999e4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 10 15:28:42 2019 +0100 mshtml: Update to Wine Gecko 2.47.1. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 8 ++++---- dlls/mshtml/nsiface.idl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8d4be64930..48a84f3958 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -45,14 +45,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); -#define GECKO_VERSION "2.47" +#define GECKO_VERSION "2.47.1" #ifdef __i386__ #define ARCH_STRING "x86" -#define GECKO_SHA "3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a" +#define GECKO_SHA "f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051" #elif defined(__x86_64__) #define ARCH_STRING "x86_64" -#define GECKO_SHA "c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d" +#define GECKO_SHA "69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a" #else #define ARCH_STRING "" #define GECKO_SHA "???" @@ -79,7 +79,7 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - L"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"wine-gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 6074edebca..af83b6a438 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -25,7 +25,7 @@ #pragma makedep header -cpp_quote("#define GECKO_VERSION \"2.47\"") +cpp_quote("#define GECKO_VERSION \"2.47.1\"") cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl";

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetNames.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: c4819437da1c92ec619bdac7cadf3f33879a5bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4819437da1c92ec619bdac7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:10 2019 +0100 vbscript: Implement ScriptTypeInfo_GetNames. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 6dc34b32d9..373efcc507 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -546,6 +546,26 @@ typedef struct { ScriptDisp *disp; } ScriptTypeInfo; +static function_t *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + if (!(memid & DISPID_FUNCTION_MASK)) return NULL; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + + if (memid == typeinfo->funcs[i].memid) + return typeinfo->funcs[i].func; + else if (memid < typeinfo->funcs[i].memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -707,10 +727,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + if (func) + { + UINT num = min(cMaxNames, func->arg_cnt + 1); + + rgBstrNames[0] = SysAllocString(func->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + + for (i = 1; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->args[i - 1].name))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + else + { + rgBstrNames[0] = SysAllocString(This->disp->global_vars[memid - 1]->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetRefTypeOfImplType.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 8ce98552566845a22bf4bb16b2aa1c55217e5e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce98552566845a22bf4bb16… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:16 2019 +0100 vbscript: Implement ScriptTypeInfo_GetRefTypeOfImplType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 373efcc507..346ec13e32 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -780,9 +780,14 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%u %p)\n", This, index, pRefType); + TRACE("(%p)->(%u %p)\n", This, index, pRefType); - return E_NOTIMPL; + /* We only inherit from IDispatch */ + if (!pRefType) return E_INVALIDARG; + if (index != 0) return TYPE_E_ELEMENTNOTFOUND; + + *pRefType = 1; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT index, INT *pImplTypeFlags)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetRefTypeInfo.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 3dc54aa79d230e23b6bb5c6bfc9af7ee09627672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc54aa79d230e23b6bb5c6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:21 2019 +0100 vbscript: Implement ScriptTypeInfo_GetRefTypeInfo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 346ec13e32..b01335b3bf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -884,10 +884,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + HRESULT hr; - FIXME("(%p)->(%x %p)\n", This, hRefType, ppTInfo); + TRACE("(%p)->(%x %p)\n", This, hRefType, ppTInfo); - return E_NOTIMPL; + if (!ppTInfo || (INT)hRefType < 0) return E_INVALIDARG; + + if (hRefType & ~3) return E_FAIL; + if (hRefType & 1) + { + hr = get_dispatch_typeinfo(ppTInfo); + if (FAILED(hr)) return hr; + } + else + *ppTInfo = iface; + + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetImplTypeFlags.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 09b9da5bba85315be5c5044bda2a6a96e0acd79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b9da5bba85315be5c5044b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:27 2019 +0100 vbscript: Implement ScriptTypeInfo_GetImplTypeFlags. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b01335b3bf..00c48e0b48 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -794,9 +794,13 @@ static HRESULT WINAPI ScriptTypeInfo_GetImplTypeFlags(ITypeInfo *iface, UINT ind { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%u %p)\n", This, index, pImplTypeFlags); + TRACE("(%p)->(%u %p)\n", This, index, pImplTypeFlags); - return E_NOTIMPL; + if (!pImplTypeFlags) return E_INVALIDARG; + if (index != 0) return TYPE_E_ELEMENTNOTFOUND; + + *pImplTypeFlags = 0; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *rgszNames, UINT cNames,

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_Invoke.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 5e912f28698cb3a68c6d1bd5925224af453683c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e912f28698cb3a68c6d1bd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:33 2019 +0100 vbscript: Implement ScriptTypeInfo_Invoke. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 00c48e0b48..a6436125a3 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -858,11 +858,33 @@ static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + IDispatch *disp; + HRESULT hr; - FIXME("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, + TRACE("(%p)->(%p %d %d %p %p %p %p)\n", This, pvInstance, memid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + if (!pvInstance) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_Invoke(disp_typeinfo, pvInstance, memid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + } + + hr = IUnknown_QueryInterface((IUnknown*)pvInstance, &IID_IDispatch, (void**)&disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_Invoke(disp, memid, &IID_NULL, LOCALE_USER_DEFAULT, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + IDispatch_Release(disp); + + return hr; } static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrName,

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDocumentation.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 0fee1c759bddf174b06537d9774953dba56803fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fee1c759bddf174b06537d9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:40 2019 +0100 vbscript: Implement ScriptTypeInfo_GetDocumentation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a6436125a3..94c68733cc 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -891,10 +891,46 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + function_t *func; + HRESULT hr; - FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); - return E_NOTIMPL; + if (pBstrDocString) *pBstrDocString = NULL; + if (pdwHelpContext) *pdwHelpContext = 0; + if (pBstrHelpFile) *pBstrHelpFile = NULL; + + if (memid == MEMBERID_NIL) + { + if (pBstrName && !(*pBstrName = SysAllocString(L"VBScriptTypeInfo"))) + return E_OUTOFMEMORY; + if (pBstrDocString && + !(*pBstrDocString = SysAllocString(L"Visual Basic Scripting Type Info"))) + { + if (pBstrName) SysFreeString(*pBstrName); + return E_OUTOFMEMORY; + } + return S_OK; + } + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetDocumentation(disp_typeinfo, memid, pBstrName, pBstrDocString, + pdwHelpContext, pBstrHelpFile); + } + + if (pBstrName) + { + *pBstrName = SysAllocString(func ? func->name : This->disp->global_vars[memid - 1]->name); + if (!*pBstrName) return E_OUTOFMEMORY; + } + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind,

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDllEntry.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 5376e792c5e5f1e7b22e935fc53c1adb22ebda37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5376e792c5e5f1e7b22e935f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:49 2019 +0100 vbscript: Implement ScriptTypeInfo_GetDllEntry. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 94c68733cc..edf7739a5d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -937,10 +937,23 @@ static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memi BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + TRACE("(%p)->(%d %d %p %p %p)\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); - return E_NOTIMPL; + if (pBstrDllName) *pBstrDllName = NULL; + if (pBstrName) *pBstrName = NULL; + if (pwOrdinal) *pwOrdinal = 0; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetDllEntry(disp_typeinfo, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); + } + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE hRefType, ITypeInfo **ppTInfo)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_AddressOfMember.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 313d6de3fbbb45074788554c110770243c138c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=313d6de3fbbb45074788554c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:19:56 2019 +0100 vbscript: Implement ScriptTypeInfo_AddressOfMember. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index edf7739a5d..319867b0ea 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -981,10 +981,22 @@ static HRESULT WINAPI ScriptTypeInfo_GetRefTypeInfo(ITypeInfo *iface, HREFTYPE h static HRESULT WINAPI ScriptTypeInfo_AddressOfMember(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); + TRACE("(%p)->(%d %d %p)\n", This, memid, invKind, ppv); - return E_NOTIMPL; + if (!ppv) return E_INVALIDARG; + *ppv = NULL; + + if (!get_func_from_memid(This, memid) && memid > This->num_vars) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_AddressOfMember(disp_typeinfo, memid, invKind, ppv); + } + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown *pUnkOuter, REFIID riid, PVOID *ppvObj)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_CreateInstance.
by Alexandre Julliard 11 Dec '19

11 Dec '19

Module: wine Branch: master Commit: 16ccc06d227f0a2391a8bb61ecf0d2d0f965bc41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ccc06d227f0a2391a8bb61… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 11 18:20:01 2019 +0100 vbscript: Implement ScriptTypeInfo_CreateInstance. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 319867b0ea..55307d127c 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1003,9 +1003,12 @@ static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown * { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); + TRACE("(%p)->(%p %s %p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObj); - return E_NOTIMPL; + if (!ppvObj) return E_INVALIDARG; + + *ppvObj = NULL; + return TYPE_E_BADMODULEKIND; } static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops)

1 0