June 2020 - Wine-Devel - list.winehq.org

[PATCH v6 3/3] oleaut32: Match funcdesc using both memberid and invkind.
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Property access functions can share the same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c095d8ea0fb..a8cb966f33e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1050,11 +1050,9 @@ static void test_TypeInfo(void) /* correct memberid -- wrong invkind */ hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); /* correct memberid -- correct invkind */ @@ -1069,7 +1067,6 @@ todo_wine ok_ole_success(hr, ITypeInfo_GetDllEntry); ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); -todo_wine ok(ordinal == 2, "got ordinal: %04x\n", ordinal); SysFreeString(bstrDllName); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab421fec90d..01bb16efbc4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1701,6 +1701,19 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, return NULL; } +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid_invkind(ITypeInfoImpl *typeinfo, MEMBERID memid, INVOKEKIND invkind) +{ + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid && typeinfo->funcdescs[i].funcdesc.invkind == invkind) + return &typeinfo->funcdescs[i]; + } + + return NULL; +} + static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { int i; @@ -7804,7 +7817,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This, memid); + pFDesc = TLB_get_funcdesc_by_memberid_invkind(This, memid, invKind); if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; dump_TypeInfo(This); -- 2.23.0

1 0

[PATCH v6 2/3] oleaut32/tests: Add tests for ITypeInfo::GetDllEntry()
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/test_reg.idl | 13 ++++++++ dlls/oleaut32/tests/typelib.c | 55 ++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index c9be76b0273..d41f4bec52b 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -163,4 +163,17 @@ library register_test UINT32 field; HRESULT hr; }; + + [ + uuid(f073cd92-a199-11ea-bb37-0242ac130002), + dllname("test.dll") + ] + module TestGetDllEntry + { + [propget, entry(1)] + int test1([out] int *i); + + [propput, entry(2)] + int test1([in] int i); + }; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e5b44a0345..c095d8ea0fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -831,18 +831,22 @@ static void test_TypeInfo(void) static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 }; static WCHAR wszClone[] = {'C','l','o','n','e',0}; + static WCHAR wszTestDll[] = {'t','e','s','t','.','d','l','l',0}; OLECHAR* bogus = wszBogus; OLECHAR* pwszGetTypeInfo = wszGetTypeInfo; OLECHAR* pwszClone = wszClone; DISPID dispidMember; DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; + static const GUID moduleTestGetDllEntryGuid = {0xf073cd92,0xa199,0x11ea,{0xbb,0x37,0x02,0x42,0xac,0x13,0x00,0x02}}; VARIANT var, res, args[2]; UINT count, i; TYPEKIND kind; const WCHAR *filename; TYPEATTR *attr; LONG l; + WORD ordinal; + BSTR bstrDllName, bstrName; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -1025,6 +1029,52 @@ static void test_TypeInfo(void) hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); + /* test GetDllEntry */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &moduleTestGetDllEntryGuid, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + ok(pTypeInfo != NULL, "got NULL typeinfo\n"); + + /* wrong memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* wrong memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); + ok(ordinal == 1, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrDllName); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); +todo_wine + ok(ordinal == 2, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrDllName); + + ITypeInfo_Release(pTypeInfo); + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IInvokeTest, &pTypeInfo); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5092,7 +5142,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, - { TKIND_RECORD, 0 } + { TKIND_RECORD, 0 }, + { TKIND_MODULE, 0 }, }; trace("Starting %s typelib registration tests\n", @@ -5126,7 +5177,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 14, "got %d\n", count); + ok(count == 15, "got %d\n", count); for(i = 0; i < count; i++) { -- 2.23.0

1 0

[PATCH v6 1/3] oleaut32: Return early if there is no matching funcdesc.
by Huw Davies June 11, 2020

June 11, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f8d71368345..ab421fec90d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7805,28 +7805,24 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid return TYPE_E_BADMODULEKIND; pFDesc = TLB_get_funcdesc_by_memberid(This, memid); - if(pFDesc){ - dump_TypeInfo(This); - if (TRACE_ON(ole)) - dump_TLBFuncDescOne(pFDesc); - - if (pBstrDllName) - *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); - - if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { - if (pBstrName) - *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); - if (pwOrdinal) - *pwOrdinal = -1; - return S_OK; - } - if (pBstrName) - *pBstrName = NULL; - if (pwOrdinal) - *pwOrdinal = LOWORD(pFDesc->Entry); - return S_OK; - } - return TYPE_E_ELEMENTNOTFOUND; + if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; + + dump_TypeInfo(This); + if (TRACE_ON(ole)) dump_TLBFuncDescOne(pFDesc); + + if (pBstrDllName) *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); + + if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) + { + if (pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); + if (pwOrdinal) *pwOrdinal = -1; + } + else + { + if (pBstrName) *pBstrName = NULL; + if (pwOrdinal) *pwOrdinal = LOWORD(pFDesc->Entry); + } + return S_OK; } /* internal function to make the inherited interfaces' methods appear -- 2.23.0

1 0

[PATCH v5 3/3] oleaut32: Match funcdesc using both memberid and invkind.
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Property access functions can share the same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9f55cc41400..0e59db6ee7f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1050,11 +1050,9 @@ static void test_TypeInfo(void) /* correct memberid -- wrong invkind */ hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); /* correct memberid -- correct invkind */ @@ -1069,7 +1067,6 @@ todo_wine ok_ole_success(hr, ITypeInfo_GetDllEntry); ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); -todo_wine ok(ordinal == 2, "got ordinal: %04x\n", ordinal); SysFreeString(bstrName); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab421fec90d..01bb16efbc4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1701,6 +1701,19 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, return NULL; } +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid_invkind(ITypeInfoImpl *typeinfo, MEMBERID memid, INVOKEKIND invkind) +{ + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid && typeinfo->funcdescs[i].funcdesc.invkind == invkind) + return &typeinfo->funcdescs[i]; + } + + return NULL; +} + static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { int i; @@ -7804,7 +7817,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This, memid); + pFDesc = TLB_get_funcdesc_by_memberid_invkind(This, memid, invKind); if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; dump_TypeInfo(This); -- 2.23.0

1 0

[PATCH v5 2/3] oleaut32/tests: Add tests for ITypeInfo::GetDllEntry()
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/test_reg.idl | 13 ++++++++ dlls/oleaut32/tests/typelib.c | 55 ++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index c9be76b0273..d41f4bec52b 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -163,4 +163,17 @@ library register_test UINT32 field; HRESULT hr; }; + + [ + uuid(f073cd92-a199-11ea-bb37-0242ac130002), + dllname("test.dll") + ] + module TestGetDllEntry + { + [propget, entry(1)] + int test1([out] int *i); + + [propput, entry(2)] + int test1([in] int i); + }; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e5b44a0345..9f55cc41400 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -831,18 +831,22 @@ static void test_TypeInfo(void) static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 }; static WCHAR wszClone[] = {'C','l','o','n','e',0}; + static WCHAR wszTestDll[] = {'t','e','s','t','.','d','l','l',0}; OLECHAR* bogus = wszBogus; OLECHAR* pwszGetTypeInfo = wszGetTypeInfo; OLECHAR* pwszClone = wszClone; DISPID dispidMember; DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; + static const GUID moduleTestGetDllEntryGuid = {0xf073cd92,0xa199,0x11ea,{0xbb,0x37,0x02,0x42,0xac,0x13,0x00,0x02}}; VARIANT var, res, args[2]; UINT count, i; TYPEKIND kind; const WCHAR *filename; TYPEATTR *attr; LONG l; + WORD ordinal; + BSTR bstrDllName, bstrName; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -1025,6 +1029,52 @@ static void test_TypeInfo(void) hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); + /* test GetDllEntry */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &moduleTestGetDllEntryGuid, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + ok(pTypeInfo != NULL, "got NULL typeinfo\n"); + + /* wrong memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* wrong memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); + ok(ordinal == 1, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrName); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); +todo_wine + ok(ordinal == 2, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrName); + + ITypeInfo_Release(pTypeInfo); + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IInvokeTest, &pTypeInfo); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5092,7 +5142,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, - { TKIND_RECORD, 0 } + { TKIND_RECORD, 0 }, + { TKIND_MODULE, 0 }, }; trace("Starting %s typelib registration tests\n", @@ -5126,7 +5177,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 14, "got %d\n", count); + ok(count == 15, "got %d\n", count); for(i = 0; i < count; i++) { -- 2.23.0

1 0

[PATCH v5 1/3] oleaut32: Return early if there is no matching funcdesc.
by Huw Davies June 11, 2020

June 11, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f8d71368345..ab421fec90d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7805,28 +7805,24 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid return TYPE_E_BADMODULEKIND; pFDesc = TLB_get_funcdesc_by_memberid(This, memid); - if(pFDesc){ - dump_TypeInfo(This); - if (TRACE_ON(ole)) - dump_TLBFuncDescOne(pFDesc); - - if (pBstrDllName) - *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); - - if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { - if (pBstrName) - *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); - if (pwOrdinal) - *pwOrdinal = -1; - return S_OK; - } - if (pBstrName) - *pBstrName = NULL; - if (pwOrdinal) - *pwOrdinal = LOWORD(pFDesc->Entry); - return S_OK; - } - return TYPE_E_ELEMENTNOTFOUND; + if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; + + dump_TypeInfo(This); + if (TRACE_ON(ole)) dump_TLBFuncDescOne(pFDesc); + + if (pBstrDllName) *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); + + if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) + { + if (pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); + if (pwOrdinal) *pwOrdinal = -1; + } + else + { + if (pBstrName) *pBstrName = NULL; + if (pwOrdinal) *pwOrdinal = LOWORD(pFDesc->Entry); + } + return S_OK; } /* internal function to make the inherited interfaces' methods appear -- 2.23.0

1 0

[PATCH v2 2/2] winhttp: Add WinHttpWebSocket* function stubs
by Alistair Leslie-Hughes June 11, 2020

June 11, 2020

--- dlls/winhttp/url.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 5 +++++ include/winhttp.h | 5 +++++ 3 files changed, 48 insertions(+) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 3e248bca9f..2986ef62da 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -554,3 +554,41 @@ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDW SetLastError( ERROR_SUCCESS ); return TRUE; } + +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET handle, DWORD_PTR context) +{ + FIXME("%p, %08lx\n", handle, context); + + return NULL; +} + +DWORD WINAPI WinHttpWebSocketSend(HINTERNET handle, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, + void *buffer, DWORD length) +{ + FIXME("%p, %d, %p, %d\n", handle, type, buffer, length); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketReceive(HINTERNET handle, void *buffer, DWORD length, DWORD *read, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *type) +{ + FIXME("%p, %p, %d, %p, %p\n", handle, buffer, length, read, type); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketClose(HINTERNET handle, USHORT status, void *reason, DWORD length) +{ + FIXME("%p, %d, %p, %d\n", handle, status, reason, length); + + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET handle, USHORT *status, void *reason, + DWORD length, DWORD *consumed) +{ + FIXME("%p, %p, %p, %d, %p\n", handle, status, reason, length, consumed); + + return ERROR_INVALID_PARAMETER; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 28dcb1598b..2d4dd8231d 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -28,4 +28,9 @@ @ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) +@ stdcall WinHttpWebSocketClose(ptr long ptr long) +@ stdcall WinHttpWebSocketCompleteUpgrade(ptr ptr) +@ stdcall WinHttpWebSocketQueryCloseStatus(ptr ptr ptr long ptr) +@ stdcall WinHttpWebSocketReceive(ptr ptr long ptr ptr) +@ stdcall WinHttpWebSocketSend(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) diff --git a/include/winhttp.h b/include/winhttp.h index ddfda48088..90ef804c75 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -853,6 +853,11 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); +DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET, USHORT*, void*,DWORD, DWORD*); +DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void *,DWORD); BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); -- 2.26.2

1 0

[PATCH v2 1/2] include: Add winhttp web socket defines
by Alistair Leslie-Hughes June 11, 2020

June 11, 2020

--- include/winhttp.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/winhttp.h b/include/winhttp.h index 33fc1f915d..ddfda48088 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -762,6 +762,54 @@ typedef struct _WINHTTP_REQUEST_STATS ULONGLONG rgullStats[WinHttpRequestStatMax]; } WINHTTP_REQUEST_STATS, *PWINHTTP_REQUEST_STATS; +typedef enum _WINHTTP_WEB_SOCKET_OPERATION +{ + WINHTTP_WEB_SOCKET_SEND_OPERATION = 0, + WINHTTP_WEB_SOCKET_RECEIVE_OPERATION = 1, + WINHTTP_WEB_SOCKET_CLOSE_OPERATION = 2, + WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION = 3 +} WINHTTP_WEB_SOCKET_OPERATION; + +typedef enum _WINHTTP_WEB_SOCKET_BUFFER_TYPE +{ + WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE = 0, + WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE = 1, + WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE = 2, + WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE = 3, + WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE = 4 +} WINHTTP_WEB_SOCKET_BUFFER_TYPE; + +typedef enum _WINHTTP_WEB_SOCKET_CLOSE_STATUS +{ + WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS = 1000, + WINHTTP_WEB_SOCKET_ENDPOINT_TERMINATED_CLOSE_STATUS = 1001, + WINHTTP_WEB_SOCKET_PROTOCOL_ERROR_CLOSE_STATUS = 1002, + WINHTTP_WEB_SOCKET_INVALID_DATA_TYPE_CLOSE_STATUS = 1003, + WINHTTP_WEB_SOCKET_EMPTY_CLOSE_STATUS = 1005, + WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS = 1006, + WINHTTP_WEB_SOCKET_INVALID_PAYLOAD_CLOSE_STATUS = 1007, + WINHTTP_WEB_SOCKET_POLICY_VIOLATION_CLOSE_STATUS = 1008, + WINHTTP_WEB_SOCKET_MESSAGE_TOO_BIG_CLOSE_STATUS = 1009, + WINHTTP_WEB_SOCKET_UNSUPPORTED_EXTENSIONS_CLOSE_STATUS = 1010, + WINHTTP_WEB_SOCKET_SERVER_ERROR_CLOSE_STATUS = 1011, + WINHTTP_WEB_SOCKET_SECURE_HANDSHAKE_ERROR_CLOSE_STATUS = 1015 +} WINHTTP_WEB_SOCKET_CLOSE_STATUS; + +typedef struct _WINHTTP_WEB_SOCKET_ASYNC_RESULT +{ + WINHTTP_ASYNC_RESULT AsyncResult; + WINHTTP_WEB_SOCKET_OPERATION Operation; +} WINHTTP_WEB_SOCKET_ASYNC_RESULT; + +typedef struct _WINHTTP_WEB_SOCKET_STATUS +{ + DWORD dwBytesTransferred; + WINHTTP_WEB_SOCKET_BUFFER_TYPE eBufferType; +} WINHTTP_WEB_SOCKET_STATUS; + +#define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123 +#define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000 + #ifdef __cplusplus extern "C" { #endif -- 2.26.2

1 0

[PATCH 10/10] prntvpt: Add support for custom scaling to ticket XML reader.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 7f65d60352..36e343bbf2 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -297,6 +297,7 @@ static void read_PageOutputColor(IXMLDOMDocument2 *doc, struct ticket *ticket) static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) { IXMLDOMNode *node, *option; + int scaling = 0; HRESULT hr; hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageScaling']", &node); @@ -317,13 +318,11 @@ static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) if (hr == S_OK && V_VT(&var) == VT_BSTR) { if (!wcscmp(V_BSTR(&var), L"psk:None")) - ticket->page.scaling = 100; + scaling = 100; + else if (!wcscmp(V_BSTR(&var), L"psk:CustomSquare")) + scaling = 0; /* psk:PageScalingScale */ else - { FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); - ticket->page.scaling = 100; - } - TRACE("scaling: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.scaling); } VariantClear(&var); @@ -332,6 +331,23 @@ static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) } IXMLDOMNode_Release(node); + + if (!scaling) + { + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:ParameterInit[@name='psk:PageScalingScale']", &node); + if (hr == S_OK) + { + read_int_value(node, &scaling); + IXMLDOMNode_Release(node); + } + } + + if (scaling) + ticket->page.scaling = scaling; + else + ticket->page.scaling = 100; + + TRACE("page.scaling: %d\n", ticket->page.scaling); } static void read_PageResolution(IXMLDOMDocument2 *doc, struct ticket *ticket) -- 2.26.2

1 0

[PATCH 09/10] prntvpt: Add support for JobCopies to ticket XML reader.
by Dmitry Timoshkov June 11, 2020

June 11, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index b210d2362e..7f65d60352 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -491,6 +491,20 @@ static void read_JobInputBin(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_JobCopies(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:ParameterInit[@name='psk:JobCopiesAllDocuments']", &node); + if (hr != S_OK) return; + + if (read_int_value(node, &ticket->job.copies) == S_OK) + TRACE("job.copies: %d\n", ticket->job.copies); + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -596,6 +610,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic if (scope > kPTDocumentScope) { read_JobInputBin(doc, ticket); + read_JobCopies(doc, ticket); } fail: -- 2.26.2

1 0