- wine-devel - winehq.org

[PATCH v6 3/3] oleaut32: Match funcdesc using both memberid and invkind.
by Huw Davies 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

--- 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 11 Jun '20

11 Jun '20

--- 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 11 Jun '20

11 Jun '20

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 11 Jun '20

11 Jun '20

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

[PATCH 08/10] prntvpt: Add support for JobInputBin to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index cc5e8e99ce..b210d2362e 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -451,6 +451,46 @@ static void read_DocumentCollate(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_JobInputBin(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:JobInputBin']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:AutoSelect")) + ticket->job.input_bin = DMBIN_AUTO; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->job.input_bin = DMBIN_AUTO; + } + TRACE("input_bin: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->job.input_bin); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -553,6 +593,11 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic if (scope > kPTPageScope) read_DocumentCollate(doc, ticket); + if (scope > kPTDocumentScope) + { + read_JobInputBin(doc, ticket); + } + fail: IXMLDOMDocument2_Release(doc); return hr; -- 2.26.2

1 0

[PATCH 07/10] prntvpt: Add support for DocumentCollate to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 1354d2e0f1..cc5e8e99ce 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -409,6 +409,48 @@ static void read_PageOrientation(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_DocumentCollate(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:DocumentCollate']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:Collated")) + ticket->document.collate = DMCOLLATE_TRUE; + else if (!wcscmp(V_BSTR(&var), L"psk:Uncollated")) + ticket->document.collate = DMCOLLATE_FALSE; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->document.collate = DMCOLLATE_FALSE; + } + TRACE("document.collate: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->document.collate); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -508,6 +550,9 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic read_PageResolution(doc, ticket); read_PageOrientation(doc, ticket); + if (scope > kPTPageScope) + read_DocumentCollate(doc, ticket); + fail: IXMLDOMDocument2_Release(doc); return hr; -- 2.26.2

1 0

[PATCH 06/10] prntvpt: Add support for PageOrientation to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index df5cd0399a..1354d2e0f1 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -367,6 +367,48 @@ static void read_PageResolution(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageOrientation(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageOrientation']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:Portrait")) + ticket->page.orientation = DMORIENT_PORTRAIT; + else if (!wcscmp(V_BSTR(&var), L"psk:Landscape")) + ticket->page.orientation = DMORIENT_LANDSCAPE; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->page.orientation = DMORIENT_PORTRAIT; + } + TRACE("orientation: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.orientation); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -464,6 +506,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic read_PageOutputColor(doc, ticket); read_PageScaling(doc, ticket); read_PageResolution(doc, ticket); + read_PageOrientation(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 05/10] prntvpt: Add support for PageResolution to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 74e9041670..df5cd0399a 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -334,6 +334,39 @@ static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageResolution(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option, *child; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageResolution']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:ResolutionX']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.resolution.x) == S_OK) + TRACE("resolution.x: %d\n", ticket->page.resolution.x); + IXMLDOMNode_Release(child); + } + + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:ResolutionY']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.resolution.y) == S_OK) + TRACE("resolution.y: %d\n", ticket->page.resolution.y); + IXMLDOMNode_Release(child); + } + + IXMLDOMNode_Release(option); + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -430,6 +463,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic read_PageMediaSize(doc, ticket); read_PageOutputColor(doc, ticket); read_PageScaling(doc, ticket); + read_PageResolution(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 04/10] prntvpt: Add support for PageScaling to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 3ddb43b75f..74e9041670 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -294,6 +294,46 @@ static void read_PageOutputColor(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageScaling(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageScaling']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:None")) + ticket->page.scaling = 100; + 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); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -389,6 +429,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic /* PageScope is always added */ read_PageMediaSize(doc, ticket); read_PageOutputColor(doc, ticket); + read_PageScaling(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 03/10] prntvpt: Add support for PageOutputColor to ticket XML reader.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 8c0f87699a..3ddb43b75f 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -252,6 +252,48 @@ static void read_PageMediaSize(IXMLDOMDocument2 *doc, struct ticket *ticket) IXMLDOMNode_Release(node); } +static void read_PageOutputColor(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageOutputColor']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + if (!wcscmp(V_BSTR(&var), L"psk:Color")) + ticket->page.color = DMCOLOR_COLOR; + else if (!wcscmp(V_BSTR(&var), L"psk:Monochrome")) + ticket->page.color = DMCOLOR_MONOCHROME; + else + { + FIXME("%s\n", wine_dbgstr_w(V_BSTR(&var))); + ticket->page.color = DMCOLOR_MONOCHROME; + } + TRACE("color: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.color); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + } + + IXMLDOMNode_Release(node); +} + static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { IStream *stream; @@ -346,6 +388,7 @@ static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct tic /* PageScope is always added */ read_PageMediaSize(doc, ticket); + read_PageOutputColor(doc, ticket); fail: IXMLDOMDocument2_Release(doc); -- 2.26.2

1 0

[PATCH 02/10] prntvpt: Implement PTConvertPrintTicketToDevMode.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/Makefile.in | 5 +- dlls/prntvpt/main.c | 1 + dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 413 ++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 16 ++ 5 files changed, 434 insertions(+), 3 deletions(-) create mode 100644 dlls/prntvpt/ticket.c diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index a3db8760c2..452faa4fbf 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,8 +1,9 @@ MODULE = prntvpt.dll IMPORTLIB = prntvpt -IMPORTS = winspool +IMPORTS = winspool ole32 oleaut32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - main.c + main.c \ + ticket.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index e150308720..ac44cdc1ee 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "wingdi.h" #include "winspool.h" +#include "objbase.h" #include "prntvpt.h" #include "wine/heap.h" #include "wine/debug.h" diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index d785bae9c6..ce8a0e591c 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -5,7 +5,7 @@ @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket -@ stub PTConvertPrintTicketToDevMode +@ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) @ stub PTConvertDevModeToPrintTicket @ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c new file mode 100644 index 0000000000..8c0f87699a --- /dev/null +++ b/dlls/prntvpt/ticket.c @@ -0,0 +1,413 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winspool.h" +#include "objbase.h" +#include "prntvpt.h" +#include "initguid.h" +#include "msxml2.h" +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); + +struct size +{ + int width; + int height; +}; + +struct media +{ + int paper; + struct size size; +}; + +struct resolution +{ + int x; + int y; +}; + +struct page +{ + struct media media; + struct resolution resolution; + int orientation; + int scaling; + int color; +}; + +struct document +{ + int collate; +}; + +struct job +{ + int nup; + int copies; + int input_bin; +}; + +struct ticket +{ + struct job job; + struct document document; + struct page page; +}; + +static const struct +{ + const WCHAR *name; + int paper; +} psk_media[] = +{ + { L"psk:ISOA4", DMPAPER_A4 }, +}; + +static int media_to_paper(const WCHAR *name) +{ + int i; + + for (i = 0 ; i < ARRAY_SIZE(psk_media); i++) + if (!wcscmp(name, psk_media[i].name)) + return psk_media[i].paper; + + FIXME("%s\n", wine_dbgstr_w(name)); + return DMPAPER_A4; +} + +static BOOL is_valid_node_name(const WCHAR *name) +{ + static const WCHAR * const psf_names[] = { L"psf:ParameterInit", L"psf:Feature" }; + int i; + + for (i = 0 ; i < ARRAY_SIZE(psf_names); i++) + if (!wcscmp(name, psf_names[i])) return TRUE; + + return FALSE; +} + +static HRESULT verify_ticket(IXMLDOMDocument2 *doc) +{ + IXMLDOMElement *element; + IXMLDOMNode *node = NULL; + BSTR str; + HRESULT hr; + + hr = IXMLDOMDocument2_get_documentElement(doc, &element); + if (hr != S_OK) return E_PRINTTICKET_FORMAT; + + hr = IXMLDOMElement_get_tagName(element, &str); + if (hr != S_OK) goto fail; + if (wcscmp(str, L"psf:PrintTicket") != 0) + hr = E_FAIL; + SysFreeString(str); + if (hr != S_OK) goto fail; + + hr = IXMLDOMElement_get_firstChild(element, &node); + IXMLDOMElement_Release(element); + if (hr != S_OK) return S_OK; + + for (;;) + { + VARIANT var; + IXMLDOMNode *next_node; + + hr = IXMLDOMNode_get_nodeName(node, &str); + if (hr != S_OK) break; + if (!is_valid_node_name(str)) + hr = E_FAIL; + SysFreeString(str); + if (hr != S_OK) break; + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void **)&element); + if (hr != S_OK) break; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + IXMLDOMElement_Release(element); + if (hr != S_OK) break; + if (V_VT(&var) != VT_BSTR) + hr = E_FAIL; + VariantClear(&var); + if (hr != S_OK) break; + + hr = IXMLDOMNode_get_nextSibling(node, &next_node); + if (hr != S_OK) + { + hr = S_OK; + break; + } + + IXMLDOMNode_Release(node); + node = next_node; + } + +fail: + if (node) IXMLDOMNode_Release(node); + + return hr != S_OK ? E_PRINTTICKET_FORMAT : S_OK; +} + +static HRESULT read_int_value(IXMLDOMNode *node, int *value) +{ + IXMLDOMNode *val; + HRESULT hr; + VARIANT var1, var2; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Value[@xsi:type='xsd:integer']", &val); + if (hr != S_OK) return hr; + + VariantInit(&var1); + hr = IXMLDOMNode_get_nodeTypedValue(val, &var1); + if (hr == S_OK) + { + VariantInit(&var2); + hr = VariantChangeTypeEx(&var2, &var1, 0, 0, VT_I4); + if (hr == S_OK) + *value = V_I4(&var2); + + VariantClear(&var1); + } + + IXMLDOMNode_Release(val); + return hr; +} + +static void read_PageMediaSize(IXMLDOMDocument2 *doc, struct ticket *ticket) +{ + IXMLDOMNode *node, *option, *child; + HRESULT hr; + + hr = IXMLDOMDocument2_selectSingleNode(doc, (BSTR)L"psf:PrintTicket/psf:Feature[@name='psk:PageMediaSize']", &node); + if (hr != S_OK) return; + + hr = IXMLDOMNode_selectSingleNode(node, (BSTR)L"./psf:Option", &option); + if (hr == S_OK) + { + IXMLDOMElement *element; + + hr = IXMLDOMNode_QueryInterface(option, &IID_IXMLDOMElement, (void **)&element); + if (hr == S_OK) + { + VARIANT var; + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute(element, (BSTR)L"name", &var); + if (hr == S_OK && V_VT(&var) == VT_BSTR) + { + ticket->page.media.paper = media_to_paper(V_BSTR(&var)); + TRACE("paper: %s => %d\n", wine_dbgstr_w(V_BSTR(&var)), ticket->page.media.paper); + } + VariantClear(&var); + + IXMLDOMElement_Release(element); + } + + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:MediaSizeWidth']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.media.size.width) == S_OK) + TRACE("width: %d\n", ticket->page.media.size.width); + IXMLDOMNode_Release(child); + } + + hr = IXMLDOMNode_selectSingleNode(option, (BSTR)L"./psf:ScoredProperty[@name='psk:MediaSizeHeight']", &child); + if (hr == S_OK) + { + if (read_int_value(child, &ticket->page.media.size.height) == S_OK) + TRACE("height: %d\n", ticket->page.media.size.height); + IXMLDOMNode_Release(child); + } + + IXMLDOMNode_Release(option); + } + + IXMLDOMNode_Release(node); +} + +static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) +{ + IStream *stream; + IXMLDOMElement *element = NULL; + IXMLDOMNamedNodeMap *map = NULL; + HRESULT hr; + LONG count, i; + HGLOBAL hmem; + BSTR str; + VARIANT var; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if (hr != S_OK) return; + + hr = IXMLDOMDocument2_get_documentElement(doc, &element); + if (hr != S_OK) goto fail; + + hr = IXMLDOMElement_get_attributes(element, &map); + if (hr != S_OK) goto fail; + + hr = IXMLDOMNamedNodeMap_get_length(map, &count); + if (hr != S_OK) goto fail; + + for (i = 0; i < count; i++) + { + IXMLDOMNode *node; + + hr = IXMLDOMNamedNodeMap_get_item(map, i, &node); + if (hr == S_OK) + { + hr = IXMLDOMNode_get_nodeName(node, &str); + if (hr == S_OK) + { + VariantInit(&var); + hr = IXMLDOMNode_get_nodeValue(node, &var); + if (hr == S_OK) + { + if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6)) + { + TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); + IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL); + IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL); + IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL); + IStream_Write(stream, L"\" ", 2 * sizeof(WCHAR), NULL); + } + VariantClear(&var); + } + SysFreeString(str); + } + IXMLDOMNode_Release(node); + } + } + + IStream_Write(stream, L"", sizeof(WCHAR), NULL); + + hr = GetHGlobalFromStream(stream, &hmem); + if (hr != S_OK) goto fail; + + str = GlobalLock(hmem); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(str); + IXMLDOMDocument2_setProperty(doc, (BSTR)L"SelectionNamespaces", var); + SysFreeString(V_BSTR(&var)); + GlobalUnlock(hmem); + +fail: + if (map) IXMLDOMNamedNodeMap_Release(map); + if (element) IXMLDOMElement_Release(element); + IStream_Release(stream); +} + +static HRESULT parse_ticket(IStream *stream, EPrintTicketScope scope, struct ticket *ticket) +{ + IXMLDOMDocument2 *doc; + VARIANT src; + VARIANT_BOOL ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DOMDocument30, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void **)&doc); + if (hr != S_OK) return hr; + + V_VT(&src) = VT_UNKNOWN; + V_UNKNOWN(&src) = (IUnknown *)stream; + hr = IXMLDOMDocument2_load(doc, src, &ret); + if (hr != S_OK) goto fail; + + hr = verify_ticket(doc); + if (hr != S_OK) goto fail; + + set_SelectionNamespaces(doc); + + /* PageScope is always added */ + read_PageMediaSize(doc, ticket); + +fail: + IXMLDOMDocument2_Release(doc); + return hr; +} + +static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) +{ + memset(dm, 0, sizeof(*dm)); + + dm->dmSize = sizeof(*dm); + dm->dmFields = DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | DM_SCALE | + DM_COPIES | DM_COLOR | DM_PRINTQUALITY | DM_YRESOLUTION | DM_COLLATE; + dm->u1.s1.dmOrientation = ticket->page.orientation; + dm->u1.s1.dmPaperSize = ticket->page.media.paper; + dm->u1.s1.dmPaperWidth = ticket->page.media.size.width / 100; + dm->u1.s1.dmPaperLength = ticket->page.media.size.height / 100; + dm->u1.s1.dmScale = ticket->page.scaling; + dm->u1.s1.dmCopies = ticket->job.copies; + dm->dmColor = ticket->page.color; + dm->u1.s1.dmPrintQuality = ticket->page.resolution.x; + dm->dmYResolution = ticket->page.resolution.y; + dm->dmCollate = ticket->document.collate; +} + +static void initialize_ticket(struct ticket *ticket) +{ + ticket->job.nup = 0; + ticket->job.copies = 1; + ticket->job.input_bin = DMBIN_AUTO; + ticket->document.collate = DMCOLLATE_FALSE; + ticket->page.media.paper = DMPAPER_A4; + ticket->page.media.size.width = 210000; + ticket->page.media.size.height = 297000; + ticket->page.resolution.x = 600; + ticket->page.resolution.y = 600; + ticket->page.orientation = DMORIENT_PORTRAIT; + ticket->page.scaling = 100; + ticket->page.color = DMCOLOR_MONOCHROME; +} + +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stream, EDefaultDevmodeType type, + EPrintTicketScope scope, ULONG *size, PDEVMODEW *dm, BSTR *error) +{ + HRESULT hr; + struct ticket ticket; + + TRACE("%p,%p,%d,%d,%p,%p,%p\n", provider, stream, type, scope, size, dm, error); + + if (!provider || !stream || !size || !dm) + return E_INVALIDARG; + + initialize_ticket(&ticket); + + hr = parse_ticket(stream, scope, &ticket); + if (hr != S_OK) return hr; + + *dm = heap_alloc(sizeof(**dm)); + if (!dm) return E_OUTOFMEMORY; + + ticket_to_devmode(&ticket, *dm); + *size = sizeof(**dm); + + return S_OK; +} diff --git a/include/prntvpt.h b/include/prntvpt.h index a3c28ef6d4..e1855badd1 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -25,9 +25,25 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); +#define E_PRINTTICKET_FORMAT 0x80040003 + +typedef enum +{ + kPTPageScope, + kPTDocumentScope, + kPTJobScope +} EPrintTicketScope; + +typedef enum +{ + kUserDefaultDevmode, + kPrinterDefaultDevmode +} EDefaultDevmodeType; + HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); HRESULT WINAPI PTCloseProvider(HPTPROVIDER); +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus -- 2.26.2

1 0

[PATCH 01/10] prntvpt: Implement PTReleaseMemory.
by Dmitry Timoshkov 11 Jun '20

11 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 1bbe280d0e..e150308720 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -51,6 +51,12 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } +HRESULT WINAPI PTReleaseMemory(PVOID mem) +{ + heap_free(mem); + return S_OK; +} + HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) { FIXME("stub:%s %p\n", debugstr_w(printer), version); diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 99c6708242..d785bae9c6 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -7,7 +7,7 @@ @ stub PTMergeAndValidatePrintTicket @ stub PTConvertPrintTicketToDevMode @ stub PTConvertDevModeToPrintTicket -@ stub PTReleaseMemory +@ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 @ stub ConvertDevModeToPrintTicketThunk @ stub ConvertPrintTicketToDevModeThunk2 diff --git a/include/prntvpt.h b/include/prntvpt.h index a453f8cb37..a3c28ef6d4 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -28,6 +28,7 @@ DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); HRESULT WINAPI PTCloseProvider(HPTPROVIDER); +HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus } -- 2.26.2

1 0

[PATCH 2/2] winhttp: Add WinHttpWebSocket* function stubs
by Alistair Leslie-Hughes 11 Jun '20

11 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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..3ccaaedb54 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, %p\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, %d\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 1/2] include: Add winhttp web socket defines
by Alistair Leslie-Hughes 11 Jun '20

11 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- 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 v4 1/2] user32/tests:Add test function Used to verify the child window Z order problem
by Jiajin Cui 11 Jun '20

11 Jun '20

Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

2 1

[PATCH v4 2/2] user32:Fix z order error when child window want to be topmost windows
by Jiajin Cui 11 Jun '20

11 Jun '20

I have submit job to wine testbot, the job id is 73197,73198 for verify this patch. and I think this path wasn`t for specific application. window with WS_CHILD does not need to change Z order when SetWindowPos param hwndInsertAfter is HWND_TOPMOST or HWND_NOTOPMOST Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/winpos.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

2 1

[PATCH v4 1/2] user32/tests:Add test function Used to verify the child window Z order problem
by Jiajin Cui 11 Jun '20

11 Jun '20

Signed-off-by: cuijiajin <cuijiajin(a)uniontech.com> --- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

1 0

[PATCH] ws2_32: Implement GetHostNameW() function using GetComputerNameW
by Vijay Kiran Kamuju 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] ws2_32: Implement GetHostNameW() function using GetComputerNameW
by Vijay Kiran Kamuju 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/3] quartz/filtergraph: Always try to query IMediaSeeking if it's not cached yet.
by Anton Baskanov 10 Jun '20

10 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/filtergraph.c | 33 +++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 43 ++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..a77a9165f5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -585,6 +585,21 @@ static BOOL has_output_pins(IBaseFilter *filter) return FALSE; } +static void update_seeking(struct filter *filter) +{ + if (!filter->seeking) + { + /* The Legend of Heroes: Trails of Cold Steel II destroys its filter when + * its IMediaSeeking interface is released, so cache the interface instead + * of querying for it every time. + * Some filters (e.g. MediaStreamFilter) can become seekable when they are + * already in the graph, so always try to query IMediaSeeking if it's not + * cached yet. */ + if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&filter->seeking))) + filter->seeking = NULL; + } +} + static BOOL is_renderer(struct filter *filter) { IAMFilterMiscFlags *flags; @@ -596,8 +611,12 @@ static BOOL is_renderer(struct filter *filter) ret = TRUE; IAMFilterMiscFlags_Release(flags); } - else if (filter->seeking && !has_output_pins(filter->filter)) - ret = TRUE; + else + { + update_seeking(filter); + if (filter->seeking && !has_output_pins(filter->filter)) + ret = TRUE; + } return ret; } @@ -663,15 +682,10 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter_AddRef(entry->filter = filter); - /* The Legend of Heroes: Trails of Cold Steel II destroys its filter when - * its IMediaSeeking interface is released, so cache the interface instead - * of querying for it every time. */ - if (FAILED(IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&entry->seeking))) - entry->seeking = NULL; - list_add_head(&graph->filters, &entry->entry); list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; + entry->seeking = NULL; ++graph->version; if (is_renderer(entry)) @@ -2249,6 +2263,7 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { + update_seeking(filter); if (!filter->seeking) continue; hr = FoundSeek(This, filter->seeking, arg); @@ -2454,6 +2469,7 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { + update_seeking(filter); if (!filter->seeking) continue; @@ -2562,6 +2578,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * { LONGLONG current = current_ptr ? *current_ptr : 0, stop = stop_ptr ? *stop_ptr : 0; + update_seeking(filter); if (!filter->seeking) continue; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..98b24c68d6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3618,6 +3618,17 @@ static void test_ec_complete(void) ok(filter3.ref == 1, "Got outstanding refcount %d.\n", filter3.ref); } +/* Remove and re-add the filter, to flush the graph's internal + * IMediaSeeking cache. Don't expose IMediaSeeking when adding, to show + * that it's only queried when needed. */ +static void flush_cached_seeking(IFilterGraph2 *graph, struct testfilter *filter) +{ + IFilterGraph2_RemoveFilter(graph, &filter->IBaseFilter_iface); + filter->IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter->IBaseFilter_iface, NULL); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; +} + static void test_graph_seeking(void) { struct testfilter filter1, filter2; @@ -3658,9 +3669,6 @@ static void test_graph_seeking(void) testfilter_init(&filter1, NULL, 0); testfilter_init(&filter2, NULL, 0); - filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; - filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); @@ -3823,6 +3831,8 @@ static void test_graph_seeking(void) IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; filter1.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; filter2.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetDuration; @@ -3832,6 +3842,9 @@ static void test_graph_seeking(void) ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3847,6 +3860,9 @@ static void test_graph_seeking(void) ok(hr == E_FAIL, "Got hr %#x.\n", hr); ok(!caps, "Got caps %#x.\n", caps); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + hr = IMediaSeeking_IsFormatSupported(seeking, &testguid); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3904,6 +3920,9 @@ static void test_graph_seeking(void) hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &TIME_FORMAT_NONE); todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + filter1.seek_duration = 0x12345; filter2.seek_duration = 0x23456; hr = IMediaSeeking_GetDuration(seeking, &time); @@ -3916,6 +3935,9 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + filter1.seek_stop = 0x54321; filter2.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); @@ -3947,16 +3969,25 @@ static void test_graph_seeking(void) ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); filter1.seek_hr = filter2.seek_hr = S_OK; + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!time, "Got time %s.\n", wine_dbgstr_longlong(time)); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current)); ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + current = 0x123; stop = 0x321; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, @@ -4024,6 +4055,9 @@ static void test_graph_seeking(void) ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + hr = IMediaSeeking_SetRate(seeking, 2.0); ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(filter1.seek_rate == 2.0, "Got rate %.16e.\n", filter1.seek_rate); @@ -4039,6 +4073,9 @@ static void test_graph_seeking(void) todo_wine ok(filter1.seek_rate == -1.0, "Got rate %.16e.\n", filter1.seek_rate); todo_wine ok(filter2.seek_rate == -1.0, "Got rate %.16e.\n", filter2.seek_rate); + flush_cached_seeking(graph, &filter1); + flush_cached_seeking(graph, &filter2); + hr = IMediaSeeking_GetRate(seeking, &rate); ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(rate == -1.0, "Got rate %.16e.\n", rate); -- 2.17.1

3 7

[PATCH 1/3] winegstreamer: Don't query our own source pad to convert duration.
by Zebediah Figura 10 Jun '20

10 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7c38e421f9b..19d36cd233c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1139,21 +1139,23 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) { struct gstdemux *This = gst_pad_get_element_private(pad); GstFormat format; - int ret; - LONGLONG duration; TRACE("filter %p, type %s.\n", This, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: - gst_query_parse_duration (query, &format, NULL); - if (format == GST_FORMAT_PERCENT) { - gst_query_set_duration (query, GST_FORMAT_PERCENT, GST_FORMAT_PERCENT_MAX); + gst_query_parse_duration(query, &format, NULL); + if (format == GST_FORMAT_PERCENT) + { + gst_query_set_duration(query, GST_FORMAT_PERCENT, GST_FORMAT_PERCENT_MAX); return TRUE; } - ret = gst_pad_query_convert (pad, GST_FORMAT_BYTES, This->filesize, format, &duration); - gst_query_set_duration(query, format, duration); - return ret; + else if (format == GST_FORMAT_BYTES) + { + gst_query_set_duration(query, GST_FORMAT_BYTES, This->filesize); + return TRUE; + } + return FALSE; case GST_QUERY_SEEKING: gst_query_parse_seeking (query, &format, NULL, NULL, NULL); if (format != GST_FORMAT_BYTES) -- 2.27.0

1 2

[PATCH] winegstreamer: Prevent hanging when loading a short MP3 file.
by Akihiro Sagawa 10 Jun '20

10 Jun '20

If Info tag[1] isn't present in the MP3 file, GStreamer trys to read some more frames from the file to estimate a duration. Then, it sends a duration-changed message to winegstreamer. However, it seems not to send the message if the file is too short to estimate the duration, e.g. 0.5 seconds. Winegstreamer gets stuck in this case. This patch removes Info tag from dlls/quartz/tests/test.mp3 and fixes the above issue by watching pad's EOS events. [1] http://gabriel.mp3-tech.org/mp3infotag.html Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mp3 | Bin 2349 -> 2157 bytes dlls/winegstreamer/gstdemux.c | 13 ++++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-)

3 2

[PATCH] ws2_32: Optimize interface_bind_check() by caching adapter addresses.
by Paul Gofman 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48668 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 65 ++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 199b7187a87..87446025646 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -277,6 +277,17 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +static in_addr_t *if_addr_cache; +static unsigned int if_addr_cache_size; +static CRITICAL_SECTION cs_if_addr_cache; +static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = +{ + 0, 0, &cs_if_addr_cache, + { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } +}; +static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + union generic_unix_sockaddr { struct sockaddr addr; @@ -3348,6 +3359,33 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " "receiving broadcast packets will not work on socket %04lx.\n", s); #endif + if (ret) + { + EnterCriticalSection(&cs_if_addr_cache); + if (if_addr_cache_size <= adapter->Index) + { + unsigned int new_size; + in_addr_t *new; + + new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) + { + ERR("No memory.\n"); + ret = FALSE; + LeaveCriticalSection(&cs_if_addr_cache); + break; + } + memset(new + if_addr_cache_size, 0, sizeof(*if_addr_cache) + * (new_size - if_addr_cache_size)); + if_addr_cache = new; + if_addr_cache_size = new_size; + } + if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) + WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + + if_addr_cache[adapter->Index] = adapter_addr; + LeaveCriticalSection(&cs_if_addr_cache); + } break; } } @@ -3752,27 +3790,12 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) #endif if (!ret) { - PIP_ADAPTER_INFO adapters, adapter; - DWORD adap_size; - - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - return; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) - { - /* Search the IPv4 adapter list for the appropriate bound interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr; - if (adapter->Index != ifindex) continue; - - adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); - addr->sin_addr.s_addr = adapter_addr; - TRACE("reporting interface address from adapter %d\n", ifindex); - break; - } - } - HeapFree(GetProcessHeap(), 0, adapters); + EnterCriticalSection(&cs_if_addr_cache); + if (ifindex < if_addr_cache_size) + addr->sin_addr.s_addr = if_addr_cache[ifindex]; + else + ERR("No cache entry for ifindex %u.\n", ifindex); + LeaveCriticalSection(&cs_if_addr_cache); } #endif } -- 2.26.2

1 0

[PATCH] ws2_32: Optimize interface_bind_check() by caching adapter addresses.
by Paul Gofman 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48668 --- dlls/ws2_32/socket.c | 65 ++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 199b7187a87..87446025646 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -277,6 +277,17 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +static in_addr_t *if_addr_cache; +static unsigned int if_addr_cache_size; +static CRITICAL_SECTION cs_if_addr_cache; +static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = +{ + 0, 0, &cs_if_addr_cache, + { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } +}; +static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + union generic_unix_sockaddr { struct sockaddr addr; @@ -3348,6 +3359,33 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " "receiving broadcast packets will not work on socket %04lx.\n", s); #endif + if (ret) + { + EnterCriticalSection(&cs_if_addr_cache); + if (if_addr_cache_size <= adapter->Index) + { + unsigned int new_size; + in_addr_t *new; + + new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) + { + ERR("No memory.\n"); + ret = FALSE; + LeaveCriticalSection(&cs_if_addr_cache); + break; + } + memset(new + if_addr_cache_size, 0, sizeof(*if_addr_cache) + * (new_size - if_addr_cache_size)); + if_addr_cache = new; + if_addr_cache_size = new_size; + } + if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) + WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + + if_addr_cache[adapter->Index] = adapter_addr; + LeaveCriticalSection(&cs_if_addr_cache); + } break; } } @@ -3752,27 +3790,12 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) #endif if (!ret) { - PIP_ADAPTER_INFO adapters, adapter; - DWORD adap_size; - - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - return; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) - { - /* Search the IPv4 adapter list for the appropriate bound interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr; - if (adapter->Index != ifindex) continue; - - adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); - addr->sin_addr.s_addr = adapter_addr; - TRACE("reporting interface address from adapter %d\n", ifindex); - break; - } - } - HeapFree(GetProcessHeap(), 0, adapters); + EnterCriticalSection(&cs_if_addr_cache); + if (ifindex < if_addr_cache_size) + addr->sin_addr.s_addr = if_addr_cache[ifindex]; + else + ERR("No cache entry for ifindex %u.\n", ifindex); + LeaveCriticalSection(&cs_if_addr_cache); } #endif } -- 2.26.2

1 0

[PATCH 6/6] winemac.drv: Support multiple adapter display settings in registry.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 91 +++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 31 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 461662b33b9..896948b2fea 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -151,44 +151,64 @@ static void release_display_device_init_mutex(HANDLE mutex) CloseHandle(mutex); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_value_fmt[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; + static const WCHAR video_key[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, display, ARRAY_SIZE(display))) return FALSE; - strcat(key, display0); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(display), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, video_value_fmt, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_key, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) + return FALSE; + + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; + + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -216,22 +236,31 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_mac_reg_key[128]; + WCHAR wine_mac_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_mac_reg_key, ARRAY_SIZE(wine_mac_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -250,6 +279,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -833,12 +863,6 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter settings is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -956,13 +980,18 @@ better: /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); - if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) + if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devname, devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; } else if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; + else if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter settings is currently unsupported.\n"); + ret = DISP_CHANGE_SUCCESSFUL; + } else if (macdrv_set_display_mode(&displays[0], best_display_mode)) { int mode_bpp = display_mode_bits_per_pixel(best_display_mode); @@ -1032,7 +1061,7 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, if (mode == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode\n", mode); - return read_registry_settings(devmode); + return read_registry_settings(devname, devmode); } if (macdrv_get_displays(&displays, &num_displays)) -- 2.25.1

2 1

[PATCH 5/6] winemac.drv: Use helpers to get and release display device init mutex.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

This makes later patches smaller. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e6fb9ded7eb..461662b33b9 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -136,6 +136,21 @@ static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL inited_original_display_mode; +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + static BOOL get_display_device_reg_key(char *key, unsigned len) { static const char display_device_guid_prop[] = "__wine_display_device_guid"; @@ -1673,7 +1688,6 @@ static void cleanup_devices(void) */ void macdrv_init_display_devices(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; @@ -1688,8 +1702,7 @@ void macdrv_init_display_devices(BOOL force) WCHAR driverW[1024]; LUID gpu_luid; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -1757,8 +1770,7 @@ done: SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); macdrv_free_gpus(gpus); macdrv_free_adapters(adapters); -- 2.25.1

2 1

[PATCH 2/6] winemac.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5bbea22d3aa..e6fb9ded7eb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -193,7 +193,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->dmPosition.x); query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); #undef query_value -- 2.25.1

2 1

[PATCH] mshtml: Add IHTMLCSSStyleDeclaration2::perspective implementation.
by Jacek Caban 10 Jun '20

10 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH] winemac.drv: Ensure output IDs are unique for mirrored displays.
by Brendan Shanks 10 Jun '20

10 Jun '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/display.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5bbea22d3aa..050bf05da92 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1545,7 +1545,7 @@ done: * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *monitor, int monitor_index, - int video_index, const LUID *gpu_luid) + int video_index, const LUID *gpu_luid, UINT output_id) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR nameW[MAX_PATH]; @@ -1573,7 +1573,7 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, - DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; /* Create driver key */ @@ -1685,6 +1685,7 @@ void macdrv_init_display_devices(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; LUID gpu_luid; + UINT output_id = 0; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1736,7 +1737,7 @@ void macdrv_init_display_devices(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); - if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid, output_id++)) goto done; } -- 2.26.2

2 1

[PATCH 4/4] msvcp: Use BitScanReverse in log2i.
by Jacek Caban 10 Jun '20

10 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcp90/misc.c | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)

2 1

[PATCH 1/5] dwrite: Return ranges for selected cmap.
by Nikolay Sivov 10 Jun '20

10 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 7 +- dlls/dwrite/font.c | 18 +--- dlls/dwrite/opentype.c | 188 ++++++++++++++--------------------- 3 files changed, 81 insertions(+), 132 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2a8a4d47414..a9fbb260e35 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -198,6 +198,8 @@ enum font_flags struct dwrite_cmap; typedef UINT16 (*p_cmap_get_glyph_func)(const struct dwrite_cmap *cmap, unsigned int ch); +typedef unsigned int (*p_cmap_get_ranges_func)(const struct dwrite_cmap *cmap, unsigned int max_count, + DWRITE_UNICODE_RANGE *ranges); struct dwrite_cmap { @@ -226,6 +228,7 @@ struct dwrite_cmap } format12_13; } u; p_cmap_get_glyph_func get_glyph; + p_cmap_get_ranges_func get_ranges; unsigned short symbol : 1; IDWriteFontFileStream *stream; void *table_context; @@ -235,6 +238,8 @@ extern void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, un DWRITE_FONT_FACE_TYPE face_type) DECLSPEC_HIDDEN; extern void dwrite_cmap_release(struct dwrite_cmap *cmap) DECLSPEC_HIDDEN; extern UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) DECLSPEC_HIDDEN; +extern HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, + DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; struct dwrite_fontface { @@ -387,8 +392,6 @@ struct ot_gsubgpos_table extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; extern HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag, const void **data, void **context, UINT32 *size, BOOL *exists) DECLSPEC_HIDDEN; -extern HRESULT opentype_cmap_get_unicode_ranges(const struct file_stream_desc *stream_desc, unsigned int max_count, - DWRITE_UNICODE_RANGE *ranges, unsigned int *count) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(struct file_stream_desc*,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern void opentype_get_font_typo_metrics(struct file_stream_desc *stream_desc, unsigned int *ascent, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7f5cce4e4b2..ab60d4368c7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1005,7 +1005,6 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace5 *iface, DWRITE_UNICODE_RANGE *ranges, UINT32 *count) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - struct file_stream_desc stream_desc; TRACE("%p, %u, %p, %p.\n", iface, max_count, ranges, count); @@ -1013,10 +1012,8 @@ static HRESULT WINAPI dwritefontface1_GetUnicodeRanges(IDWriteFontFace5 *iface, if (max_count && !ranges) return E_INVALIDARG; - stream_desc.stream = fontface->stream; - stream_desc.face_index = fontface->index; - stream_desc.face_type = fontface->type; - return opentype_cmap_get_unicode_ranges(&stream_desc, max_count, ranges, count); + dwrite_cmap_init(&fontface->cmap, NULL, fontface->index, fontface->type); + return opentype_cmap_get_unicode_ranges(&fontface->cmap, max_count, ranges, count); } static BOOL WINAPI dwritefontface1_IsMonospacedFont(IDWriteFontFace5 *iface) @@ -2000,8 +1997,6 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 m UINT32 *count) { struct dwrite_font *font = impl_from_IDWriteFont3(iface); - struct file_stream_desc stream_desc; - HRESULT hr; TRACE("%p, %u, %p, %p.\n", iface, max_count, ranges, count); @@ -2009,13 +2004,8 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont3 *iface, UINT32 m if (max_count && !ranges) return E_INVALIDARG; - if (FAILED(hr = get_filestream_from_file(font->data->file, &stream_desc.stream))) - return hr; - stream_desc.face_index = font->data->face_index; - stream_desc.face_type = font->data->face_type; - hr = opentype_cmap_get_unicode_ranges(&stream_desc, max_count, ranges, count); - IDWriteFontFileStream_Release(stream_desc.stream); - return hr; + dwrite_cmap_init(&font->data->cmap, font->data->file, font->data->face_index, font->data->face_type); + return opentype_cmap_get_unicode_ranges(&font->data->cmap, max_count, ranges, count); } static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont3 *iface) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 563154992ab..d8bfa3f7f6d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1571,6 +1571,18 @@ static UINT16 opentype_cmap_format0_get_glyph(const struct dwrite_cmap *cmap, un return (ch < 0xff) ? glyphs[ch] : 0; } +static unsigned int opentype_cmap_format0_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + if (count > 0) + { + ranges->first = 0; + ranges->last = 255; + } + + return 1; +} + struct cmap_format4_compare_context { const struct dwrite_cmap *cmap; @@ -1627,6 +1639,22 @@ static UINT16 opentype_cmap_format4_get_glyph(const struct dwrite_cmap *cmap, un return glyph & 0xffff; } +static unsigned int opentype_cmap_format4_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + unsigned int i; + + count = min(count, cmap->u.format4.seg_count); + + for (i = 0; i < count; ++i) + { + ranges[i].first = GET_BE_WORD(cmap->u.format4.starts[i]); + ranges[i].last = GET_BE_WORD(cmap->u.format4.ends[i]); + } + + return cmap->u.format4.seg_count; +} + static UINT16 opentype_cmap_format6_10_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { const UINT16 *glyphs = cmap->data; @@ -1634,6 +1662,18 @@ static UINT16 opentype_cmap_format6_10_get_glyph(const struct dwrite_cmap *cmap, return glyphs[ch - cmap->u.format6_10.first]; } +static unsigned int opentype_cmap_format6_10_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + if (count > 0) + { + ranges->first = cmap->u.format6_10.first; + ranges->last = cmap->u.format6_10.last; + } + + return 1; +} + static int cmap_format12_13_compare_group(const void *a, const void *b) { const unsigned int *ch = a; @@ -1661,6 +1701,23 @@ static UINT16 opentype_cmap_format12_get_glyph(const struct dwrite_cmap *cmap, u GET_BE_DWORD(group_found[2]) + (ch - GET_BE_DWORD(group_found[0])) : 0; } +static unsigned int opentype_cmap_format12_13_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + unsigned int i, group_count = cmap->u.format12_13.group_count; + const UINT32 *groups = cmap->data; + + count = min(count, group_count); + + for (i = 0; i < count; ++i) + { + ranges[i].first = GET_BE_DWORD(groups[3 * i]); + ranges[i].last = GET_BE_DWORD(groups[3 * i + 1]); + } + + return group_count; +} + static UINT16 opentype_cmap_format13_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { const UINT32 *groups = cmap->data; @@ -1678,6 +1735,12 @@ static UINT16 opentype_cmap_dummy_get_glyph(const struct dwrite_cmap *cmap, unsi return 0; } +static unsigned int opentype_cmap_dummy_get_ranges(const struct dwrite_cmap *cmap, unsigned int count, + DWRITE_UNICODE_RANGE *ranges) +{ + return 0; +} + UINT16 opentype_cmap_get_glyph(const struct dwrite_cmap *cmap, unsigned int ch) { UINT16 glyph; @@ -1771,6 +1834,7 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned case 0: cmap->data = table_read_ensure(&table, offset + 6, 256); cmap->get_glyph = opentype_cmap_format0_get_glyph; + cmap->get_ranges = opentype_cmap_format0_get_ranges; break; case 4: length = table_read_be_word(&table, offset + 2); @@ -1782,6 +1846,7 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned cmap->u.format4.glyph_id_array = cmap->data = cmap->u.format4.id_range_offset + count; cmap->u.format4.glyph_id_array_len = (length - 16 - 8 * count) / 2; cmap->get_glyph = opentype_cmap_format4_get_glyph; + cmap->get_ranges = opentype_cmap_format4_get_ranges; break; case 6: case 10: @@ -1792,12 +1857,14 @@ void dwrite_cmap_init(struct dwrite_cmap *cmap, IDWriteFontFile *file, unsigned cmap->u.format6_10.last = cmap->u.format6_10.first + count; cmap->data = table_read_ensure(&table, offset + f * 10, count * 2); cmap->get_glyph = opentype_cmap_format6_10_get_glyph; + cmap->get_ranges = opentype_cmap_format6_10_get_ranges; break; case 12: case 13: cmap->u.format12_13.group_count = count = table_read_be_dword(&table, offset + 12); cmap->data = table_read_ensure(&table, offset + 16, count * 3 * 4); cmap->get_glyph = format == 12 ? opentype_cmap_format12_get_glyph : opentype_cmap_format13_get_glyph; + cmap->get_ranges = opentype_cmap_format12_13_get_ranges; break; default: WARN("Unhandled subtable format %u.\n", format); @@ -1810,6 +1877,7 @@ failed: /* Dummy implementation, returns 0 unconditionally. */ cmap->data = cmap; cmap->get_glyph = opentype_cmap_dummy_get_glyph; + cmap->get_ranges = opentype_cmap_dummy_get_ranges; } } @@ -1824,125 +1892,13 @@ void dwrite_cmap_release(struct dwrite_cmap *cmap) cmap->stream = NULL; } -static unsigned int opentype_cmap_get_unicode_ranges_count(const struct dwrite_fonttable *cmap) +HRESULT opentype_cmap_get_unicode_ranges(const struct dwrite_cmap *cmap, unsigned int max_count, DWRITE_UNICODE_RANGE *ranges, + unsigned int *count) { - unsigned int i, num_tables, count = 0; - const struct cmap_header *header; - - num_tables = table_read_be_word(cmap, FIELD_OFFSET(struct cmap_header, num_tables)); - header = table_read_ensure(cmap, 0, FIELD_OFFSET(struct cmap_header, tables[num_tables])); - - if (!header) - return 0; - - for (i = 0; i < num_tables; ++i) - { - unsigned int format, offset; - - if (GET_BE_WORD(header->tables[i].platformID) != 3) - continue; - - offset = GET_BE_DWORD(header->tables[i].offset); - format = table_read_be_word(cmap, offset); - - switch (format) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - { - count += table_read_be_word(cmap, offset + FIELD_OFFSET(struct cmap_segment_mapping, seg_count_x2)) / 2; - break; - } - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - { - count += table_read_be_dword(cmap, offset + FIELD_OFFSET(struct cmap_segmented_coverage, num_groups)); - break; - } - default: - FIXME("table format %u is not supported.\n", format); - } - } - - return count; -} - -HRESULT opentype_cmap_get_unicode_ranges(const struct file_stream_desc *stream_desc, unsigned int max_count, - DWRITE_UNICODE_RANGE *ranges, unsigned int *count) -{ - unsigned int i, num_tables, k = 0; - const struct cmap_header *header; - struct dwrite_fonttable cmap; - - opentype_get_font_table(stream_desc, MS_CMAP_TAG, &cmap); - - if (!cmap.exists) + if (!cmap->data) return E_FAIL; - *count = opentype_cmap_get_unicode_ranges_count(&cmap); - - num_tables = table_read_be_word(&cmap, FIELD_OFFSET(struct cmap_header, num_tables)); - header = table_read_ensure(&cmap, 0, FIELD_OFFSET(struct cmap_header, tables[num_tables])); - - if (!header) - { - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, cmap.context); - return S_OK; - } - - for (i = 0; i < num_tables && k < max_count; ++i) - { - unsigned int j, offset, format; - - if (GET_BE_WORD(header->tables[i].platformID) != 3) - continue; - - offset = GET_BE_DWORD(header->tables[i].offset); - - format = table_read_be_word(&cmap, offset); - switch (format) - { - case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: - { - unsigned int segment_count = table_read_be_word(&cmap, offset + - FIELD_OFFSET(struct cmap_segment_mapping, seg_count_x2)) / 2; - const UINT16 *start_code = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segment_mapping, end_code[segment_count]) + - 2 /* reservedPad */ + - 2 * segment_count /* start code array */); - const UINT16 *end_code = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segment_mapping, end_code[segment_count])); - - if (!start_code || !end_code) - continue; - - for (j = 0; j < segment_count && GET_BE_WORD(end_code[j]) != 0xffff && k < max_count; ++j, ++k) - { - ranges[k].first = GET_BE_WORD(start_code[j]); - ranges[k].last = GET_BE_WORD(end_code[j]); - } - break; - } - case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: - { - unsigned int num_groups = table_read_be_dword(&cmap, offset + - FIELD_OFFSET(struct cmap_segmented_coverage, num_groups)); - const struct cmap_segmented_coverage *coverage; - - coverage = table_read_ensure(&cmap, offset, - FIELD_OFFSET(struct cmap_segmented_coverage, groups[num_groups])); - - for (j = 0; j < num_groups && k < max_count; j++, k++) - { - ranges[k].first = GET_BE_DWORD(coverage->groups[j].startCharCode); - ranges[k].last = GET_BE_DWORD(coverage->groups[j].endCharCode); - } - break; - } - default: - FIXME("table format %u unhandled.\n", format); - } - } - - IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, cmap.context); + *count = cmap->get_ranges(cmap, max_count, ranges); return *count > max_count ? E_NOT_SUFFICIENT_BUFFER : S_OK; } -- 2.26.2

1 4

[PATCH] msi: Fix installing from administrative image with compressed source files.
by Hans Leidekker 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49352 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 10 +++---- dlls/msi/tests/install.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 46207df0ce8..f63895f6e70 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1066,10 +1066,9 @@ static UINT load_file(MSIRECORD *row, LPVOID param) */ if (package->WordCount & msidbSumInfoSourceTypeAdminImage) { - file->IsCompressed = FALSE; + file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; } - else if (file->Attributes & - (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) + else if (file->Attributes & (msidbFileAttributesCompressed | msidbFileAttributesPatchAdded)) { file->IsCompressed = TRUE; } @@ -1077,10 +1076,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) { file->IsCompressed = FALSE; } - else - { - file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; - } + else file->IsCompressed = package->WordCount & msidbSumInfoSourceTypeCompressed; load_file_hash(package, file); load_file_disk_id(package, file); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 99d53e56570..2cfa810e1da 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1392,6 +1392,34 @@ static const CHAR sr_custom_action_dat[] = "sourcedir_unset\t19\t\tSourceDir should not be set\n" "sourcedir_set\t19\t\tSourceDir should be set\n"; +static const CHAR ai2_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "five.txt\tFive\tfive.txt\t1000\t\t\t0\t5\n" + "four.txt\tFour\tfour.txt\t1000\t\t\t0\t4\n"; + +static const CHAR ai2_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "Five\t{8CC92E9D-14B2-4CA4-B2AA-B11D02078087}\tNEWDIR\t2\t\tfive.txt\n" + "Four\t{FD37B4EA-7209-45C0-8917-535F35A2F080}\tCABOUTDIR\t2\t\tfour.txt\n"; + +static const CHAR ai2_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "Five\t\tFive\tThe Five Feature\t5\t3\tNEWDIR\t0\n" + "Four\t\tFour\tThe Four Feature\t4\t3\tCABOUTDIR\t0\n"; + +static const CHAR ai2_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "Five\tFive\n" + "Four\tFour\n"; + static const msi_table tables[] = { ADD_TABLE(component), @@ -1821,6 +1849,18 @@ static const msi_table ai_tables[] = ADD_TABLE(property) }; +static const msi_table ai2_tables[] = +{ + ADD_TABLE(ai2_component), + ADD_TABLE(directory), + ADD_TABLE(ai2_feature), + ADD_TABLE(ai2_feature_comp), + ADD_TABLE(ai2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + static const msi_table pc_tables[] = { ADD_TABLE(ca51_component), @@ -4865,6 +4905,24 @@ static void test_adminimage(void) delete_pf_files(); + create_file("four.txt", 100); + create_file("five.txt", 100); + create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); + create_database_wordcount(msifile, ai2_tables, ARRAY_SIZE(ai2_tables), + 100, msidbSumInfoSourceTypeAdminImage|msidbSumInfoSourceTypeCompressed, + ";1033", "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + error: DeleteFileA("msifile"); DeleteFileA("msitest\\cabout\\new\\five.txt"); -- 2.20.1

2 1

[PATCH v4 2/2] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by Porot Mo 10 Jun '20

10 Jun '20

This allows ITypeInfo::GetDllEntry() to search exact property access functions which share same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: split tests and fix v4: remove todo_wine dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[PATCH resend 1/2] gdi32/tests: Remove tests for VidPnSourceId.
by Zhiyi Zhang 10 Jun '20

10 Jun '20

VidPnSourceId may be zero for non-primary adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ed83a728131..6172d4a7983 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,11 +86,6 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_gdi_desc.VidPnSourceId); - else - ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); @@ -135,12 +130,6 @@ static void test_D3DKMTOpenAdapterFromHdc(void) status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); - else - todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); DeleteDC(hdc); if (status == STATUS_SUCCESS) -- 2.25.1

2 1

[PATCH v3 2/2] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by Porot Mo 10 Jun '20

10 Jun '20

This allows ITypeInfo::GetDllEntry() to search exact property access functions which share same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: spilt tests and fix dlls/oleaut32/typelib.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

2 3

[PATCH v2 4/4] prntvpt: Add some tests for PTOpenProvider and PTOpenProviderEx.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/prntvpt/tests/Makefile.in | 5 ++ dlls/prntvpt/tests/prntvpt.c | 148 +++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 4 files changed, 155 insertions(+) create mode 100644 dlls/prntvpt/tests/Makefile.in create mode 100644 dlls/prntvpt/tests/prntvpt.c diff --git a/configure.ac b/configure.ac index e61a98455c..72276fc066 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,6 +3616,7 @@ WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) +WINE_CONFIG_MAKEFILE(dlls/prntvpt/tests) WINE_CONFIG_MAKEFILE(dlls/propsys) WINE_CONFIG_MAKEFILE(dlls/propsys/tests) WINE_CONFIG_MAKEFILE(dlls/psapi) diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in new file mode 100644 index 0000000000..692a134d01 --- /dev/null +++ b/dlls/prntvpt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = prntvpt.dll +IMPORTS = prntvpt winspool ole32 + +C_SRCS = \ + prntvpt.c diff --git a/dlls/prntvpt/tests/prntvpt.c b/dlls/prntvpt/tests/prntvpt.c new file mode 100644 index 0000000000..55b6f3fdef --- /dev/null +++ b/dlls/prntvpt/tests/prntvpt.c @@ -0,0 +1,148 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> +#include <objbase.h> +#include <prntvpt.h> + +#include "wine/test.h" + +static WCHAR default_name[256]; + +struct hprov_data +{ + HPTPROVIDER hprov; + HRESULT hr; +}; + +static DWORD WINAPI CloseProvider_proc(void *param) +{ + struct hprov_data *data = param; + + data->hr = PTCloseProvider(data->hprov); + + return 0; +} + +static void test_PTOpenProvider(void) +{ + DWORD tid, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProvider(default_name, 1, &hprov); + ok(hr == S_OK, "got %#x\n", hr); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + + if (data.hr != S_OK) + { + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + } + + hr = PTOpenProvider(default_name, 0, &hprov); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + for (i = 2; i < 20; i++) + { + hr = PTOpenProvider(default_name, i, &hprov); + ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%u: got %#x\n", i, hr); + } +} + +static void test_PTOpenProviderEx(void) +{ + DWORD tid, ver, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, &ver); + ok(hr == S_OK, "got %#x\n", hr); + ok(ver == 1, "got %#x\n", ver); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + + if (data.hr != S_OK) + { + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + } + + for (i = 1; i < 20; i++) + { + hr = PTOpenProviderEx(default_name, 0, i, &hprov, &ver); + ok(hr == E_INVALIDARG, "%u: got %#x\n", i, hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, i, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + } +} + +START_TEST(prntvpt) +{ + DWORD size; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + size = ARRAY_SIZE(default_name); + if (!GetDefaultPrinterW(default_name, &size)) + { + skip("no default printer set\n"); + return; + } + + trace("default printer: %s\n", wine_dbgstr_w(default_name)); + + test_PTOpenProvider(); + test_PTOpenProviderEx(); + + CoUninitialize(); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index 8b873dd0aa..a453f8cb37 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -27,6 +27,7 @@ DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); +HRESULT WINAPI PTCloseProvider(HPTPROVIDER); #ifdef __cplusplus } -- 2.26.2

1 0

[PATCH v2 3/4] prntvpt: Implement PTCloseProvider.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 21 +++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 9c12b0cbfa..dee5ca519a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -57,6 +57,27 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) return E_NOTIMPL; } +static BOOL is_valid_provider(struct prn_provider *prov) +{ + return prov && prov->owner == GetCurrentThreadId(); +} + +HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + + TRACE("%p\n", provider); + + if (!is_valid_provider(prov)) + return E_HANDLE; + + prov->owner = 0; + ClosePrinter(prov->hprn); + heap_free(prov); + + return S_OK; +} + HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { DWORD used_version; diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 5581fa4c50..99c6708242 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,7 +1,7 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) @ stdcall PTOpenProviderEx(wstr long long ptr ptr) -@ stub PTCloseProvider +@ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket -- 2.26.2

1 0

[PATCH v2 2/4] prntvpt: Implement PTOpenProvider.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 902be87114..9c12b0cbfa 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -59,8 +59,13 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { - FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); - return E_NOTIMPL; + DWORD used_version; + + TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + + if (version != 1) return E_INVALIDARG; + + return PTOpenProviderEx(printer, 1, 1, provider, &used_version); } HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) -- 2.26.2

1 0

[PATCH v2 1/4] prntvpt: Implement PTOpenProviderEx.
by Dmitry Timoshkov 10 Jun '20

10 Jun '20

v2: Fix test failures under Windows 8. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/Makefile.in | 4 +++- dlls/prntvpt/main.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 5efd1c4eb2..a3db8760c2 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,6 @@ -MODULE = prntvpt.dll +MODULE = prntvpt.dll +IMPORTLIB = prntvpt +IMPORTS = winspool EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index ec7cf7c3e2..902be87114 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -22,11 +22,20 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winspool.h" #include "prntvpt.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +struct prn_provider +{ + DWORD owner; + HANDLE hprn; +}; + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", hinst, reason, reserved); @@ -42,7 +51,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } - HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) { FIXME("stub:%s %p\n", debugstr_w(printer), version); @@ -57,6 +65,25 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) { - FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); - return E_NOTIMPL; + struct prn_provider *prov; + + TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + + if (!max_version || !provider || !used_version) + return E_INVALIDARG; + + prov = heap_alloc(sizeof(*prov)); + if (!prov) return E_OUTOFMEMORY; + + if (!OpenPrinterW((LPWSTR)printer, &prov->hprn, NULL)) + { + heap_free(prov); + return HRESULT_FROM_WIN32(GetLastError()); + } + + prov->owner = GetCurrentThreadId(); + *provider = (HPTPROVIDER)prov; + *used_version = 1; + + return S_OK; } -- 2.26.2

1 0

[PATCH resend] winapi_test: Add/remove headers for urlmon test, in tests.dat.
by Serge Gautherie 10 Jun '20

10 Jun '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..57a65e1 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1261,9 +1261,9 @@ Unit tests for data structure packing %header -basetsd.h winnt.h windef.h +guiddef.h urlmon.h %include -- 2.10.0.windows.1

2 4

[PATCH] ntdll: interpretation of l_addr depends on FreeBSD version
by Damjan Jovanovic 10 Jun '20

10 Jun '20

FreeBSD changed l_addr to mean the relocation offset like it does on other OSes, and provided a dynamic linker symbol, "_rtld_version_laddr_offset", that can be used to check the meaning. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH] advapi32: Add RegEnableReflectionKey stub
by Alex Henrie 10 Jun '20

10 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ac8ea6268a..64b0288dc9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -639,7 +639,7 @@ @ stdcall RegDisablePredefinedCache() # @ stub RegDisablePredefinedCacheEx @ stdcall RegDisableReflectionKey(ptr) -# @ stub RegEnableReflectionKey +@ stdcall RegEnableReflectionKey(ptr) @ stdcall RegEnumKeyA(long long ptr long) @ stdcall -import RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) @ stdcall -import RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b8b168496f..7cfdbaa53b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -635,6 +635,17 @@ LONG WINAPI RegCopyTreeA( HKEY hsrc, const char *subkey, HKEY hdst ) } +/****************************************************************************** + * RegEnableReflectionKey [ADVAPI32.@] + * + */ +LONG WINAPI RegEnableReflectionKey(HKEY base) +{ + FIXME("%p: stub\n", base); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + /****************************************************************************** * RegDisableReflectionKey [ADVAPI32.@] * -- 2.27.0

1 0

[PATCH v2 3/4] windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks() when "boundsInBlocks" is NULL.
by Ziqing Hui 10 Jun '20

10 Jun '20

The added tests shows that when boundsInBlocks parameter is NULL, stride parameter will be checked to ensure it is bigger or equal to frame stride, but it will be ignored in the call. This can be proved by: * CopyBlocks(NULL, frame_stride - 1, sizeof(buffer), buffer) return error. * CopyBlocks(NULL, frame_stride, sizeof(buffer), buffer) and CopyBlocks(NULL, frame_stride * 2, sizeof(buffer), buffer) works fine and result in same buffer content. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 37 ++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-)

4 4

[PATCH v2 4/4] windowscodecs: Implement DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 10 Jun '20

10 Jun '20

v2: Add a check for stride size when boundsInBlocks is NULL. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 42 ++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 42 ++++++++++++++-------------- 2 files changed, 61 insertions(+), 23 deletions(-)

2 1

[PATCH v2 2/4] windowscodecs/tests: Add a DXT3 test image for DDS decoder.
by Ziqing Hui 10 Jun '20

10 Jun '20

We only tested DXT1 images with 1 blocks before. That's not enough. Also, for CopyBlocks(), when boundsInBlocks parameter is NULL, the stride should be the stride of the frame itself. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 67 ++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 8 deletions(-)

2 1

[PATCH v2 1/4] windowscodecs: Initialize block data in DdsDecoder_Dds_GetFrame().
by Ziqing Hui 10 Jun '20

10 Jun '20

v2: * Correct the HeapFree() order. * Simplify the loop in GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 68 +++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 14 deletions(-)

2 1

[PATCH] include: Add IMarkupServices2, IMarkupContainer2 and IMarkupPointer2 related interfaces
by Vijay Kiran Kamuju 09 Jun '20

09 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH] ntdll: Perform fsync() in client for files and directories.
by Paul Gofman 09 Jun '20

09 Jun '20

Fixes stuttering in Assetto Corsa Competizione (multiplayer mode). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/file.c | 13 ++++++++++++- dlls/ntdll/tests/file.c | 21 +++++++++++++++++++++ server/file.c | 14 +------------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1b70e473676..57baa102af4 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3584,7 +3584,18 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (ret == STATUS_ACCESS_DENIED) ret = unix_funcs->server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); - if (!ret && type == FD_TYPE_SERIAL) + if (type == FD_TYPE_FILE || type == FD_TYPE_DIR) + { + if (!ret) + { + if (fsync(fd)) + ret = FILE_GetNtStatus(); + + io->u.Status = ret; + io->Information = 0; + } + } + else if (!ret && type == FD_TYPE_SERIAL) { ret = COMM_FlushBuffersFile( fd ); } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0e..6502bc3e08c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4863,14 +4863,26 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#x.\n", + io_status_block.Information); status = pNtFlushBuffersFile(hfileread, &io_status_block); ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(NULL, &io_status_block); ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#x.\n", + io_status_block.Information); CloseHandle(hfileread); CloseHandle(hfile); @@ -4881,6 +4893,15 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; + status = pNtFlushBuffersFile((HANDLE)0xdeadbeef, &io_status_block); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#x.\n", + io_status_block.Information); + CloseHandle(hfile); DeleteFileA(buffer); } diff --git a/server/file.c b/server/file.c index bce202138e0..38260cfd2b3 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static int file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -108,7 +107,7 @@ static const struct fd_ops file_fd_ops = file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - file_flush, /* flush */ + no_fd_flush, /* flush */ default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ @@ -296,17 +295,6 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static int file_flush( struct fd *fd, struct async *async ) -{ - int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1 && fsync( unix_fd ) == -1) - { - file_set_error(); - return 0; - } - return 1; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd ); -- 2.26.2

2 1

[PATCH 4/4] prntvpt: Add some tests for PTOpenProvider and PTOpenProviderEx.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure.ac | 1 + dlls/prntvpt/tests/Makefile.in | 5 ++ dlls/prntvpt/tests/prntvpt.c | 142 +++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 4 files changed, 149 insertions(+) create mode 100644 dlls/prntvpt/tests/Makefile.in create mode 100644 dlls/prntvpt/tests/prntvpt.c diff --git a/configure.ac b/configure.ac index e61a98455c..72276fc066 100644 --- a/configure.ac +++ b/configure.ac @@ -3616,6 +3616,7 @@ WINE_CONFIG_MAKEFILE(dlls/pidgen) WINE_CONFIG_MAKEFILE(dlls/powrprof) WINE_CONFIG_MAKEFILE(dlls/printui) WINE_CONFIG_MAKEFILE(dlls/prntvpt) +WINE_CONFIG_MAKEFILE(dlls/prntvpt/tests) WINE_CONFIG_MAKEFILE(dlls/propsys) WINE_CONFIG_MAKEFILE(dlls/propsys/tests) WINE_CONFIG_MAKEFILE(dlls/psapi) diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in new file mode 100644 index 0000000000..692a134d01 --- /dev/null +++ b/dlls/prntvpt/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = prntvpt.dll +IMPORTS = prntvpt winspool ole32 + +C_SRCS = \ + prntvpt.c diff --git a/dlls/prntvpt/tests/prntvpt.c b/dlls/prntvpt/tests/prntvpt.c new file mode 100644 index 0000000000..47f9f8341b --- /dev/null +++ b/dlls/prntvpt/tests/prntvpt.c @@ -0,0 +1,142 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> +#include <objbase.h> +#include <prntvpt.h> + +#include "wine/test.h" + +static WCHAR default_name[256]; + +struct hprov_data +{ + HPTPROVIDER hprov; + HRESULT hr; +}; + +static DWORD WINAPI CloseProvider_proc(void *param) +{ + struct hprov_data *data = param; + + data->hr = PTCloseProvider(data->hprov); + + return 0; +} + +static void test_PTOpenProvider(void) +{ + DWORD tid, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProvider(default_name, 1, &hprov); + ok(hr == S_OK, "got %#x\n", hr); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /*Win8*/, "got %#x\n", data.hr); + if (data.hr == S_OK) return; + + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + + hr = PTOpenProvider(default_name, 0, &hprov); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + for (i = 2; i < 20; i++) + { + hr = PTOpenProvider(default_name, i, &hprov); + ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%u: got %#x\n", i, hr); + } +} + +static void test_PTOpenProviderEx(void) +{ + DWORD tid, ver, i; + HPTPROVIDER hprov; + HRESULT hr; + HANDLE hthread; + struct hprov_data data; + + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, 1, &hprov, &ver); + ok(hr == S_OK, "got %#x\n", hr); + ok(ver == 1, "got %#x\n", ver); + + data.hprov = hprov; + hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); + WaitForSingleObject(hthread, INFINITE); + CloseHandle(hthread); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /*Win8*/, "got %#x\n", data.hr); + if (data.hr == S_OK) return; + + hr = PTCloseProvider(hprov); + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 1; i < 20; i++) + { + hr = PTOpenProviderEx(default_name, 0, i, &hprov, &ver); + ok(hr == E_INVALIDARG, "%u: got %#x\n", i, hr); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, 1, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + + ver = 0xdeadbeef; + hr = PTOpenProviderEx(default_name, i, i, &hprov, &ver); + ok(hr == S_OK, "%u: got %#x\n", i, hr); + ok(ver == 1, "%u: got %#x\n", i, ver); + PTCloseProvider(hprov); + } +} + +START_TEST(prntvpt) +{ + DWORD size; + + CoInitialize(NULL); + + size = ARRAY_SIZE(default_name); + if (!GetDefaultPrinterW(default_name, &size)) + { + skip("no default printer set\n"); + return; + } + + trace("default printer: %s\n", wine_dbgstr_w(default_name)); + + test_PTOpenProvider(); + test_PTOpenProviderEx(); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index 8b873dd0aa..a453f8cb37 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -27,6 +27,7 @@ DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); +HRESULT WINAPI PTCloseProvider(HPTPROVIDER); #ifdef __cplusplus } -- 2.26.2

2 1

[PATCH v2] ntdll: Perform fsync() in client for files and directories.
by Paul Gofman 09 Jun '20

09 Jun '20

Fixes stuttering in Assetto Corsa Competizione (multiplayer mode). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/file.c | 10 +++++++++- dlls/ntdll/tests/file.c | 21 +++++++++++++++++++++ server/file.c | 14 +------------- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1b70e473676..aba7b608f69 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3584,7 +3584,15 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (ret == STATUS_ACCESS_DENIED) ret = unix_funcs->server_get_unix_fd( hFile, FILE_APPEND_DATA, &fd, &needs_close, &type, NULL ); - if (!ret && type == FD_TYPE_SERIAL) + if (!ret && (type == FD_TYPE_FILE || type == FD_TYPE_DIR)) + { + if (fsync(fd)) + ret = FILE_GetNtStatus(); + + io->u.Status = ret; + io->Information = 0; + } + else if (!ret && type == FD_TYPE_SERIAL) { ret = COMM_FlushBuffersFile( fd ); } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 31c18454f0e..44c2929fd2d 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4863,14 +4863,26 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, (IO_STATUS_BLOCK *)0xdeadbeaf); ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + ok(io_status_block.Status == STATUS_SUCCESS, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(!io_status_block.Information, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); status = pNtFlushBuffersFile(hfileread, &io_status_block); ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; status = pNtFlushBuffersFile(NULL, &io_status_block); ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); CloseHandle(hfileread); CloseHandle(hfile); @@ -4881,6 +4893,15 @@ static void test_flush_buffers_file(void) status = pNtFlushBuffersFile(hfile, &io_status_block); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); + io_status_block.Information = 0xdeadbeef; + io_status_block.Status = 0xdeadbeef; + status = pNtFlushBuffersFile((HANDLE)0xdeadbeef, &io_status_block); + ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %#x.\n", status); + ok(io_status_block.Status == 0xdeadbeef, "Got unexpected io_status_block.Status %#x.\n", + io_status_block.Status); + ok(io_status_block.Information == 0xdeadbeef, "Got unexpected io_status_block.Information %#lx.\n", + io_status_block.Information); + CloseHandle(hfile); DeleteFileA(buffer); } diff --git a/server/file.c b/server/file.c index bce202138e0..38260cfd2b3 100644 --- a/server/file.c +++ b/server/file.c @@ -75,7 +75,6 @@ static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); -static int file_flush( struct fd *fd, struct async *async ); static enum server_fd_type file_get_fd_type( struct fd *fd ); static const struct object_ops file_ops = @@ -108,7 +107,7 @@ static const struct fd_ops file_fd_ops = file_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ no_fd_write, /* write */ - file_flush, /* flush */ + no_fd_flush, /* flush */ default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ @@ -296,17 +295,6 @@ static int file_get_poll_events( struct fd *fd ) return events; } -static int file_flush( struct fd *fd, struct async *async ) -{ - int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1 && fsync( unix_fd ) == -1) - { - file_set_error(); - return 0; - } - return 1; -} - static enum server_fd_type file_get_fd_type( struct fd *fd ) { struct file *file = get_fd_user( fd ); -- 2.26.2

1 0

[PATCH] ntoskrnl: Use loader notification callback to perform relocations.
by Jacek Caban 09 Jun '20

09 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49093 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The main problem with current code is that it causes infinite recursion if there is circular dependency in modules that need relocations. The other problem is that if a module does not need relocations, its dependences are not checked. dlls/ntoskrnl.exe/ntoskrnl.c | 182 ++++++++++++++--------------------- include/winternl.h | 2 + 2 files changed, 72 insertions(+), 112 deletions(-)

1 0

[PATCH 3/4] prntvpt: Implement PTCloseProvider.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 21 +++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 9c12b0cbfa..dee5ca519a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -57,6 +57,27 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) return E_NOTIMPL; } +static BOOL is_valid_provider(struct prn_provider *prov) +{ + return prov && prov->owner == GetCurrentThreadId(); +} + +HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + + TRACE("%p\n", provider); + + if (!is_valid_provider(prov)) + return E_INVALIDARG; + + prov->owner = 0; + ClosePrinter(prov->hprn); + heap_free(prov); + + return S_OK; +} + HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { DWORD used_version; diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 5581fa4c50..99c6708242 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,7 +1,7 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) @ stdcall PTOpenProviderEx(wstr long long ptr ptr) -@ stub PTCloseProvider +@ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket -- 2.26.2

1 0

[PATCH 2/4] prntvpt: Implement PTOpenProvider.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 902be87114..9c12b0cbfa 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -59,8 +59,13 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provider) { - FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); - return E_NOTIMPL; + DWORD used_version; + + TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + + if (version != 1) return E_INVALIDARG; + + return PTOpenProviderEx(printer, 1, 1, provider, &used_version); } HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) -- 2.26.2

1 0

[PATCH 1/4] prntvpt: Implement PTOpenProviderEx.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/Makefile.in | 4 +++- dlls/prntvpt/main.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 5efd1c4eb2..a3db8760c2 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,6 @@ -MODULE = prntvpt.dll +MODULE = prntvpt.dll +IMPORTLIB = prntvpt +IMPORTS = winspool EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index ec7cf7c3e2..902be87114 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -22,11 +22,20 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winspool.h" #include "prntvpt.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +struct prn_provider +{ + DWORD owner; + HANDLE hprn; +}; + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", hinst, reason, reserved); @@ -42,7 +51,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return TRUE; } - HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) { FIXME("stub:%s %p\n", debugstr_w(printer), version); @@ -57,6 +65,25 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) { - FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); - return E_NOTIMPL; + struct prn_provider *prov; + + TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + + if (!max_version || !provider || !used_version) + return E_INVALIDARG; + + prov = heap_alloc(sizeof(*prov)); + if (!prov) return E_OUTOFMEMORY; + + if (!OpenPrinterW((LPWSTR)printer, &prov->hprn, NULL)) + { + heap_free(prov); + return HRESULT_FROM_WIN32(GetLastError()); + } + + prov->owner = GetCurrentThreadId(); + *provider = (HPTPROVIDER)prov; + *used_version = 1; + + return S_OK; } -- 2.26.2

1 0

[PATCH 12/12] mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 11/12] mshtml: Expose IHTMLCSSStyleDeclaration2 to scripts.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 62 +++++++++++++++++++++---------- dlls/mshtml/tests/documentmode.js | 3 ++ 2 files changed, 46 insertions(+), 19 deletions(-)

1 0

[PATCH 10/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRule property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-)

1 0

[PATCH 09/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleWidth property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-)

1 0

[PATCH 08/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleStyle property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH 07/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnRuleColor property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 19 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-)

1 0

[PATCH 06/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnSpan property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH 05/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnFill property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-)

1 0

[PATCH 04/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-)

1 0

[PATCH 03/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnWidth property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-)

1 0

[PATCH 02/12] mshtml: Add IHTMLCSSStyleDeclaration2::columnCount property semi-stub implementation.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 +++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 5 deletions(-)

1 0

[PATCH 01/12] mshtml: Use DISPID_UNKNOWN for compat dispids not supported in compat mode.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0

[resend PATCH V2] directmanipulation: New stub dll
by Vijay Kiran Kamuju 09 Jun '20

09 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] pwrshplugin: add new stub dll
by Louis Lenders 09 Jun '20

09 Jun '20

https://bugs.winehq.org/show_bug.cgi?id=49351 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/pwrshplugin/Makefile.in | 5 +++++ dlls/pwrshplugin/pwrshplugin.spec | 12 ++++++++++++ dlls/pwrshplugin/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) create mode 100644 dlls/pwrshplugin/Makefile.in create mode 100644 dlls/pwrshplugin/pwrshplugin.spec create mode 100644 dlls/pwrshplugin/version.rc diff --git a/configure b/configure index 44f8e7b9db..e58ac071ad 100755 --- a/configure +++ b/configure @@ -1531,6 +1531,7 @@ enable_prntvpt enable_propsys enable_psapi enable_pstorec +enable_pwrshplugin enable_qasf enable_qcap enable_qdvd @@ -21034,6 +21035,7 @@ wine_fn_config_makefile dlls/psapi enable_psapi wine_fn_config_makefile dlls/psapi/tests enable_tests wine_fn_config_makefile dlls/pstorec enable_pstorec wine_fn_config_makefile dlls/pstorec/tests enable_tests +wine_fn_config_makefile dlls/pwrshplugin enable_pwrshplugin wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap diff --git a/configure.ac b/configure.ac index e61a98455c..4b8f872f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -3622,6 +3622,7 @@ WINE_CONFIG_MAKEFILE(dlls/psapi) WINE_CONFIG_MAKEFILE(dlls/psapi/tests) WINE_CONFIG_MAKEFILE(dlls/pstorec) WINE_CONFIG_MAKEFILE(dlls/pstorec/tests) +WINE_CONFIG_MAKEFILE(dlls/pwrshplugin) WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) diff --git a/dlls/pwrshplugin/Makefile.in b/dlls/pwrshplugin/Makefile.in new file mode 100644 index 0000000000..03138ab166 --- /dev/null +++ b/dlls/pwrshplugin/Makefile.in @@ -0,0 +1,5 @@ +MODULE = pwrshplugin.dll + +EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/pwrshplugin/pwrshplugin.spec b/dlls/pwrshplugin/pwrshplugin.spec new file mode 100644 index 0000000000..fe9b51180c --- /dev/null +++ b/dlls/pwrshplugin/pwrshplugin.spec @@ -0,0 +1,12 @@ +@ stub GetCLRVersionForPSVersion +@ stub PerformWSManPluginReportCompletion +@ stub WSManPluginCommand +@ stub WSManPluginConnect +@ stub WSManPluginReceive +@ stub WSManPluginReleaseCommandContext +@ stub WSManPluginReleaseShellContext +@ stub WSManPluginSend +@ stub WSManPluginShell +@ stub WSManPluginShutdown +@ stub WSManPluginSignal +@ stub WSManPluginStartup \ No newline at end of file diff --git a/dlls/pwrshplugin/version.rc b/dlls/pwrshplugin/version.rc new file mode 100644 index 0000000000..f3ea96f3cc --- /dev/null +++ b/dlls/pwrshplugin/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine powershell plugin" +#define WINE_FILENAME_STR "pwrshplugin.dll" +#define WINE_FILEVERSION 6,3,9600,16384 +#define WINE_FILEVERSION_STR "6.3.9600.16384" +#define WINE_PRODUCTVERSION 6,3,9600,16384 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16384" + +#include "wine/wine_common_ver.rc" -- 2.27.0

1 0

[PATCH] crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

This makes reading and writing of CRYPT_KEY_PROV_INFO certificate property from/to the certificate storage independent from architecture the crypt32.dll code being executed on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 162 +++++++++++++++++++++++++++++--------------- 1 file changed, 109 insertions(+), 53 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 488b84001c..5b7e031338 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -520,38 +520,90 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, return ret; } -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) -{ - DWORD i, containerLen, provNameLen; - LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); - - if (info->pwszContainerName) - { - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; +/* 64-bit compatible definitions */ +typedef struct +{ + DWORD pwszContainerName; + DWORD pad1; + DWORD pwszProvName; + DWORD pad2; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + DWORD pad3; + DWORD rgProvParam; + DWORD pad4; + DWORD dwKeySpec; + DWORD pad5; +} store_CRYPT_KEY_PROV_INFO; + +typedef struct +{ + DWORD dwParam; + DWORD pad1; + DWORD pbData; + DWORD pad2; + DWORD cbData; + DWORD dwFlags; +} store_CRYPT_KEY_PROV_PARAM; + +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) +{ + CRYPT_KEY_PROV_INFO info; + store_CRYPT_KEY_PROV_INFO *store = (store_CRYPT_KEY_PROV_INFO *)buf; + BYTE *p = (BYTE *)(store + 1); + + if (store->pwszContainerName) + { + info.pwszContainerName = (LPWSTR)p; + p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } + else + info.pwszContainerName = NULL; - if (info->pwszProvName) + if (store->pwszProvName) { - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + info.pwszProvName = (LPWSTR)p; + p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } + else + info.pwszProvName = NULL; + + info.dwProvType = store->dwProvType; + info.dwFlags = store->dwFlags; + info.dwKeySpec = store->dwKeySpec; + info.cProvParam = store->cProvParam; - if (info->cProvParam) + if (info.cProvParam) { - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + DWORD i; - for (i = 0; i < info->cProvParam; i++) + info.rgProvParam = (CRYPT_KEY_PROV_PARAM *)p; + + for (i = 0; i < store->cProvParam; i++) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + CRYPT_KEY_PROV_PARAM param; + store_CRYPT_KEY_PROV_PARAM *store_param; + + store_param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*store_param); + + param.dwParam = store_param[i].dwParam; + param.dwFlags = store_param[i].dwFlags; + param.cbData = store_param[i].cbData; + param.pbData = param.cbData ? p : NULL; + p += store_param[i].cbData; + + memcpy(&info.rgProvParam[i], &param, sizeof(param)); } } else - info->rgProvParam = NULL; + info.rgProvParam = NULL; + + TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info.pwszContainerName), debugstr_w(info.pwszProvName), + info.dwProvType, info.dwFlags, info.cProvParam, info.rgProvParam, info.dwKeySpec); + + *buf = info; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, @@ -606,72 +658,76 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, * data, but whose pointers are uninitialized. * Upon return, to contains a contiguous copy of from, packed in the following * order: - * - CRYPT_KEY_PROV_INFO + * - store_CRYPT_KEY_PROV_INFO * - pwszContainerName * - pwszProvName - * - rgProvParam[0]... + * - store_CRYPT_KEY_PROV_PARAM[0] + * - store_CRYPT_KEY_PROV_PARAM[0].data + * - ... */ -static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to, - const CRYPT_KEY_PROV_INFO *from) +static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY_PROV_INFO *from) { DWORD i; - LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); + BYTE *p; + store_CRYPT_KEY_PROV_PARAM *param; + + p = (BYTE *)(to + 1); if (from->pwszContainerName) { - to->pwszContainerName = (LPWSTR)nextData; - lstrcpyW(to->pwszContainerName, from->pwszContainerName); - nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + to->pwszContainerName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszContainerName); + p += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); } else - to->pwszContainerName = NULL; + to->pwszContainerName = 0; + if (from->pwszProvName) { - to->pwszProvName = (LPWSTR)nextData; - lstrcpyW(to->pwszProvName, from->pwszProvName); - nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + to->pwszProvName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszProvName); + p += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); } else - to->pwszProvName = NULL; + to->pwszProvName = 0; + to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; - to->rgProvParam = (PCRYPT_KEY_PROV_PARAM)nextData; - nextData += to->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); to->dwKeySpec = from->dwKeySpec; + for (i = 0; i < to->cProvParam; i++) { - memcpy(&to->rgProvParam[i], &from->rgProvParam[i], - sizeof(CRYPT_KEY_PROV_PARAM)); - to->rgProvParam[i].pbData = nextData; - memcpy(to->rgProvParam[i].pbData, from->rgProvParam[i].pbData, - from->rgProvParam[i].cbData); - nextData += from->rgProvParam[i].cbData; + param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*param); + + param->dwParam = from->rgProvParam[i].dwParam; + param->cbData = from->rgProvParam[i].cbData; + param->dwFlags = from->rgProvParam[i].dwFlags; + memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); + p += from->rgProvParam[i].cbData; } } static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, const CRYPT_KEY_PROV_INFO *info) { + BYTE *buf; + DWORD size = sizeof(store_CRYPT_KEY_PROV_INFO), i; BOOL ret; - LPBYTE buf = NULL; - DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; if (info->pwszContainerName) - containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - else - containerSize = 0; + size += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); if (info->pwszProvName) - provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - else - provNameSize = 0; - size += containerSize + provNameSize; + size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + for (i = 0; i < info->cProvParam; i++) - size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + size += sizeof(store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + buf = CryptMemAlloc(size); if (buf) { - CRYPT_CopyKeyProvInfo((PCRYPT_KEY_PROV_INFO)buf, info); + CRYPT_CopyKeyProvInfo((store_CRYPT_KEY_PROV_INFO *)buf, info); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, buf, size); CryptMemFree(buf); -- 2.26.2

2 8

[PATCH v2] gdi32: Skip edge processing on overflow.
by Gabriel Ivăncescu 09 Jun '20

09 Jun '20

Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which broke when REGION_CreateEdgeTable overflowed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 185732. The patch just indents the code to skip it if nb_points is zero, which can be from overflow. dlls/gdi32/region.c | 181 ++++++++++++++++++------------------ dlls/gdi32/tests/clipping.c | 9 ++ 2 files changed, 101 insertions(+), 89 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5..3a3138a 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2631,79 +2631,28 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (!(obj = alloc_region( nb_points / 2 ))) goto done; - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); - list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { + if (nb_points) + { + if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); + list_init( &AET ); + pSLL = ET.scanlines.next; + if (mode != WINDING) { /* - * Add a new edge to the active edge table when we - * get to the next edge. + * for each scanline */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - pSLL = pSLL->next; - } - - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) - { - if (first) - { - obj->rects[obj->numRects].left = active->bres.minor_axis; - obj->rects[obj->numRects].top = y; - } - else if (obj->rects[obj->numRects].left != active->bres.minor_axis) - { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; - } - first = !first; + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + pSLL = pSLL->next; } - } - - next_scanline( &AET, y ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; - } - } - } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - REGION_computeWAET( &AET, &WETE ); - pSLL = pSLL->next; - } - pWETE = list_head( &WETE ); - - /* - * for each active edge - */ - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + if (!clip_rect || y >= clip_rect->top) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ - if (pWETE == &active->winding_entry) + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { if (first) { @@ -2717,40 +2666,94 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo obj->numRects++; } first = !first; - pWETE = list_next( &WETE, pWETE ); } } - } + next_scanline( &AET, y ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } + } + } + else { /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. + * for each scanline */ - if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + REGION_computeWAET( &AET, &WETE ); + pSLL = pSLL->next; + } + pWETE = list_head( &WETE ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; + /* + * for each active edge + */ + if (!clip_rect || y >= clip_rect->top) + { + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + { + /* + * add to the buffer only those edges that + * are in the Winding active edge table. + */ + if (pWETE == &active->winding_entry) + { + if (first) + { + obj->rects[obj->numRects].left = active->bres.minor_axis; + obj->rects[obj->numRects].top = y; + } + else if (obj->rects[obj->numRects].left != active->bres.minor_axis) + { + obj->rects[obj->numRects].right = active->bres.minor_axis; + obj->rects[obj->numRects].bottom = y + 1; + obj->numRects++; + } + first = !first; + pWETE = list_next( &WETE, pWETE ); + } + } + } + + /* + * recompute the winding active edge table if + * we just resorted or have exited an edge. + */ + if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } } } - } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= nb_points / 2 ); - if (obj->numRects) - { - obj->extents.left = INT_MAX; - obj->extents.right = INT_MIN; - obj->extents.top = obj->rects[0].top; - obj->extents.bottom = obj->rects[obj->numRects-1].bottom; - for (i = 0; i < obj->numRects; i++) + if (obj->numRects) { - obj->extents.left = min( obj->extents.left, obj->rects[i].left ); - obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + obj->extents.left = INT_MAX; + obj->extents.right = INT_MIN; + obj->extents.top = obj->rects[0].top; + obj->extents.bottom = obj->rects[obj->numRects-1].bottom; + for (i = 0; i < obj->numRects; i++) + { + obj->extents.left = min( obj->extents.left, obj->rects[i].left ); + obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + } } + REGION_compact( obj ); } - REGION_compact( obj ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 0151575..484430b 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -513,8 +513,10 @@ static void test_CreatePolyPolygonRgn(void) POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + POINT points_overflow[] = { {0, 0}, {1, 0}, {0, 0x80000000} }; INT counts_single_poly[] = { 3 }; INT counts_two_poly[] = { 3, 3 }; + INT counts_overflow[] = { ARRAY_SIZE(points_overflow) }; int ret; RECT rect; @@ -543,6 +545,13 @@ static void test_CreatePolyPolygonRgn(void) ret = GetRgnBox(region, &rect); ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); DeleteObject(region); + + /* Test with points that overflow the edge table */ + region = CreatePolyPolygonRgn(points_overflow, counts_overflow, ARRAY_SIZE(counts_overflow), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); } START_TEST(clipping) -- 2.21.0

2 1

[PATCH v3 2/2] gdi32: Skip scan conversion on overflow.
by Huw Davies 09 Jun '20

09 Jun '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which broke when REGION_CreateEdgeTable overflowed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/region.c | 2 +- dlls/gdi32/tests/clipping.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 893b6d6f4d3..878b73f8c94 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2742,7 +2742,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if ((obj = alloc_region( nb_points / 2 ))) { - scan_convert( obj, &ET, mode, clip_rect ); + if (nb_points) scan_convert( obj, &ET, mode, clip_rect ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 015157522da..484430b0cb9 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -513,8 +513,10 @@ static void test_CreatePolyPolygonRgn(void) POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + POINT points_overflow[] = { {0, 0}, {1, 0}, {0, 0x80000000} }; INT counts_single_poly[] = { 3 }; INT counts_two_poly[] = { 3, 3 }; + INT counts_overflow[] = { ARRAY_SIZE(points_overflow) }; int ret; RECT rect; @@ -543,6 +545,13 @@ static void test_CreatePolyPolygonRgn(void) ret = GetRgnBox(region, &rect); ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); DeleteObject(region); + + /* Test with points that overflow the edge table */ + region = CreatePolyPolygonRgn(points_overflow, counts_overflow, ARRAY_SIZE(counts_overflow), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); } START_TEST(clipping) -- 2.23.0

1 0

[PATCH v3 1/2] gdi32: Move the scan conversion to a helper function.
by Huw Davies 09 Jun '20

09 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/region.c | 154 +++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 81 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5a843..893b6d6f4d3 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2583,67 +2583,25 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) } } -/*********************************************************************** - * create_polypolygon_region - * - * Helper for CreatePolyPolygonRgn. - */ -HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, - const RECT *clip_rect ) +static void scan_convert( WINEREGION *obj, EdgeTable *ET, INT mode, const RECT *clip_rect ) { - HRGN hrgn = 0; - WINEREGION *obj = NULL; - INT y; /* current scanline */ - struct list WETE, *pWETE; /* Winding Edge Table */ - ScanLineList *pSLL; /* current scanLineList */ - EdgeTable ET; /* header node for ET */ - struct list AET; /* header for AET */ - EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ - ScanLineListBlock SLLBlock; /* header for scanlinelist */ + struct list AET; + ScanLineList *pSLL; struct edge_table_entry *active; - unsigned int nb_points; - int cur_band = 0, prev_band = 0; - INT i, poly, total, first = 1; + INT i, y, first = 1, cur_band = 0, prev_band = 0; - TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); - - /* special case a rectangle */ + if (clip_rect) ET->ymax = min( ET->ymax, clip_rect->bottom ); - if (((nbpolygons == 1) && ((*Count == 4) || - ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && - (((Pts[0].y == Pts[1].y) && - (Pts[1].x == Pts[2].x) && - (Pts[2].y == Pts[3].y) && - (Pts[3].x == Pts[0].x)) || - ((Pts[0].x == Pts[1].x) && - (Pts[1].y == Pts[2].y) && - (Pts[2].x == Pts[3].x) && - (Pts[3].y == Pts[0].y)))) - return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), - max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); - - for(poly = total = 0; poly < nbpolygons; poly++) - total += Count[poly]; - if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) - return 0; - - nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); - if (!(obj = alloc_region( nb_points / 2 ))) - goto done; - - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + pSLL = ET->scanlines.next; + + if (mode != WINDING) + { + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); pSLL = pSLL->next; } @@ -2676,33 +2634,26 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { + else /* mode == WINDING */ + { + struct list WETE, *pWETE; + + for (y = ET->ymin; y < ET->ymax; y++) + { + /* Add a new edge to the active edge table when we get to the next edge. */ + if (pSLL != NULL && y == pSLL->scanline) + { REGION_loadAET(&AET, &pSLL->edgelist); REGION_computeWAET( &AET, &WETE ); pSLL = pSLL->next; } pWETE = list_head( &WETE ); - /* - * for each active edge - */ if (!clip_rect || y >= clip_rect->top) { LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ + /* Add to the buffer only those edges that are in the Winding active edge table. */ if (pWETE == &active->winding_entry) { if (first) @@ -2722,10 +2673,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. - */ + /* Recompute the winding active edge table if we just resorted or have exited an edge. */ if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); if (obj->numRects) @@ -2736,7 +2684,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= obj->size ); if (obj->numRects) { @@ -2751,11 +2699,55 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo } } REGION_compact( obj ); +} - if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) - free_region( obj ); +/*********************************************************************** + * create_polypolygon_region + * + * Helper for CreatePolyPolygonRgn. + */ +HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygons, INT mode, + const RECT *clip_rect ) +{ + HRGN hrgn = 0; + WINEREGION *obj = NULL; + EdgeTable ET; /* header node for ET */ + EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ + ScanLineListBlock SLLBlock; /* header for scanlinelist */ + unsigned int nb_points; + INT poly, total; + + TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); + + /* special case a rectangle */ + + if (((nbpolygons == 1) && ((*Count == 4) || + ((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) && + (((Pts[0].y == Pts[1].y) && + (Pts[1].x == Pts[2].x) && + (Pts[2].y == Pts[3].y) && + (Pts[3].x == Pts[0].x)) || + ((Pts[0].x == Pts[1].x) && + (Pts[1].y == Pts[2].y) && + (Pts[2].x == Pts[3].x) && + (Pts[3].y == Pts[0].y)))) + return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y), + max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) ); + + for(poly = total = 0; poly < nbpolygons; poly++) + total += Count[poly]; + if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) + return 0; + + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); + if ((obj = alloc_region( nb_points / 2 ))) + { + scan_convert( obj, &ET, mode, clip_rect ); + + if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) + free_region( obj ); + } -done: REGION_FreeStorage(SLLBlock.next); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; -- 2.23.0

1 0

[PATCH 1/5] dwrite: Limit recursion level for context lookups.
by Nikolay Sivov 09 Jun '20

09 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 2 ++ dlls/dwrite/opentype.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3d7884cb57f..0bb5455a677 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -543,6 +543,8 @@ struct scriptshaping_context unsigned int cur; unsigned int glyph_count; + unsigned int nesting_level_left; + float emsize; DWRITE_MEASURING_MODE measuring_mode; float *advances; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 8853f3a4244..22ae1069240 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -67,6 +67,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif +#define GLYPH_CONTEXT_MAX_LENGTH 64 +#define SHAPE_MAX_NESTING_LEVEL 6 + typedef struct { CHAR TTCTag[4]; DWORD Version; @@ -4616,6 +4619,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gpos_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); @@ -4993,8 +4997,6 @@ static BOOL opentype_layout_apply_gsub_lig_substitution(struct scriptshaping_con return FALSE; } -#define GLYPH_CONTEXT_MAX_LENGTH 64 - static BOOL opentype_layout_context_match_input(const struct match_context *mc, unsigned int count, const UINT16 *input, unsigned int *end_offset, unsigned int *match_positions) { @@ -5081,6 +5083,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c unsigned int i, j; int end, delta; + if (!context->nesting_level_left) + return TRUE; + end = context->cur + match_length; for (i = 0; i < lookup_count; ++i) @@ -5097,7 +5102,9 @@ static BOOL opentype_layout_context_apply_lookup(struct scriptshaping_context *c lookup_index = GET_BE_WORD(lookup_records[i+1]); + --context->nesting_level_left; context->u.buffer.apply_context_lookup(context, lookup_index); + ++context->nesting_level_left; delta = context->glyph_count - orig_len; if (!delta) @@ -5692,6 +5699,7 @@ void opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int i; BOOL ret; + context->nesting_level_left = SHAPE_MAX_NESTING_LEVEL; context->u.buffer.apply_context_lookup = opentype_layout_apply_gsub_context_lookup; opentype_layout_collect_lookups(context, script_index, language_index, features, context->table, &lookups); -- 2.26.2

1 4

[PATCH] ole32: Add variable check for clipbrd_wndproc to deal WM_RENDERFORMAT message
by Zhipeng Zhao 09 Jun '20

09 Jun '20

2 1

[PATCH v2] ole32: Deal with WM_RENDERFORMAT if the clipboard is empty.
by Huw Davies 09 Jun '20

09 Jun '20

From: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Zhipeng Zhao <zhaozhipeng(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/clipboard.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9df37750a32..cb6770c05b3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2066,6 +2066,8 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, ole_priv_data_entry *entry; TRACE("(): WM_RENDERFORMAT(cfFormat=%x)\n", cf); + + if (!clipbrd || !clipbrd->cached_enum) break; entry = find_format_in_list(clipbrd->cached_enum->entries, clipbrd->cached_enum->count, cf); if(entry) -- 2.23.0

1 0

[PATCH v3 1/2] oleaut32/tests: Add tests for ITypeInfo::GetDllEntry()
by Porot Mo 09 Jun '20

09 Jun '20

Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: check returned dllname, split tests and fix dlls/oleaut32/tests/test_reg.idl | 13 +++++++++++ dlls/oleaut32/tests/typelib.c | 50 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-)

2 1

[PATCH v3] ntdll: Print a warning when LdrGetProcedureAddress fails
by Alex Henrie 09 Jun '20

09 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: - Don't use LdrGetDllFullName - Print warning regardless of validity of function arguments (the fact that the function arguments were invalid could indicate a bug elsewhere in Wine) --- dlls/ntdll/loader.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 762ca22c26..4cd318395d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1841,6 +1841,7 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, ULONG ord, PVOID *address) { + WINE_MODREF *wm; IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; NTSTATUS ret = STATUS_PROCEDURE_NOT_FOUND; @@ -1848,17 +1849,29 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, RtlEnterCriticalSection( &loader_section ); /* check if the module itself is invalid to return the proper error */ - if (!get_modref( module )) ret = STATUS_DLL_NOT_FOUND; - else if ((exports = RtlImageDirectoryEntryToData( module, TRUE, - IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - { - LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, load_path ) - : find_ordinal_export( module, exports, exp_size, ord - exports->Base, load_path ); - if (proc) + if (!(wm = get_modref( module ))) + { + ret = STATUS_DLL_NOT_FOUND; + } + else + { + if ((exports = RtlImageDirectoryEntryToData( module, TRUE, + IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) + { + const WCHAR *load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; + void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, load_path ) + : find_ordinal_export( module, exports, exp_size, ord - exports->Base, load_path ); + if (proc) + { + *address = proc; + ret = STATUS_SUCCESS; + } + } + + if (ret == STATUS_PROCEDURE_NOT_FOUND) { - *address = proc; - ret = STATUS_SUCCESS; + WARN( "function %s (ordinal %d) not found in module %s\n", + wine_dbgstr_a(name ? name->Buffer : NULL), ord, wine_dbgstr_w(wm->ldr.FullDllName.Buffer) ); } } -- 2.27.0

2 1

[PATCH 1/4] quartz/filtergraph: Always try to query IMediaSeeking if it's not cached yet.
by Anton Baskanov 09 Jun '20

09 Jun '20

Some filters (e.g. MediaStreamFilter) can become seekable when they are already in the graph. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/filtergraph.c | 30 +++++++++--- dlls/quartz/tests/filtergraph.c | 86 +++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..fa0a15a3fc 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -585,6 +585,18 @@ static BOOL has_output_pins(IBaseFilter *filter) return FALSE; } +static void update_seeking(struct filter *filter) +{ + if (!filter->seeking) + { + /* The Legend of Heroes: Trails of Cold Steel II destroys its filter when + * its IMediaSeeking interface is released, so cache the interface instead + * of querying for it every time. */ + if (FAILED(IBaseFilter_QueryInterface(filter->filter, &IID_IMediaSeeking, (void **)&filter->seeking))) + filter->seeking = NULL; + } +} + static BOOL is_renderer(struct filter *filter) { IAMFilterMiscFlags *flags; @@ -596,8 +608,12 @@ static BOOL is_renderer(struct filter *filter) ret = TRUE; IAMFilterMiscFlags_Release(flags); } - else if (filter->seeking && !has_output_pins(filter->filter)) - ret = TRUE; + else + { + update_seeking(filter); + if (filter->seeking && !has_output_pins(filter->filter)) + ret = TRUE; + } return ret; } @@ -663,15 +679,10 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter_AddRef(entry->filter = filter); - /* The Legend of Heroes: Trails of Cold Steel II destroys its filter when - * its IMediaSeeking interface is released, so cache the interface instead - * of querying for it every time. */ - if (FAILED(IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&entry->seeking))) - entry->seeking = NULL; - list_add_head(&graph->filters, &entry->entry); list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; + entry->seeking = NULL; ++graph->version; if (is_renderer(entry)) @@ -2249,6 +2260,7 @@ static HRESULT all_renderers_seek(IFilterGraphImpl *This, fnFoundSeek FoundSeek, LIST_FOR_EACH_ENTRY(filter, &This->filters, struct filter, entry) { + update_seeking(filter); if (!filter->seeking) continue; hr = FoundSeek(This, filter->seeking, arg); @@ -2454,6 +2466,7 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { + update_seeking(filter); if (!filter->seeking) continue; @@ -2562,6 +2575,7 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * { LONGLONG current = current_ptr ? *current_ptr : 0, stop = stop_ptr ? *stop_ptr : 0; + update_seeking(filter); if (!filter->seeking) continue; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..10f76d36ce 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3658,9 +3658,6 @@ static void test_graph_seeking(void) testfilter_init(&filter1, NULL, 0); testfilter_init(&filter2, NULL, 0); - filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; - filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; - IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IFilterGraph2_QueryInterface(graph, &IID_IMediaSeeking, (void **)&seeking); IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); @@ -3823,6 +3820,8 @@ static void test_graph_seeking(void) IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; filter1.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; filter2.seek_caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetDuration; @@ -3832,6 +3831,15 @@ static void test_graph_seeking(void) ok(filter1.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter1.seeking_ref); ok(filter2.seeking_ref > 0, "Unexpected seeking refcount %d.\n", filter2.seeking_ref); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + caps = AM_SEEKING_CanDoSegments | AM_SEEKING_CanGetCurrentPos; hr = IMediaSeeking_CheckCapabilities(seeking, &caps); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3847,6 +3855,15 @@ static void test_graph_seeking(void) ok(hr == E_FAIL, "Got hr %#x.\n", hr); ok(!caps, "Got caps %#x.\n", caps); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + hr = IMediaSeeking_IsFormatSupported(seeking, &testguid); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -3904,6 +3921,15 @@ static void test_graph_seeking(void) hr = IMediaSeeking_ConvertTimeFormat(seeking, &time, &testguid, 0x123456789a, &TIME_FORMAT_NONE); todo_wine ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter1.seek_duration = 0x12345; filter2.seek_duration = 0x23456; hr = IMediaSeeking_GetDuration(seeking, &time); @@ -3916,6 +3942,15 @@ static void test_graph_seeking(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time == 0x23456, "Got time %s.\n", wine_dbgstr_longlong(time)); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter1.seek_stop = 0x54321; filter2.seek_stop = 0x65432; hr = IMediaSeeking_GetStopPosition(seeking, &time); @@ -3947,16 +3982,43 @@ static void test_graph_seeking(void) ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); filter1.seek_hr = filter2.seek_hr = S_OK; + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!time, "Got time %s.\n", wine_dbgstr_longlong(time)); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!current, "Got time %s.\n", wine_dbgstr_longlong(current)); ok(stop == 0x65432, "Got time %s.\n", wine_dbgstr_longlong(stop)); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + current = 0x123; stop = 0x321; hr = IMediaSeeking_SetPositions(seeking, &current, AM_SEEKING_AbsolutePositioning, @@ -4024,6 +4086,15 @@ static void test_graph_seeking(void) ok(filter2.seek_current == 0x123, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_current)); ok(filter2.seek_stop == 0x321, "Got time %s.\n", wine_dbgstr_longlong(filter2.seek_stop)); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + hr = IMediaSeeking_SetRate(seeking, 2.0); ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(filter1.seek_rate == 2.0, "Got rate %.16e.\n", filter1.seek_rate); @@ -4039,6 +4110,15 @@ static void test_graph_seeking(void) todo_wine ok(filter1.seek_rate == -1.0, "Got rate %.16e.\n", filter1.seek_rate); todo_wine ok(filter2.seek_rate == -1.0, "Got rate %.16e.\n", filter2.seek_rate); + IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); + IFilterGraph2_RemoveFilter(graph, &filter2.IBaseFilter_iface); + filter1.IMediaSeeking_iface.lpVtbl = NULL; + filter2.IMediaSeeking_iface.lpVtbl = NULL; + IFilterGraph2_AddFilter(graph, &filter1.IBaseFilter_iface, NULL); + IFilterGraph2_AddFilter(graph, &filter2.IBaseFilter_iface, NULL); + filter1.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + filter2.IMediaSeeking_iface.lpVtbl = &testseek_vtbl; + hr = IMediaSeeking_GetRate(seeking, &rate); ok(hr == S_OK, "Got hr %#x.\n", hr); todo_wine ok(rate == -1.0, "Got rate %.16e.\n", rate); -- 2.17.1

3 8

[PATCH v2] crypt32: Store CRYPT_KEY_PROV_INFO in a platform independent way.
by Dmitry Timoshkov 09 Jun '20

09 Jun '20

This makes reading and writing of CRYPT_KEY_PROV_INFO certificate property from/to the certificate storage independent from architecture the crypt32.dll code being executed on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 151 +++++++++++++++++++++++++++++--------------- 1 file changed, 101 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 488b84001c..e4cab01cd9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -520,38 +520,85 @@ static BOOL CertContext_GetProperty(cert_t *cert, DWORD dwPropId, return ret; } -void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) +/* 64-bit compatible layout, so that 64-bit crypt32 is able to read + * the structure saved by 32-bit crypt32. + */ +typedef struct { - DWORD i, containerLen, provNameLen; - LPBYTE data = (LPBYTE)info + sizeof(CRYPT_KEY_PROV_INFO); + ULONG64 pwszContainerName; + ULONG64 pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + ULONG64 rgProvParam; + DWORD dwKeySpec; +} store_CRYPT_KEY_PROV_INFO; - if (info->pwszContainerName) +typedef struct +{ + DWORD dwParam; + ULONG64 pbData; + DWORD cbData; + DWORD dwFlags; +} store_CRYPT_KEY_PROV_PARAM; + +void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) +{ + CRYPT_KEY_PROV_INFO info; + store_CRYPT_KEY_PROV_INFO *store = (store_CRYPT_KEY_PROV_INFO *)buf; + BYTE *p = (BYTE *)(store + 1); + + if (store->pwszContainerName) { - info->pwszContainerName = (LPWSTR)data; - containerLen = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - data += containerLen; + info.pwszContainerName = (LPWSTR)p; + p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } + else + info.pwszContainerName = NULL; - if (info->pwszProvName) + if (store->pwszProvName) { - info->pwszProvName = (LPWSTR)data; - provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - data += provNameLen; + info.pwszProvName = (LPWSTR)p; + p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } + else + info.pwszProvName = NULL; + + info.dwProvType = store->dwProvType; + info.dwFlags = store->dwFlags; + info.dwKeySpec = store->dwKeySpec; + info.cProvParam = store->cProvParam; - if (info->cProvParam) + if (info.cProvParam) { - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + DWORD i; + + info.rgProvParam = (CRYPT_KEY_PROV_PARAM *)p; - for (i = 0; i < info->cProvParam; i++) + for (i = 0; i < store->cProvParam; i++) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + CRYPT_KEY_PROV_PARAM param; + store_CRYPT_KEY_PROV_PARAM *store_param; + + store_param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*store_param); + + param.dwParam = store_param[i].dwParam; + param.dwFlags = store_param[i].dwFlags; + param.cbData = store_param[i].cbData; + param.pbData = param.cbData ? p : NULL; + p += store_param[i].cbData; + + memcpy(&info.rgProvParam[i], &param, sizeof(param)); } } else - info->rgProvParam = NULL; + info.rgProvParam = NULL; + + TRACE("%s,%s,%u,%08x,%u,%p,%u\n", debugstr_w(info.pwszContainerName), debugstr_w(info.pwszProvName), + info.dwProvType, info.dwFlags, info.cProvParam, info.rgProvParam, info.dwKeySpec); + + *buf = info; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, @@ -606,72 +653,76 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, * data, but whose pointers are uninitialized. * Upon return, to contains a contiguous copy of from, packed in the following * order: - * - CRYPT_KEY_PROV_INFO + * - store_CRYPT_KEY_PROV_INFO * - pwszContainerName * - pwszProvName - * - rgProvParam[0]... + * - store_CRYPT_KEY_PROV_PARAM[0] + * - store_CRYPT_KEY_PROV_PARAM[0].data + * - ... */ -static void CRYPT_CopyKeyProvInfo(PCRYPT_KEY_PROV_INFO to, - const CRYPT_KEY_PROV_INFO *from) +static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY_PROV_INFO *from) { DWORD i; - LPBYTE nextData = (LPBYTE)to + sizeof(CRYPT_KEY_PROV_INFO); + BYTE *p; + store_CRYPT_KEY_PROV_PARAM *param; + + p = (BYTE *)(to + 1); if (from->pwszContainerName) { - to->pwszContainerName = (LPWSTR)nextData; - lstrcpyW(to->pwszContainerName, from->pwszContainerName); - nextData += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); + to->pwszContainerName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszContainerName); + p += (lstrlenW(from->pwszContainerName) + 1) * sizeof(WCHAR); } else - to->pwszContainerName = NULL; + to->pwszContainerName = 0; + if (from->pwszProvName) { - to->pwszProvName = (LPWSTR)nextData; - lstrcpyW(to->pwszProvName, from->pwszProvName); - nextData += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); + to->pwszProvName = p - (BYTE *)to; + lstrcpyW((LPWSTR)p, from->pwszProvName); + p += (lstrlenW(from->pwszProvName) + 1) * sizeof(WCHAR); } else - to->pwszProvName = NULL; + to->pwszProvName = 0; + to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; - to->rgProvParam = (PCRYPT_KEY_PROV_PARAM)nextData; - nextData += to->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); to->dwKeySpec = from->dwKeySpec; + for (i = 0; i < to->cProvParam; i++) { - memcpy(&to->rgProvParam[i], &from->rgProvParam[i], - sizeof(CRYPT_KEY_PROV_PARAM)); - to->rgProvParam[i].pbData = nextData; - memcpy(to->rgProvParam[i].pbData, from->rgProvParam[i].pbData, - from->rgProvParam[i].cbData); - nextData += from->rgProvParam[i].cbData; + param = (store_CRYPT_KEY_PROV_PARAM *)p; + p += sizeof(*param); + + param->dwParam = from->rgProvParam[i].dwParam; + param->cbData = from->rgProvParam[i].cbData; + param->dwFlags = from->rgProvParam[i].dwFlags; + memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData); + p += from->rgProvParam[i].cbData; } } static BOOL CertContext_SetKeyProvInfoProperty(CONTEXT_PROPERTY_LIST *properties, const CRYPT_KEY_PROV_INFO *info) { + BYTE *buf; + DWORD size = sizeof(store_CRYPT_KEY_PROV_INFO), i; BOOL ret; - LPBYTE buf = NULL; - DWORD size = sizeof(CRYPT_KEY_PROV_INFO), i, containerSize, provNameSize; if (info->pwszContainerName) - containerSize = (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); - else - containerSize = 0; + size += (lstrlenW(info->pwszContainerName) + 1) * sizeof(WCHAR); if (info->pwszProvName) - provNameSize = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); - else - provNameSize = 0; - size += containerSize + provNameSize; + size += (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); + for (i = 0; i < info->cProvParam; i++) - size += sizeof(CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + size += sizeof(store_CRYPT_KEY_PROV_PARAM) + info->rgProvParam[i].cbData; + buf = CryptMemAlloc(size); if (buf) { - CRYPT_CopyKeyProvInfo((PCRYPT_KEY_PROV_INFO)buf, info); + CRYPT_CopyKeyProvInfo((store_CRYPT_KEY_PROV_INFO *)buf, info); ret = ContextPropertyList_SetProperty(properties, CERT_KEY_PROV_INFO_PROP_ID, buf, size); CryptMemFree(buf); -- 2.26.2

1 0

[PATCH 8/8] ntdll: Export builtin functions as cdecl.
by Jacek Caban 09 Jun '20

09 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This fixes 32-bit compilation with MSVC clang target. dlls/ntdll/large_int.c | 101 +++++++++++++++------------- dlls/ntdll/ntdll.spec | 16 ++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 ++--- 3 files changed, 71 insertions(+), 62 deletions(-)

2 1

[PATCH v2] strmbase: Release the allocator in IPin::Disconnect() (Valgrind).
by Zebediah Figura 08 Jun '20

08 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/strmbase/pin.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7330859466..d603ea46ed 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1443,7 +1443,7 @@ static void test_connect_pin(void) ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); ref = IMemAllocator_Release(allocator); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index ecf4090f76..edf63c5bda 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3072,7 +3072,7 @@ static void test_renderless_formats(void) ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); hr = IMemInputPin_GetAllocator(input, &allocator); - todo_wine_if (i == 0) ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); + todo_wine ok(hr == S_OK, "Test %u: Got hr %#x.\n", i, hr); if (hr != S_OK) { test_allocator(input); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f08c6d0186..e5017c2ff9 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -594,6 +594,13 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) IMemInputPin_Release(This->pMemInputPin); This->pMemInputPin = NULL; } + + if (This->pAllocator) + { + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + } + if (This->pin.peer) { IPin_Release(This->pin.peer); @@ -930,6 +937,12 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) if (pin->pFuncsTable->sink_disconnect) pin->pFuncsTable->sink_disconnect(pin); + if (pin->pAllocator) + { + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; + } + IPin_Release(pin->pin.peer); pin->pin.peer = NULL; FreeMediaType(&pin->pin.mt); -- 2.27.0

1 0

[PATCH 1/4] ntdll/tests: Add tests for LdrGetDllFullName
by Alex Henrie 08 Jun '20

08 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Documented at https://github.com/hfiref0x/NtCall64/blob/master/Source/NtCall64/ntos.h#L58… --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/rtl.c | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index ed15c51339..c7683c1522 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ntdll.dll -IMPORTS = user32 advapi32 +IMPORTS = user32 advapi32 shlwapi C_SRCS = \ atom.c \ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea0..3588e00681 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,7 @@ #include "in6addr.h" #include "inaddr.h" #include "ip2string.h" +#include "shlwapi.h" #ifndef __WINE_WINTERNL_H @@ -80,6 +81,7 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pLdrGetDllFullName)(HMODULE, PUNICODE_STRING); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); @@ -120,6 +122,7 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pLdrGetDllFullName = (void *)GetProcAddress(hntdll, "LdrGetDllFullName"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); } @@ -3483,6 +3486,66 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static void test_LdrGetDllFullName(void) +{ + static const WCHAR ntdll_dll[] = {'n','t','d','l','l','.','d','l','l',0}; + static const WCHAR dot_exe[] = {'.','e','x','e',0}; + HMODULE ntdll = GetModuleHandleA("ntdll.dll"); + WCHAR ntdll_path[MAX_PATH], path_buffer[MAX_PATH]; + UNICODE_STRING path = {0, 0, path_buffer}; + WCHAR expected_terminator; + const WCHAR *extension; + NTSTATUS status; + + if (!pLdrGetDllFullName) + { + skip("LdrGetDllFullName not available\n"); + return; + } + + if (0) /* crashes on Windows */ + pLdrGetDllFullName(ntdll, NULL); + + memset(path_buffer, 0x23, sizeof(path_buffer)); + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(path.Length == 0, "Expected length 0, got %d\n", path.Length); + ok(path_buffer[0] == 0x2323, "Expected 0x2323, got 0x%x\n", path_buffer[0]); + + GetSystemDirectoryW(ntdll_path, ARRAY_SIZE(ntdll_path)); + path.MaximumLength = 5; /* odd numbers produce partially copied characters */ + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(path.Length == path.MaximumLength, + "Expected length %d, got %d\n", path.MaximumLength, path.Length); + expected_terminator = 0x2300 | (ntdll_path[path.MaximumLength / sizeof(WCHAR)] & 0xFF); + ok(path_buffer[path.MaximumLength / sizeof(WCHAR)] == expected_terminator, + "Expected 0x%x, got 0x%x\n", expected_terminator, path_buffer[path.MaximumLength / 2]); + path_buffer[path.MaximumLength / sizeof(WCHAR)] = 0; + ntdll_path[path.MaximumLength / sizeof(WCHAR)] = 0; + ok(lstrcmpW(path_buffer, ntdll_path) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(ntdll_path), wine_dbgstr_w(path_buffer)); + + GetSystemDirectoryW(ntdll_path, ARRAY_SIZE(ntdll_path)); + PathAppendW(ntdll_path, ntdll_dll); + path.MaximumLength = sizeof(path_buffer); + + status = pLdrGetDllFullName(NULL, &path); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + extension = PathFindExtensionW(path_buffer); + ok(lstrcmpW(extension, dot_exe) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(dot_exe), wine_dbgstr_w(extension)); + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(path.Length == lstrlenW(ntdll_path) * sizeof(WCHAR), "Expected length %d, got %d\n", + lstrlenW(ntdll_path) * sizeof(WCHAR), path.Length); + ok(lstrcmpiW(path_buffer, ntdll_path) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(ntdll_path), wine_dbgstr_w(path_buffer)); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3586,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_LdrGetDllFullName(); } -- 2.27.0

4 11

[PATCH 1/2] kernel32/tests: Fix handle leak.
by Brendan Shanks 08 Jun '20

08 Jun '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/kernel32/tests/thread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index a9869863b44..ebc42ca0726 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1389,6 +1389,9 @@ static void test_RegisterWaitForSingleObject(void) ok(!ret, "Expected UnregisterWait to fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + + CloseHandle(complete_event); + CloseHandle(handle); } static DWORD LS_main; -- 2.26.2

1 1

[PATCH] include: Add missing packing, structs and defines for xact3wb.h
by Vijay Kiran Kamuju 08 Jun '20

08 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 5/8] ntdll: Reimplement _allrem using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

2 1

[PATCH] vcruntime140_1: Add support for pointer to object in unwind info.
by Piotr Caban 08 Jun '20

08 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49307 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/except_x86_64.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)

1 0

[PATCH] strmbase: Release the allocator in IPin::Disconnect() (Valgrind).
by Zebediah Figura 08 Jun '20

08 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f08c6d0186..e5017c2ff9 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -594,6 +594,13 @@ static HRESULT WINAPI source_Disconnect(IPin *iface) IMemInputPin_Release(This->pMemInputPin); This->pMemInputPin = NULL; } + + if (This->pAllocator) + { + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + } + if (This->pin.peer) { IPin_Release(This->pin.peer); @@ -930,6 +937,12 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) if (pin->pFuncsTable->sink_disconnect) pin->pFuncsTable->sink_disconnect(pin); + if (pin->pAllocator) + { + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; + } + IPin_Release(pin->pin.peer); pin->pin.peer = NULL; FreeMediaType(&pin->pin.mt); -- 2.27.0

2 1

[PATCH v2] quartz/filtergraph: Add a stub IVideoFrameStep interface.
by Zebediah Figura 08 Jun '20

08 Jun '20

From: Gijs Vermeulen <gijsvrm(a)gmail.com> wine-bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Avoid Hungarian notation and "This"; use a more readable trace format. dlls/quartz/filtergraph.c | 57 ++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 1 + include/axextend.idl | 13 ++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..918c41a3d6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -181,7 +181,7 @@ typedef struct _IFilterGraphImpl { /* IRegisterServiceProvider */ /* IResourceManager */ /* IServiceProvider */ - /* IVideoFrameStep */ + IVideoFrameStep IVideoFrameStep_iface; IUnknown *outer_unk; LONG ref; @@ -454,6 +454,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphVersion_iface; TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { + *ppvObj = &This->IVideoFrameStep_iface; + TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -5638,6 +5641,57 @@ static const IGraphVersionVtbl IGraphVersion_VTable = GraphVersion_QueryVersion, }; +static IFilterGraphImpl *impl_from_IVideoFrameStep(IVideoFrameStep *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoFrameStep_iface); +} + +static HRESULT WINAPI VideoFrameStep_QueryInterface(IVideoFrameStep *iface, REFIID iid, void **out) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_QueryInterface(graph->outer_unk, iid, out); +} + +static ULONG WINAPI VideoFrameStep_AddRef(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_AddRef(graph->outer_unk); +} + +static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface) +{ + IFilterGraphImpl *graph = impl_from_IVideoFrameStep(iface); + return IUnknown_Release(graph->outer_unk); +} + +static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frame_count, IUnknown *filter) +{ + FIXME("iface %p, frame_count %u, filter %p, stub!\n", iface, frame_count, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *filter) +{ + FIXME("iface %p, multiple %d, filter %p, stub!\n", iface, multiple, filter); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CancelStep(IVideoFrameStep *iface) +{ + FIXME("iface %p, stub!\n", iface); + return E_NOTIMPL; +} + +static const IVideoFrameStepVtbl VideoFrameStep_vtbl = +{ + VideoFrameStep_QueryInterface, + VideoFrameStep_AddRef, + VideoFrameStep_Release, + VideoFrameStep_Step, + VideoFrameStep_CanStep, + VideoFrameStep_CancelStep +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5668,6 +5722,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); list_init(&fimpl->sorted_filters); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..a3378efe0b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -125,6 +125,7 @@ static void test_interfaces(void) check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); diff --git a/include/axextend.idl b/include/axextend.idl index 8b46d665b5..7630ea247c 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1471,3 +1471,16 @@ interface IAMTVTuner : IAMTuner HRESULT get_VideoFrequency([out] long *freq); HRESULT get_AudioFrequency([out] long *freq); } + +[ + local, + object, + uuid(e46a9787-2b71-444d-a4b5-1fab7b708d6a), + pointer_default(unique), +] +interface IVideoFrameStep : IUnknown +{ + HRESULT Step(DWORD frame_count, [in] IUnknown *filter); + HRESULT CanStep(long multiple, [in] IUnknown *filter); + HRESULT CancelStep(); +} -- 2.27.0

3 2

[PATCH 7/8] ntdll/tests: Add long long builtins tests.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/large_int.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)

1 0

[PATCH 6/8] ntdll: Reimplement _allmul using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] ntdll: Reimplement _alldiv using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 3/8] ntdll: Reimplement _aullrem using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/large_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/8] ntdll: Reimplement _aulldiv using 32-bit arithmetic.
by Jacek Caban 08 Jun '20

08 Jun '20

Based on compiler-rt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Current solution uses native implementation for that. Once we move ntdll to PE file, compiler could use those (like MSVC does) to implement 64-bit arithmetic, creating an infinite recursion. dlls/ntdll/large_int.c | 179 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 178 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] winnt.h: Add BitScanForward and BitScanReverse implementation.
by Jacek Caban 08 Jun '20

08 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winnt.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)

1 0

[PATCH 5/5 v2] ucrtbase: Add more inf,nan,ind printf tests.
by Piotr Caban 08 Jun '20

08 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 72 +++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-)

1 0

[PATCH 4/5 v2] ucrtbase: Add printf %a format tests.
by Piotr Caban 08 Jun '20

08 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)

1 0

[PATCH 3/5 v2] msvcrt: Reimplement %a printf format handling.
by Piotr Caban 08 Jun '20

08 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 116 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+)

1 0

[PATCH 2/5 v2] msvcrt: Reimplement special doubles printing.
by Piotr Caban 08 Jun '20

08 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 278 ++++++++++++++++++++++++++----------------- 1 file changed, 171 insertions(+), 107 deletions(-)

1 0

[PATCH 1/5 v2] msvcrt: Use internal sprintf implementation.
by Piotr Caban 08 Jun '20

08 Jun '20

1 0

[PATCH 1/5] d3dcompiler: Emit constructors as sequences of stores to a synthetic variable.
by Zebediah Figura 08 Jun '20

08 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ---- dlls/d3dcompiler_43/hlsl.y | 94 +++++++++++++---------- dlls/d3dcompiler_43/utils.c | 25 ------ 3 files changed, 52 insertions(+), 81 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a61b84d6b54..c9bb6ced6c7 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -648,7 +648,6 @@ enum hlsl_ir_node_type { HLSL_IR_ASSIGNMENT = 0, HLSL_IR_CONSTANT, - HLSL_IR_CONSTRUCTOR, HLSL_IR_EXPR, HLSL_IR_IF, HLSL_IR_LOAD, @@ -880,13 +879,6 @@ struct hlsl_ir_constant } v; }; -struct hlsl_ir_constructor -{ - struct hlsl_ir_node node; - struct hlsl_ir_node *args[16]; - unsigned int args_count; -}; - struct hlsl_scope { struct list entry; @@ -1042,12 +1034,6 @@ static inline struct hlsl_ir_swizzle *swizzle_from_node(const struct hlsl_ir_nod return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); } -static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) -{ - assert(node->type == HLSL_IR_CONSTRUCTOR); - return CONTAINING_RECORD(node, struct hlsl_ir_constructor, node); -} - static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_IF); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 436b731fd16..8fbb879778d 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1244,7 +1244,6 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) return 0; } } - case HLSL_IR_CONSTRUCTOR: case HLSL_IR_EXPR: case HLSL_IR_LOAD: case HLSL_IR_SWIZZLE: @@ -2415,41 +2414,60 @@ postfix_expr: primary_expr } $$ = append_binop($1, $3, &load->node); } - /* "var_modifiers" doesn't make sense in this case, but it's needed - in the grammar to avoid shift/reduce conflicts. */ - | var_modifiers type '(' initializer_expr_list ')' - { - struct hlsl_ir_constructor *constructor; - TRACE("%s constructor.\n", debug_hlsl_type($2)); - if ($1) - { - hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, - "unexpected modifier on a constructor\n"); - YYABORT; - } - if ($2->type > HLSL_CLASS_LAST_NUMERIC) - { - hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, - "constructors may only be used with numeric data types\n"); - YYABORT; - } - if ($2->dimx * $2->dimy != initializer_size(&$4)) - { - hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, - "expected %u components in constructor, but got %u\n", - $2->dimx * $2->dimy, initializer_size(&$4)); - YYABORT; - } - assert($4.args_count <= ARRAY_SIZE(constructor->args)); + /* "var_modifiers" doesn't make sense in this case, but it's needed + in the grammar to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_assignment *assignment; + unsigned int i, writemask_offset = 0; + static unsigned int counter; + struct hlsl_ir_load *load; + struct hlsl_ir_var *var; + char name[23]; - constructor = d3dcompiler_alloc(sizeof(*constructor)); - init_node(&constructor->node, HLSL_IR_CONSTRUCTOR, $2, get_location(&@3)); - constructor->args_count = $4.args_count; - memcpy(constructor->args, $4.args, $4.args_count * sizeof(*$4.args)); - d3dcompiler_free($4.args); - $$ = append_unop($4.instrs, &constructor->node); - } + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifier on a constructor\n"); + YYABORT; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "constructors may only be used with numeric data types\n"); + YYABORT; + } + if ($2->dimx * $2->dimy != initializer_size(&$4)) + { + hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, + "expected %u components in constructor, but got %u\n", + $2->dimx * $2->dimy, initializer_size(&$4)); + YYABORT; + } + + if ($2->type == HLSL_CLASS_MATRIX) + FIXME("Matrix constructors are not supported yet.\n"); + + sprintf(name, "<constructor-%x>", counter++); + if (!(var = new_synthetic_var(name, $2, get_location(&@2)))) + YYABORT; + for (i = 0; i < $4.args_count; ++i) + { + const struct hlsl_type *arg_type = $4.args[i]->data_type; + unsigned int component_count = arg_type->dimx * arg_type->dimy; + + if (!(assignment = new_assignment(var, NULL, $4.args[i], + ((1 << component_count) - 1) << writemask_offset, $4.args[i]->loc))) + YYABORT; + writemask_offset += component_count; + list_add_tail($4.instrs, &assignment->node.entry); + } + d3dcompiler_free($4.args); + if (!(load = new_var_load(var, get_location(&@2)))) + YYABORT; + $$ = append_unop($4.instrs, &load->node); + } unary_expr: postfix_expr { @@ -2834,14 +2852,6 @@ static void compute_liveness_recurse(struct list *instrs, unsigned int loop_firs assignment->lhs.offset->last_read = instr->index; break; } - case HLSL_IR_CONSTRUCTOR: - { - struct hlsl_ir_constructor *constructor = constructor_from_node(instr); - unsigned int i; - for (i = 0; i < constructor->args_count; ++i) - constructor->args[i]->last_read = instr->index; - break; - } case HLSL_IR_EXPR: { struct hlsl_ir_expr *expr = expr_from_node(instr); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ec0da2d4034..4f156b678f2 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1763,7 +1763,6 @@ const char *debug_node_type(enum hlsl_ir_node_type type) { "HLSL_IR_ASSIGNMENT", "HLSL_IR_CONSTANT", - "HLSL_IR_CONSTRUCTOR", "HLSL_IR_EXPR", "HLSL_IR_IF", "HLSL_IR_LOAD", @@ -1951,19 +1950,6 @@ static void debug_dump_ir_expr(const struct hlsl_ir_expr *expr) wine_dbg_printf(")"); } -static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) -{ - unsigned int i; - - wine_dbg_printf("%s (", debug_hlsl_type(constructor->node.data_type)); - for (i = 0; i < constructor->args_count; ++i) - { - debug_dump_src(constructor->args[i]); - wine_dbg_printf(" "); - } - wine_dbg_printf(")"); -} - static const char *debug_writemask(DWORD writemask) { static const char components[] = {'x', 'y', 'z', 'w'}; @@ -2078,9 +2064,6 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_SWIZZLE: debug_dump_ir_swizzle(swizzle_from_node(instr)); break; - case HLSL_IR_CONSTRUCTOR: - debug_dump_ir_constructor(constructor_from_node(instr)); - break; case HLSL_IR_JUMP: debug_dump_ir_jump(jump_from_node(instr)); break; @@ -2175,11 +2158,6 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) d3dcompiler_free(swizzle); } -static void free_ir_constructor(struct hlsl_ir_constructor *constructor) -{ - d3dcompiler_free(constructor); -} - static void free_ir_expr(struct hlsl_ir_expr *expr) { d3dcompiler_free(expr); @@ -2221,9 +2199,6 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_SWIZZLE: free_ir_swizzle(swizzle_from_node(node)); break; - case HLSL_IR_CONSTRUCTOR: - free_ir_constructor(constructor_from_node(node)); - break; case HLSL_IR_EXPR: free_ir_expr(expr_from_node(node)); break; -- 2.26.2

4 9

[PATCH 1/5] dwrite: Sort feature tags returned from GetTypographicFeatures().
by Nikolay Sivov 08 Jun '20

08 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 24 +++----- dlls/dwrite/dwrite_private.h | 28 +++++++--- dlls/dwrite/opentype.c | 103 +++++++++++++++++------------------ dlls/dwrite/shape.c | 47 ++++++++++++++++ dlls/dwrite/tests/analyzer.c | 50 +++++------------ 5 files changed, 137 insertions(+), 115 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a8a3e7c359b..10c59f1bdca 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1767,29 +1767,23 @@ static HRESULT WINAPI dwritetextanalyzer2_GetTypographicFeatures(IDWriteTextAnal IDWriteFontFace *fontface, DWRITE_SCRIPT_ANALYSIS sa, const WCHAR *locale, UINT32 max_tagcount, UINT32 *actual_tagcount, DWRITE_FONT_FEATURE_TAG *tags) { + struct scriptshaping_context context = { 0 }; const struct dwritescript_properties *props; - const DWORD *scripts; - HRESULT hr = S_OK; - UINT32 language; + struct dwrite_fontface *font_obj; - TRACE("(%p %u %s %u %p %p)\n", fontface, sa.script, debugstr_w(locale), max_tagcount, actual_tagcount, - tags); + TRACE("%p, %p, %u, %s, %u, %p, %p.\n", iface, fontface, sa.script, debugstr_w(locale), max_tagcount, + actual_tagcount, tags); if (sa.script > Script_LastId) return E_INVALIDARG; - language = get_opentype_language(locale); - props = &dwritescripts_properties[sa.script]; - *actual_tagcount = 0; + font_obj = unsafe_impl_from_IDWriteFontFace(fontface); - scripts = props->scripttags; - while (*scripts && !*actual_tagcount) - { - hr = opentype_get_typographic_features(fontface, *scripts, language, max_tagcount, actual_tagcount, tags); - scripts++; - } + context.cache = fontface_get_shaping_cache(font_obj); + context.language_tag = get_opentype_language(locale); + props = &dwritescripts_properties[sa.script]; - return hr; + return shape_get_typographic_features(&context, props->scripttags, max_tagcount, actual_tagcount, tags); }; static HRESULT WINAPI dwritetextanalyzer2_CheckTypographicFeature(IDWriteTextAnalyzer2 *iface, diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f8b7e0d139d..246dab69327 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -330,6 +330,21 @@ struct file_stream_desc { extern const void* get_fontface_table(IDWriteFontFace5 *fontface, UINT32 tag, struct dwrite_fonttable *table) DECLSPEC_HIDDEN; +struct tag_array +{ + unsigned int *tags; + size_t capacity; + size_t count; +}; + +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,BOOL*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,UINT32*) DECLSPEC_HIDDEN; extern HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag, const void **data, void **context, UINT32 *size, BOOL *exists) DECLSPEC_HIDDEN; @@ -343,7 +358,8 @@ extern HRESULT opentype_get_font_info_strings(const struct file_stream_desc *str DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; +extern void opentype_get_typographic_features(struct ot_gsubgpos_table *table, unsigned int script_index, + unsigned int language_index, struct tag_array *tags) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const struct dwrite_fonttable *table, INT ppem, UINT16 *ascent, UINT16 *descent) DECLSPEC_HIDDEN; extern unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; @@ -438,14 +454,6 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; -struct ot_gsubgpos_table -{ - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; -}; - struct scriptshaping_cache { const struct shaping_font_ops *font; @@ -586,3 +594,5 @@ extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *co extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; +extern HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, + unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 2106fe2cf78..a07d12c0f8c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2467,74 +2467,69 @@ static inline const struct ot_script *opentype_get_script(const struct ot_script return NULL; } -static inline const struct ot_langsys *opentype_get_langsys(const struct ot_script *script, UINT32 languagetag) +static const struct ot_langsys *opentype_get_langsys(const struct ot_gsubgpos_table *table, unsigned int script_index, + unsigned int language_index, unsigned int *feature_count) { - UINT16 j; - - for (j = 0; j < GET_BE_WORD(script->langsys_count); j++) { - const char *tag = script->langsys[j].tag; - if (languagetag == DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3])) - return (struct ot_langsys *)((BYTE*)script + GET_BE_WORD(script->langsys[j].langsys)); - } - - return NULL; -} + unsigned int table_offset, langsys_offset; + const struct ot_langsys *langsys = NULL; -static void opentype_add_font_features(const struct gpos_gsub_header *header, const struct ot_langsys *langsys, - UINT32 max_tagcount, UINT32 *count, DWRITE_FONT_FEATURE_TAG *tags) -{ - const struct ot_feature_list *features = (const struct ot_feature_list *)((const BYTE*)header + GET_BE_WORD(header->feature_list)); - UINT16 j; + *feature_count = 0; - for (j = 0; j < GET_BE_WORD(langsys->feature_count); j++) { - const struct ot_feature_record *feature = &features->features[langsys->feature_index[j]]; + if (!table->table.data || script_index == ~0u) + return NULL; - if (*count < max_tagcount) - tags[*count] = GET_BE_DWORD(feature->tag); + /* ScriptTable offset. */ + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); + if (!table_offset) + return NULL; - (*count)++; - } + if (language_index == ~0u) + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); + else + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + + FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + + FIELD_OFFSET(struct ot_langsys_record, langsys)); + langsys_offset += table->script_list + table_offset; + + *feature_count = table_read_be_word(&table->table, langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_count)); + if (*feature_count) + langsys = table_read_ensure(&table->table, langsys_offset, FIELD_OFFSET(struct ot_langsys, feature_index[*feature_count])); + if (!langsys) + *feature_count = 0; + + return langsys; } -HRESULT opentype_get_typographic_features(IDWriteFontFace *fontface, UINT32 scripttag, UINT32 languagetag, UINT32 max_tagcount, - UINT32 *count, DWRITE_FONT_FEATURE_TAG *tags) +void opentype_get_typographic_features(struct ot_gsubgpos_table *table, unsigned int script_index, + unsigned int language_index, struct tag_array *t) { - UINT32 tables[2] = { MS_GSUB_TAG, MS_GPOS_TAG }; - HRESULT hr; - UINT8 i; - - *count = 0; - for (i = 0; i < ARRAY_SIZE(tables); i++) { - const struct ot_script_list *scriptlist; - const struct gpos_gsub_header *header; - const struct ot_script *script; - const void *ptr; - void *context; - UINT32 size; - BOOL exists; + unsigned int i, total_feature_count, script_feature_count; + const struct ot_feature_list *feature_list; + const struct ot_langsys *langsys = NULL; - exists = FALSE; - hr = IDWriteFontFace_TryGetFontTable(fontface, tables[i], &ptr, &size, &context, &exists); - if (FAILED(hr)) - return hr; + langsys = opentype_get_langsys(table, script_index, language_index, &script_feature_count); - if (!exists) - continue; + total_feature_count = table_read_be_word(&table->table, table->feature_list); + if (!total_feature_count) + return; - header = (const struct gpos_gsub_header *)ptr; - scriptlist = (const struct ot_script_list *)((const BYTE*)header + GET_BE_WORD(header->script_list)); + feature_list = table_read_ensure(&table->table, table->feature_list, + FIELD_OFFSET(struct ot_feature_list, features[total_feature_count])); + if (!feature_list) + return; - script = opentype_get_script(scriptlist, scripttag); - if (script) { - const struct ot_langsys *langsys = opentype_get_langsys(script, languagetag); - if (langsys) - opentype_add_font_features(header, langsys, max_tagcount, count, tags); - } + for (i = 0; i < script_feature_count; ++i) + { + unsigned int feature_index = GET_BE_WORD(langsys->feature_index[i]); + if (feature_index >= total_feature_count) + continue; - IDWriteFontFace_ReleaseFontTable(fontface, context); - } + if (!dwrite_array_reserve((void **)&t->tags, &t->capacity, t->count + 1, sizeof(*t->tags))) + return; - return *count > max_tagcount ? E_NOT_SUFFICIENT_BUFFER : S_OK; + t->tags[t->count++] = feature_list->features[feature_index].tag; + } } static unsigned int find_vdmx_group(const struct vdmx_header *hdr) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 32aabac5f68..4968cd995d4 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -22,11 +22,18 @@ #define COBJMACROS #include "dwrite_private.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +#ifdef WORDS_BIGENDIAN +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) +#endif + struct scriptshaping_cache *create_scriptshaping_cache(void *context, const struct shaping_font_ops *font_ops) { struct scriptshaping_cache *cache; @@ -303,3 +310,43 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i return (context->glyph_count <= context->u.subst.max_glyph_count) ? S_OK : E_NOT_SUFFICIENT_BUFFER; } + +static int tag_array_sorting_compare(const void *a, const void *b) +{ + unsigned int left = GET_BE_DWORD(*(unsigned int *)a), right = GET_BE_DWORD(*(unsigned int *)b); + return left != right ? (left < right ? -1 : 1) : 0; +}; + +HRESULT shape_get_typographic_features(struct scriptshaping_context *context, const unsigned int *scripts, + unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) +{ + unsigned int i, j, script_index, language_index; + struct tag_array t = { 0 }; + + /* Collect from both tables, sort and remove duplicates. */ + + shape_get_script_lang_index(context, scripts, MS_GSUB_TAG, &script_index, &language_index); + opentype_get_typographic_features(&context->cache->gsub, script_index, language_index, &t); + + shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index); + opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t); + + /* Sort and remove duplicates. */ + qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare); + + for (i = 1, j = 0; i < t.count; ++i) + { + if (t.tags[i] != t.tags[j]) + t.tags[++j] = t.tags[i]; + } + t.count = j + 1; + + if (t.count <= max_tagcount) + memcpy(tags, t.tags, t.count * sizeof(*t.tags)); + + *actual_tagcount = t.count; + + heap_free(t.tags); + + return t.count <= max_tagcount ? S_OK : E_NOT_SUFFICIENT_BUFFER; +} diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 70becb55ee5..6dd251270c7 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1795,15 +1795,6 @@ if (0) { IDWriteTextAnalyzer_Release(analyzer); } -static BOOL has_feature(const DWRITE_FONT_FEATURE_TAG *tags, UINT32 count, DWRITE_FONT_FEATURE_TAG feature) -{ - UINT32 i; - - for (i = 0; i < count; i++) - if (tags[i] == feature) return TRUE; - return FALSE; -} - static void test_GetTypographicFeatures(void) { static const WCHAR arabicW[] = {0x064a,0x064f,0x0633,0}; @@ -1814,7 +1805,6 @@ static void test_GetTypographicFeatures(void) DWRITE_SCRIPT_ANALYSIS sa; UINT32 count; HRESULT hr; - BOOL ret; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1831,45 +1821,31 @@ static void test_GetTypographicFeatures(void) get_script_analysis(L"abc", &sa); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, 0, &count, NULL); -todo_wine { - ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(count > 0, "got %u\n", count); -} + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(!!count, "Unexpected count %u.\n", count); + /* invalid locale name is ignored */ get_script_analysis(L"abc", &sa); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, L"cadabra", 0, &count, NULL); -todo_wine { - ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(count > 0, "got %u\n", count); -} - /* both GSUB and GPOS features are reported */ + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(!!count, "Unexpected count %u.\n", count); + + /* Make some calls for different scripts. */ + get_script_analysis(arabicW, &sa); memset(tags, 0, sizeof(tags)); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, ARRAY_SIZE(tags), &count, tags); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { - ok(count > 0, "got %u\n", count); - ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES); - ok(ret, "expected 'calt' feature\n"); - ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING); - ok(ret, "expected 'mkmk' feature\n"); -} + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!count, "Unexpected count %u.\n", count); + get_script_analysis(L"abc", &sa); memset(tags, 0, sizeof(tags)); count = 0; hr = IDWriteTextAnalyzer2_GetTypographicFeatures(analyzer2, fontface, sa, NULL, ARRAY_SIZE(tags), &count, tags); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { - ok(count > 0, "got %u\n", count); - ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION); - ok(ret, "expected 'ccmp' feature\n"); - ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING); - ok(ret, "expected 'mkmk' feature\n"); -} - ret = has_feature(tags, count, DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES); - ok(!ret, "unexpected 'calt' feature\n"); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!count, "Unexpected count %u.\n", count); IDWriteFontFace_Release(fontface); IDWriteTextAnalyzer2_Release(analyzer2); -- 2.26.2

1 4

[PATCH] quartz/filtergraph: Add a stub IVideoFrameStep interface.
by Gijs Vermeulen 08 Jun '20

08 Jun '20

wine-bug: https://bugs.winehq.org/show_bug.cgi?id=42372 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/filtergraph.c | 64 ++++++++++++++++++++++++++++++++- dlls/quartz/tests/filtergraph.c | 1 + include/axextend.idl | 13 +++++++ 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6217516db1..db2f922bc1 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -181,7 +181,7 @@ typedef struct _IFilterGraphImpl { /* IRegisterServiceProvider */ /* IResourceManager */ /* IServiceProvider */ - /* IVideoFrameStep */ + IVideoFrameStep IVideoFrameStep_iface; IUnknown *outer_unk; LONG ref; @@ -454,6 +454,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown *iface, REFIID ri } else if (IsEqualGUID(&IID_IGraphVersion, riid)) { *ppvObj = &This->IGraphVersion_iface; TRACE(" returning IGraphVersion interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IVideoFrameStep, riid)) { + *ppvObj = &This->IVideoFrameStep_iface; + TRACE(" returning IVideoFrameStep interface (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -5638,6 +5641,64 @@ static const IGraphVersionVtbl IGraphVersion_VTable = GraphVersion_QueryVersion, }; +static inline IFilterGraphImpl *impl_from_IVideoFrameStep(IVideoFrameStep *iface) +{ + return CONTAINING_RECORD(iface, IFilterGraphImpl, IVideoFrameStep_iface); +} + +static HRESULT WINAPI VideoFrameStep_QueryInterface(IVideoFrameStep *iface, REFIID riid, void **ppv) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI VideoFrameStep_AddRef(IVideoFrameStep *iface) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI VideoFrameStep_Release(IVideoFrameStep *iface) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + + return IUnknown_Release(This->outer_unk); +} + +static HRESULT WINAPI VideoFrameStep_Step(IVideoFrameStep *iface, DWORD frames, IUnknown *stepobj) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + FIXME("(%p)->(%d %p): stub!\n", This, frames, stepobj); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CanStep(IVideoFrameStep *iface, LONG multiple, IUnknown *stepobj) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + FIXME("(%p)->(%d %p): stub!\n", This, multiple, stepobj); + return E_NOTIMPL; +} + +static HRESULT WINAPI VideoFrameStep_CancelStep(IVideoFrameStep *iface) +{ + IFilterGraphImpl *This = impl_from_IVideoFrameStep(iface); + FIXME("(%p)->(): stub!\n", This); + return E_NOTIMPL; +} + + +static const IVideoFrameStepVtbl IVideoFrameStep_VTable = +{ + VideoFrameStep_QueryInterface, + VideoFrameStep_AddRef, + VideoFrameStep_Release, + VideoFrameStep_Step, + VideoFrameStep_CanStep, + VideoFrameStep_CancelStep +}; + static const IUnknownVtbl IInner_VTable = { FilterGraphInner_QueryInterface, @@ -5668,6 +5729,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IMediaPosition_iface.lpVtbl = &IMediaPosition_VTable; fimpl->IObjectWithSite_iface.lpVtbl = &IObjectWithSite_VTable; fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; + fimpl->IVideoFrameStep_iface.lpVtbl = &IVideoFrameStep_VTable; fimpl->ref = 1; list_init(&fimpl->filters); list_init(&fimpl->sorted_filters); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f0aa084192..a3378efe0b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -125,6 +125,7 @@ static void test_interfaces(void) check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); + check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); diff --git a/include/axextend.idl b/include/axextend.idl index 8b46d665b5..8303166721 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1471,3 +1471,16 @@ interface IAMTVTuner : IAMTuner HRESULT get_VideoFrequency([out] long *freq); HRESULT get_AudioFrequency([out] long *freq); } + +[ + local, + object, + uuid(e46a9787-2b71-444d-a4b5-1fab7b708d6a), + pointer_default(unique), +] +interface IVideoFrameStep : IUnknown +{ + HRESULT Step(DWORD dwFrames, [in] IUnknown *pStepObject); + HRESULT CanStep(long bMultiple, [in] IUnknown *pStepObject); + HRESULT CancelStep(); +} -- 2.27.0

1 0

[PATCH 2/2] rpcrt4/tests: Add some tests for marshalling embedded conformant arrays.
by Dmitry Timoshkov 08 Jun '20

08 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/tests/server.c | 54 ++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 27 ++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6ac2f74227..d665568831 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -94,6 +94,9 @@ static int (__cdecl *sum_cps)(cps_t *cps); static int (__cdecl *sum_cpsc)(cpsc_t *cpsc); static int (__cdecl *get_cpsc)(int n, cpsc_t *cpsc); static int (__cdecl *sum_complex_array)(int n, refpint_t pi[]); +static int (__cdecl *sum_blob)(cs_blob_t *blob); +static int (__cdecl *sum_data)(cs_data_t *data); +static int (__cdecl *sum_container)(cs_container_t *container); static int (__cdecl *square_puint)(puint_t p); static int (__cdecl *sum_puints)(puints_t *p); static int (__cdecl *sum_cpuints)(cpuints_t *p); @@ -185,6 +188,9 @@ static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); X(sum_cpsc) \ X(get_cpsc) \ X(sum_complex_array) \ + X(sum_blob) \ + X(sum_data) \ + X(sum_container) \ X(square_puint) \ X(sum_puints) \ X(sum_cpuints) \ @@ -507,6 +513,36 @@ int __cdecl s_sum_complex_array(int n, refpint_t pi[]) return total; } +int __cdecl s_sum_blob(cs_blob_t *blob) +{ + int i, total = 0; + + for (i = 0; i < blob->n; i++) + total += blob->ca[i]; + + return total; +} + +int __cdecl s_sum_data(cs_data_t *data) +{ + int i, total = 0; + + for (i = 0; i < data->blob.n; i++) + total += data->blob.ca[i]; + + return total; +} + +int __cdecl s_sum_container(cs_container_t *container) +{ + int i, total = 0; + + for (i = 0; i < container->data.blob.n; i++) + total += container->data.blob.ca[i]; + + return total; +} + int __cdecl s_dot_two_vectors(vector_t vs[2]) { return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; @@ -1618,6 +1654,9 @@ array_tests(void) vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; cps_t cps; cpsc_t cpsc; + cs_blob_t blob; + cs_data_t data; + cs_container_t container; cs_t *cs; int n; int ca[5] = {1, -2, 3, -4, 5}; @@ -1761,6 +1800,21 @@ array_tests(void) ok(sum_ptr_array(ptr_array) == 3, "RPC sum_ptr_array\n"); ok(sum_array_ptr(&array) == 7, "RPC sum_array_ptr\n"); + + blob.n = ARRAY_SIZE(c); + blob.ca = c; + n = sum_blob(&blob); + ok(n == 45, "RPC sum_blob = %d\n", n); + + data.blob.n = ARRAY_SIZE(c); + data.blob.ca = c; + n = sum_data(&data); + ok(n == 45, "RPC sum_data = %d\n", n); + + container.data.blob.n = ARRAY_SIZE(c); + container.data.blob.ca = c; + n = sum_container(&container); + ok(n == 45, "RPC sum_container = %d\n", n); } void __cdecl s_authinfo_test(unsigned int protseq, int secure) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index afda2eddd0..4d945dcca3 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -169,6 +169,30 @@ cpp_quote("#ifndef SKIP_TYPE_DECLS") [size_is(n)] int ca[]; } cs_t; + typedef struct + { + int n; + [size_is(n)] int *ca; + } cs_blob_t; + + typedef struct + { +/* FIXME: widl generates incorrect correlation descriptor and the tests crash */ +#if 0 + int dummy[1]; /* to make offset to conformant array unique */ +#endif + cs_blob_t blob; + } cs_data_t; + + typedef struct + { +/* FIXME: widl generates incorrect correlation descriptor and the tests crash */ +#if 0 + int dummy[2]; /* to make offset to conformant array unique */ +#endif + cs_data_t data; + } cs_container_t; + typedef struct { int *pn; @@ -191,6 +215,9 @@ cpp_quote("#endif") int sum_cpsc(cpsc_t *cpsc); int get_cpsc(int n, [out] cpsc_t *cpsc ); int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); + int sum_blob([in] cs_blob_t *blob); + int sum_data([in] cs_data_t *data); + int sum_container([in] cs_container_t *container); cpp_quote("#ifndef SKIP_TYPE_DECLS") typedef [wire_marshal(int)] void *puint_t; -- 2.26.2

1 0

[PATCH 1/2] rpcrt4/tests: Fix compilation with MS VC.
by Dmitry Timoshkov 08 Jun '20

08 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 2400143eef..6ac2f74227 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -141,7 +141,7 @@ static void (__cdecl *stop_autolisten)(void); static void (__cdecl *ip_test)(ipu_t *a); static int (__cdecl *sum_ptr_array)(int *a[2]); static int (__cdecl *sum_array_ptr)(int (*a)[2]); -static ctx_handle_t __cdecl (*get_handle)(void); +static ctx_handle_t (__cdecl *get_handle)(void); static void (__cdecl *get_handle_by_ptr)(ctx_handle_t *r); static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); -- 2.26.2

1 0

[PATCH 0/8] Implement cross-process rawinput messages support.
by Rémi Bernon 08 Jun '20

08 Jun '20

Hi! This is another attempt at upstreaming my rawinput patches. I think there's a safer route, by first implementing the wineserver and dinput8 parts, while still relying on the current winex11 code. As long as a Wine window has input focus, the rawinput messages can be dispatch correctly to the listening processes. This series implements the missing rawinput support in wineserver, as well as some flag support that dinput8 implementation will then use. Then it should be possible to implement dinput8 on top of rawinput API, and get rid of the low-level hooks there, which is the correct way to do, and which should improve performance. The tricky part is about listening to xinput2 rawevent globally, which will solve the spurious mouse movements, but it will require first to sort out or workaround some focus issues, so that events are only dispatched when a Wine window has input focus. It can probably still live in staging until an good solution is found. Cheers, Rémi Bernon (8): user32/tests: Add basic rawinput message tests. user32/tests: Add inter-thread rawinput message tests. user32/tests: Add inter-process rawinput message tests. server: Implement rawinput cross-process message dispatch. server: Split cursor position update to update_desktop_cursor_pos. server: Split cursor state update to update_desktop_mouse_state. server: Implement RegisterRawInputDevices RIDEV_NOLEGACY flag. server: Implement RegisterRawInputDevices RIDEV_INPUTSINK flag. dlls/user32/rawinput.c | 9 +- dlls/user32/tests/input.c | 325 +++++++++++++++++++++++++++++++++++++- server/queue.c | 200 +++++++++++++++++------ 3 files changed, 485 insertions(+), 49 deletions(-) -- 2.27.0

4 14

[PATCH 1/3] dinput: Stop sending WM_WINE_NOTIFY_ACTIVITY on every input.
by Rémi Bernon 08 Jun '20

08 Jun '20

This message triggers screensaver notification in the user drivers, but it is not useful to send it on every input message, and it even hurts performance when high polling mouse is used. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33643 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46976 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: This only partially solves the mentionned bugs. Performance can be improved even more by using rawinput API instead of low-level hooks, but it requires the wineserver side to be implemented first. Because wiggling the mouse is a bit unpredictable, I've used evemu to create a fake evdev mouse device. And I've then injected events using this python / evemu-play script: python -u - <<EOF | stdbuf -oL evemu-play /dev/input/eventX for i in range(0, 1000*10000): print('E: {:.06f} 0002 0001 +001 # EV_REL / REL_Y' ' +1'.format(i / 1000.)) print('E: {:.06f} 0000 0000 0000 # ------------ ' 'SYN_REPORT (0) ---------- +1ms'.format(i / 1000.)) EOF Event injection time is not 100% reliable, but it is consistent and the event frequency is approximately 1kHz, similar to a high polling rate mouse. I've used Sekiro as a test case, with graphics settings set to lowest possible. The game runs at ~60fps without mouse input. The fps is not completely stable, and I believe it may be because the game is doing things at the same time. So I've measured the average fps of the first game scene after letting the injection run for a long time. Only positive REL_Y events are used so that the game camera gets down quickly and stops moving, to smooth variation that could be caused by the draw calls. With Wine 5.10, the fps drop to about ~40fps while input is injected, and PATCH #1 makes it go up to ~50fps. The other two patches have smaller effect and not easily measurable, but I believe they are still helpful -- perf indicates a lot of cache misses around the list iterations -- and they are also preparing ground for the rawinput patches. dlls/dinput/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8c5aa318837..51ae349f34e 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -931,13 +931,19 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq) { + static ULONGLONG notify_ms = 0; IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); int next_pos, ofs = id_to_offset(&This->data_format, inst_id); + ULONGLONG time_ms = GetTickCount64(); /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); - PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + if (time_ms - notify_ms > 1000) + { + PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + notify_ms = time_ms; + } if (!This->queue_len || This->overflow || ofs < 0) return; -- 2.27.0

1 2

[PATCH 2/3] windowscodecs: Initialize block data in DdsDecoder_Dds_GetFrame().
by Ziqing Hui 08 Jun '20

08 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 61 ++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 14 deletions(-)

2 2

[PATCH 3/3] windowscodecs: Implement DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 08 Jun '20

08 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 41 ++++++++++++++++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 30 ++++++++++---------- 2 files changed, 54 insertions(+), 17 deletions(-)

2 2

[PATCH] kernelbase: Output message ID as hex in debug messages.
by Jeff Smith 08 Jun '20

08 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- When printed as (signed) decimals in wine logs, many error codes are unrecognizable. dlls/kernelbase/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4f67a0d6d2..4e7bd9937b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3689,7 +3689,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageA( DWORD flags, const void *source, WCHAR *result, *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (flags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { @@ -3771,7 +3771,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH FormatMessageW( DWORD flags, const void *source, WCHAR *message = NULL; NTSTATUS status; - TRACE( "(0x%x,%p,%d,0x%x,%p,%d,%p)\n", flags, source, msgid, langid, buffer, size, args ); + TRACE( "(0x%x,%p,%#x,0x%x,%p,%u,%p)\n", flags, source, msgid, langid, buffer, size, args ); if (!buffer) { -- 2.23.0

1 0

[PATCH resend] oleaut32: Retrieve funcdesc from TLB by memberid and invkind.
by mo porot 08 Jun '20

08 Jun '20

This allows searching exact property access functions which share same memberid. Signed-off-by: porotmjp <porotmjp(a)gmail.com> --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)

3 2

[PATCH 1/2] setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList.
by Jeff Smith 08 Jun '20

08 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 40 ++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d4c82dea1f..bbdd375214 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2708,7 +2708,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2740,7 +2743,10 @@ static void test_class_installer(void) ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2766,7 +2772,10 @@ static void test_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2786,7 +2795,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2854,7 +2866,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2883,7 +2898,10 @@ static void test_class_coinstaller(void) ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2906,7 +2924,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2954,7 +2975,10 @@ static void test_call_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xcafef00d); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); + todo_wine ok(!ret || !GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll"); -- 2.23.0

3 9

[PATCH 1/4] quartz: Free type libraries on process detach (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/main.c | 3 +++ dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..9266987c2e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -32,7 +32,10 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_DETACH) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..5d3d9aad99 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough { -- 2.27.0

2 4

[PATCH v2 1/4] quartz: Free type libraries on process detach (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Check the 'reserved' parameter; thanks Nikolay. dlls/quartz/main.c | 5 ++++- dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..303cc30a93 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -31,8 +31,11 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_DETACH) + if (reason == DLL_PROCESS_DETACH && !reserved) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..5d3d9aad99 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough { -- 2.27.0

1 3

[PATCH] quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind).
by Zebediah Figura 07 Jun '20

07 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0e1e92a950..9505bfb591 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -967,6 +967,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); sink_bih = req_format.bmiHeader; @@ -1072,6 +1073,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.27.0

1 0

[PATCH] include: Add wownt16.h
by Vijay Kiran Kamuju 07 Jun '20

07 Jun '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

32-bit hotpatching question
by Alexandre Ganea 07 Jun '20

07 Jun '20

Hello, While implementing the MSVC /hotpatch flag into LLVM clang-cl, we were wondering how hotpatching is achieved in Wine for 32-bit x86 targets? Previous versions of MSVC up to VS2013 were emitting "8F FF MOV edi, edi". However since VS2015, a two-byte nop "66 90 XCHG ax, ax" is emitted, as suggested by Intel documentation. Charles suggested here: https://reviews.llvm.org/D81301#2077964 that Wine might be relying on the magic "8F FF" to patch the Win32 APIs. However how is that possible since (I assume) recent Windows do not contain that magic sequence, rather a two-byte nop. In essence the question is, if MSVC /hotpatch or GCC __ms_hook_prologue__ was supported in LLVM, would it be fine if it generated "66 90 XCHG ax, ax"? Thanks in advance! Alex.

3 4

[PATCH 1/2] msado15: Ignore IRunnableObject interface in recordset/connection_QueryInterface.
by Gijs Vermeulen 07 Jun '20

07 Jun '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This avoids a fixme in FinanceExplorer and CMS-Client. dlls/msado15/connection.c | 7 +++++++ dlls/msado15/recordset.c | 7 +++++++ dlls/msado15/tests/msado15.c | 6 ++++++ 3 files changed, 20 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 9e8c05522e..b9474e1b78 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -98,6 +98,8 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid struct connection *connection = impl_from_Connection( iface ); TRACE( "%p, %s, %p\n", connection, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { @@ -111,6 +113,11 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->IConnectionPointContainer_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ffb3788531..a5096e5c4f 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -784,6 +784,8 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); + *obj = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || @@ -795,6 +797,11 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { *obj = &recordset->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IRunnableObject )) + { + TRACE("IID_IRunnableObject not supported returning NULL\n"); + return E_NOINTERFACE; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a8d2afdd41..1d457a703d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -61,6 +61,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + IRunnableObject *runtime; ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; @@ -73,6 +74,10 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_IRunnableObject, (void**)&runtime); + ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); + /* _Recordset object supports ISupportErrorInfo */ errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); @@ -676,6 +681,7 @@ static void test_Connection(void) hr = _Connection_QueryInterface(connection, &IID_IRunnableObject, (void**)&runtime); ok(hr == E_NOINTERFACE, "Unexpected IRunnableObject interface\n"); + ok(runtime == NULL, "expected NULL\n"); hr = _Connection_QueryInterface(connection, &IID_ISupportErrorInfo, (void**)&errorinfo); ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); -- 2.26.2

1 1

[PATCH] ntdll: Replicate InterlockedCompareExchange64 to the Unix library.
by Gerald Pfeifer 06 Jun '20

06 Jun '20

Between Wine 5.9 and 5.10 many ntdll functions moved to the Unix library. Make the implementation of InterlockedCompareExchange64 via RtlInterlockedCompareExchange64 available there as well for targets without __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8. This fixes the build on FreeBSD/i386 with GCC 9. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/unix_private.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a422fd825e..a0485b411d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -23,6 +23,10 @@ #include "unixlib.h" +#ifndef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +#define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) +#endif + struct debug_info { unsigned int str_pos; /* current position in strings buffer */ -- 2.25.0

1 0

[PATCH] strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
by Zebediah Figura 06 Jun '20

06 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eab7c0cb2e..f08c6d0186 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -119,6 +119,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface); + AM_MEDIA_TYPE mt; unsigned int i; HRESULT hr; @@ -133,10 +134,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { - if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); - else - hr = E_OUTOFMEMORY; + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt); + if (hr == S_OK) + { + if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + *mts[i] = mt; + else + hr = E_OUTOFMEMORY; + } if (FAILED(hr)) { while (i--) -- 2.27.0

1 0

[PATCH] strmbase: Clear the debug info before calling DeleteCriticalSection (Valgrind).
by Zebediah Figura 06 Jun '20

06 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/filter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 2809832ee8..8b8182a13a 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -532,11 +532,13 @@ void strmbase_filter_init(struct strmbase_filter *filter, IUnknown *outer, filter->ops = ops; } -void strmbase_filter_cleanup(struct strmbase_filter *This) +void strmbase_filter_cleanup(struct strmbase_filter *filter) { - if (This->clock) - IReferenceClock_Release(This->clock); + if (filter->clock) + IReferenceClock_Release(filter->clock); - This->IBaseFilter_iface.lpVtbl = NULL; - DeleteCriticalSection(&This->csFilter); + filter->IBaseFilter_iface.lpVtbl = NULL; + if (filter->csFilter.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + filter->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->csFilter); } -- 2.27.0

1 0

[PATCH] ntdll: Avoid leaking "drive" on error paths from get_mountmgr_fs_info() (Valgrind).
by Zebediah Figura 06 Jun '20

06 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b5a48db176..1b70e47367 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2328,7 +2328,10 @@ static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) + { + RtlFreeHeap( GetProcessHeap(), 0, drive ); return NULL; + } status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, drive, sizeof(*drive), drive, 1024 ); -- 2.27.0

2 1

[PATCH 3/3] oleaut32: Add support for decoding SLTG variable help strings.
by Vijay Kiran Kamuju 06 Jun '20

06 Jun '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/3] oleaut32: Add support for decoding SLTG function help strings.
by Vijay Kiran Kamuju 06 Jun '20

06 Jun '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

Wine staging 5.10 release
by Alistair Leslie-Hughes 06 Jun '20

06 Jun '20

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.10 (818 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Refactor RtlCreateUserThread into NtCreateThreadEx. Added: * [46969] ntdll: Implement RtlQueryRegistryValuesEx. * [41636] d3d11: Implement ID3D11Device2 GetImmediateContext1. Updated: * winebuild-Fake_Dlls * d3d11-Deferred_Context * ntdll-ForceBottomUpAlloc * ntdll-Interrupt-0x2e Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] mscoree: Update Wine Mono to 5.1.0.
by Esme Povirk 05 Jun '20

05 Jun '20

Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 0047278c736..dcade07c445 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "5.0.0" +#define MONO_VERSION "5.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#define MONO_SHA "ae55439c7cd61d1a17f0c687967fad8ad12d9e2263972ffd5e9dde2685fd8ddd" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index cd032aefc06..096b20875b1 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "5.0.0" +#define WINE_MONO_VERSION "5.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

3 2

[PATCH 5/5] ucrtbase: Add more inf,nan,ind printf tests.
by Piotr Caban 05 Jun '20

05 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 85 +++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-)

2 1

[PATCH 4/5] ucrtbase: Add printf %a format tests.
by Piotr Caban 05 Jun '20

05 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)

1 0

[PATCH 3/5] msvcrt: Reimplement %a printf format handling.
by Piotr Caban 05 Jun '20

05 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 116 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+)

1 0

[PATCH 2/5] msvcrt: Reimplement special doubles printing.
by Piotr Caban 05 Jun '20

05 Jun '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/printf.h | 278 ++++++++++++++++++++++++++----------------- 1 file changed, 171 insertions(+), 107 deletions(-)

1 0

[PATCH 1/5] msvcrt: Use internal sprintf implementation.
by Piotr Caban 05 Jun '20

05 Jun '20

1 0

[PATCH vkd3d 1/5] vkd3d: Index the "vk_uav_counter_views" array to match the "uav_counters" array.
by Zebediah Figura 05 Jun '20

05 Jun '20

That is, index elements of vk_uav_counter_views by their index in uav_counters, rather than by their register index. This is necessary because multiple UAVs can share the same register index but differ in register space. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d/command.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8a7ff66..7c6b758 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2653,9 +2653,10 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; + const struct d3d12_pipeline_state *state = list->state; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; + unsigned int i, j, k, descriptor_count; struct d3d12_desc *descriptor; descriptor_table = root_signature_get_descriptor_table(root_signature, index); @@ -2678,14 +2679,20 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int register_idx = range->base_register_idx + j; /* Track UAV counters. */ - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + for (k = 0; k < vkd3d_popcount(state->uav_counter_mask); ++k) + { + if (state->uav_counters[k].register_index == register_idx) + { + VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + if (bindings->vk_uav_counter_views[k] != vk_counter_view) + bindings->uav_counter_dirty_mask |= 1u << k; + bindings->vk_uav_counter_views[k] = vk_counter_view; + break; + } + } } if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, @@ -2826,7 +2833,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma unsigned int uav_counter_count; unsigned int i; - if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask)) + if (!state || !bindings->uav_counter_dirty_mask) return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2841,7 +2848,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - assert(vk_uav_counter_views[uav_counter->register_index]); + assert(vk_uav_counter_views[i]); vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_writes[i].pNext = NULL; @@ -2852,7 +2859,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[i]; } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); -- 2.26.2

2 15

[PATCH] joy.cpl: Fix pulsing buttons in joystick button state display.
by Torge Matthies 05 Jun '20

05 Jun '20

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- Bug encountered by junaru on the VKx Discord. dlls/joy.cpl/main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 4ad9cf848c..3921f59cbb 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -404,8 +404,7 @@ static DWORD WINAPI input_thread(void *param) /* Indicate pressed buttons */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - if (state.rgbButtons[i]) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, TRUE, 0); + SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0); /* Indicate axis positions, axes showing are hardcoded for now */ axes_pos[0][0] = state.lX; @@ -438,10 +437,6 @@ static DWORD WINAPI input_thread(void *param) } Sleep(TEST_POLL_TIME); - - /* Reset button state */ - for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - SendMessageW(data->graphics.buttons[i], BM_SETSTATE, FALSE, 0); } return 0; -- 2.27.0

1 0

[PATCH 8/8] mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-)

1 0

[PATCH 7/8] mshtml: Add IHTMLCSSStyleDeclaration2::animationName property implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-)

1 0

[PATCH 6/8] mshtml: Add IHTMLCSSStyleDeclaration2::transform property implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 5 deletions(-)

1 0

[PATCH 5/8] mshtml: Use default white value in IHTMLDocument2::get_bgColor.
by Jacek Caban 05 Jun '20

05 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49062#c0 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 36 ++++++++++++++---------------------- dlls/mshtml/tests/dom.c | 8 ++++++++ 2 files changed, 22 insertions(+), 22 deletions(-)

1 0

[PATCH 4/8] mshtml: Use return_nsstr_variant in IHTMLBodyElement::get_bgColor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlbody.c | 21 ++++----------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 22 +++++++++++++--------- 3 files changed, 18 insertions(+), 26 deletions(-)

1 0

[PATCH 3/8] jscript: Add Object.preventExtensions semi-stub implementation.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 24 +++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 23 ++++++++++++++++++++++- 2 files changed, 45 insertions(+), 2 deletions(-)

1 0

[PATCH 2/8] jscript: Support passing non-string flags to RegExp constructor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 24 ++++++++++-------------- dlls/jscript/tests/regexp.js | 12 ++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-)

1 0

[PATCH 1/8] jscript: Support passing non-string pattern to RegExp constructor.
by Jacek Caban 05 Jun '20

05 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsregexp.c | 33 +++++++++++++++------------------ dlls/jscript/tests/regexp.js | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 18 deletions(-)

1 0

[PATCH 1/3] windowscodecs/tests: Add more tests for DdsFrameDecode_Dds_CopyBlocks().
by Ziqing Hui 05 Jun '20

05 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 46 ++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-)

3 4

[PATCH] gdiplus: keep temporary dc for some need, like ali wangwang
by Yu Changping 05 Jun '20

05 Jun '20

2 1

[PATCH 1/5] d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS.
by Zebediah Figura 05 Jun '20

05 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 60bb5ff8145..7093e9eb2c0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1403,29 +1403,29 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask) +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) { - unsigned int i, j, bit = 0, inverted = 0, components, new_writemask = 0, new_swizzle = 0; + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ for (i = 0; i < 4; ++i) { - if (writemask & (1 << i)) + if (*writemask & (1 << i)) { unsigned int s = (*swizzle >> (i * 2)) & 3; new_swizzle |= s << (bit++ * 2); if (new_writemask & (1 << s)) - return 0; + return FALSE; new_writemask |= 1 << s; } } - components = bit; + width = bit; /* Invert the swizzle. */ bit = 0; for (i = 0; i < 4; ++i) { - for (j = 0; j < components; ++j) + for (j = 0; j < width; ++j) { unsigned int s = (new_swizzle >> (j * 2)) & 3; if (s == i) @@ -1434,7 +1434,9 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask } *swizzle = inverted; - return new_writemask; + *writemask = new_writemask; + *ret_width = width; + return TRUE; } struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, @@ -1463,6 +1465,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign else if (lhs->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); @@ -1472,12 +1476,23 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign list_add_after(&rhs->entry, &lhs->entry); swizzle->val = rhs; - if (!(writemask = invert_swizzle(&swizzle->swizzle, writemask))) + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); d3dcompiler_free(assign); return NULL; } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + { + struct hlsl_type *type; + if (!(type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, swizzle_type->base_type, width, 1))) + { + d3dcompiler_free(assign); + return NULL; + } + swizzle->node.data_type = type; + } rhs = &swizzle->node; } else -- 2.26.2

4 12

[v2 PATCH 2/2] dwrite: Use correct glyph array offset for alternate substitution table output.
by Nikolay Sivov 05 Jun '20

05 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed typos in subject dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fc46610bcba..2106fe2cf78 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4916,7 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con if (alt_index > count || !alt_index) return FALSE; - glyph = table_read_be_word(gsub, subtable_offset + offset + sizeof(count) + (alt_index - 1) * sizeof(glyph)); + glyph = table_read_be_word(gsub, subtable_offset + offset + 2 + (alt_index - 1) * sizeof(glyph)); } else { -- 2.26.2

1 0

[PATCH 1/2] dwrite: Fix global feature mask to match its shift.
by Nikolay Sivov 05 Jun '20

05 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 64fba562024..fc46610bcba 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4407,7 +4407,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex struct shaping_feature *feature; unsigned int i, j, next_bit; unsigned int global_bit_shift = 1; - unsigned int global_bit_mask = 1; + unsigned int global_bit_mask = 2; UINT16 feature_index; if (!table->table.data) -- 2.26.2

1 1

[PATCH] bcrypt: Handle different sized R/S signature components.
by Hans Leidekker 05 Jun '20

05 Jun '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index d447e90a11..19a00e2ee2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1431,8 +1431,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_DSA: { int err; - unsigned int pad_size, sig_len = get_signature_length( type ); + unsigned int pad_size_r, pad_size_s, sig_len = get_signature_length( type ); gnutls_datum_t r, s; /* format as r||s */ + unsigned char *r_data, *s_data; if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) { @@ -1442,31 +1443,35 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; - /* remove prepended zero byte */ - if (r.size % 2) + if (r.size % 2) /* remove prepended zero byte */ { r.size--; - r.data += 1; + r_data = r.data + 1; } + else r_data = r.data; + if (s.size % 2) { s.size--; - s.data += 1; + s_data = s.data + 1; } + else s_data = s.data; - if (r.size != s.size || r.size + s.size > sig_len) + if (r.size + s.size > sig_len) { ERR( "we didn't get a correct signature\n" ); return STATUS_INTERNAL_ERROR; } - pad_size = (sig_len / 2) - s.size; + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; memset( output, 0, sig_len ); - memcpy( output + pad_size, r.data, r.size ); - memcpy( output + (sig_len / 2) + pad_size, s.data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); *ret_len = sig_len; + free( r.data ); free( s.data ); return STATUS_SUCCESS; } default: -- 2.20.1

1 0

[PATCH 1/6] ndis.sys: Add netio.sys dependency.
by Paul Gofman 05 Jun '20

05 Jun '20

ndis.sys links to netio.sys on newer Windows. Adding the dependency now is needed to get libnetio.cross.a built to be usable in ntoskrnl.exe test drivers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 186295-186298, 186350. dlls/ndis.sys/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index cc522606258..70e6bb2afdf 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,5 @@ MODULE = ndis.sys +IMPORTS = ntoskrnl netio EXTRADLLFLAGS = -Wl,--subsystem,native EXTRADLLFLAGS = -mno-cygwin -- 2.26.2

2 7

[PATCH] bcrypt: Add stubs for DSS private key functions on macOS.
by Huw Davies 05 Jun '20

05 Jun '20

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/bcrypt/macos.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index f635ba4bc8e..7f902535b8f 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -240,12 +240,24 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_export_dsa_capi( struct key *key, UCHAR *buf, ULONG len, ULONG *ret_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_export_ecc( struct key *key, UCHAR *output, ULONG len, ULONG *ret_len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_import_dsa_capi( struct key *key, UCHAR *buf, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_import_ecc( struct key *key, UCHAR *input, ULONG len ) { FIXME( "not implemented on Mac\n" ); -- 2.23.0

1 0

[PATCH 4/4] wined3d: Partially implement adapter_vk_clear_uav().
by Henri Verbeet 05 Jun '20

05 Jun '20

This is easy, and sufficient in a lot of cases. However, for a more complete implementation, we'll want to do something more similar to vkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 5 ++- dlls/wined3d/view.c | 63 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 586be3751a0..1e4d663dcb4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1765,7 +1765,10 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, void adapter_vk_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { - FIXME("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value)); + + wined3d_unordered_access_view_vk_clear_uint(wined3d_unordered_access_view_vk(view), + clear_value, wined3d_context_vk(context)); } static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 28028a76395..a690bd4ae6b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1478,6 +1478,69 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi return hr; } +void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_vk_info *vk_info; + const struct wined3d_format *format; + struct wined3d_buffer_vk *buffer_vk; + struct wined3d_resource *resource; + VkCommandBuffer vk_command_buffer; + VkBufferMemoryBarrier vk_barrier; + VkAccessFlags access_mask; + unsigned int offset, size; + + TRACE("view_vk %p, clear_value %s, context_vk %p.\n", view_vk, debug_uvec4(clear_value), context_vk); + + resource = view_vk->v.resource; + if (resource->type != WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + format = view_vk->v.format; + if (format->id != WINED3DFMT_R32_UINT && format->id != WINED3DFMT_R32_SINT) + { + FIXME("Not implemented for format %s.\n", debug_d3dformat(format->id)); + return; + } + + vk_info = context_vk->vk_info; + buffer_vk = wined3d_buffer_vk(buffer_from_resource(resource)); + wined3d_buffer_load_location(&buffer_vk->b, &context_vk->c, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(&buffer_vk->b, ~WINED3D_LOCATION_BUFFER); + + get_buffer_view_range(&buffer_vk->b, &view_vk->v.desc, format, &offset, &size); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + return; + wined3d_context_vk_end_current_render_pass(context_vk); + + access_mask = vk_access_mask_from_bind_flags(buffer_vk->b.resource.bind_flags); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = access_mask; + vk_barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = buffer_vk->bo.vk_buffer; + vk_barrier.offset = buffer_vk->bo.buffer_offset + offset; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + VK_CALL(vkCmdFillBuffer(vk_command_buffer, buffer_vk->bo.vk_buffer, + buffer_vk->bo.buffer_offset + offset, size, clear_value->x)); + + vk_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier.dstAccessMask = access_mask; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); +} + void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *uav_vk, struct wined3d_context_vk *context_vk) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83e2566cca4..17acd4be4d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4993,6 +4993,8 @@ static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_ return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v); } +void wined3d_unordered_access_view_vk_clear_uint(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 3/4] wined3d: Reference the back buffer in wined3d_swapchain_vk_blit().
by Henri Verbeet 05 Jun '20

05 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3497a4d560e..e034bdf6241 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1026,6 +1026,7 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, swapchain_vk->vk_images[image_idx], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit, VK_FILTER_NEAREST)); + wined3d_context_vk_reference_texture(context_vk, back_buffer_vk); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, 0, -- 2.20.1

1 0

[PATCH 2/4] wined3d: Clear WINED3DFMT_FLAG_DEPTH_STENCIL if the format is not supported as FBO attachment.
by Henri Verbeet 05 Jun '20

05 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 7 ------- dlls/wined3d/utils.c | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f9a11ea2ad..15e4a45ea59 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -135,13 +135,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) - { - WARN("Render target or depth stencil is not FBO attachable.\n"); - continue; - } if ((bind_flags & WINED3D_BIND_SHADER_RESOURCE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 55ee0ede339..d078c503df3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2515,11 +2515,11 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { if (!rt_internal) { - if (format->f.flags[type] & WINED3DFMT_FLAG_RENDERTARGET) + if (format->f.flags[type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) { WARN("Format %s with rendertarget flag is not supported as FBO color attachment (type %u)," " and no fallback specified.\n", debug_d3dformat(format->f.id), type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } else { @@ -2552,7 +2552,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { WARN("Format %s rtInternal format is not supported as FBO %s attachment, type %u.\n", debug_d3dformat(format->f.id), type_string, type); - format->f.flags[type] &= ~WINED3DFMT_FLAG_RENDERTARGET; + format->f.flags[type] &= ~(WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL); } } } @@ -2725,8 +2725,9 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { FIXME("Format %s needs different render target formats for different resource types.\n", debug_d3dformat(format->f.id)); - format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE - | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); + format_clear_flag(&format->f, WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL + | WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB + | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING); } } -- 2.20.1

1 0

[PATCH 1/4] wined3d: Introduce WINED3DFMT_FLAG_DEPTH_STENCIL.
by Henri Verbeet 05 Jun '20

05 Jun '20

To indicate whether WINED3D_BIND_DEPTH_STENCIL is valid for the format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 6 ++--- dlls/wined3d/resource.c | 2 +- dlls/wined3d/texture.c | 4 +-- dlls/wined3d/utils.c | 49 ++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ddce04f55dd..f4094c8fba2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1437,7 +1437,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d_adapter *ad WARN("Format %s is not render target format.\n", debug_d3dformat(rt_format->id)); return WINED3DERR_NOTAVAILABLE; } - if (!(ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!(ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_DEPTH_STENCIL)) { WARN("Format %s is not depth/stencil format.\n", debug_d3dformat(ds_format->id)); return WINED3DERR_NOTAVAILABLE; @@ -1505,8 +1505,6 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada { if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; - if (!(ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - return FALSE; /* Blacklist formats not supported on Windows */ if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ @@ -1658,6 +1656,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_TEXTURE; if (bind_flags & WINED3D_BIND_RENDER_TARGET) format_flags |= WINED3DFMT_FLAG_RENDERTARGET; + if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) + format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index bbb892b328d..8f9a11ea2ad 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -130,7 +130,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * continue; } if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && !(format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_DEPTH_STENCIL)) { WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 65e9da73b45..84020f17c95 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -297,9 +297,9 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win break; case WINED3D_BLIT_OP_DEPTH_BLIT: - if (!(src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!(src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_DEPTH_STENCIL)) return false; - if (!(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (!(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_DEPTH_STENCIL)) return false; /* Accept pure swizzle fixups for depth formats. In general we * ignore the stencil component (if present) at the moment and the diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 21215ca7e7f..55ee0ede339 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1785,67 +1785,67 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, - WINED3DFMT_FLAG_DEPTH, + WINED3DFMT_FLAG_DEPTH_STENCIL, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, EXT_PACKED_DEPTH_STENCIL, convert_s1_uint_d15_unorm}, {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_D24_UNORM_S8_UINT, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, + | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, - WINED3DFMT_FLAG_DEPTH, + WINED3DFMT_FLAG_DEPTH_STENCIL, WINED3D_GL_EXT_NONE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_X8D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 4, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, x8_d24_unorm_upload, x8_d24_unorm_download}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S4X4_UINT_D24_UNORM, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 4, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, EXT_PACKED_DEPTH_STENCIL, convert_s4x4_uint_d24_unorm}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, - WINED3DFMT_FLAG_DEPTH, + WINED3DFMT_FLAG_DEPTH_STENCIL, WINED3D_GL_EXT_NONE, NULL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_D32_FLOAT, GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT32F, 0, GL_DEPTH_COMPONENT, GL_FLOAT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_BUFFER_FLOAT, NULL}, {WINED3DFMT_D32_FLOAT_S8X24_UINT, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, 0, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_BUFFER_FLOAT, NULL}, {WINED3DFMT_S8_UINT_D24_FLOAT, GL_DEPTH32F_STENCIL8, GL_DEPTH32F_STENCIL8, 0, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 8, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL | WINED3DFMT_FLAG_SHADOW, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH_STENCIL | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_BUFFER_FLOAT, convert_s8_uint_d24_float}, {WINED3DFMT_R32G32B32A32_UINT, GL_RGBA32UI, GL_RGBA32UI, 0, GL_RGBA_INTEGER, GL_UNSIGNED_INT, 0, @@ -1875,7 +1875,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_INTZ, GL_DEPTH24_STENCIL8, GL_DEPTH24_STENCIL8, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + | WINED3DFMT_FLAG_DEPTH_STENCIL, EXT_PACKED_DEPTH_STENCIL, NULL}, {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, @@ -2485,7 +2485,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for create_and_bind_fbo_attachment(gl_info, format, type, &object, format->internal); - if (format->f.flags[type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (format->f.flags[type] & WINED3DFMT_FLAG_DEPTH_STENCIL) { gl_info->fbo_ops.glGenRenderbuffers(1, &color_rb); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, color_rb); @@ -2711,7 +2711,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for else if (status == GL_FRAMEBUFFER_COMPLETE) format->f.flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; - if (format->f.flags[type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (format->f.flags[type] & WINED3DFMT_FLAG_DEPTH_STENCIL) { gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, 0); gl_info->fbo_ops.glDeleteRenderbuffers(1, &color_rb); @@ -3109,7 +3109,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, query_view_class(format); if (format->internal && format->f.flags[WINED3D_GL_RES_TYPE_RB] - & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_DEPTH_STENCIL)) { if (gl_info->supported[ARB_INTERNALFORMAT_QUERY]) { @@ -3187,8 +3187,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win /* GL_ARB_depth_texture does not support 3D textures. It also says "cube textures are * problematic", but doesn't explicitly mandate that an error is generated. */ - if (gl_info->supported[EXT_TEXTURE3D] - && !(format_texture_info[i].flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + if (gl_info->supported[EXT_TEXTURE3D] && !(format_texture_info[i].flags & WINED3DFMT_FLAG_DEPTH_STENCIL)) format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags | WINED3DFMT_FLAG_BLIT; if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) @@ -3792,7 +3791,7 @@ static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) { typeless_ds_format->flags[j] = typeless_format->flags[j]; - typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); + typeless_format->flags[j] &= ~WINED3DFMT_FLAG_DEPTH_STENCIL; } if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) @@ -3988,7 +3987,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, { struct wined3d_format_gl *format = get_format_gl_by_idx(adapter, i); - if (format->f.flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH) + if (format->f.depth_size && (format->f.flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH_STENCIL)) { TRACE("Testing depth bias scale for format %s.\n", debug_d3dformat(format->f.id)); format->f.depth_bias_scale = wined3d_adapter_find_polyoffset_scale(ctx, format->internal); @@ -4235,6 +4234,10 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } + if (texture_flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) + { + flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; + } if (texture_flags & VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT) { flags |= WINED3DFMT_FLAG_FILTERING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d96f27ccc69..83e2566cca4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5506,8 +5506,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 #define WINED3DFMT_FLAG_FILTERING 0x00000002 -#define WINED3DFMT_FLAG_DEPTH 0x00000004 -#define WINED3DFMT_FLAG_STENCIL 0x00000008 +#define WINED3DFMT_FLAG_DEPTH_STENCIL 0x00000008 #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 #define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 -- 2.20.1

1 0

[PATCH] explorerframe: return S_OK in ITaskbarList::SetOverlayIcon
by Louis Lenders 05 Jun '20

05 Jun '20

https://bugs.winehq.org/show_bug.cgi?id=49322 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/explorerframe/taskbarlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 44b8a8ab91..1a0eb7567d 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -227,7 +227,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetOverlayIcon(ITaskbarList4 *ifac FIXME("iface %p, hwnd %p, hIcon %p, pszDescription %s stub!\n", iface, hwnd, hIcon, debugstr_w(pszDescription)); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailTooltip(ITaskbarList4 *iface, -- 2.27.0

1 0

[PATCH 1/2] user32: Add missing WM_WINE_CLIPCURSOR message type name.
by Matteo Bruni 05 Jun '20

05 Jun '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/user32/spy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ddd90e664fc..8a2fa430b5d 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_MOUSE_LL_HOOK - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1162,6 +1162,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", + "WM_WINE_CLIPCURSOR", }; /* Virtual key names */ -- 2.26.2

2 2

[PATCH] wlanapi: Add WlanQueryInterface stub implementation
by Zhipeng Zhao 05 Jun '20

05 Jun '20

1 0

[PATCH] user32: Discard unsupported flags in DEFWND_Print func
by Zhipeng Zhao 05 Jun '20

05 Jun '20

1 0

[PATCH] ole32: Add variable check for clipbrd_wndproc to deal WM_RENDERFORMAT message
by Zhipeng Zhao 05 Jun '20

05 Jun '20

1 0

[PATCH] include: add include guard in d2dbasetypes.h
by Biswapriyo Nath 05 Jun '20

05 Jun '20

1 0

[PATCH 1/2] winmm-wave: fixed waveOutGetDevCaps and waveInGetDevCaps
by Yu Changping 05 Jun '20

05 Jun '20

3 2

[PATCH 2/2] winmm-wave: fixed waveOutOpen and waveInOpen
by Yu Changping 05 Jun '20

05 Jun '20

2 1

[PATCH] mshtml: Fix error message in HTMLBodyElement_get_bgColor
by Alex Henrie 05 Jun '20

05 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Mentioned in https://bugs.winehq.org/show_bug.cgi?id=49062#c0 --- dlls/mshtml/htmlbody.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 981d93f9b4..8c5a7820d0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -422,7 +422,7 @@ static HRESULT WINAPI HTMLBodyElement_get_bgColor(IHTMLBodyElement *iface, VARIA V_VT(p) = VT_BSTR; hres = nscolor_to_str(color, &V_BSTR(p)); }else { - ERR("SetBgColor failed: %08x\n", nsres); + ERR("GetBgColor failed: %08x\n", nsres); hres = E_FAIL; } -- 2.27.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 04 Jun '20

04 Jun '20

2 1

[PATCH v2 3/7] jscript: Throw proper stack overflow exception.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Thanks, Chip. dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 10 ++++++++-- 5 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH 3/7] mshtml: Throw proper stack overflow exception.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 2 +- dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 10 ++++++++-- 5 files changed, 12 insertions(+), 3 deletions(-)

2 1

[PATCH 7/7] jscript: Add Array.prototype.reduce implementation.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 71 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/es5.js | 47 ++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-)

1 0

[PATCH 6/7] jscript: Use wide string literals in array.c.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 77 +++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 51 deletions(-)

1 0

[PATCH 5/7] jscript: Add Object.keys implementation.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 11 +++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 51 ++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/es5.js | 16 +++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-)

1 0

[PATCH 4/7] mshtml/tests: Improve tests exception handling.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/winetest.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 2/7] jscript: Don't realloc interpreter stack.
by Jacek Caban 04 Jun '20

04 Jun '20

We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- resend: With add_eval inlined GCC seems to be smart enough to see that ret is always initialized. dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-)

1 0

[PATCH 1/7] jscript: Inline add_eval implementation.
by Jacek Caban 04 Jun '20

04 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-)

1 0

[PATCH] quartz/tests: Fix overflow in 32-bit time calculation
by Alex Henrie 04 Jun '20

04 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This fixes intermittent testbot errors on Windows XP. --- dlls/quartz/tests/systemclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 71a7ac26d8..f13e89abed 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -183,7 +183,7 @@ static void test_get_time(void) if (pGetTickCount64) time2 = pGetTickCount64() * 10000; else - time2 = GetTickCount() * 10000; + time2 = (REFERENCE_TIME)GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); -- 2.27.0

2 1

[PATCH resend] gdi32: Skip edge processing when the area is empty.
by Gabriel Ivăncescu 04 Jun '20

04 Jun '20

Fixes a regression introduced by 9bc6f004ceccf3963584a4f7f4681b5c0578c214, which caused the assert to fail under specific circumstances, and break some apps. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The patch just indents the code to skip it if nb_points is zero. dlls/gdi32/region.c | 181 ++++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 89 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93238b5..3a3138a 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2631,79 +2631,28 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (!(obj = alloc_region( nb_points / 2 ))) goto done; - if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); - list_init( &AET ); - pSLL = ET.scanlines.next; - if (mode != WINDING) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { + if (nb_points) + { + if (clip_rect) ET.ymax = min( ET.ymax, clip_rect->bottom ); + list_init( &AET ); + pSLL = ET.scanlines.next; + if (mode != WINDING) { /* - * Add a new edge to the active edge table when we - * get to the next edge. + * for each scanline */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - pSLL = pSLL->next; - } - - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) - { - if (first) - { - obj->rects[obj->numRects].left = active->bres.minor_axis; - obj->rects[obj->numRects].top = y; - } - else if (obj->rects[obj->numRects].left != active->bres.minor_axis) - { - obj->rects[obj->numRects].right = active->bres.minor_axis; - obj->rects[obj->numRects].bottom = y + 1; - obj->numRects++; - } - first = !first; + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + pSLL = pSLL->next; } - } - - next_scanline( &AET, y ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; - } - } - } - else { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL != NULL && y == pSLL->scanline) { - REGION_loadAET(&AET, &pSLL->edgelist); - REGION_computeWAET( &AET, &WETE ); - pSLL = pSLL->next; - } - pWETE = list_head( &WETE ); - - /* - * for each active edge - */ - if (!clip_rect || y >= clip_rect->top) - { - LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + if (!clip_rect || y >= clip_rect->top) { - /* - * add to the buffer only those edges that - * are in the Winding active edge table. - */ - if (pWETE == &active->winding_entry) + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) { if (first) { @@ -2717,40 +2666,94 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo obj->numRects++; } first = !first; - pWETE = list_next( &WETE, pWETE ); } } - } + next_scanline( &AET, y ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } + } + } + else { /* - * recompute the winding active edge table if - * we just resorted or have exited an edge. + * for each scanline */ - if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL != NULL && y == pSLL->scanline) { + REGION_loadAET(&AET, &pSLL->edgelist); + REGION_computeWAET( &AET, &WETE ); + pSLL = pSLL->next; + } + pWETE = list_head( &WETE ); - if (obj->numRects) - { - prev_band = REGION_Coalesce( obj, prev_band, cur_band ); - cur_band = obj->numRects; + /* + * for each active edge + */ + if (!clip_rect || y >= clip_rect->top) + { + LIST_FOR_EACH_ENTRY( active, &AET, struct edge_table_entry, entry ) + { + /* + * add to the buffer only those edges that + * are in the Winding active edge table. + */ + if (pWETE == &active->winding_entry) + { + if (first) + { + obj->rects[obj->numRects].left = active->bres.minor_axis; + obj->rects[obj->numRects].top = y; + } + else if (obj->rects[obj->numRects].left != active->bres.minor_axis) + { + obj->rects[obj->numRects].right = active->bres.minor_axis; + obj->rects[obj->numRects].bottom = y + 1; + obj->numRects++; + } + first = !first; + pWETE = list_next( &WETE, pWETE ); + } + } + } + + /* + * recompute the winding active edge table if + * we just resorted or have exited an edge. + */ + if (next_scanline( &AET, y )) REGION_computeWAET( &AET, &WETE ); + + if (obj->numRects) + { + prev_band = REGION_Coalesce( obj, prev_band, cur_band ); + cur_band = obj->numRects; + } } } - } - assert( obj->numRects <= nb_points / 2 ); + assert( obj->numRects <= nb_points / 2 ); - if (obj->numRects) - { - obj->extents.left = INT_MAX; - obj->extents.right = INT_MIN; - obj->extents.top = obj->rects[0].top; - obj->extents.bottom = obj->rects[obj->numRects-1].bottom; - for (i = 0; i < obj->numRects; i++) + if (obj->numRects) { - obj->extents.left = min( obj->extents.left, obj->rects[i].left ); - obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + obj->extents.left = INT_MAX; + obj->extents.right = INT_MIN; + obj->extents.top = obj->rects[0].top; + obj->extents.bottom = obj->rects[obj->numRects-1].bottom; + for (i = 0; i < obj->numRects; i++) + { + obj->extents.left = min( obj->extents.left, obj->rects[i].left ); + obj->extents.right = max( obj->extents.right, obj->rects[i].right ); + } } + REGION_compact( obj ); } - REGION_compact( obj ); if (!(hrgn = alloc_gdi_handle( obj, OBJ_REGION, &region_funcs ))) free_region( obj ); -- 2.21.0

2 3

[PATCH] mountmgr: Fix buffer length check.
by Hans Leidekker 04 Jun '20

04 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49305 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c29ce9f924..d99a096c61 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1780,7 +1780,7 @@ static void query_property( struct disk_device *device, IRP *irp ) if (!irp->UserBuffer || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DEVICE_DESCRIPTOR)) + else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); -- 2.20.1

1 0

[PATCH 5/5] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in create_and_bind_fbo_attachment().
by Henri Verbeet 04 Jun '20

04 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 52 ++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 26dd9ef5339..21215ca7e7f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2236,13 +2236,15 @@ static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info, } } -/* Context activation is done by the caller. */ -static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, unsigned int flags, - enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal, GLenum format, GLenum type) +static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, + const struct wined3d_format_gl *format_gl, + enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal) { - GLenum attach_type = flags & WINED3DFMT_FLAG_DEPTH ? - GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; + GLenum format = format_gl->format; + GLenum type = format_gl->type; + GLenum attach_type; + attach_type = format_gl->f.depth_size ? GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; switch (d3d_type) { case WINED3D_GL_RES_TYPE_TEX_1D: @@ -2252,11 +2254,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, - *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, - *object, 0); + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, *object, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, *object, 0); break; case WINED3D_GL_RES_TYPE_TEX_2D: @@ -2270,7 +2271,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, wined3d_gl_type_to_enum(d3d_type), *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, wined3d_gl_type_to_enum(d3d_type), *object, 0); break; @@ -2282,11 +2283,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, - GL_TEXTURE_3D, *object, 0, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, - GL_TEXTURE_3D, *object, 0, 0); + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_3D, *object, 0, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_3D, *object, 0, 0); break; case WINED3D_GL_RES_TYPE_TEX_CUBE: @@ -2309,7 +2309,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); break; @@ -2318,11 +2318,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glGenRenderbuffers(1, object); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, *object); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, internal, 16, 16); - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, - *object); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, - *object); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, *object); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, *object); break; case WINED3D_GL_RES_TYPE_BUFFER: @@ -2484,8 +2483,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (type == WINED3D_GL_RES_TYPE_BUFFER) continue; - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->internal); if (format->f.flags[type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { @@ -2539,8 +2537,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for while (gl_info->gl_ops.gl.p_glGetError()); delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->rt_internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->rt_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check"); @@ -2691,8 +2688,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (format->internal != format->srgb_internal) { delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, &object, format->srgb_internal, - format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->srgb_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check"); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in query_internal_format().
by Henri Verbeet 04 Jun '20

04 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df948264f95..26dd9ef5339 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3100,8 +3100,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write_supported) format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); - if (!gl_info->supported[ARB_DEPTH_TEXTURE] - && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) { format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use "depth_size" to check for a depth format in resolve_depth_buffer().
by Henri Verbeet 04 Jun '20

04 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ce3e346ef7..59b53aa355f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1695,7 +1695,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) if (!(dst_texture = state->textures[0])) return; dst_resource = &dst_texture->resource; - if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_resource->format->depth_size) return; if (!(src_view = state->fb.depth_stencil)) return; -- 2.20.1

1 0

[PATCH 2/5] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache.
by Henri Verbeet 04 Jun '20

04 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 08a90e36634..b7ca8ceca2e 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -566,9 +566,9 @@ static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3 entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); @@ -594,9 +594,9 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } } -- 2.20.1

1 0

[PATCH 1/5] wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit().
by Henri Verbeet 04 Jun '20

04 Jun '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cd3d4b4912d..65e9da73b45 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5859,7 +5859,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_resource->format->id == src_resource->format->id) { - if (dst_resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_resource->format->depth_size || dst_resource->format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT; -- 2.20.1

1 0

[PATCH 1/5] mfmediaengine: Implement error property.
by Nikolay Sivov 04 Jun '20

04 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 39 +++++++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 32 ++++++++++--------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d77b1e4afee..dba55bb937d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -84,6 +84,7 @@ struct media_engine double default_playback_rate; double volume; double duration; + MF_MEDIA_ENGINE_ERR error_code; IMFMediaSession *session; IMFSourceResolver *resolver; CRITICAL_SECTION cs; @@ -512,16 +513,44 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) { - FIXME("(%p, %p): stub.\n", iface, error); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, error); + + *error = NULL; + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (engine->error_code) + { + if (SUCCEEDED(hr = create_media_error(error))) + IMFMediaError_SetErrorCode(*error, engine->error_code); + } + LeaveCriticalSection(&engine->cs); + + return hr; } -static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR error) +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR code) { - FIXME("(%p, %d): stub.\n", iface, error); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u.\n", iface, code); + + if ((unsigned int)code > MF_MEDIA_ENGINE_ERR_ENCRYPTED) + return E_INVALIDARG; + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + engine->error_code = code; + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 2f114db7e9e..660e5b95331 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -503,45 +503,47 @@ static void test_error(void) eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!eo, "Unexpected instance.\n"); -} + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ABORTED); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); eo = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!eo, "Unexpected instance.\n"); -} + eo2 = NULL; hr = IMFMediaEngine_GetError(media_engine, &eo2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(eo2 != eo, "Unexpected instance.\n"); -} - if (eo2) - IMFMediaError_Release(eo2); - if (eo) - IMFMediaError_Release(eo); + + IMFMediaError_Release(eo2); + IMFMediaError_Release(eo); hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); eo = (void *)0xdeadbeef; hr = IMFMediaEngine_GetError(media_engine, &eo); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!eo, "Unexpected instance.\n"); -} + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + eo = (void *)0xdeadbeef; + hr = IMFMediaEngine_GetError(media_engine, &eo); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + ok(!eo, "Unexpected instance.\n"); + + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaEngine_Release(media_engine); /* Error object. */ -- 2.26.2

1 4

[PATCH v2 2/2] gdi32: Add a vertical font replacement if it's a DBCS font.
by Huw Davies 04 Jun '20

04 Jun '20

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> For example, if one maps MS Gothic to a font, also map @MS Gothic to that font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9801c32d65..f82a8c1641 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -288,6 +288,8 @@ typedef struct tagFace { struct enum_data *cached_enum_data; } Face; +#define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -618,6 +620,7 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static BOOL use_default_fallback = FALSE; +static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl); static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL *vert); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_bitmap_text_metrics(GdiFont *font); @@ -2270,7 +2273,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { - const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB; FONTSIGNATURE fs; ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP ); @@ -2360,6 +2362,30 @@ static void DumpFontList(void) } } +static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const Family *family) +{ + Face *face; + BOOL ret = FALSE; + WCHAR *at_orig, *at_repl = NULL; + + face = LIST_ENTRY(list_head(&family->faces), Face, entry); + if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) + return FALSE; + + at_orig = prepend_at(strdupW(orig)); + if (at_orig && !find_family_from_any_name(at_orig)) + { + at_repl = prepend_at(strdupW(repl)); + if (at_repl) + ret = map_font_family(at_orig, at_repl); + } + + HeapFree(GetProcessHeap(), 0, at_orig); + HeapFree(GetProcessHeap(), 0, at_repl); + + return ret; +} + static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) { Family *family = find_family_from_any_name(repl); @@ -2374,6 +2400,10 @@ static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) list_init(&new_family->faces); new_family->replacement = &family->faces; list_add_tail(&font_list, &new_family->entry); + + if (repl[0] != '@') + map_vertical_font_family(orig, repl, family); + return TRUE; } } -- 2.23.0

1 0

[PATCH v2 1/2] gdi32: Handle vertical faces in the fontconfig fallback.
by Huw Davies 04 Jun '20

04 Jun '20

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48440 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f68198df8b..9801c32d65 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5261,7 +5261,7 @@ done: } #ifdef SONAME_LIBFONTCONFIG -static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO *csi) +static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO *csi, BOOL want_vertical) { const char *name; WCHAR nameW[LF_FACESIZE]; @@ -5305,8 +5305,17 @@ static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO * const SYSTEM_LINKS *font_link; const struct list *face_list; - ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, - nameW, ARRAY_SIZE(nameW)); + if (!want_vertical) + { + ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, + nameW, ARRAY_SIZE(nameW)); + } + else + { + nameW[0] = '@'; + ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, + nameW + 1, ARRAY_SIZE(nameW) - 1); + } if (!ret) continue; family = find_family_from_any_name(nameW); if (!family) continue; @@ -5726,7 +5735,7 @@ static HFONT CDECL freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags #ifdef SONAME_LIBFONTCONFIG /* Try FontConfig substitutions if the face isn't found */ - family = get_fontconfig_family(lf.lfPitchAndFamily, &csi); + family = get_fontconfig_family(lf.lfPitchAndFamily, &csi, want_vertical); if (family) goto found; #endif -- 2.23.0

1 0

[PATCH 1/3] api-ms-win-core-libraryloader-l2-1-0: add new dll
by Louis Lenders 04 Jun '20

04 Jun '20

https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l2-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec diff --git a/configure b/configure index 07adf68fce..3f37b9c367 100755 --- a/configure +++ b/configure @@ -971,6 +971,7 @@ enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 +enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 @@ -20264,6 +20265,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 +wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_win_core_libraryloader_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 diff --git a/configure.ac b/configure.ac index 83c451e087..21a2144dd8 100644 --- a/configure.ac +++ b/configure.ac @@ -2886,6 +2886,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in new file mode 100644 index 0000000000..c4c4c315b6 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l2-1-0.dll diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec new file mode 100644 index 0000000000..6ef9592daf --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall LoadPackagedLibrary(wstr long) kernel32.LoadPackagedLibrary +@ stub QueryOptionalDelayLoadedAPI -- 2.27.0.rc2

1 2

[PATCH 1/5] crypt32/tests: Fix signed integral cast warning.
by Rémi Bernon 04 Jun '20

04 Jun '20

First cast to int, then to DWORD. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/crypt32/tests/cert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 880ae720a4b..7d6d07fe025 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2909,7 +2909,7 @@ static void testGetValidUsages(void) ret = pCertGetValidUsages(0, NULL, NULL, NULL, &size); */ contexts[0] = NULL; - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pCertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %d\n", GetLastError()); @@ -2921,12 +2921,12 @@ static void testGetValidUsages(void) sizeof(certWithUsage)); contexts[2] = CertCreateCertificateContext(X509_ASN_ENCODING, cert2WithUsage, sizeof(cert2WithUsage)); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(0, NULL, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %d\n", size); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(1, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); -- 2.27.0.rc2

3 7

[PATCH] vcruntime140_1: Don't terminate on -1 trylevel.
by Daniel Lehman 04 Jun '20

04 Jun '20

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- trylevel is promoted to unsigned (unwind_count is UINT) so a trylevel of -1 still results in a terminate() --- dlls/vcruntime140_1/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 4203373294..b4b7bd2348 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -426,7 +426,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, TRACE("current level: %d, last level: %d\n", trylevel, last_level); - if (trylevel<-1 || trylevel>=descr->unwind_count) + if (trylevel<-1 || trylevel>=(int)descr->unwind_count) { ERR("invalid trylevel %d\n", trylevel); terminate(); -- 2.17.1

2 1

[PATCH] kernel32/tests: Fix GetNLSVersion test failure on Windows Server 2003
by Alex Henrie 04 Jun '20

04 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c73c4a3f21..5b2f4c2d94 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6743,7 +6743,9 @@ static void test_NLSVersion(void) info.dwNLSVersionInfoSize = sizeof(info); ret = pGetNLSVersion( 2, LOCALE_USER_DEFAULT, (NLSVERSIONINFO *)&info ); ok( !ret, "GetNLSVersion succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_FLAGS, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_FLAGS || + broken( GetLastError() == ERROR_INSUFFICIENT_BUFFER ), /* win2003 */ + "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); info.dwNLSVersionInfoSize = sizeof(info); -- 2.27.0

1 0

[PATCH resend 1/2] winemenubuilder: Blacklist desktop integration for certain associations
by Alex Henrie 04 Jun '20

04 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/mshtml.inf | 6 +++ loader/wine.inf.in | 10 ++++ programs/winemenubuilder/winemenubuilder.c | 54 +++++++++++++++++++--- 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index 4a650b444f..548739f432 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -111,6 +111,7 @@ HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.gif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; GZIP HKCR,"MIME\Database\Content Type\application/x-gzip","Extension",,".gz" @@ -158,6 +159,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpe,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPEG HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%" @@ -173,6 +175,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpeg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; JPG HKCR,".jpg",,2,"jpegfile" @@ -184,6 +187,7 @@ HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jpg,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; MHTML HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%" @@ -221,6 +225,7 @@ HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" +HKCU,Software\Wine\FileOpenBlacklist\.jfif,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PNG HKCR,"MIME\Database\Content Type\image/png","Extension",,".png" @@ -234,6 +239,7 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" +HKCU,Software\Wine\FileOpenBlacklist\.png,"iexplore",,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de0dd4e455..ecce019835 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -501,6 +501,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.ini,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.pdf,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.rtf,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.txt,"notepad",,"%11%\notepad.exe %1" +HKCU,Software\Wine\FileOpenBlacklist\.url,"ieframe",,"rundll32.exe ieframe.dll,OpenURL %l" +HKCU,Software\Wine\FileOpenBlacklist\.wri,"wordpad",,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" +HKCU,Software\Wine\FileOpenBlacklist\.xml,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e2923..64e1dbdf20 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_hard_blacklisted(const WCHAR *extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2484,6 +2484,42 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static BOOL is_soft_blacklisted(const WCHAR *extension, const WCHAR *command) +{ + static const WCHAR FileOpenBlacklistW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'F','i','l','e','O','p','e','n','B','l','a','c','k','l','i','s','t','\\',0}; + WCHAR blacklist_key_path[MAX_PATH]; + HKEY blacklist_key; + WCHAR program_name[MAX_PATH], *blacklisted_command; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (ARRAY_SIZE(FileOpenBlacklistW) + lstrlenW(extension) > ARRAY_SIZE(blacklist_key_path)) + return FALSE; + + lstrcpyW(blacklist_key_path, FileOpenBlacklistW); + lstrcatW(blacklist_key_path, extension); + + if (RegOpenKeyExW(HKEY_CURRENT_USER, blacklist_key_path, 0, KEY_QUERY_VALUE, &blacklist_key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(blacklist_key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + blacklisted_command = reg_get_valW(HKEY_CURRENT_USER, blacklist_key_path, program_name); + if (strcmpW(command, blacklisted_command) == 0) + { + RegCloseKey(blacklist_key); + return TRUE; + } + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(blacklist_key); + return FALSE; +} + static const char* get_special_mime_type(LPCWSTR extension) { static const WCHAR lnkW[] = {'.','l','n','k',0}; @@ -2564,7 +2600,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_hard_blacklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; @@ -2582,6 +2618,15 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *progIdA = NULL; char *mimeProgId = NULL; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (is_soft_blacklisted(extensionW, commandW)) + /* command is on the blacklist => desktop integration is not desirable */ + goto end; + extensionA = wchars_to_utf8_chars(strlwrW(extensionW)); if (extensionA == NULL) { @@ -2650,11 +2695,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) openWithIconA = extract_icon(executableW, 0, NULL, FALSE); -- 2.26.2

1 1

[PATCH] amstream/tests: Define and use a global variable holding an audio media type.
by Zebediah Figura 04 Jun '20

04 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 220 +++++++-------------------------- 1 file changed, 44 insertions(+), 176 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f082b78347a..2bc1310a96b 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -29,6 +29,26 @@ #include "ksmedia.h" #include "wine/strmbase.h" +static const WAVEFORMATEX audio_format = +{ + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .wBitsPerSample = 16, + .nBlockAlign = 2, + .nAvgBytesPerSec = 2 * 11025, +}; + +static const AM_MEDIA_TYPE audio_mt = +{ + /* MEDIATYPE_Audio, MEDIASUBTYPE_PCM, FORMAT_WaveFormatEx */ + .majortype = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .subtype = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}, + .formattype = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&audio_format, +}; + static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -2888,25 +2908,6 @@ static void test_audiostream_set_format(void) static void test_audiostream_receive_connection(void) { - static const WAVEFORMATEX valid_format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 2, - .nSamplesPerSec = 44100, - .wBitsPerSample = 16, - .nBlockAlign = 4, - .nAvgBytesPerSec = 4 * 44100, - }; - - const AM_MEDIA_TYPE valid_mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&valid_format, - }; - WAVEFORMATEXTENSIBLE extensible_format; IAudioMediaStream *audio_stream; IAMMultiMediaStream *mmstream; @@ -2933,56 +2934,56 @@ static void test_audiostream_receive_connection(void) hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); - mt = valid_mt; + mt = audio_mt; mt.majortype = GUID_NULL; hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - mt = valid_mt; + mt = audio_mt; mt.subtype = MEDIASUBTYPE_RGB24; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); - mt = valid_mt; + mt = audio_mt; mt.formattype = GUID_NULL; hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - mt = valid_mt; + mt = audio_mt; mt.cbFormat = sizeof(WAVEFORMATEX) - 1; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - extensible_format.Format = valid_format; + extensible_format.Format = audio_format; extensible_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; extensible_format.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - extensible_format.Samples.wValidBitsPerSample = valid_format.wBitsPerSample; + extensible_format.Samples.wValidBitsPerSample = audio_format.wBitsPerSample; extensible_format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; extensible_format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - mt = valid_mt; + mt = audio_mt; mt.cbFormat = sizeof(extensible_format); mt.pbFormat = (BYTE *)&extensible_format; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format); + hr = IAudioMediaStream_SetFormat(audio_stream, &audio_format); ok(hr == S_OK, "Got hr %#x.\n", hr); - format = valid_format; - format.nChannels = 1; - mt = valid_mt; + format = audio_format; + format.nChannels = 2; + mt = audio_mt; mt.pbFormat = (BYTE *)&format; hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); IGraphBuilder_Disconnect(graph, pin); IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); @@ -3035,25 +3036,6 @@ static void test_audiostream_set_state(void) void test_audiostream_end_of_stream(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); struct testfilter source; IGraphBuilder *graph; @@ -3075,7 +3057,7 @@ void test_audiostream_end_of_stream(void) hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_EndOfStream(pin); @@ -3113,25 +3095,6 @@ void test_audiostream_end_of_stream(void) static void test_audiostream_receive(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - ALLOCATOR_PROPERTIES properties = { .cBuffers = 3, @@ -3171,7 +3134,7 @@ static void test_audiostream_receive(void) hr = IMemAllocator_Commit(allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMemAllocator_GetBuffer(allocator, &sample1, NULL, NULL, 0); @@ -3282,25 +3245,6 @@ static void test_audiostream_initialize(void) static void test_audiostream_begin_flush_end_flush(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample; IAudioMediaStream *audio_stream; @@ -3334,7 +3278,7 @@ static void test_audiostream_begin_flush_end_flush(void) hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); @@ -3455,25 +3399,6 @@ static DWORD CALLBACK audiostream_receive(void *param) static void test_audiostreamsample_update(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample; @@ -3542,7 +3467,7 @@ static void test_audiostreamsample_update(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3697,25 +3622,6 @@ static void test_audiostreamsample_update(void) void test_audiostreamsample_completion_status(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - static const BYTE test_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; IAMMultiMediaStream *mmstream = create_ammultimediastream(); IAudioStreamSample *stream_sample1; @@ -3762,7 +3668,7 @@ void test_audiostreamsample_completion_status(void) hr = IAudioMediaStream_CreateSample(audio_stream, audio_data2, 0, &stream_sample2); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -4101,25 +4007,6 @@ void test_mediastreamfilter_stop_pause_run(void) static void test_mediastreamfilter_support_seeking(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; static const MSPID mspid2 = {0x88888888, 2}; @@ -4178,7 +4065,7 @@ static void test_mediastreamfilter_support_seeking(void) hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); source2.get_duration_hr = E_FAIL; @@ -4186,13 +4073,13 @@ static void test_mediastreamfilter_support_seeking(void) hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); check_interface(filter, &IID_IMediaSeeking, FALSE); @@ -4238,25 +4125,6 @@ static void test_mediastreamfilter_support_seeking(void) static void test_mediastreamfilter_set_positions(void) { - static const WAVEFORMATEX format = - { - .wFormatTag = WAVE_FORMAT_PCM, - .nChannels = 1, - .nSamplesPerSec = 11025, - .wBitsPerSample = 16, - .nBlockAlign = 2, - .nAvgBytesPerSec = 2 * 11025, - }; - - const AM_MEDIA_TYPE mt = - { - .majortype = MEDIATYPE_Audio, - .subtype = MEDIASUBTYPE_PCM, - .formattype = FORMAT_WaveFormatEx, - .cbFormat = sizeof(WAVEFORMATEX), - .pbFormat = (BYTE *)&format, - }; - IAMMultiMediaStream *mmstream = create_ammultimediastream(); static const MSPID mspid1 = {0x88888888, 1}; static const MSPID mspid2 = {0x88888888, 2}; @@ -4322,15 +4190,15 @@ static void test_mediastreamfilter_set_positions(void) hr = IGraphBuilder_AddFilter(graph, &source3.filter.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source2.source.pin.IPin_iface, pin2, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source3.source.pin.IPin_iface, pin3, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_SupportSeeking(filter, TRUE); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &mt); + hr = IGraphBuilder_ConnectDirect(graph, &source1.source.pin.IPin_iface, pin1, &audio_mt); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaStreamFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); -- 2.26.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 03 Jun '20

03 Jun '20

2 1

[PATCH 5/6] jscript: Don't realloc interpreter stack.
by Jacek Caban 03 Jun '20

03 Jun '20

We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-)

2 1

[PATCH 1/6] winex11.drv: Set DM_POSITION and DM_DISPLAYORIENTATION when reporting registry display settings.
by Zhiyi Zhang 03 Jun '20

03 Jun '20

Set DM_POSITION and DM_DISPLAYORIENTATION when calling EnumDisplaySettings(ENUM_REGISTRY_SETTINGS). DM_DISPLAYFIXEDOUTPUT is not set because it is not necessarily reported according to tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 3 ++- dlls/winex11.drv/settings.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index b37af4d4203..6750325a291 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3319,7 +3319,8 @@ static void test_EnumDisplaySettings(void) } else { - todo_wine ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", + todo_wine_if(mode != ENUM_REGISTRY_SETTINGS) + ok((dm.dmFields & mode_fields) == mode_fields, "Expect dmFields to contain %#x, got %#x\n", mode_fields, dm.dmFields); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 70ce35361b6..bc9f7aa1dca 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -210,7 +210,9 @@ static BOOL read_registry_settings(DEVMODEW *dm) dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); + dm->dmFields |= DM_POSITION; query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation); + dm->dmFields |= DM_DISPLAYORIENTATION; query_value("DefaultSettings.FixedOutput", &dm->u1.s2.dmDisplayFixedOutput); #undef query_value -- 2.25.1

2 1

[PATCH v3 1/5] amstream: Leave critical section on error in MediaStreamFilter::EnumPins().
by Zebediah Figura 03 Jun '20

03 Jun '20

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: no changes. dlls/amstream/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index fb9b1d9aee5..f89fe13e625 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -361,14 +361,14 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - EnterCriticalSection(&filter->cs); - if (!enum_pins) return E_POINTER; if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; + EnterCriticalSection(&filter->cs); + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = filter->nb_streams; @@ -376,6 +376,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) { heap_free(object); + LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } for (i = 0; i < filter->nb_streams; ++i) -- 2.26.2

1 4

[PATCH 1/5] include: Add more Media Foundation error codes.
by Nikolay Sivov 03 Jun '20

03 Jun '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mferror.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 523800d7f02..28910d25682 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -77,12 +77,28 @@ #define MF_E_DISABLED_IN_SAFEMODE _HRESULT_TYPEDEF_(0xc00d36ef) #define MF_E_CANNOT_PARSE_BYTESTREAM _HRESULT_TYPEDEF_(0xc00d36f0) #define MF_E_SOURCERESOLVER_MUTUALLY_EXCLUSIVE_FLAGS _HRESULT_TYPEDEF_(0xc00d36f1) +#define MF_E_CANNOT_CREATE_SINK _HRESULT_TYPEDEF_(0xc00d36fa) #define MF_E_BYTESTREAM_UNKNOWN_LENGTH _HRESULT_TYPEDEF_(0xc00d36fb) +#define MF_E_SESSION_PAUSEWHILESTOPPED _HRESULT_TYPEDEF_(0xc00d36fc) +#define MF_S_ACTIVATE_REPLACED _HRESULT_TYPEDEF_(0x000d36fd) +#define MF_E_FORMAT_CHANGE_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00d36fe) #define MF_E_INVALID_WORKQUEUE _HRESULT_TYPEDEF_(0xc00d36ff) +#define MF_E_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3700) +#define MF_E_UNAUTHORIZED _HRESULT_TYPEDEF_(0xc00d3701) +#define MF_E_OUT_OF_RANGE _HRESULT_TYPEDEF_(0xc00d3702) +#define MF_E_INVALID_CODEC_MERIT _HRESULT_TYPEDEF_(0xc00d3703) +#define MF_E_HW_MFT_FAILED_START_STREAMING _HRESULT_TYPEDEF_(0xc00d3704) +#define MF_E_OPERATION_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00d3705) +#define MF_E_HARDWARE_DRM_UNSUPPORTED _HRESULT_TYPEDEF_(0xc00d3706) +#define MF_E_DURATION_TOO_LONG _HRESULT_TYPEDEF_(0xc00d3707) #define MF_E_NO_EVENTS_AVAILABLE _HRESULT_TYPEDEF_(0xc00d3e80) #define MF_E_INVALID_STATE_TRANSITION _HRESULT_TYPEDEF_(0xc00d3e82) #define MF_E_END_OF_STREAM _HRESULT_TYPEDEF_(0xc00d3e84) #define MF_E_SHUTDOWN _HRESULT_TYPEDEF_(0xc00d3e85) +#define MF_E_MP3_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e86) +#define MF_E_MP3_OUT_OF_DATA _HRESULT_TYPEDEF_(0xc00d3e87) +#define MF_E_MP3_NOTMP3 _HRESULT_TYPEDEF_(0xc00d3e88) +#define MF_E_MP3_NOTSUPPORTED _HRESULT_TYPEDEF_(0xc00d3e89) #define MF_E_NO_DURATION _HRESULT_TYPEDEF_(0xc00d3e8a) #define MF_E_INVALID_FORMAT _HRESULT_TYPEDEF_(0xc00d3e8c) #define MF_E_PROPERTY_NOT_FOUND _HRESULT_TYPEDEF_(0xc00d3e8d) @@ -90,9 +106,17 @@ #define MF_E_PROPERTY_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00d3e8f) #define MF_E_MEDIA_SOURCE_NOT_STARTED _HRESULT_TYPEDEF_(0xc00d3e91) #define MF_E_UNSUPPORTED_FORMAT _HRESULT_TYPEDEF_(0xc00d3e98) +#define MF_E_MP3_BAD_CRC _HRESULT_TYPEDEF_(0xc00d3e99) +#define MF_E_NOT_PROTECTED _HRESULT_TYPEDEF_(0xc00d3e9a) #define MF_E_MEDIA_SOURCE_WRONGSTATE _HRESULT_TYPEDEF_(0xc00d3e9b) #define MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED _HRESULT_TYPEDEF_(0xc00d3e9c) +#define MF_E_CANNOT_FIND_KEYFRAME_SAMPLE _HRESULT_TYPEDEF_(0xc00d3e9d) #define MF_E_UNSUPPORTED_CHARACTERISTICS _HRESULT_TYPEDEF_(0xc00d3e9e) +#define MF_E_NO_AUDIO_RECORDING_DEVICE _HRESULT_TYPEDEF_(0xc00d3e9f) +#define MF_E_AUDIO_RECORDING_DEVICE_IN_USE _HRESULT_TYPEDEF_(0xc00d3ea0) +#define MF_E_AUDIO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea1) +#define MF_E_VIDEO_RECORDING_DEVICE_INVALIDATED _HRESULT_TYPEDEF_(0xc00d3ea2) +#define MF_E_VIDEO_RECORDING_DEVICE_PREEMPTED _HRESULT_TYPEDEF_(0xc00d3ea3) #define MF_E_STREAMSINK_REMOVED _HRESULT_TYPEDEF_(0xc00d4a38) #define MF_E_STREAMSINKS_OUT_OF_SYNC _HRESULT_TYPEDEF_(0xc00d4a3a) -- 2.26.2

1 4

[PATCH] typelib.dll16: Add stub LoadRegTypeLib function
by Vijay Kiran Kamuju 03 Jun '20

03 Jun '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44781 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/5] amstream: Leave critical section on error in MediaStreamFilter::EnumPins.
by Anton Baskanov 03 Jun '20

03 Jun '20

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index fb9b1d9aee..f89fe13e62 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -361,14 +361,14 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - EnterCriticalSection(&filter->cs); - if (!enum_pins) return E_POINTER; if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; + EnterCriticalSection(&filter->cs); + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = filter->nb_streams; @@ -376,6 +376,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) { heap_free(object); + LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } for (i = 0; i < filter->nb_streams; ++i) -- 2.17.1

1 4

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-devel