December 2019 - Wine-commits

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetDllEntry.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: dff51ec93385d9e4ed2ff18824a3f4ace4f963c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff51ec93385d9e4ed2ff188… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:51 2019 +0200 jscript: 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/jscript/dispex.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dd1fcc7d0f..0c4705171d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1043,10 +1043,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) && !get_var_from_memid(This, memid)) + { + 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 : jscript: Implement ScriptTypeInfo_GetDocumentation.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 4a38774b53e23a5c467b9190ceccc9e95cbd7a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a38774b53e23a5c467b9190… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:50 2019 +0200 jscript: 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/jscript/dispex.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6f13c6b534..dd1fcc7d0f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -990,10 +990,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + struct typeinfo_func *func; + ITypeInfo *disp_typeinfo; + dispex_prop_t *var; + 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"JScriptTypeInfo"))) + return E_OUTOFMEMORY; + if (pBstrDocString && + !(*pBstrDocString = SysAllocString(L"JScript 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) + { + var = get_var_from_memid(This, memid); + if (!var) + { + 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->prop->name : var->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 : jscript: Implement ScriptTypeInfo_AddressOfMember.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 26c7b39407b0259a2b88f670a4f00747879961d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c7b39407b0259a2b88f670… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:52 2019 +0200 jscript: 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/jscript/dispex.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0c4705171d..f5f545c8bb 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1087,10 +1087,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) && !get_var_from_memid(This, memid)) + { + 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 : jscript: Implement ScriptTypeInfo_CreateInstance.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 0dc32852cbb0265db6ae75193b95afe6672e106f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc32852cbb0265db6ae7519… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:53 2019 +0200 jscript: 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/jscript/dispex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f5f545c8bb..b754a177ce 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1109,9 +1109,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

Gabriel Ivăncescu : jscript: Implement ScriptTypeInfo_GetMops.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 691faf0eae85c66f9d911d0f600620e97d587a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=691faf0eae85c66f9d911d0f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:54 2019 +0200 jscript: Implement ScriptTypeInfo_GetMops. 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/jscript/dispex.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b754a177ce..6f9a0eb7f3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1120,10 +1120,23 @@ static HRESULT WINAPI ScriptTypeInfo_CreateInstance(ITypeInfo *iface, IUnknown * static HRESULT WINAPI ScriptTypeInfo_GetMops(ITypeInfo *iface, MEMBERID memid, BSTR *pBstrMops) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + HRESULT hr; - FIXME("(%p)->(%d %p)\n", This, memid, pBstrMops); + TRACE("(%p)->(%d %p)\n", This, memid, pBstrMops); - return E_NOTIMPL; + if (!pBstrMops) return E_INVALIDARG; + + if (!get_func_from_memid(This, memid) && !get_var_from_memid(This, memid)) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetMops(disp_typeinfo, memid, pBstrMops); + } + + *pBstrMops = NULL; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITypeLib **ppTLib, UINT *pIndex)

1 0

Gabriel Ivăncescu : jscript/tests: Add more tests for the script TypeInfo.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: a416b0380e1fe5f086aa78c513b1ff959e7d8b7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a416b0380e1fe5f086aa78c5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 13 14:59:55 2019 +0200 jscript/tests: Add more tests for the script TypeInfo. 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/jscript/tests/jscript.c | 117 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index e6083672d9..84805b1906 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -986,12 +986,16 @@ static void test_typeinfo(const WCHAR *parse_func_name) VARDESC *vardesc; IDispatchEx *disp; DESCKIND desckind; + INT implTypeFlags; + UINT count, index; + HREFTYPE reftype; BINDPTR bindptr; MEMBERID memid; TYPEATTR *attr; - UINT index; HRESULT hr; WCHAR str[64], *names = str; + BSTR bstr, bstrs[5]; + void *obj; int i; if (parse_func_name) @@ -1053,6 +1057,20 @@ static void test_typeinfo(const WCHAR *parse_func_name) ok(typeinfo != typeinfo2, "TypeInfo was not supposed to be shared.\n"); ITypeInfo_Release(typeinfo2); + obj = (void*)0xdeadbeef; + hr = ITypeInfo_CreateInstance(typeinfo, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "CreateInstance returned: %08x\n", hr); + hr = ITypeInfo_CreateInstance(typeinfo, NULL, NULL, &obj); + ok(hr == TYPE_E_BADMODULEKIND, "CreateInstance returned: %08x\n", hr); + hr = ITypeInfo_CreateInstance(typeinfo, NULL, &IID_IDispatch, &obj); + ok(hr == TYPE_E_BADMODULEKIND, "CreateInstance returned: %08x\n", hr); + ok(!obj, "Unexpected non-null obj %p.\n", obj); + + hr = ITypeInfo_GetDocumentation(typeinfo, MEMBERID_NIL, &bstr, NULL, NULL, NULL); + ok(hr == S_OK, "GetDocumentation(MEMBERID_NIL) failed: %08x\n", hr); + ok(!lstrcmpW(bstr, L"JScriptTypeInfo"), "Unexpected TypeInfo name %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); ok(hr == S_OK, "GetTypeAttr failed: %08x\n", hr); ok(IsEqualGUID(&attr->guid, &IID_IScriptTypeInfo), "Unexpected GUID %s\n", wine_dbgstr_guid(&attr->guid)); @@ -1071,6 +1089,45 @@ static void test_typeinfo(const WCHAR *parse_func_name) ok(attr->idldescType.wIDLFlags == IDLFLAG_NONE, "Unexpected idldescType.wIDLFlags 0x%x\n", attr->idldescType.wIDLFlags); ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + /* The type inherits from IDispatch */ + hr = ITypeInfo_GetImplTypeFlags(typeinfo, 0, NULL); + ok(hr == E_INVALIDARG, "GetImplTypeFlags returned: %08x\n", hr); + hr = ITypeInfo_GetImplTypeFlags(typeinfo, 1, &implTypeFlags); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetImplTypeFlags returned: %08x\n", hr); + hr = ITypeInfo_GetImplTypeFlags(typeinfo, -1, &implTypeFlags); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetImplTypeFlags returned: %08x\n", hr); + hr = ITypeInfo_GetImplTypeFlags(typeinfo, 0, &implTypeFlags); + ok(hr == S_OK, "GetImplTypeFlags failed: %08x\n", hr); + ok(implTypeFlags == 0, "Unexpected implTypeFlags 0x%x\n", implTypeFlags); + + hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, 0, NULL); + ok(hr == E_INVALIDARG, "GetRefTypeOfImplType returned: %08x\n", hr); + hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, 1, &reftype); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetRefTypeOfImplType returned: %08x\n", hr); + hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, -1, &reftype); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetRefTypeOfImplType failed: %08x\n", hr); + hr = ITypeInfo_GetRefTypeOfImplType(typeinfo, 0, &reftype); + ok(hr == S_OK, "GetRefTypeOfImplType failed: %08x\n", hr); + ok(reftype == 1, "Unexpected reftype %d\n", reftype); + + hr = ITypeInfo_GetRefTypeInfo(typeinfo, reftype, NULL); + ok(hr == E_INVALIDARG, "GetRefTypeInfo returned: %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(typeinfo, -1, &typeinfo2); + ok(hr == E_INVALIDARG, "GetRefTypeInfo returned: %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(typeinfo, 4, &typeinfo2); + ok(hr == E_FAIL, "GetRefTypeInfo returned: %08x\n", hr); + hr = ITypeInfo_GetRefTypeInfo(typeinfo, 0, &typeinfo2); + ok(hr == S_OK, "GetRefTypeInfo failed: %08x\n", hr); + ok(typeinfo == typeinfo2, "Unexpected TypeInfo %p (expected %p)\n", typeinfo2, typeinfo); + ITypeInfo_Release(typeinfo2); + hr = ITypeInfo_GetRefTypeInfo(typeinfo, reftype, &typeinfo2); + ok(hr == S_OK, "GetRefTypeInfo failed: %08x\n", hr); + hr = ITypeInfo_GetDocumentation(typeinfo2, MEMBERID_NIL, &bstr, NULL, NULL, NULL); + ok(hr == S_OK, "GetDocumentation(MEMBERID_NIL) failed: %08x\n", hr); + ok(!lstrcmpW(bstr, L"IDispatch"), "Unexpected TypeInfo name %s\n", wine_dbgstr_w(bstr)); + ITypeInfo_Release(typeinfo2); + SysFreeString(bstr); + /* GetIDsOfNames looks into the inherited types as well */ wcscpy(str, L"queryinterface"); hr = ITypeInfo_GetIDsOfNames(typeinfo, NULL, 1, &memid); @@ -1088,6 +1145,52 @@ static void test_typeinfo(const WCHAR *parse_func_name) hr = ITypeInfo_GetIDsOfNames(typeinfo, &names, 1, &memid); ok(hr == S_OK, "GetIDsOfNames failed: %08x\n", hr); ok(!lstrcmpW(str, L"Math"), "Unexpected string %s\n", wine_dbgstr_w(str)); + hr = ITypeInfo_GetNames(typeinfo, memid, NULL, 1, &count); + ok(hr == E_INVALIDARG, "GetNames returned: %08x\n", hr); + hr = ITypeInfo_GetNames(typeinfo, memid, bstrs, 1, NULL); + ok(hr == E_INVALIDARG, "GetNames returned: %08x\n", hr); + hr = ITypeInfo_GetNames(typeinfo, memid, bstrs, 0, &count); + ok(hr == S_OK, "GetNames failed: %08x\n", hr); + ok(count == 0, "Unexpected count %u\n", count); + hr = ITypeInfo_GetNames(typeinfo, memid, bstrs, ARRAY_SIZE(bstrs), &count); + ok(hr == S_OK, "GetNames failed: %08x\n", hr); + ok(count == 3, "Unexpected count %u\n", count); + ok(!lstrcmpW(bstrs[0], L"math"), "Unexpected function name %s\n", wine_dbgstr_w(bstrs[0])); + ok(!lstrcmpW(bstrs[1], L"x"), "Unexpected function first param name %s\n", wine_dbgstr_w(bstrs[1])); + ok(!lstrcmpW(bstrs[2], L"y"), "Unexpected function second param name %s\n", wine_dbgstr_w(bstrs[2])); + for (i = 0; i < count; i++) SysFreeString(bstrs[i]); + + hr = ITypeInfo_GetMops(typeinfo, memid, NULL); + ok(hr == E_INVALIDARG, "GetMops returned: %08x\n", hr); + hr = ITypeInfo_GetMops(typeinfo, memid, &bstr); + ok(hr == S_OK, "GetMops failed: %08x\n", hr); + ok(!bstr, "Unexpected non-null string %s\n", wine_dbgstr_w(bstr)); + hr = ITypeInfo_GetMops(typeinfo, MEMBERID_NIL, &bstr); + ok(hr == S_OK, "GetMops failed: %08x\n", hr); + ok(!bstr, "Unexpected non-null string %s\n", wine_dbgstr_w(bstr)); + + /* These always fail */ + obj = (void*)0xdeadbeef; + hr = ITypeInfo_AddressOfMember(typeinfo, memid, INVOKE_FUNC, NULL); + ok(hr == E_INVALIDARG, "AddressOfMember returned: %08x\n", hr); + hr = ITypeInfo_AddressOfMember(typeinfo, memid, INVOKE_FUNC, &obj); + ok(hr == TYPE_E_BADMODULEKIND, "AddressOfMember returned: %08x\n", hr); + ok(!obj, "Unexpected non-null obj %p.\n", obj); + bstr = (BSTR)0xdeadbeef; + hr = ITypeInfo_GetDllEntry(typeinfo, memid, INVOKE_FUNC, &bstr, NULL, NULL); + ok(hr == TYPE_E_BADMODULEKIND, "GetDllEntry returned: %08x\n", hr); + ok(!bstr, "Unexpected non-null str %p.\n", bstr); + wcscpy(str, L"Invoke"); + hr = ITypeInfo_GetIDsOfNames(typeinfo, &names, 1, &memid); + ok(hr == S_OK, "GetIDsOfNames failed: %08x\n", hr); + obj = (void*)0xdeadbeef; + hr = ITypeInfo_AddressOfMember(typeinfo, memid, INVOKE_FUNC, &obj); + ok(hr == TYPE_E_BADMODULEKIND, "AddressOfMember returned: %08x\n", hr); + ok(!obj, "Unexpected non-null obj %p.\n", obj); + bstr = (BSTR)0xdeadbeef; + hr = ITypeInfo_GetDllEntry(typeinfo, memid, INVOKE_FUNC, &bstr, NULL, NULL); + ok(hr == TYPE_E_BADMODULEKIND, "GetDllEntry returned: %08x\n", hr); + ok(!bstr, "Unexpected non-null str %p.\n", bstr); } /* Check variable descriptions */ @@ -1099,6 +1202,12 @@ static void test_typeinfo(const WCHAR *parse_func_name) { hr = ITypeInfo_GetVarDesc(typeinfo, i, &vardesc); ok(hr == S_OK, "GetVarDesc(%u) failed: %08x\n", i, hr); + hr = ITypeInfo_GetDocumentation(typeinfo, vardesc->memid, &bstr, &bstrs[0], NULL, NULL); + ok(hr == S_OK, "[%u] GetDocumentation failed: %08x\n", i, hr); + ok(!lstrcmpW(bstr, var[i].name), "[%u] Unexpected variable name %s (expected %s)\n", + i, wine_dbgstr_w(bstr), wine_dbgstr_w(var[i].name)); + ok(!bstrs[0], "[%u] Unexpected doc string %s\n", i, wine_dbgstr_w(bstrs[0])); + SysFreeString(bstr); ok(vardesc->memid <= 0xFFFF, "[%u] Unexpected memid 0x%x\n", i, vardesc->memid); ok(vardesc->lpstrSchema == NULL, "[%u] Unexpected lpstrSchema %p\n", i, vardesc->lpstrSchema); ok(vardesc->oInst == 0, "[%u] Unexpected oInst %u\n", i, vardesc->oInst); @@ -1122,6 +1231,12 @@ static void test_typeinfo(const WCHAR *parse_func_name) { hr = ITypeInfo_GetFuncDesc(typeinfo, i, &funcdesc); ok(hr == S_OK, "GetFuncDesc(%u) failed: %08x\n", i, hr); + hr = ITypeInfo_GetDocumentation(typeinfo, funcdesc->memid, &bstr, &bstrs[0], NULL, NULL); + ok(hr == S_OK, "[%u] GetDocumentation failed: %08x\n", i, hr); + ok(!lstrcmpW(bstr, func[i].name), "[%u] Unexpected function name %s (expected %s)\n", + i, wine_dbgstr_w(bstr), wine_dbgstr_w(func[i].name)); + ok(!bstrs[0], "[%u] Unexpected doc string %s\n", i, wine_dbgstr_w(bstrs[0])); + SysFreeString(bstr); ok(funcdesc->memid <= 0xFFFF, "[%u] Unexpected memid 0x%x\n", i, funcdesc->memid); ok(funcdesc->lprgscode == NULL, "[%u] Unexpected lprgscode %p\n", i, funcdesc->lprgscode); ok(func[i].num_args ? (funcdesc->lprgelemdescParam != NULL) : (funcdesc->lprgelemdescParam == NULL),

1 0

Alexandre Julliard : Release 5.0-rc1.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: ce7e10868a1279573acc5be5a9659d254e936b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce7e10868a1279573acc5be5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 22:25:46 2019 +0100 Release 5.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1065 ++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 615 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce7e10868a1279573acc…

1 0

Tag wine-5.0-rc1 : Alexandre Julliard : Release 5.0-rc1
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: refs/tags/wine-5.0-rc1 Tag: 24dca5643d79ec935ebe56f7cd1a4b2d8aecca8e URL: https://source.winehq.org/git/wine.git/?a=tag;h=24dca5643d79ec935ebe56f7cd1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 13 22:25:46 2019 +0100 Release 5.0-rc1

1 0

Francois Gouget : user32: Fix the spelling of a comment.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: fe18edd6f8986afd27df66430bba92688d410fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe18edd6f8986afd27df6643… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:44 2019 +0100 user32: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b407b51811..2ff5b2f909 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2133,7 +2133,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, /* Tell it "disabled" */ if (lpAnimInfo && lpAnimInfo->cbSize == sizeof(ANIMATIONINFO)) { - lpAnimInfo->iMinAnimate = 0; /* Minimise and restore animation is disabled (nonzero == enabled) */ + lpAnimInfo->iMinAnimate = 0; /* Minimize and restore animation is disabled (nonzero == enabled) */ ret = TRUE; } break;

1 0

Francois Gouget : shell32: Tweak / fix the MS-DOS name in a comment.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 013949fc0bf1d225b1c420648bbc5c5058383430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=013949fc0bf1d225b1c42064… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:15:02 2019 +0100 shell32: Tweak / fix the MS-DOS name in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 44422ab4ff..d1be5408fb 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -876,7 +876,7 @@ HICON WINAPI ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, LPWORD l } if( hIcon == (HICON)1 ) - *lpiIcon = 2; /* MSDOS icon - we found .exe but no icons in it */ + *lpiIcon = 2; /* MS-DOS icon - we found .exe but no icons in it */ else *lpiIcon = 6; /* generic icon - found nothing */

1 0