September 2023 - Wine-Commits

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLDOMAttribute.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 528fb917ce0892711759e63238836e5de0c20c8a URL: https://gitlab.winehq.org/wine/wine/-/commit/528fb917ce0892711759e63238836e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLDOMAttribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlattr.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 2631b935f0a..5e38215057c 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -38,28 +38,16 @@ static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *i } static HRESULT WINAPI HTMLDOMAttribute_QueryInterface(IHTMLDOMAttribute *iface, - REFIID riid, void **ppv) + REFIID riid, void **ppv) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLDOMAttribute_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) { - *ppv = &This->IHTMLDOMAttribute_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMAttribute2, riid)) { - *ppv = &This->IHTMLDOMAttribute2_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("%s not supported\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLDOMAttribute_AddRef(IHTMLDOMAttribute *iface) @@ -477,6 +465,18 @@ static inline HTMLDOMAttribute *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMAttribute, dispex); } +static void *HTMLDOMAttribute_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLDOMAttribute, riid)) + return &This->IHTMLDOMAttribute_iface; + if(IsEqualGUID(&IID_IHTMLDOMAttribute2, riid)) + return &This->IHTMLDOMAttribute2_iface; + + return NULL; +} + static void HTMLDOMAttribute_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMAttribute *This = impl_from_DispatchEx(dispex); @@ -499,6 +499,7 @@ static void HTMLDOMAttribute_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLDOMAttribute_dispex_vtbl = { + .query_interface = HTMLDOMAttribute_query_interface, .destructor = HTMLDOMAttribute_destructor, .traverse = HTMLDOMAttribute_traverse, .unlink = HTMLDOMAttribute_unlink

1 0

Esme Povirk : user32/tests: Register test_hvredraw class in temp desktop.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: f9e4c0bc65577e2225b4a841e8ae9ed36fd5f812 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9e4c0bc65577e2225b4a841e8ae9e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Sep 9 12:22:31 2023 -0500 user32/tests: Register test_hvredraw class in temp desktop. Windows v1709 has a bug that breaks GetClassLong on a different desktop from where the class was registered. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55539 --- dlls/user32/tests/msg.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ddc6ca90cb2..5fc05ad80ff 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9593,7 +9593,7 @@ static void test_swp_paint_region_on_extend_zerosize(void) DeleteObject( hrgn_actual ); } -static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) +static void subtest_hvredraw(HWND hparent, UINT class_style, DWORD style) { static const struct movesize_test { int dx, dy, dw, dh; @@ -9613,12 +9613,19 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) const int x0 = 100, y0 = 100, w0 = 200, h0 = 200; size_t i; HWND hwnd; - UINT class_style; + WNDCLASSA cls = { + .style = class_style, + .lpfnWndProc = DefWindowProcA, + .hInstance = GetModuleHandleA(0), + .hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW), + .hbrBackground = GetStockObject(WHITE_BRUSH), + .lpszClassName = "TestHVRedrawClass" + }; - hwnd = CreateWindowExA( 0, classname, "Test window", style, x0, y0, w0, h0, hparent, 0, 0, NULL ); - ok(hwnd != NULL, "Failed to create the window\n"); + register_class(&cls); - class_style = GetClassLongA( hwnd, GCL_STYLE ); + hwnd = CreateWindowExA( 0, cls.lpszClassName, "Test window", style, x0, y0, w0, h0, hparent, 0, 0, NULL ); + ok(hwnd != NULL, "Failed to create the window\n"); ShowWindow( hwnd, SW_SHOW ); UpdateWindow( hwnd ); @@ -9631,8 +9638,8 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) RECT rect_old_vis, rect_new_vis; BOOL rgn_ok; - winetest_push_context( "%s %08lx SetWindowPos redraw #%Id (%d, %d, %d, %d)", - classname, style, i, test->dx, test->dy, test->dw, test->dh ); + winetest_push_context( "%x %08lx SetWindowPos redraw #%Id (%d, %d, %d, %d)", + class_style, style, i, test->dx, test->dy, test->dw, test->dh ); SetWindowPos( hwnd, HWND_TOP, x0, y0, w0, h0, SWP_NOACTIVATE ); @@ -9683,6 +9690,7 @@ static void subtest_hvredraw(HWND hparent, const char *classname, DWORD style) DeleteObject( hrgn_expect ); DeleteObject( hrgn_new_vis ); DeleteObject( hrgn_old_vis ); + UnregisterClassA( cls.lpszClassName, cls.hInstance ); } @@ -9690,18 +9698,18 @@ static void test_hvredraw(void) { HWND htoplevel; - subtest_hvredraw( NULL, "SimpleWindowClassWithHRedraw", WS_OVERLAPPEDWINDOW ); - subtest_hvredraw( NULL, "SimpleWindowClassWithVRedraw", WS_OVERLAPPEDWINDOW ); - subtest_hvredraw( NULL, "SimpleWindowClassWithHVRedraw", WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_HREDRAW, WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_VREDRAW, WS_OVERLAPPEDWINDOW ); + subtest_hvredraw( NULL, CS_HREDRAW|CS_VREDRAW, WS_OVERLAPPEDWINDOW ); htoplevel = CreateWindowExA( 0, "SimpleWindowClass", "Test toplevel", WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_VISIBLE, 100, 100, 400, 400, 0, 0, 0, NULL ); ok( htoplevel != 0, "Failed to create top-level window: %lu\n", GetLastError() ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithHRedraw", WS_CHILD | WS_BORDER ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithVRedraw", WS_CHILD | WS_BORDER ); - subtest_hvredraw( htoplevel, "SimpleWindowClassWithHVRedraw", WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_HREDRAW, WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_VREDRAW, WS_CHILD | WS_BORDER ); + subtest_hvredraw( htoplevel, CS_HREDRAW|CS_VREDRAW, WS_CHILD | WS_BORDER ); DestroyWindow( htoplevel ); } @@ -11206,21 +11214,6 @@ static void register_classes(void) cls.lpszClassName = "SimpleWindowClassWithParentDC"; register_class(&cls); - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_HREDRAW; - cls.lpszClassName = "SimpleWindowClassWithHRedraw"; - register_class(&cls); - - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_VREDRAW; - cls.lpszClassName = "SimpleWindowClassWithVRedraw"; - register_class(&cls); - - cls.lpfnWndProc = DefWindowProcA; - cls.style = CS_HREDRAW | CS_VREDRAW; - cls.lpszClassName = "SimpleWindowClassWithHVRedraw"; - register_class(&cls); - clsW.style = 0; clsW.lpfnWndProc = MsgCheckProcW; clsW.cbClsExtra = 0;

1 0

Mohamad Al-Jaf : appxdeploymentclient: Add IPackageManager2 stub interface.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 5de4010eb9957b9060bbabf3ff9fa4ecb33fd07c URL: https://gitlab.winehq.org/wine/wine/-/commit/5de4010eb9957b9060bbabf3ff9fa4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:52:44 2023 -0400 appxdeploymentclient: Add IPackageManager2 stub interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55403 --- dlls/appxdeploymentclient/package.c | 102 ++++++++++++++++++++++++++++ dlls/appxdeploymentclient/private.h | 38 +++++++++++ dlls/windows.applicationmodel/tests/model.c | 12 ++++ 3 files changed, 152 insertions(+)

1 0

Mohamad Al-Jaf : appxdeploymentclient: Implement IActivationFactory::ActivateInstance().
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: ec1b83ad9d14370bb827361d89aa486b895338c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec1b83ad9d14370bb827361d89aa48… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:28:46 2023 -0400 appxdeploymentclient: Implement IActivationFactory::ActivateInstance(). --- dlls/appxdeploymentclient/package.c | 221 +++++++++++++++++++++++++++- dlls/appxdeploymentclient/private.h | 1 + dlls/windows.applicationmodel/tests/model.c | 41 ++++-- 3 files changed, 251 insertions(+), 12 deletions(-)

1 0

Mohamad Al-Jaf : include: Add Windows.Management.Deployment.IPackageManager2 interface definition.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 0eb9e723367aa62a216b90d6f6c9c5f007b53bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0eb9e723367aa62a216b90d6f6c9c5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 20:40:42 2023 -0400 include: Add Windows.Management.Deployment.IPackageManager2 interface definition. --- include/windows.management.deployment.idl | 70 +++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/windows.management.deployment.idl b/include/windows.management.deployment.idl index d78c64680f3..bdb115b924e 100644 --- a/include/windows.management.deployment.idl +++ b/include/windows.management.deployment.idl @@ -29,11 +29,14 @@ namespace Windows.Management.Deployment { typedef enum DeploymentProgressState DeploymentProgressState; typedef enum PackageInstallState PackageInstallState; typedef enum PackageState PackageState; + typedef enum PackageTypes PackageTypes; + typedef enum RemovalOptions RemovalOptions; typedef struct DeploymentProgress DeploymentProgress; interface IDeploymentResult; interface IPackageManager; + interface IPackageManager2; interface IPackageUserInformation; runtimeclass DeploymentResult; @@ -99,6 +102,35 @@ namespace Windows.Management.Deployment { Tampered = 3, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [flags] + enum PackageTypes + { + None = 0x0, + Main = 0x1, + Framework = 0x2, + Resource = 0x4, + Bundle = 0x8, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Xap = 0x10, + [contract(Windows.Foundation.UniversalApiContract, 3.0)] + Optional = 0x20, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + All = 0xffffffff, + }; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [flags] + enum RemovalOptions + { + None = 0x0, + PreserveApplicationData = 0x1000, + [contract(Windows.Foundation.UniversalApiContract, 10.0)] + PreserveRoamableApplicationData = 0x80, + [contract(Windows.Foundation.UniversalApiContract, 7.0)] + RemoveForAllUsers = 0x80000, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] struct DeploymentProgress { @@ -157,6 +189,44 @@ namespace Windows.Management.Deployment { HRESULT FindPackageByUserSecurityIdPackageFullName([in] HSTRING sid, [in] HSTRING name, [out, retval] Windows.ApplicationModel.Package **package); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Management.Deployment.PackageManager), + uuid(f7aad08d-0840-46f2-b5d8-cad47693a095) + ] + interface IPackageManager2 : IInspectable + { + [overload("RemovePackageAsync")] + HRESULT RemovePackageWithOptionsAsync([in] HSTRING name, [in] Windows.Management.Deployment.RemovalOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + [overload("StagePackageAsync")] + HRESULT StagePackageWithOptionsAsync([in] Windows.Foundation.Uri *uri, [in] Windows.Foundation.Collections.IIterable<Windows.Foundation.Uri *> *dependencies, + [in] Windows.Management.Deployment.DeploymentOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + HRESULT RegisterPackageByFullNameAsync([in] HSTRING name, [in] Windows.Foundation.Collections.IIterable<HSTRING> *dependencies, + [in] Windows.Management.Deployment.DeploymentOptions options, + [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesWithPackageTypes([in] Windows.Management.Deployment.PackageTypes types, [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdWithPackageTypes([in] HSTRING sid, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesByNamePublisherWithPackageTypes([in] HSTRING name, [in] HSTRING publisher, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdNamePublisherWithPackageTypes([in] HSTRING sid, [in] HSTRING name, [in] HSTRING publisher, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesWithPackageTypes")] + HRESULT FindPackagesByPackageFamilyNameWithPackageTypes([in] HSTRING family_name, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("FindPackagesForUserWithPackageTypes")] + HRESULT FindPackagesByUserSecurityIdPackageFamilyNameWithPackageTypes([in] HSTRING sid, [in] HSTRING family_name, [in] Windows.Management.Deployment.PackageTypes types, + [out, retval] Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *> **packages); + [overload("StageUserDataAsync")] + HRESULT StageUserDataAsync([in] HSTRING name, [out, retval] Windows.Foundation.IAsyncOperationWithProgress<Windows.Management.Deployment.DeploymentResult *, Windows.Management.Deployment.DeploymentProgress> **operation); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Management.Deployment.PackageUserInformation),

1 0

Mohamad Al-Jaf : appxdeploymentclient: Add stub DLL.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 0617824e0a8ab781cc41b8d09685cd8af1e8932d URL: https://gitlab.winehq.org/wine/wine/-/commit/0617824e0a8ab781cc41b8d09685cd… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Mon Aug 28 19:25:32 2023 -0400 appxdeploymentclient: Add stub DLL. --- configure | 2 + configure.ac | 1 + dlls/appxdeploymentclient/Makefile.in | 9 ++ .../appxdeploymentclient/appxdeploymentclient.spec | 82 +++++++++++++++ dlls/appxdeploymentclient/classes.idl | 23 +++++ dlls/appxdeploymentclient/main.c | 46 +++++++++ dlls/appxdeploymentclient/package.c | 115 +++++++++++++++++++++ dlls/appxdeploymentclient/private.h | 40 +++++++ dlls/windows.applicationmodel/tests/model.c | 9 +- 9 files changed, 322 insertions(+), 5 deletions(-)

1 0

Daniel Lehman : msxml3/tests: Fix failure messages.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 2dcf0b5872c0b3b1ec4c4b5a42c0a51c618090c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dcf0b5872c0b3b1ec4c4b5a42c0a5… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Sep 7 22:25:10 2023 -0700 msxml3/tests: Fix failure messages. --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cf9fb62a65e..6590a8dbad4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13765,12 +13765,12 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { - ok(hr == S_OK, "Failed to get node name, hr %#lx.\n", hr); + ok(hr == S_OK, "Failed to get prefix, hr %#lx.\n", hr); ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else - ok(hr == S_FALSE, "Failed to get node name, hr %#lx.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr ); str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); @@ -13782,7 +13782,7 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_namespaceURI(item, &str); if (test->uris[i]) { - ok(hr == S_OK, "Failed to get node name, hr %#lx.\n", hr); + ok(hr == S_OK, "Failed to get namespace URI, hr %#lx.\n", hr); if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); else @@ -13790,7 +13790,7 @@ static void test_namespaces_as_attributes(void) SysFreeString(str); } else - ok(hr == S_FALSE, "Failed to get node name, hr %#lx.\n", hr); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr ); str = NULL; hr = IXMLDOMNode_get_text(item, &str);

1 0

Rémi Bernon : dmime: Fix indentation in IDirectMusicPerformance_QueryInterface.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: e5ae7f90eebc5618385afaf539157be8110a8512 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5ae7f90eebc5618385afaf539157b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 21:59:03 2023 +0200 dmime: Fix indentation in IDirectMusicPerformance_QueryInterface. --- dlls/dmime/performance.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d6f7e76686e..a185716761d 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -252,21 +252,23 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi } /* IDirectMusicPerformance8 IUnknown part: */ -static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ppv) +static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { - TRACE("(%p, %s,%p)\n", iface, debugstr_dmguid(riid), ppv); - - if (IsEqualIID (riid, &IID_IUnknown) || - IsEqualIID (riid, &IID_IDirectMusicPerformance) || - IsEqualIID (riid, &IID_IDirectMusicPerformance2) || - IsEqualIID (riid, &IID_IDirectMusicPerformance8)) { - *ppv = iface; - IUnknown_AddRef(iface); - return S_OK; - } + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IDirectMusicPerformance) + || IsEqualGUID(riid, &IID_IDirectMusicPerformance2) + || IsEqualGUID(riid, &IID_IDirectMusicPerformance8)) + { + *ret_iface = iface; + IUnknown_AddRef(iface); + return S_OK; + } - WARN("(%p, %s,%p): not found\n", iface, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + *ret_iface = NULL; + WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } static ULONG WINAPI performance_AddRef(IDirectMusicPerformance8 *iface)

1 0

Rémi Bernon : dmime: Add a IDirectMusicTool interface to the performance.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 428eb3e87c863fd391f2b5b91a8d67036cd21120 URL: https://gitlab.winehq.org/wine/wine/-/commit/428eb3e87c863fd391f2b5b91a8d67… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 21:56:20 2023 +0200 dmime: Add a IDirectMusicTool interface to the performance. --- dlls/dmime/performance.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/dmime.c | 6 ++-- 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 887d9a7bf16..1f8de0837d5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -38,6 +38,7 @@ struct performance { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; IDirectMusicGraph IDirectMusicGraph_iface; + IDirectMusicTool IDirectMusicTool_iface; LONG ref; IDirectMusic8 *dmusic; IDirectSound *dsound; @@ -276,6 +277,13 @@ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectMusicTool)) + { + *ret_iface = &This->IDirectMusicTool_iface; + IDirectMusicTool_AddRef(&This->IDirectMusicTool_iface); + return S_OK; + } + *ret_iface = NULL; WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -1322,6 +1330,86 @@ static const IDirectMusicGraphVtbl performance_graph_vtbl = performance_graph_RemoveTool, }; +static inline struct performance *impl_from_IDirectMusicTool(IDirectMusicTool *iface) +{ + return CONTAINING_RECORD(iface, struct performance, IDirectMusicTool_iface); +} + +static HRESULT WINAPI performance_tool_QueryInterface(IDirectMusicTool *iface, REFIID riid, void **ret_iface) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + return IDirectMusicPerformance8_QueryInterface(&This->IDirectMusicPerformance8_iface, riid, ret_iface); +} + +static ULONG WINAPI performance_tool_AddRef(IDirectMusicTool *iface) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + return IDirectMusicPerformance8_AddRef(&This->IDirectMusicPerformance8_iface); +} + +static ULONG WINAPI performance_tool_Release(IDirectMusicTool *iface) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + return IDirectMusicPerformance8_Release(&This->IDirectMusicPerformance8_iface); +} + +static HRESULT WINAPI performance_tool_Init(IDirectMusicTool *iface, IDirectMusicGraph *graph) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p): stub\n", This, graph); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_tool_GetMsgDeliveryType(IDirectMusicTool *iface, DWORD *type) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p): stub\n", This, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_tool_GetMediaTypeArraySize(IDirectMusicTool *iface, DWORD *size) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p): stub\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_tool_GetMediaTypes(IDirectMusicTool *iface, DWORD **types, DWORD size) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p, %lu): stub\n", This, types, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, + IDirectMusicPerformance *performance, DMUS_PMSG *msg) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p, %p): stub\n", This, performance, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_tool_Flush(IDirectMusicTool *iface, + IDirectMusicPerformance *performance, DMUS_PMSG *msg, REFERENCE_TIME time) +{ + struct performance *This = impl_from_IDirectMusicTool(iface); + FIXME("(%p, %p, %p, %I64d): stub\n", This, performance, msg, time); + return E_NOTIMPL; +} + +static const IDirectMusicToolVtbl performance_tool_vtbl = +{ + performance_tool_QueryInterface, + performance_tool_AddRef, + performance_tool_Release, + performance_tool_Init, + performance_tool_GetMsgDeliveryType, + performance_tool_GetMediaTypeArraySize, + performance_tool_GetMediaTypes, + performance_tool_ProcessPMsg, + performance_tool_Flush, +}; + /* for ClassFactory */ HRESULT create_dmperformance(REFIID iid, void **ret_iface) { @@ -1334,6 +1422,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicPerformance8_iface.lpVtbl = &performance_vtbl; obj->IDirectMusicGraph_iface.lpVtbl = &performance_graph_vtbl; + obj->IDirectMusicTool_iface.lpVtbl = &performance_tool_vtbl; obj->ref = 1; obj->pDefaultPath = NULL; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6dcb2b820c9..0aeed24b200 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1489,10 +1489,9 @@ static void test_performance_tool(void) check_interface(performance, &IID_IDirectMusicTool8, FALSE); hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicTool, (void **)&tool); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (hr != S_OK) goto skip_tool; + ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicTool_Init(tool, graph); ok(hr == E_NOTIMPL, "got %#lx\n", hr); @@ -1514,7 +1513,6 @@ static void test_performance_tool(void) IDirectMusicGraph_Release(graph); IDirectMusicTool_Release(tool); -skip_tool: IDirectMusicPerformance_Release(performance); }

1 0

Rémi Bernon : dmime: Add a IDirectMusicGraph interface to the performance.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 2e25af4fd3e7cd618b2080502c429446e35d4666 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e25af4fd3e7cd618b2080502c4294… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 4 21:50:46 2023 +0200 dmime: Add a IDirectMusicGraph interface to the performance. --- dlls/dmime/performance.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/dmime/tests/dmime.c | 22 +++++-------- dlls/dmime/tests/performance.c | 2 +- 3 files changed, 83 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a185716761d..887d9a7bf16 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -37,6 +37,7 @@ struct pchannel_block { struct performance { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; + IDirectMusicGraph IDirectMusicGraph_iface; LONG ref; IDirectMusic8 *dmusic; IDirectSound *dsound; @@ -254,6 +255,8 @@ static inline struct performance *impl_from_IDirectMusicPerformance8(IDirectMusi /* IDirectMusicPerformance8 IUnknown part: */ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface, REFIID riid, void **ret_iface) { + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface); if (IsEqualGUID(riid, &IID_IUnknown) @@ -266,6 +269,13 @@ static HRESULT WINAPI performance_QueryInterface(IDirectMusicPerformance8 *iface return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectMusicGraph)) + { + *ret_iface = &This->IDirectMusicGraph_iface; + IDirectMusicGraph_AddRef(&This->IDirectMusicGraph_iface); + return S_OK; + } + *ret_iface = NULL; WARN("(%p, %s, %p): not found\n", iface, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -1249,6 +1259,69 @@ static const IDirectMusicPerformance8Vtbl performance_vtbl = performance_GetParamEx, }; +static inline struct performance *impl_from_IDirectMusicGraph(IDirectMusicGraph *iface) +{ + return CONTAINING_RECORD(iface, struct performance, IDirectMusicGraph_iface); +} + +static HRESULT WINAPI performance_graph_QueryInterface(IDirectMusicGraph *iface, REFIID riid, void **ret_iface) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + return IDirectMusicPerformance8_QueryInterface(&This->IDirectMusicPerformance8_iface, riid, ret_iface); +} + +static ULONG WINAPI performance_graph_AddRef(IDirectMusicGraph *iface) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + return IDirectMusicPerformance8_AddRef(&This->IDirectMusicPerformance8_iface); +} + +static ULONG WINAPI performance_graph_Release(IDirectMusicGraph *iface) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + return IDirectMusicPerformance8_Release(&This->IDirectMusicPerformance8_iface); +} + +static HRESULT WINAPI performance_graph_StampPMsg(IDirectMusicGraph *iface, DMUS_PMSG *msg) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + FIXME("(%p, %p): stub\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_graph_InsertTool(IDirectMusicGraph *iface, IDirectMusicTool *tool, + DWORD *channels, DWORD channels_count, LONG index) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + FIXME("(%p, %p, %p, %lu, %ld): stub\n", This, tool, channels, channels_count, index); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_graph_GetTool(IDirectMusicGraph *iface, DWORD index, IDirectMusicTool **tool) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + FIXME("(%p, %lu, %p): stub\n", This, index, tool); + return E_NOTIMPL; +} + +static HRESULT WINAPI performance_graph_RemoveTool(IDirectMusicGraph *iface, IDirectMusicTool *tool) +{ + struct performance *This = impl_from_IDirectMusicGraph(iface); + FIXME("(%p, %p): stub\n", This, tool); + return E_NOTIMPL; +} + +static const IDirectMusicGraphVtbl performance_graph_vtbl = +{ + performance_graph_QueryInterface, + performance_graph_AddRef, + performance_graph_Release, + performance_graph_StampPMsg, + performance_graph_InsertTool, + performance_graph_GetTool, + performance_graph_RemoveTool, +}; + /* for ClassFactory */ HRESULT create_dmperformance(REFIID iid, void **ret_iface) { @@ -1260,6 +1333,7 @@ HRESULT create_dmperformance(REFIID iid, void **ret_iface) *ret_iface = NULL; if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicPerformance8_iface.lpVtbl = &performance_vtbl; + obj->IDirectMusicGraph_iface.lpVtbl = &performance_graph_vtbl; obj->ref = 1; obj->pDefaultPath = NULL; diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e95a1c02427..6dcb2b820c9 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1536,8 +1536,7 @@ static void test_performance_graph(void) /* performance exposes a graph interface but it's not an actual toolgraph */ hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (hr != S_OK) goto skip_graph; + ok(hr == S_OK, "got %#lx\n", hr); hr = IDirectMusicGraph_InsertTool(graph, (IDirectMusicTool *)tool, NULL, 0, -1); ok(hr == E_NOTIMPL, "got %#lx\n", hr); hr = IDirectMusicGraph_GetTool(graph, 0, &tmp_tool); @@ -1578,7 +1577,6 @@ static void test_performance_graph(void) IDirectMusicGraph_Release(graph); -skip_graph: /* performance doesn't have a default embedded toolgraph */ hr = IDirectMusicPerformance_GetGraph(performance, &graph); ok(hr == DMUS_E_NOT_FOUND, "got %#lx\n", hr); @@ -1604,8 +1602,7 @@ skip_graph: /* test IDirectMusicGraph_StampPMsg usage */ hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (hr != S_OK) goto skip_graph2; + ok(hr == S_OK, "got %#lx\n", hr); memset(&msg, 0, sizeof(msg)); hr = IDirectMusicGraph_StampPMsg(graph, &msg); @@ -1636,7 +1633,6 @@ skip_graph: IDirectMusicGraph_Release(graph); -skip_graph2: IDirectMusicPerformance_Release(performance); IDirectMusicTool_Release(tool); } @@ -1874,12 +1870,11 @@ static void test_performance_pmsg(void) msg->dwFlags = DMUS_PMSGF_REFTIME; msg->dwType = DMUS_PMSGT_USER; - graph = NULL; hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); + ok(hr == S_OK, "got %#lx\n", hr); + hr = IDirectMusicGraph_StampPMsg(graph, msg); todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (graph) hr = IDirectMusicGraph_StampPMsg(graph, msg); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (graph) IDirectMusicGraph_Release(graph); + IDirectMusicGraph_Release(graph); hr = IDirectMusicPerformance_SendPMsg(performance, msg); ok(hr == S_OK, "got %#lx\n", hr); @@ -1906,11 +1901,10 @@ static void test_performance_pmsg(void) msg->dwType = DMUS_PMSGT_USER; hr = IDirectMusicPerformance_QueryInterface(performance, &IID_IDirectMusicGraph, (void **)&graph); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - if (!graph) hr = S_OK; - else hr = IDirectMusicGraph_StampPMsg(graph, msg); ok(hr == S_OK, "got %#lx\n", hr); - if (graph) IDirectMusicGraph_Release(graph); + hr = IDirectMusicGraph_StampPMsg(graph, msg); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); + IDirectMusicGraph_Release(graph); msg->dwFlags &= ~(DMUS_PMSGF_TOOL_IMMEDIATE | DMUS_PMSGF_TOOL_QUEUE | DMUS_PMSGF_TOOL_ATTIME); msg->dwFlags |= delivery_flags[i]; diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4af91fc3130..5cb91a78387 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -627,7 +627,7 @@ static void test_performance_graph(void) ok(graph2 == NULL, "unexpected pointer.\n"); hr = IDirectMusicPerformance8_QueryInterface(perf, &IID_IDirectMusicGraph, (void**)&graph); - todo_wine ok(hr == S_OK, "Failed: %#lx\n", hr); + ok(hr == S_OK, "Failed: %#lx\n", hr); if (graph) IDirectMusicGraph_Release(graph);

1 0