wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Matteo Bruni : dxgi: Add feature level support.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: ffce30bc317f743cf07867201769541fa0550f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffce30bc317f743cf07867201… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:19 2016 +0100 dxgi: Add feature level support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 17 ++++++++-- dlls/d3d11/d3d11_private.h | 4 ++- dlls/dxgi/adapter.c | 3 +- dlls/dxgi/device.c | 11 +++++-- dlls/dxgi/dxgi.spec | 2 +- dlls/dxgi/dxgi_main.c | 10 +++--- dlls/dxgi/dxgi_private.h | 8 +++-- dlls/dxgi/utils.c | 77 ++++++++++++++++++++++++++++++++++++++++------ 8 files changed, 109 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffce30bc317f743cf0786…

1 0

Huw Davies : riched20: Set the base embedding level for RTL paragraphs.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a2c57a2a8aafb9211323a4b4a40d5e9d6af53f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c57a2a8aafb9211323a4b4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 11:59:42 2016 +0000 riched20: Set the base embedding level for RTL paragraphs. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e8575fdb..49a62ce 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -746,6 +746,11 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) assert( p->type == diParagraph ); + if (para->pFmt->dwMask & PFM_RTLPARA && para->pFmt->wEffects & PFE_RTLPARA) + state.uBidiLevel = 1; + + TRACE( "Base embedding level %d\n", state.uBidiLevel ); + while (1) { hr = ScriptItemize( para->text->szData, para->text->nLen, items_passed, &control,

1 0

Huw Davies : riched20: \pard resets the reading direction.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: ac5edd1b6bc6da1a9333be75169863cd36ea4522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac5edd1b6bc6da1a9333be751… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 11:59:41 2016 +0000 riched20: \pard resets the reading direction. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 ++- dlls/riched20/tests/editor.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b87dfc..7ac94ca 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -553,7 +553,7 @@ void ME_RTFParAttrHook(RTF_Info *info) info->borderType = RTFBorderParaTop; info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | - PFM_STARTINDENT; + PFM_STARTINDENT | PFM_RTLPARA; /* TODO: numbering, shading */ info->fmt.wAlignment = PFA_LEFT; info->fmt.cTabCount = 0; @@ -563,6 +563,7 @@ void ME_RTFParAttrHook(RTF_Info *info) info->fmt.bLineSpacingRule = 0; info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0; info->fmt.dyLineSpacing = 0; + info->fmt.wEffects &= ~PFE_RTLPARA; if (!info->editor->bEmulateVersion10) /* v4.1 */ { if (info->tableDef && info->tableDef->tableRowStart && diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 18d080c..c6444ff 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8284,10 +8284,12 @@ static void test_rtf_specials(void) "\\rquote\\ldblquote\\rdblquote\\ltrmark\\rtlmark\\zwj\\zwnj}"; const WCHAR expect_specials[] = {' ',' ',0x2022,0x2018,0x2019,0x201c, 0x201d,0x200e,0x200f,0x200d,0x200c}; + const char *pard = "{\\rtf1 ABC\\rtlpar\\par DEF\\par HIJ\\pard\\par}"; HWND edit = new_richeditW( NULL ); EDITSTREAM es; WCHAR buf[80]; LRESULT result; + PARAFORMAT2 fmt; es.dwCookie = (DWORD_PTR)&specials; es.dwError = 0; @@ -8299,6 +8301,26 @@ static void test_rtf_specials(void) ok( result == sizeof(expect_specials)/sizeof(expect_specials[0]), "got %ld\n", result ); ok( !memcmp( buf, expect_specials, sizeof(expect_specials) ), "got %s\n", wine_dbgstr_w(buf) ); + /* Show that \rtlpar propagates to the second paragraph and is + reset by \pard in the third. */ + es.dwCookie = (DWORD_PTR)&pard; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == 11, "got %ld\n", result ); + + fmt.cbSize = sizeof(fmt); + SendMessageW( edit, EM_SETSEL, 1, 1 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 5, 5 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( fmt.wEffects & PFE_RTLPARA, "rtl para not set\n" ); + SendMessageW( edit, EM_SETSEL, 9, 9 ); + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.dwMask & PFM_RTLPARA, "rtl para mask not set\n" ); + ok( !(fmt.wEffects & PFE_RTLPARA), "rtl para set\n" ); + DestroyWindow( edit ); }

1 0

Nikolay Sivov : ole32: Implement IComThreadingInfo:: GetCurrentLogicalThreadId().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 5b7c9ecd09a4dadf45011b32b6846f44cb9e92fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7c9ecd09a4dadf45011b32b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:51:34 2016 +0300 ole32: Implement IComThreadingInfo::GetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++-- dlls/ole32/tests/compobj.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 91f11f6..a7fe650 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4739,8 +4739,8 @@ static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, static HRESULT WINAPI Context_CTI_GetCurrentLogicalThreadId(IComThreadingInfo *iface, GUID *logical_thread_id) { - FIXME("(%p): stub\n", logical_thread_id); - return E_NOTIMPL; + TRACE("(%p)\n", logical_thread_id); + return CoGetCurrentLogicalThreadId(logical_thread_id); } static HRESULT WINAPI Context_CTI_SetCurrentLogicalThreadId(IComThreadingInfo *iface, REFGUID logical_thread_id) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 0f562a2..d684e33 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1782,6 +1782,7 @@ static void test_CoGetObjectContext(void) struct info info; HANDLE thread; DWORD tid, exitcode; + GUID id, id2; if (!pCoGetObjectContext) { @@ -1810,6 +1811,17 @@ static void test_CoGetObjectContext(void) pComThreadingInfo = NULL; hr = pCoGetObjectContext(&IID_IComThreadingInfo, (void **)&pComThreadingInfo); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); + + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = id2 = GUID_NULL; + hr = IComThreadingInfo_GetCurrentLogicalThreadId(pComThreadingInfo, &id); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoGetCurrentLogicalThreadId(&id2); + ok(IsEqualGUID(&id, &id2), "got %s, expected %s\n", wine_dbgstr_guid(&id), wine_dbgstr_guid(&id2)); + IComThreadingInfo_Release(pComThreadingInfo); SetEvent(info.stop);

1 0

Nikolay Sivov : ole32: Implement CoGetCurrentLogicalThreadId().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 1105acd26a822b3b82f5c4ff550438cbe1da84ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1105acd26a822b3b82f5c4ff5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:51:33 2016 +0300 ole32: Implement CoGetCurrentLogicalThreadId(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 14 ++++++++++++++ dlls/ole32/ole2stubs.c | 9 --------- dlls/ole32/tests/compobj.c | 15 +++++++++++++++ include/objbase.h | 1 + 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index de7438c..91f11f6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3850,6 +3850,20 @@ DWORD WINAPI CoGetCurrentProcess(void) return GetCurrentProcessId(); } +/*********************************************************************** + * CoGetCurrentLogicalThreadId [OLE32.@] + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id) +{ + TRACE("(%p)\n", id); + + if (!id) + return E_INVALIDARG; + + *id = COM_CurrentCausalityId(); + return S_OK; +} + /****************************************************************************** * CoRegisterMessageFilter [OLE32.@] * diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 1f8b9f8..90862d0 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -83,12 +83,3 @@ HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) FIXME("stub!\n"); return E_NOTIMPL; } - -/*********************************************************************** - * CoGetCurrentLogicalThreadId [OLE32.@] - */ -HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *pguid) -{ - FIXME(": stub\n"); - return E_NOTIMPL; -} diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 183d8a0..0f562a2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3093,6 +3093,20 @@ static void test_IMallocSpy(void) ok(hr == CO_E_OBJNOTREG, "got 0x%08x\n", hr); } +static void test_CoGetCurrentLogicalThreadId(void) +{ + HRESULT hr; + GUID id; + + hr = CoGetCurrentLogicalThreadId(NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + id = GUID_NULL; + hr = CoGetCurrentLogicalThreadId(&id); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!IsEqualGUID(&id, &GUID_NULL), "got null id\n"); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -3161,4 +3175,5 @@ START_TEST(compobj) test_OleRegGetUserType(); test_CoGetApartmentType(); test_IMallocSpy(); + test_CoGetCurrentLogicalThreadId(); } diff --git a/include/objbase.h b/include/objbase.h index 02656d1..43f3357 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -285,6 +285,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved); HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit); void WINAPI CoUninitialize(void); DWORD WINAPI CoGetCurrentProcess(void); +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *id); HRESULT WINAPI CoGetApartmentType(APTTYPE *type, APTTYPEQUALIFIER *qualifier); HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree);

1 0

Nikolay Sivov : avifil32: Use matching buffer length for dest string ( Coverity).
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 94c1c8e504edb82cd112c71fc6427991713685c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c1c8e504edb82cd112c71fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 12:26:57 2016 +0300 avifil32: Use matching buffer length for dest string (Coverity). Reported issue is about potential overflow when copying to fixed size buffer from larger source buffer Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 7232450..0715d58 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1036,14 +1036,16 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) return AVIERR_ERROR; } for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == ERROR_SUCCESS;n++) { + WCHAR clsidW[40]; + /* get CLSID to extension */ - size = sizeof(szValue); - if (RegQueryValueW(hKey, szFileExt, szValue, &size) != ERROR_SUCCESS) + size = sizeof(clsidW); + if (RegQueryValueW(hKey, szFileExt, clsidW, &size) != ERROR_SUCCESS) break; /* search if the CLSID is already known */ for (i = 1; i <= count; i++) { - if (lstrcmpW(lp[i].szClsid, szValue) == 0) + if (lstrcmpW(lp[i].szClsid, clsidW) == 0) break; /* a new one */ } @@ -1058,7 +1060,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) break; } - lstrcpyW(lp[i].szClsid, szValue); + lstrcpyW(lp[i].szClsid, clsidW); count++; }

1 0

Nikolay Sivov : ole32/tests: A test to show data cache QI problems.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a411ef99fcee102dfb1a5426af2f9f6697643a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a411ef99fcee102dfb1a5426a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 10:33:31 2016 +0300 ole32/tests: A test to show data cache QI problems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 2167f66..d58105c 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1505,13 +1505,11 @@ static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Unknown_AddRef(IUnknown *iface) { - ok(0, "unexpected AddRef\n"); return 2; } static ULONG WINAPI Unknown_Release(IUnknown *iface) { - ok(0, "unexpected Release\n"); return 1; } @@ -1528,7 +1526,9 @@ static void test_data_cache(void) { HRESULT hr; IOleCache2 *pOleCache; + IOleCache *olecache; IStorage *pStorage; + IUnknown *unk; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1601,9 +1601,32 @@ static void test_data_cache(void) todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk != (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); + IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); + + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); +} IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); /* Test with new data */

1 0

Hans Leidekker : webservices: Keep track of prefix bindings.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: cceb19d0b2026c602ba16361581fafd34bd723ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cceb19d0b2026c602ba163615… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 9 14:16:32 2016 +0100 webservices: Keep track of prefix bindings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 139 ++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 128 +++++++++++++++++++++++++++++- dlls/webservices/webservices_private.h | 5 ++ 3 files changed, 257 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cceb19d0b2026c602ba16…

1 0

Andrew Eikum : mmdevapi: Implement Set/GetMute.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 620cfe7e79c3bbe7c85bf93b3eeb52d357534ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620cfe7e79c3bbe7c85bf93b3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:28 2016 -0600 mmdevapi: Implement Set/GetMute. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 21 +++++++++++++++++---- dlls/mmdevapi/tests/render.c | 7 +++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 742823c..76f9f4e 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -44,6 +44,7 @@ typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; float master_vol; + BOOL mute; } AEVImpl; static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx *iface) @@ -197,18 +198,30 @@ static HRESULT WINAPI AEV_GetChannelVolumeLevelScalar(IAudioEndpointVolumeEx *if static HRESULT WINAPI AEV_SetMute(IAudioEndpointVolumeEx *iface, BOOL mute, const GUID *ctx) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + HRESULT ret; + TRACE("(%p)->(%u,%s)\n", iface, mute, debugstr_guid(ctx)); - FIXME("stub\n"); - return E_NOTIMPL; + + ret = This->mute == mute ? S_FALSE : S_OK; + + This->mute = mute; + + return ret; } static HRESULT WINAPI AEV_GetMute(IAudioEndpointVolumeEx *iface, BOOL *mute) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%p)\n", iface, mute); + if (!mute) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mute = This->mute; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeStepInfo(IAudioEndpointVolumeEx *iface, UINT *stepsize, UINT *stepcount) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1e8a5f1..9d2853c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2248,6 +2248,7 @@ static void test_endpointvolume(void) HRESULT hr; IAudioEndpointVolume *aev; float mindb, maxdb, increment, volume; + BOOL mute; hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); @@ -2271,6 +2272,12 @@ static void test_endpointvolume(void) hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + hr = IAudioEndpointVolume_GetMute(aev, &mute); + ok(hr == S_OK, "GetMute failed: %08x\n", hr); + + hr = IAudioEndpointVolume_SetMute(aev, mute, NULL); + ok(hr == S_OK || hr == S_FALSE, "SetMute failed: %08x\n", hr); + IAudioEndpointVolume_Release(aev); }

1 0

Andrew Eikum : mmdevapi: Implement Set/GetMasterVolumeLevel.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 982d005da56c5c6f771987c6f724018daa5735ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=982d005da56c5c6f771987c6f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:25 2016 -0600 mmdevapi: Implement Set/GetMasterVolumeLevel. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 21 +++++++++++++++++---- dlls/mmdevapi/tests/render.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index a49d2e9..742823c 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); typedef struct AEVImpl { IAudioEndpointVolumeEx IAudioEndpointVolumeEx_iface; LONG ref; + float master_vol; } AEVImpl; static inline AEVImpl *impl_from_IAudioEndpointVolumeEx(IAudioEndpointVolumeEx *iface) @@ -120,9 +121,16 @@ static HRESULT WINAPI AEV_GetChannelCount(IAudioEndpointVolumeEx *iface, UINT *c static HRESULT WINAPI AEV_SetMasterVolumeLevel(IAudioEndpointVolumeEx *iface, float leveldb, const GUID *ctx) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%f,%s)\n", iface, leveldb, debugstr_guid(ctx)); - FIXME("stub\n"); - return E_NOTIMPL; + + if(leveldb < -100.f || leveldb > 0.f) + return E_INVALIDARG; + + This->master_vol = leveldb; + + return S_OK; } static HRESULT WINAPI AEV_SetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *iface, float level, const GUID *ctx) @@ -134,11 +142,16 @@ static HRESULT WINAPI AEV_SetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *ifa static HRESULT WINAPI AEV_GetMasterVolumeLevel(IAudioEndpointVolumeEx *iface, float *leveldb) { + AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); + TRACE("(%p)->(%p)\n", iface, leveldb); + if (!leveldb) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *leveldb = This->master_vol; + + return S_OK; } static HRESULT WINAPI AEV_GetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *iface, float *level) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1476adc..1e8a5f1 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2247,7 +2247,7 @@ static void test_endpointvolume(void) { HRESULT hr; IAudioEndpointVolume *aev; - float mindb, maxdb, increment; + float mindb, maxdb, increment, volume; hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, CLSCTX_INPROC_SERVER, NULL, (void**)&aev); @@ -2262,6 +2262,15 @@ static void test_endpointvolume(void) ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, mindb - increment, NULL); + ok(hr == E_INVALIDARG, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetMasterVolumeLevel(aev, &volume); + ok(hr == S_OK, "GetMasterVolumeLevel failed: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_SetMasterVolumeLevel(aev, volume, NULL); + ok(hr == S_OK, "SetMasterVolumeLevel failed: 0x%08x\n", hr); + IAudioEndpointVolume_Release(aev); }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
73
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 March 2016