wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: b5b71d9aed01ee195a8e131ff866e81c909431f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b71d9aed01ee195a8e131f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 22:34:41 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 529 +++++++++++++++++++++++++++++++++++-- 1 file changed, 507 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5b71d9aed01ee195a8e…

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.214.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: af8b466f7199046484ed8e997533a6b094448df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8b466f7199046484ed8e99… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 17 18:28:29 2022 +0200 winevulkan: Update to VK spec version 1.3.214. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 11 ++++ dlls/winevulkan/loader_thunks.h | 9 +++ dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 92 ++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 13 ++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 142 +++++++++++++++++++++++++++++++++++----- 7 files changed, 252 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af8b466f7199046484ed…

1 0

Zebediah Figura : maintainers: Add a Windows Media Format section.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: d2d1ebdfc2fe31dce4c87b5ad9d518dc06cdec0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d1ebdfc2fe31dce4c87b5a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 12:38:11 2022 -0500 maintainers: Add a Windows Media Format section. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 01d2cfa80f5..c60a383b3b9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -333,6 +333,11 @@ F: dlls/wbemdisp/ F: dlls/wbemprox/ F: dlls/wmiutils/ +Windows Media Format +M: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/wmp/ +F: dlls/wmvcore/ + Windows Media Foundation M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/mf/

1 0

Zebediah Figura : maintainers: Add a GStreamer section.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 73289b65552f02ccb798d81ad3bd6f52d48eecc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73289b65552f02ccb798d81a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 17 12:38:10 2022 -0500 maintainers: Add a GStreamer section. Assign formal maintainership of the whole DLL to myself. Although there are parts of winegstreamer that fall under the purview of Media Foundation, it is not really possible to separate these logically from the parts which interact with the GStreamer backend. Better to have a dedicated maintainer for the whole DLL, and assign patches to the Media Foundation maintainer as necessary. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index f532c2eb570..01d2cfa80f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -113,7 +113,6 @@ F: dlls/qcap/ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ -F: dlls/winegstreamer/quartz_parser.c F: libs/strmbase/ DirectWrite @@ -156,6 +155,10 @@ GPhoto Driver M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ +GStreamer multimedia backend +M: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/winegstreamer/ + HID support M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com>

1 0

Piotr Caban : oleacc: Add IAccessible refcount tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 32cd910bde51a23d1263ec99e18a753510b657d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cd910bde51a23d1263ec99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:48 2022 +0200 oleacc: Add IAccessible refcount tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index cbbc98e4742..532c5d71257 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -100,6 +100,7 @@ static struct Accessible { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + LONG ref; IAccessible *parent; HWND acc_hwnd; @@ -140,12 +141,14 @@ static HRESULT WINAPI Accessible_QueryInterface( static ULONG WINAPI Accessible_AddRef(IAccessible *iface) { - return 2; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedIncrement(&This->ref); } static ULONG WINAPI Accessible_Release(IAccessible *iface) { - return 1; + struct Accessible *This = impl_from_Accessible(iface); + return InterlockedDecrement(&This->ref); } static HRESULT WINAPI Accessible_GetTypeInfoCount( @@ -226,9 +229,11 @@ static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, return S_FALSE; case 3: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_OK; case 4: *ppdispChild = (IDispatch*)&Accessible_child.IAccessible_iface; + IDispatch_AddRef(*ppdispChild); return S_FALSE; default: ok(0, "unexpected call\n"); @@ -464,6 +469,7 @@ static struct Accessible Accessible = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, NULL, 0, 0 }; @@ -471,6 +477,7 @@ static struct Accessible Accessible_child = { { &AccessibleVtbl }, { &OleWindowVtbl }, + 1, &Accessible.IAccessible_iface, 0, 0 }; @@ -906,6 +913,8 @@ static void test_AccessibleObjectFromEvent(void) IAccessible_Release(acc); DestroyWindow(hwnd); + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } static void test_GetProcessHandleFromHwnd(void) @@ -1014,6 +1023,9 @@ static void test_AccessibleChildren(IAccessible *acc) IDispatch_Release(V_DISPATCH(children+1)); } ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); + + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } #define check_acc_state(acc, state) _check_acc_state(__LINE__, acc, state) @@ -2003,6 +2015,8 @@ static void test_WindowFromAccessibleObject(void) CHECK_CALLED(Accessible_child_get_accParent); Accessible.ow_hwnd = NULL; + ok(Accessible.ref == 1, "Accessible.ref = %ld\n", Accessible.ref); + ok(Accessible_child.ref == 1, "Accessible.ref = %ld\n", Accessible_child.ref); } START_TEST(main)

1 0

Piotr Caban : oleacc: Store test IAccessible data in structure.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 3dbfe812b6f0333c0041fd8ebe736e3947a93ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dbfe812b6f0333c0041fd8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 17 14:38:40 2022 +0200 oleacc: Store test IAccessible data in structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 147 +++++++++++++++++++++++++++++------------------ 1 file changed, 92 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dbfe812b6f0333c0041…

1 0

Connor McAdams : oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 92fe1c3cf02148050cf375283087812498cf776a URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fe1c3cf02148050cf37528… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 14:38:35 2022 +0200 oleacc: Add support for retrieving an HWND from accNavigate to WindowFromAccessibleObject. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 53 ++++++++++++++++--- dlls/oleacc/tests/main.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index dced84be7b5..062884f9bf4 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -30,6 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; +#define NAVDIR_INTERNAL_HWND 10 +DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); + extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; @@ -400,35 +403,71 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) { + IServiceProvider *sp; + IAccessible *acc2; IDispatch *parent; IOleWindow *ow; + VARIANT v, cid; HRESULT hres; TRACE("%p %p\n", acc, phwnd); - IAccessible_AddRef(acc); + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + if(SUCCEEDED(hres) && *phwnd) + return S_OK; + } + + VariantInit(&v); + variant_init_i4(&cid, CHILDID_SELF); + hres = IAccessible_accNavigate(acc, NAVDIR_INTERNAL_HWND, cid, &v); + if(SUCCEEDED(hres)) { + if(hres == S_OK && V_VT(&v) == VT_I4 && V_I4(&v)) { + *phwnd = LongToHandle(V_I4(&v)); + return S_OK; + } + /* native leaks v here */ + VariantClear(&v); + } + + hres = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void**)&sp); + if(SUCCEEDED(hres)) { + hres = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, + &IID_IAccessible, (void**)&acc2); + IServiceProvider_Release(sp); + } + if(FAILED(hres)) { + acc2 = acc; + IAccessible_AddRef(acc2); + } + while(1) { - hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + hres = IAccessible_QueryInterface(acc2, &IID_IOleWindow, (void**)&ow); if(SUCCEEDED(hres)) { hres = IOleWindow_GetWindow(ow, phwnd); IOleWindow_Release(ow); - IAccessible_Release(acc); - return hres; + if(SUCCEEDED(hres)) { + IAccessible_Release(acc2); + return hres; + } } hres = IAccessible_get_accParent(acc, &parent); - IAccessible_Release(acc); + IAccessible_Release(acc2); if(FAILED(hres)) return hres; - if(hres!=S_OK || !parent) { + if(!parent) { *phwnd = NULL; return hres; } - hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc2); IDispatch_Release(parent); if(FAILED(hres)) return hres; + acc = acc2; } } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 780919c2ab5..a0ab3eb2fb0 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -59,9 +59,12 @@ DEFINE_EXPECT(Accessible_get_accChildCount); DEFINE_EXPECT(Accessible_get_accChild); DEFINE_EXPECT(Accessible_get_accName); DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); +#define NAVDIR_INTERNAL_HWND 10 DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -93,7 +96,11 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } +static IAccessible Accessible; static IAccessible Accessible_child; +static IOleWindow OleWindow; +static HWND Accessible_hwnd; +static HWND OleWindow_hwnd; static HRESULT WINAPI Accessible_QueryInterface( IAccessible *iface, REFIID riid, void **ppvObject) @@ -106,6 +113,12 @@ static HRESULT WINAPI Accessible_QueryInterface( return S_OK; } + if(IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) { + *ppvObject = &OleWindow; + IOleWindow_AddRef(&OleWindow); + return S_OK; + } + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { CHECK_EXPECT(Accessible_QI_IEnumVARIANT); return E_NOINTERFACE; @@ -157,11 +170,16 @@ static HRESULT WINAPI Accessible_get_accParent( IAccessible *iface, IDispatch **ppdispParent) { if(iface == &Accessible_child) + { CHECK_EXPECT(Accessible_child_get_accParent); + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, + (void **)ppdispParent); + } else CHECK_EXPECT(Accessible_get_accParent); - return E_NOTIMPL; + *ppdispParent = NULL; + return S_FALSE; } static HRESULT WINAPI Accessible_get_accChildCount( @@ -297,7 +315,21 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG navDir, VARIANT varStart, VARIANT *pvarEnd) { - ok(0, "unexpected call\n"); + if(iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); + + /* + * Magic number value for retrieving an HWND. Used by DynamicAnnotation + * IAccessible wrapper. + */ + if(navDir == NAVDIR_INTERNAL_HWND && Accessible_hwnd) { + V_VT(pvarEnd) = VT_I4; + V_I4(pvarEnd) = HandleToULong(Accessible_hwnd); + return Accessible_hwnd ? S_OK : S_FALSE; + } + return E_NOTIMPL; } @@ -360,8 +392,47 @@ static IAccessibleVtbl AccessibleVtbl = { Accessible_put_accValue }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **obj) +{ + return IAccessible_QueryInterface(&Accessible, riid, obj); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + return IAccessible_AddRef(&Accessible); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + return IAccessible_Release(&Accessible); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) +{ + if(OleWindow_hwnd) { + *hwnd = OleWindow_hwnd; + return S_OK; + } + return E_FAIL; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = { + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + static IAccessible Accessible = {&AccessibleVtbl}; static IAccessible Accessible_child = {&AccessibleVtbl}; +static IOleWindow OleWindow = {&OleWindowVtbl}; static void test_getroletext(void) { @@ -1844,6 +1915,59 @@ static void test_default_edit_accessible_object(void) DestroyWindow(hwnd); } +static void test_WindowFromAccessibleObject(void) +{ + HRESULT hr; + HWND hwnd; + + /* Successfully retrieve an HWND from the IOleWindow interface. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + + /* Successfully retrieve an HWND from IAccessible::accNavigate. */ + Accessible_hwnd = (HWND)0xdeadf00d; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + /* This value gets sign-extended on 64-bit. */ + ok(hwnd == IntToPtr(0xdeadf00d), "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_accNavigate); + + /* Don't return an HWND from either method. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = NULL; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_accNavigate); + SET_EXPECT(Accessible_get_accParent); + hr = WindowFromAccessibleObject(&Accessible, &hwnd); + /* Return value from IAccessible::get_accParent. */ + ok(hr == S_FALSE, "got %lx\n", hr); + ok(!hwnd, "hwnd %p\n", hwnd); + CHECK_CALLED(Accessible_accNavigate); + CHECK_CALLED(Accessible_get_accParent); + + /* Successfully retrieve an HWND from a parent IAccessible's IOleWindow interface. */ + Accessible_hwnd = NULL; + OleWindow_hwnd = (HWND)0xdeadf00d; + hwnd = (HWND)0xdeadbeef; + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + hr = WindowFromAccessibleObject(&Accessible_child, &hwnd); + ok(hr == S_OK, "got %lx\n", hr); + ok(hwnd == (HWND)0xdeadf00d, "hwnd != 0xdeadf00d!\n"); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + + Accessible_hwnd = NULL; + OleWindow_hwnd = NULL; +} + START_TEST(main) { int argc; @@ -1885,6 +2009,7 @@ START_TEST(main) test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object(); + test_WindowFromAccessibleObject(); unregister_window_class(); CoUninitialize();

1 0

Connor McAdams : oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 1621a5f42780d356acf485e89fab650e1d352e0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1621a5f42780d356acf485e8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 14:38:31 2022 +0200 oleacc/tests: Add tests for retrieving an IAccessible contained within a Dynamic Annotation wrapper. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7854764ec08..780919c2ab5 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -62,6 +62,8 @@ DEFINE_EXPECT(Accessible_get_accParent); DEFINE_EXPECT(Accessible_child_get_accName); DEFINE_EXPECT(Accessible_child_get_accParent); +DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); + static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); static BOOL init(void) @@ -684,7 +686,8 @@ static void test_AccessibleObjectFromWindow(void) static void test_AccessibleObjectFromEvent(void) { - IAccessible *acc; + IAccessible *acc, *acc2; + IServiceProvider *sp; VARIANT cid; HRESULT hr; HWND hwnd; @@ -720,6 +723,21 @@ static void test_AccessibleObjectFromEvent(void) CHECK_CALLED(Accessible_get_accChild); ok(hr == S_OK, "got %#lx\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); + /* Get &Accessible out of the Dynamic Annotation IAccessible wrapper. */ + if (!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible)) + { + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&sp); + ok(hr == S_OK, "got %#lx\n", hr); + ok(!!sp, "sp == NULL\n"); + + hr = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, &IID_IAccessible, + (void**)&acc2); + ok(hr == S_OK, "got %#lx\n", hr); + ok(iface_cmp((IUnknown*)acc2, (IUnknown*)&Accessible), "acc != &Accessible\n"); + IAccessible_Release(acc2); + IServiceProvider_Release(sp); + } + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); ok(V_I4(&cid) == 1, "got %#lx, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent);

1 0

Nikolay Sivov : mfreadwrite/reader: Propagate resource sharing mode to the sample allocator.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 5b04d18945c547144bf692f6418af5ec25315835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b04d18945c547144bf692f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 15:30:47 2022 +0300 mfreadwrite/reader: Propagate resource sharing mode to the sample allocator. Issue found by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 741ef93f367..b1175479dec 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1651,9 +1651,30 @@ static HRESULT source_reader_set_compatible_media_type(struct source_reader *rea return type_set ? S_OK : S_FALSE; } +static HRESULT source_reader_create_sample_allocator_attributes(const struct source_reader *reader, + IMFAttributes **attributes) +{ + UINT32 shared = 0, shared_without_mutex = 0; + HRESULT hr; + + if (FAILED(hr = MFCreateAttributes(attributes, 1))) + return hr; + + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared); + IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex); + + if (shared_without_mutex) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, TRUE); + else if (shared) + hr = IMFAttributes_SetUINT32(*attributes, &MF_SA_D3D11_SHARED, TRUE); + + return hr; +} + static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader, unsigned int index) { struct media_stream *stream = &reader->streams[index]; + IMFAttributes *attributes = NULL; GUID major = { 0 }; HRESULT hr; @@ -1680,8 +1701,17 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader return hr; } - if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) + if (FAILED(hr = source_reader_create_sample_allocator_attributes(reader, &attributes))) + WARN("Failed to create allocator attributes, hr %#lx.\n", hr); + + if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, + attributes, stream->current))) + { WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); + } + + if (attributes) + IMFAttributes_Release(attributes); return hr; }

1 0

Zhiyi Zhang : gdi32: Implement D3DKMTQueryVideoMemoryInfo().
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8bc0c8d64604945540ba37b41becf343a2ae4a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc0c8d64604945540ba37b4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 17 14:18:12 2022 +0800 gdi32: Implement D3DKMTQueryVideoMemoryInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/driver.c | 2 +- dlls/win32u/dibdrv/dc.c | 2 ++ dlls/win32u/driver.c | 37 ++++++++++++++++++++++++++ dlls/win32u/emfdrv.c | 1 + dlls/win32u/font.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/path.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 +++++ dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/ntgdi.h | 1 + include/wine/gdi_driver.h | 1 + 18 files changed, 118 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc0c8d64604945540ba…

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022