July 2020 - Wine-commits - list.winehq.org

Brendan Shanks : winemac.drv: Fix warnings for constants deprecated by macOS 10.12.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 7aa2601f947a1f0c0e2ff00884898fc297230cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa2601f947a1f0c0e2ff008… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jul 23 10:34:35 2020 -0700 winemac.drv: Fix warnings for constants deprecated by macOS 10.12. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.h | 35 +++++++++++++++++ dlls/winemac.drv/cocoa_app.m | 50 +++++++++++++----------- dlls/winemac.drv/cocoa_event.m | 7 +++- dlls/winemac.drv/cocoa_opengl.m | 3 +- dlls/winemac.drv/cocoa_status_item.m | 6 ++- dlls/winemac.drv/cocoa_window.m | 76 ++++++++++++++++++------------------ 6 files changed, 111 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7aa2601f947a1f0c0e2f…

1 0

Gijs Vermeulen : wbemprox/tests: Fix test failures.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 850b289ce9b8b975786fb7d261ac74485296b0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=850b289ce9b8b975786fb7d2… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 17:33:10 2020 +0200 wbemprox/tests: Fix test failures. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index da47773da2..0fa091b739 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,8 +1144,10 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); IEnumWbemClassObject *result; IWbemClassObject *obj; - HRESULT hr; + CIMTYPE type; + VARIANT val; DWORD count; + HRESULT hr; hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); if (hr != S_OK) @@ -1154,21 +1156,39 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) return; } - hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - ok( hr == S_OK, "got %08x\n", hr ); - - if (count > 0) + for (;;) { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"BankLabel", VT_BSTR, CIM_STRING ); check_property( obj, L"Capacity", VT_BSTR, CIM_UINT64 ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceLocator", VT_BSTR, CIM_STRING ); check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); - check_property( obj, L"PartNumber", VT_NULL, CIM_STRING ); - check_property( obj, L"SerialNumber", VT_NULL, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "PartNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"SerialNumber", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "SerialNumber %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Gijs Vermeulen : wbemprox/tests: Add a test for Win32_PhysicalMemory.ConfiguredClockSpeed.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 25853da03e0d79348de280fd7621fe7ff8c8785d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25853da03e0d79348de280fd… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 17:33:11 2020 +0200 wbemprox/tests: Add a test for Win32_PhysicalMemory.ConfiguredClockSpeed. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0fa091b739..73740f18c8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1168,6 +1168,17 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) check_property( obj, L"FormFactor", VT_I4, CIM_UINT16 ); check_property( obj, L"MemoryType", VT_I4, CIM_UINT16 ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"ConfiguredClockSpeed", 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* < win10 */, "got %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "ConfiguredClockSpeed %u\n", V_I4( &val ) ); + } + type = 0xdeadbeef; VariantInit( &val ); hr = IWbemClassObject_Get( obj, L"PartNumber", 0, &val, &type, NULL );

1 0

Dmitry Timoshkov : ieframe: Implement IOleObject::GetUserClassID().
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: d998bc54ce3108f8c3726c31cf7673445b7ec3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d998bc54ce3108f8c3726c31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 27 15:28:18 2020 +0200 ieframe: Implement IOleObject::GetUserClassID(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 9 ++++++--- dlls/ieframe/tests/webbrowser.c | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 5c49845aa7..62faaae6bd 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -719,11 +719,14 @@ static HRESULT WINAPI OleObject_IsUpToDate(IOleObject *iface) return E_NOTIMPL; } -static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID* pClsid) +static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) { WebBrowser *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClsid); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClsid); + + *pClsid = This->version == 1 ? CLSID_WebBrowser_V1 : CLSID_WebBrowser; + return S_OK; } static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 95d5fc4988..3ec5921a32 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2227,7 +2227,7 @@ static void test_Persist(IWebBrowser2 *wb, int version) HRESULT hr; hr = IWebBrowser2_QueryInterface(wb, &IID_IPersist, (void **)&persist); - ok(hr == S_OK, "QueryInterface(IID_IPersist failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IID_IPersist) failed: %08x\n", hr); hr = IPersist_GetClassID(persist, &guid); ok(hr == S_OK, "GetClassID failed: %08x\n", hr); @@ -2239,6 +2239,25 @@ static void test_Persist(IWebBrowser2 *wb, int version) IPersist_Release(persist); } +static void test_OleObject(IWebBrowser2 *wb, int version) +{ + IOleObject *oleobj; + CLSID clsid; + HRESULT hr; + + hr = IWebBrowser2_QueryInterface(wb, &IID_IOleObject, (void **)&oleobj); + ok(hr == S_OK, "QueryInterface(IID_IOleObject) failed: %08x\n", hr); + + hr = IOleObject_GetUserClassID(oleobj, &clsid); + ok(hr == S_OK, "GetUserClassID failed: %08x\n", hr); + if (version == 1) + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser_V1), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + else + ok(IsEqualGUID(&clsid, &CLSID_WebBrowser), "got wrong CLSID: %s\n", wine_dbgstr_guid(&clsid)); + + IOleObject_Release(oleobj); +} + static void test_ie_funcs(IWebBrowser2 *wb) { IDispatch *disp; @@ -3761,6 +3780,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_Navigate2(webbrowser, L"about:blank"); test_QueryStatusWB(webbrowser, TRUE); test_Persist(webbrowser, 2); + test_OleObject(webbrowser, 2); if(do_download) { IHTMLDocument2 *doc, *doc2; @@ -3870,6 +3890,7 @@ static void test_WebBrowserV1(void) test_ClassInfo(wb); test_EnumVerbs(wb); test_Persist(wb, 1); + test_OleObject(wb, 1); ref = IWebBrowser2_Release(wb); ok(ref == 0, "ref=%d, expected 0\n", ref);

1 0

Louis Lenders : sc.exe: Fake succes for the SdSet argument.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: a22b295cc30d89e446038c4e677f8ea6fef159e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22b295cc30d89e446038c4e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jul 27 11:26:30 2020 +0200 sc.exe: Fake succes for the SdSet argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a78..c9744afee3 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("SdSet command not supported, faking success\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n");

1 0

Jacek Caban : wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 928fffee8dac4a9555bbbc141d9f29483422eee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=928fffee8dac4a9555bbbc14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 24 20:39:53 2020 +0200 wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index be6ddf2000..ad3cd25bf5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -212,6 +212,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) { + if (GetLastError() == ERROR_IO_INCOMPLETE) return; ERR( "failed to get renderer events: %u\n", GetLastError() ); data->dying = TRUE; return;

1 0

Jacek Caban : wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 29d5c6c476faa00529fe765150d014607da48f27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d5c6c476faa00529fe7651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 24 20:39:58 2020 +0200 wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index ad3cd25bf5..75bb878bfd 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -66,19 +66,12 @@ static void WINECON_Usage(void) */ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) { - SERVER_START_REQ( read_console_output ) - { - req->handle = wine_server_obj_handle( data->hConOut ); - req->x = 0; - req->y = upd_tp; - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->wrap = TRUE; - wine_server_set_reply( req, &data->cells[upd_tp * data->curcfg.sb_width], - (upd_bm-upd_tp+1) * data->curcfg.sb_width * sizeof(CHAR_INFO) ); - wine_server_call( req ); - } - SERVER_END_REQ; - data->fnRefresh(data, upd_tp, upd_bm); + SMALL_RECT region = { 0, upd_tp, data->curcfg.sb_width - 1, upd_bm }; + COORD size = { data->curcfg.sb_width, data->curcfg.sb_height }; + COORD coord = { 0, upd_tp }; + + if (ReadConsoleOutputW(data->hConOut, data->cells, size, coord, &region)) + data->fnRefresh(data, upd_tp, upd_bm); } /******************************************************************

1 0

Zebediah Figura : dsdmo: Add a stub waves reverb effect.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 2fea7e869c3d47d1c2ca910b9ee2a4bab68bb216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fea7e869c3d47d1c2ca910b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 24 19:20:20 2020 -0500 dsdmo: Add a stub waves reverb effect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 4 + dlls/dsdmo/dsdmo.idl | 27 +++ dlls/dsdmo/main.c | 429 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/dsdmo/tests/dsdmo.c | 42 +++-- 4 files changed, 462 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fea7e869c3d47d1c2ca…

1 0

Zebediah Figura : dsdmo: Stub IMediaObjectInPlace.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 2b9cbfd6269078e92691e2eb0f53a684b8dbbbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b9cbfd6269078e92691e2eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 24 19:20:21 2020 -0500 dsdmo: Stub IMediaObjectInPlace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 44915ca856..f3be97177a 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -33,6 +33,7 @@ static HINSTANCE dsdmo_instance; struct effect { IMediaObject IMediaObject_iface; + IMediaObjectInPlace IMediaObjectInPlace_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -61,6 +62,8 @@ static HRESULT WINAPI effect_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = iface; else if (IsEqualGUID(iid, &IID_IMediaObject)) *out = &effect->IMediaObject_iface; + else if (IsEqualGUID(iid, &IID_IMediaObjectInPlace)) + *out = &effect->IMediaObjectInPlace_iface; else if (!(*out = effect->ops->query_interface(effect, iid))) { WARN("%s not implemented; returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -282,12 +285,66 @@ static const IMediaObjectVtbl effect_vtbl = effect_Lock, }; +static struct effect *impl_from_IMediaObjectInPlace(IMediaObjectInPlace *iface) +{ + return CONTAINING_RECORD(iface, struct effect, IMediaObjectInPlace_iface); +} + +static HRESULT WINAPI effect_inplace_QueryInterface(IMediaObjectInPlace *iface, REFIID iid, void **out) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_QueryInterface(effect->outer_unk, iid, out); +} + +static ULONG WINAPI effect_inplace_AddRef(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_AddRef(effect->outer_unk); +} + +static ULONG WINAPI effect_inplace_Release(IMediaObjectInPlace *iface) +{ + struct effect *effect = impl_from_IMediaObjectInPlace(iface); + return IUnknown_Release(effect->outer_unk); +} + +static HRESULT WINAPI effect_inplace_Process(IMediaObjectInPlace *iface, ULONG size, + BYTE *data, REFERENCE_TIME start, DWORD flags) +{ + FIXME("iface %p, size %u, data %p, start %s, flags %#x, stub!\n", + iface, size, data, wine_dbgstr_longlong(start), flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_Clone(IMediaObjectInPlace *iface, IMediaObjectInPlace **out) +{ + FIXME("iface %p, out %p, stub!\n", iface, out); + return E_NOTIMPL; +} + +static HRESULT WINAPI effect_inplace_GetLatency(IMediaObjectInPlace *iface, REFERENCE_TIME *latency) +{ + FIXME("iface %p, latency %p, stub!\n", iface, latency); + return E_NOTIMPL; +} + +static const IMediaObjectInPlaceVtbl effect_inplace_vtbl = +{ + effect_inplace_QueryInterface, + effect_inplace_AddRef, + effect_inplace_Release, + effect_inplace_Process, + effect_inplace_Clone, + effect_inplace_GetLatency, +}; + static void effect_init(struct effect *effect, IUnknown *outer, const struct effect_ops *ops) { effect->outer_unk = outer ? outer : &effect->IUnknown_inner; effect->refcount = 1; effect->IUnknown_inner.lpVtbl = &effect_inner_vtbl; effect->IMediaObject_iface.lpVtbl = &effect_vtbl; + effect->IMediaObjectInPlace_iface.lpVtbl = &effect_inplace_vtbl; effect->ops = ops; }

1 0

Zebediah Figura : dsdmo: Stub IDirectSoundFXWavesReverb.
by Alexandre Julliard 27 Jul '20

27 Jul '20

Module: wine Branch: master Commit: 0cf9b5949e176572332e43596f05268896837660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cf9b5949e176572332e4359… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 24 19:20:22 2020 -0500 dsdmo: Stub IDirectSoundFXWavesReverb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index f3be97177a..cc06dfe6f5 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -352,6 +352,57 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff struct waves_reverb { struct effect effect; + IDirectSoundFXWavesReverb IDirectSoundFXWavesReverb_iface; +}; + +static struct waves_reverb *impl_from_IDirectSoundFXWavesReverb(IDirectSoundFXWavesReverb *iface) +{ + return CONTAINING_RECORD(iface, struct waves_reverb, IDirectSoundFXWavesReverb_iface); +} + +static HRESULT WINAPI waves_reverb_params_QueryInterface(IDirectSoundFXWavesReverb *iface, REFIID iid, void **out) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI waves_reverb_params_AddRef(IDirectSoundFXWavesReverb *iface) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI waves_reverb_params_Release(IDirectSoundFXWavesReverb *iface) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI waves_reverb_params_SetAllParameters(IDirectSoundFXWavesReverb *iface, const DSFXWavesReverb *params) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI waves_reverb_params_GetAllParameters(IDirectSoundFXWavesReverb *iface, DSFXWavesReverb *params) +{ + struct waves_reverb *effect = impl_from_IDirectSoundFXWavesReverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static const IDirectSoundFXWavesReverbVtbl waves_reverb_params_vtbl = +{ + waves_reverb_params_QueryInterface, + waves_reverb_params_AddRef, + waves_reverb_params_Release, + waves_reverb_params_SetAllParameters, + waves_reverb_params_GetAllParameters, }; static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) @@ -361,6 +412,10 @@ static struct waves_reverb *impl_waves_reverb_from_effect(struct effect *iface) static void *waves_reverb_query_interface(struct effect *iface, REFIID iid) { + struct waves_reverb *effect = impl_waves_reverb_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXWavesReverb)) + return &effect->IDirectSoundFXWavesReverb_iface; return NULL; } @@ -385,6 +440,7 @@ static HRESULT waves_reverb_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; effect_init(&object->effect, outer, &waves_reverb_ops); + object->IDirectSoundFXWavesReverb_iface.lpVtbl = &waves_reverb_params_vtbl; TRACE("Created waves reverb effect %p.\n", object); *out = &object->effect.IUnknown_inner; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index f236c95d43..cb6e698b6e 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -514,7 +514,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, - {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb, TRUE}, + {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, }; unsigned int i;

1 0