May 2023 - Wine-commits - list.winehq.org

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_Caption().
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: bf461e64072277391e166dc2a5d88ee63a36add2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf461e64072277391e166dc2a5d88e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:02:19 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_Caption(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 5 +++++ dlls/quartz/tests/vmr7.c | 5 +++++ dlls/quartz/tests/vmr9.c | 5 +++++ dlls/quartz/window.c | 3 +++ 4 files changed, 18 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 29a6d51be7c..903f173386b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2379,6 +2379,11 @@ static void test_video_window(void) hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + caption = SysAllocString(L"foo"); + hr = IVideoWindow_put_Caption(window, caption); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + SysFreeString(caption); + hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1f1b99a178c..5019d1b610c 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2378,6 +2378,11 @@ static void test_video_window(void) hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + caption = SysAllocString(L"foo"); + hr = IVideoWindow_put_Caption(window, caption); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + SysFreeString(caption); + hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d93802485ac..838ba812299 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2604,6 +2604,11 @@ static void test_video_window(void) hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + caption = SysAllocString(L"foo"); + hr = IVideoWindow_put_Caption(window, caption); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + SysFreeString(caption); + hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 1fdbd5f9428..3f8d862fccd 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -194,6 +194,9 @@ HRESULT WINAPI BaseControlWindowImpl_put_Caption(IVideoWindow *iface, BSTR capti TRACE("window %p, caption %s.\n", window, debugstr_w(caption)); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; + if (!SetWindowTextW(window->hwnd, caption)) return E_FAIL;

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_WindowStyle().
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 9b47d3c54358d21f994399e66caf434f6e24ac04 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b47d3c54358d21f994399e66caf43… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:03:44 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_WindowStyle(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 2 ++ 4 files changed, 11 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 903f173386b..f386d0e3edf 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2387,6 +2387,9 @@ static void test_video_window(void) hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_WindowStyle(window, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 5019d1b610c..7240e51b1d9 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2386,6 +2386,9 @@ static void test_video_window(void) hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_WindowStyle(window, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 838ba812299..8249857ff60 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2612,6 +2612,9 @@ static void test_video_window(void) hr = IVideoWindow_get_WindowStyle(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_WindowStyle(window, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 3f8d862fccd..f7242ecff58 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -231,6 +231,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG s if (style & (WS_DISABLED|WS_HSCROLL|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; SetWindowLongW(window->hwnd, GWL_STYLE, style); SetWindowPos(window->hwnd, 0, 0, 0, 0, 0,

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_AutoShow().
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 233f86abf4e19f0f2550f9906b783059db0da163 URL: https://gitlab.winehq.org/wine/wine/-/commit/233f86abf4e19f0f2550f9906b7830… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:05:05 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_AutoShow(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 9 ++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f386d0e3edf..7771c467a13 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2393,6 +2393,9 @@ static void test_video_window(void) hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_AutoShow(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 7240e51b1d9..cbab6eb077d 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2392,6 +2392,9 @@ static void test_video_window(void) hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_AutoShow(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 8249857ff60..9c5ec2129a3 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2618,6 +2618,9 @@ static void test_video_window(void) hr = IVideoWindow_get_AutoShow(window, &l); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_AutoShow(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index f7242ecff58..617d45b74e0 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -273,11 +273,14 @@ HRESULT WINAPI BaseControlWindowImpl_get_WindowStyleEx(IVideoWindow *iface, LONG HRESULT WINAPI BaseControlWindowImpl_put_AutoShow(IVideoWindow *iface, LONG AutoShow) { - struct video_window *This = impl_from_IVideoWindow(iface); + struct video_window *window = impl_from_IVideoWindow(iface); + + TRACE("window %p, AutoShow %ld.\n", window, AutoShow); - TRACE("window %p, AutoShow %ld.\n", This, AutoShow); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; - This->AutoShow = AutoShow; + window->AutoShow = AutoShow; return S_OK; }

1 0

Connor McAdams : combase: Check that process ID matches before searching the MTA for a stub manager.
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 8d11327ecfc515f8156ae6d19c3c86627c0a2411 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d11327ecfc515f8156ae6d19c3c86… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri May 5 14:20:13 2023 -0400 combase: Check that process ID matches before searching the MTA for a stub manager. Now that MTA objects across processes share a value of 0 in the Data2 field of the stub manager IPID, make sure that we only search the MTA for stub managers that reside in the current process. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/combase/stubmanager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/combase/stubmanager.c b/dlls/combase/stubmanager.c index 5bb87c60c1d..ff8937d7bd7 100644 --- a/dlls/combase/stubmanager.c +++ b/dlls/combase/stubmanager.c @@ -499,13 +499,13 @@ static HRESULT ipid_to_ifstub(const IPID *ipid, struct apartment **stub_apt, /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) *stub_apt = apartment_findfromoxid(*(const OXID *)ipid->Data4); - else if (!ipid->Data2) + else if (!ipid->Data2 && (ipid->Data3 == (USHORT)GetCurrentProcessId())) *stub_apt = apartment_get_mta(); else *stub_apt = apartment_findfromtid(ipid->Data2); if (!*stub_apt) { - TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2); + TRACE("Couldn't find apartment corresponding to TID 0x%04x, PID 0x%04x\n", ipid->Data2, ipid->Data3); return RPC_E_INVALID_OBJECT; } *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub);

1 0

Sven Baars : mscoree/tests: Remove the parent argument from create_new_dir() (Coverity).
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 1b36e9b2fa01bd6f1d82e7d7bc1ffb170f95cade URL: https://gitlab.winehq.org/wine/wine/-/commit/1b36e9b2fa01bd6f1d82e7d7bc1ffb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 7 14:23:49 2023 +0200 mscoree/tests: Remove the parent argument from create_new_dir() (Coverity). --- dlls/mscoree/tests/mscoree.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index adac72e5f4c..bfcbc78db55 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -592,18 +592,14 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty return ret; } -static BOOL create_new_dir(WCHAR newdir[MAX_PATH], const WCHAR* parent, - const WCHAR* prefix) +static BOOL create_new_dir(WCHAR newdir[MAX_PATH], const WCHAR* prefix) { WCHAR path[MAX_PATH]; BOOL try_tmpdir = TRUE; static unsigned i = 0; - if (!parent) - { - GetCurrentDirectoryW(ARRAY_SIZE(path), path); - parent = path; - } + GetCurrentDirectoryW(ARRAY_SIZE(path), path); + while (1) { swprintf(newdir, MAX_PATH, L"%s\\%s%04d", path, prefix, i); @@ -617,7 +613,6 @@ static BOOL create_new_dir(WCHAR newdir[MAX_PATH], const WCHAR* parent, try_tmpdir = FALSE; GetTempPathW(ARRAY_SIZE(path), path); path[wcslen(path) - 1] = 0; /* redundant trailing backslash */ - parent = path; break; case ERROR_ALREADY_EXISTS: i++; @@ -638,7 +633,7 @@ static void test_loadpaths_execute(const WCHAR *exe_name, const WCHAR *dll_name, DWORD exit_code = 0xdeadbeef; BOOL ret; - ok(create_new_dir(tmpdir, NULL, L"loadpaths"), + ok(create_new_dir(tmpdir, L"loadpaths"), "failed to create a new dir %lu\n", GetLastError()); end = tmpdir + wcslen(tmpdir);

1 0

Sven Baars : ddraw: Set the texture height in SetSurfaceDesc() (Coverity).
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: d26e0b880cabfad0aa9f6b3e55a587763f3d165e URL: https://gitlab.winehq.org/wine/wine/-/commit/d26e0b880cabfad0aa9f6b3e55a587… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun May 7 11:39:30 2023 +0200 ddraw: Set the texture height in SetSurfaceDesc() (Coverity). --- dlls/ddraw/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 52ca900441c..d28ed240a05 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4845,7 +4845,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_resource_get_desc(wined3d_texture_get_resource(old_texture), &wined3d_desc); wined3d_desc.width = width; - wined3d_desc.width = height; + wined3d_desc.height = height; wined3d_desc.format = format_id; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, 1, 1, @@ -4870,7 +4870,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, wined3d_resource_get_desc(wined3d_texture_get_resource(old_draw_texture), &wined3d_desc); wined3d_desc.width = width; - wined3d_desc.width = height; + wined3d_desc.height = height; wined3d_desc.format = format_id; if (FAILED(hr = wined3d_texture_create(ddraw->wined3d_device, &wined3d_desc, 1, 1,

1 0

Nikolay Sivov : mfplat: Implement MFCreatePathFromURL().
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 32cec5e6282edf0496ef0e6bb231fdc125df283f URL: https://gitlab.winehq.org/wine/wine/-/commit/32cec5e6282edf0496ef0e6bb231fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 8 14:38:43 2023 +0200 mfplat: Implement MFCreatePathFromURL(). --- dlls/mfplat/main.c | 25 +++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e1315de125a..7027b4f9516 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -9464,3 +9464,28 @@ LONGLONG WINAPI MFllMulDiv(LONGLONG val, LONGLONG num, LONGLONG denom, LONGLONG return sign ? -(LONGLONG)ret : ret; #undef LLOVERFLOW } + +/*********************************************************************** + * MFCreatePathFromURL (mfplat.@) + */ +HRESULT WINAPI MFCreatePathFromURL(const WCHAR *url, WCHAR **ret_path) +{ + WCHAR path[MAX_PATH]; + DWORD length; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_w(url), ret_path); + + if (!url || !ret_path) + return E_POINTER; + + length = ARRAY_SIZE(path); + if (FAILED(hr = PathCreateFromUrlW(url, path, &length, 0))) + return hr; + + if (!(*ret_path = CoTaskMemAlloc((length + 1) * sizeof(*path)))) + return E_OUTOFMEMORY; + + memcpy(*ret_path, path, (length + 1) * sizeof(*path)); + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index d9c8136cdd6..2f18d6380d6 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -62,7 +62,7 @@ @ stub MFCreateMediaTypeFromRepresentation @ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream -@ stub MFCreatePathFromURL +@ stdcall MFCreatePathFromURL(wstr ptr) @ stdcall MFCreatePresentationDescriptor(long ptr ptr) @ stdcall MFCreateSample(ptr) @ stub MFCreateSocket diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c5026ce2cf1..ded95ec1d5a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -397,6 +397,7 @@ static HRESULT (WINAPI *pMFCreate2DMediaBuffer)(DWORD width, DWORD height, DWORD IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateMediaBufferFromMediaType)(IMFMediaType *media_type, LONGLONG duration, DWORD min_length, DWORD min_alignment, IMFMediaBuffer **buffer); +static HRESULT (WINAPI *pMFCreatePathFromURL)(const WCHAR *url, WCHAR **path); static HRESULT (WINAPI *pMFCreateDXSurfaceBuffer)(REFIID riid, IUnknown *surface, BOOL bottom_up, IMFMediaBuffer **buffer); static HRESULT (WINAPI *pMFCreateTrackedSample)(IMFTrackedSample **sample); static DWORD (WINAPI *pMFMapDXGIFormatToDX9Format)(DXGI_FORMAT dxgi_format); @@ -1277,6 +1278,7 @@ static void init_functions(void) X(MFCreateSourceResolver); X(MFCreateMediaBufferFromMediaType); X(MFCreateMFByteStreamOnStream); + X(MFCreatePathFromURL); X(MFCreateTrackedSample); X(MFCreateTransformActivate); X(MFCreateVideoMediaTypeFromSubtype); @@ -9123,6 +9125,131 @@ static void test_MFInitMediaTypeFromAMMediaType(void) IMFMediaType_Release(media_type); } +static void test_MFCreatePathFromURL(void) +{ + static const struct + { + const WCHAR *url; + const WCHAR *path; + HRESULT hr; + } + tests[] = + { + /* 0 leading slash */ + { L"file:c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:cx|/foo/bar", L"cx|\\foo\\bar" }, + { L"file:c:foo/bar", L"c:foo\\bar" }, + { L"file:c|foo/bar", L"c:foo\\bar" }, + { L"file:c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:foo%20ba%2fr", L"foo ba/r" }, + { L"file:foo/bar/", L"foo\\bar\\" }, + + /* 1 leading (back)slash */ + { L"file:/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:/c|/foo/bar", L"c:\\foo\\bar" }, + { L"file:/cx|/foo/bar", L"\\cx|\\foo\\bar" }, + { L"file:/c:foo/bar", L"c:foo\\bar" }, + { L"file:/c|foo/bar", L"c:foo\\bar" }, + { L"file:/c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:/foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:/foo/bar/", L"\\foo\\bar\\" }, + + /* 2 leading (back)slashes */ + { L"file://c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://c:/d:/foo/bar", L"c:\\d:\\foo\\bar" }, + { L"file://c|/d|/foo/bar", L"c:\\d|\\foo\\bar" }, + { L"file://cx|/foo/bar", L"\\\\cx|\\foo\\bar" }, + { L"file://c:foo/bar", L"c:foo\\bar" }, + { L"file://c|foo/bar", L"c:foo\\bar" }, + { L"file://c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file://c%3a/foo/../bar", L"\\\\c:\\foo\\..\\bar" }, + { L"file://c%7c/foo/../bar", L"\\\\c|\\foo\\..\\bar" }, + { L"file://foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://localhost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file://localhost/c:/foo%20ba%5Cr", L"c:\\foo ba\\r" }, + { L"file://LocalHost/c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:\\\\localhost\\c:\\foo\\bar", L"c:\\foo\\bar" }, + { L"file://incomplete", L"\\\\incomplete" }, + + /* 3 leading (back)slashes (omitting hostname) */ + { L"file:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"File:///c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:///c:/foo%20ba%2fr", L"c:\\foo ba/r" }, + { L"file:///foo%20ba%2fr", L"\\foo ba/r" }, + { L"file:///foo/bar/", L"\\foo\\bar\\" }, + { L"file:///localhost/c:/foo/bar", L"\\localhost\\c:\\foo\\bar" }, + + /* 4 leading (back)slashes */ + { L"file:////c:/foo/bar", L"c:\\foo\\bar" }, + { L"file:////c:/foo%20ba%2fr", L"c:\\foo%20ba%2fr" }, + { L"file:////foo%20ba%2fr", L"\\\\foo%20ba%2fr" }, + + /* 5 and more leading (back)slashes */ + { L"file://///c:/foo/bar", L"\\\\c:\\foo\\bar" }, + { L"file://///c:/foo%20ba%2fr", L"\\\\c:\\foo ba/r" }, + { L"file://///foo%20ba%2fr", L"\\\\foo ba/r" }, + { L"file://////c:/foo/bar", L"\\\\c:\\foo\\bar" }, + + /* Leading (back)slashes cannot be escaped */ + { L"file:%2f%2flocalhost%2fc:/foo/bar", L"//localhost/c:\\foo\\bar" }, + { L"file:%5C%5Clocalhost%5Cc:/foo/bar", L"\\\\localhost\\c:\\foo\\bar" }, + + /* Hostname handling */ + { L"file://l%6fcalhost/c:/foo/bar", L"\\\\localhostc:\\foo\\bar" }, + { L"file://localhost:80/c:/foo/bar", L"\\\\localhost:80c:\\foo\\bar" }, + { L"file://host/c:/foo/bar", L"\\\\hostc:\\foo\\bar" }, + { L"file://host//c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/\\c:/foo/bar", L"\\\\host\\\\c:\\foo\\bar" }, + { L"file://host/c:foo/bar", L"\\\\hostc:foo\\bar" }, + { L"file://host/foo/bar", L"\\\\host\\foo\\bar" }, + { L"file:\\\\host\\c:\\foo\\bar", L"\\\\hostc:\\foo\\bar" }, + { L"file:\\\\host\\ca\\foo\\bar", L"\\\\host\\ca\\foo\\bar" }, + { L"file:\\\\host\\c|\\foo\\bar", L"\\\\hostc|\\foo\\bar" }, + { L"file:\\%5Chost\\c:\\foo\\bar", L"\\\\host\\c:\\foo\\bar" }, + { L"file:\\\\host\\cx:\\foo\\bar", L"\\\\host\\cx:\\foo\\bar" }, + { L"file:///host/c:/foo/bar", L"\\host\\c:\\foo\\bar" }, + + /* Not file URLs */ + { L"c:\\foo\\bar", NULL, E_INVALIDARG }, + { L"foo/bar", NULL, E_INVALIDARG }, + { L"http://foo/bar", NULL, E_INVALIDARG }, + }; + unsigned int i; + WCHAR *path; + HRESULT hr; + + if (!pMFCreatePathFromURL) + { + win_skip("MFCreatePathFromURL() is not available.\n"); + return; + } + + hr = pMFCreatePathFromURL(NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + path = (void *)0xdeadbeef; + hr = pMFCreatePathFromURL(NULL, &path); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + ok(path == (void *)0xdeadbeef, "Unexpected pointer %p.\n", path); + + hr = pMFCreatePathFromURL(L"file://foo", NULL); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = pMFCreatePathFromURL(tests[i].url, &path); + ok(hr == tests[i].hr, "Unexpected hr %#lx, expected %#lx.\n", hr, tests[i].hr); + if (SUCCEEDED(hr)) + { + ok(!wcscmp(path, tests[i].path), "Unexpected path %s, expected %s.\n", + debugstr_w(path), debugstr_w(tests[i].path)); + CoTaskMemFree(path); + } + } +} + START_TEST(mfplat) { char **argv; @@ -9206,6 +9333,7 @@ START_TEST(mfplat) test_MFCreateVideoMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromVideoInfoHeader(); test_MFInitMediaTypeFromAMMediaType(); + test_MFCreatePathFromURL(); CoUninitialize(); }

1 0

David Kahurani : shlwapi: Implement StrFormatByteSizeEx.
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 49baaf133e042865300daa6e7a468f49df30604c URL: https://gitlab.winehq.org/wine/wine/-/commit/49baaf133e042865300daa6e7a468f… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Apr 3 16:10:27 2023 +0300 shlwapi: Implement StrFormatByteSizeEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54733 Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 49 ++++++++++++++++++++++++++++++++++++++------- dlls/shlwapi/tests/string.c | 35 ++++++++++++++++++++++++++++++++ include/shlwapi.h | 7 +++++++ 4 files changed, 85 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 801b2c9a890..7f3062a2819 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -781,6 +781,7 @@ @ stdcall -import StrDupW (wstr) @ stdcall StrFormatByteSize64A(int64 ptr long) @ stdcall StrFormatByteSizeA(long ptr long) +@ stdcall StrFormatByteSizeEx(int64 long ptr long) @ stdcall StrFormatByteSizeW(int64 ptr long) @ stdcall StrFormatKBSizeA(int64 str long) @ stdcall StrFormatKBSizeW(int64 wstr long) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 77e3b978cee..2c894198239 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -840,6 +840,30 @@ typedef struct tagSHLWAPI_BYTEFORMATS * There is no StrFormatByteSize64W function, it is called StrFormatByteSizeW(). */ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) +{ + HRESULT hr; + + TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); + + if (!lpszDest || !cchMax) + return lpszDest; + + hr = StrFormatByteSizeEx(llBytes, SFBS_FLAGS_TRUNCATE_UNDISPLAYED_DECIMAL_DIGITS, + lpszDest, cchMax); + + if (FAILED(hr)) + return NULL; + + return lpszDest; +} + +/************************************************************************* + * StrFormatByteSizeEx [SHLWAPI.@] + * + */ + +HRESULT WINAPI StrFormatByteSizeEx(LONGLONG llBytes, SFBS_FLAGS flags, LPWSTR lpszDest, + UINT cchMax) { #define KB ((ULONGLONG)1024) #define MB (KB*KB) @@ -870,17 +894,17 @@ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) double dBytes; UINT i = 0; - TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); + TRACE("(0x%s,%d,%p,%d)\n", wine_dbgstr_longlong(llBytes), flags, lpszDest, cchMax); - if (!lpszDest || !cchMax) - return lpszDest; + if (!cchMax) + return E_INVALIDARG; if (llBytes < 1024) /* 1K */ { WCHAR wszBytesFormat[64]; LoadStringW(shlwapi_hInstance, IDS_BYTES_FORMAT, wszBytesFormat, 64); swprintf(lpszDest, cchMax, wszBytesFormat, (int)llBytes); - return lpszDest; + return S_OK; } /* Note that if this loop completes without finding a match, i will be @@ -903,13 +927,24 @@ LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) else dBytes = (double)llBytes + 0.00001; - dBytes = floor(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; + switch(flags) + { + case SFBS_FLAGS_ROUND_TO_NEAREST_DISPLAYED_DIGIT: + dBytes = round(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; + break; + case SFBS_FLAGS_TRUNCATE_UNDISPLAYED_DECIMAL_DIGITS: + dBytes = floor(dBytes / bfFormats[i].dDivisor) / bfFormats[i].dNormaliser; + break; + default: + return E_INVALIDARG; + } if (!FormatDouble(dBytes, bfFormats[i].nDecimals, lpszDest, cchMax)) - return NULL; + return E_FAIL; + wszAdd[1] = bfFormats[i].wPrefix; StrCatBuffW(lpszDest, wszAdd, cchMax); - return lpszDest; + return S_OK; } /************************************************************************* diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index d988e26acb4..6939063a306 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -52,6 +52,7 @@ static DWORD (WINAPI *pStrCatChainW)(LPWSTR,DWORD,DWORD,LPCWSTR); static LPSTR (WINAPI *pStrCpyNXA)(LPSTR,LPCSTR,int); static LPWSTR (WINAPI *pStrCpyNXW)(LPWSTR,LPCWSTR,int); static LPSTR (WINAPI *pStrFormatByteSize64A)(LONGLONG,LPSTR,UINT); +static HRESULT (WINAPI *pStrFormatByteSizeEx)(LONGLONG,SFBS_FLAGS,LPWSTR,UINT); static LPSTR (WINAPI *pStrFormatKBSizeA)(LONGLONG,LPSTR,UINT); static LPWSTR (WINAPI *pStrFormatKBSizeW)(LONGLONG,LPWSTR,UINT); static BOOL (WINAPI *pStrIsIntlEqualA)(BOOL,LPCSTR,LPCSTR,int); @@ -715,6 +716,38 @@ static void test_StrFormatByteSize64A(void) } } +static void test_StrFormatByteSizeEx(void) +{ + WCHAR szBuff[256]; + HRESULT hr; + LONGLONG test_value = 2147483647; + + if (!pStrFormatByteSizeEx) + { + win_skip("StrFormatByteSizeEx is not available \n"); + return; + } + + hr = pStrFormatByteSizeEx(0xdeadbeef, + SFBS_FLAGS_TRUNCATE_UNDISPLAYED_DECIMAL_DIGITS, szBuff, 0); + ok(hr == E_INVALIDARG, "Unexpected hr: %#lx expected: %#lx\n", hr, E_INVALIDARG); + + hr = pStrFormatByteSizeEx(0xdeadbeef, 10, szBuff, 256); + ok(hr == E_INVALIDARG, "Unexpected hr: %#lx expected: %#lx\n", hr, E_INVALIDARG); + + hr = pStrFormatByteSizeEx(test_value, SFBS_FLAGS_ROUND_TO_NEAREST_DISPLAYED_DIGIT, + szBuff, 256); + ok(hr == S_OK, "Invalid arguments \n"); + ok(!wcscmp(szBuff, L"2.00 GB"), "Formatted %s wrong: got %ls, expected 2.00 GB\n", + wine_dbgstr_longlong(test_value), szBuff); + + hr = pStrFormatByteSizeEx(test_value, SFBS_FLAGS_TRUNCATE_UNDISPLAYED_DECIMAL_DIGITS, + szBuff, 256); + ok(hr == S_OK, "Invalid arguments \n"); + ok(!wcscmp(szBuff, L"1.99 GB"), "Formatted %s wrong: got %ls, expected 1.99 GB\n", + wine_dbgstr_longlong(test_value), szBuff); +} + static void test_StrFormatKBSizeW(void) { WCHAR szBuffW[256]; @@ -1680,6 +1713,7 @@ START_TEST(string) pStrCpyNXW = (void *)GetProcAddress(hShlwapi, (LPSTR)400); pStrChrNW = (void *)GetProcAddress(hShlwapi, "StrChrNW"); pStrFormatByteSize64A = (void *)GetProcAddress(hShlwapi, "StrFormatByteSize64A"); + pStrFormatByteSizeEx = (void *)GetProcAddress(hShlwapi, "StrFormatByteSizeEx"); pStrFormatKBSizeA = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeA"); pStrFormatKBSizeW = (void *)GetProcAddress(hShlwapi, "StrFormatKBSizeW"); pStrIsIntlEqualA = (void *)GetProcAddress(hShlwapi, "StrIsIntlEqualA"); @@ -1716,6 +1750,7 @@ START_TEST(string) if (is_lang_english() && is_locale_english()) { test_StrFormatByteSize64A(); + test_StrFormatByteSizeEx(); test_StrFormatKBSizeA(); test_StrFormatKBSizeW(); } diff --git a/include/shlwapi.h b/include/shlwapi.h index eee41abf0dc..e81e9f0e1ec 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -856,6 +856,13 @@ WINSHLWAPI HRESULT WINAPI SHStrDupW(LPCWSTR,WCHAR**); WINSHLWAPI LPSTR WINAPI StrFormatByteSizeA (DWORD,LPSTR,UINT); +typedef enum { + SFBS_FLAGS_ROUND_TO_NEAREST_DISPLAYED_DIGIT = 0x1, + SFBS_FLAGS_TRUNCATE_UNDISPLAYED_DECIMAL_DIGITS = 0x2, +} SFBS_FLAGS; + +WINSHLWAPI HRESULT WINAPI StrFormatByteSizeEx(LONGLONG,SFBS_FLAGS,LPWSTR,UINT); + /* A/W Pairing is broken for this function */ WINSHLWAPI LPSTR WINAPI StrFormatByteSize64A (LONGLONG,LPSTR,UINT); WINSHLWAPI LPWSTR WINAPI StrFormatByteSizeW (LONGLONG,LPWSTR,UINT);

1 0

Davide Beatrici : winealsa: Move ChannelAudioVolume into mmdevapi.
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 9a9a86ea84c63815256a977b0761fe5533feb6e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a9a86ea84c63815256a977b0761fe… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 2 01:35:21 2023 +0200 winealsa: Move ChannelAudioVolume into mmdevapi. --- dlls/mmdevapi/session.c | 167 ++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 178 +------------------------------------------ 2 files changed, 168 insertions(+), 177 deletions(-)

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's ChannelAudioVolume.
by Alexandre Julliard 08 May '23

08 May '23

Module: wine Branch: master Commit: 9da395d019f416a44d31949a7fa424ab26e7db8f URL: https://gitlab.winehq.org/wine/wine/-/commit/9da395d019f416a44d31949a7fa424… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 2 01:36:09 2023 +0200 winecoreaudio: Use mmdevapi's ChannelAudioVolume. --- dlls/winecoreaudio.drv/mmdevdrv.c | 174 +------------------------------------- 1 file changed, 1 insertion(+), 173 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f387e9f71ab..835bfc6978e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -59,7 +59,7 @@ extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; static const IAudioClockVtbl AudioClock_Vtbl; static const IAudioClock2Vtbl AudioClock2_Vtbl; static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; -static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; +extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static WCHAR drv_key_devicesW[256]; @@ -100,11 +100,6 @@ static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); } -static inline AudioSessionWrapper *impl_from_IChannelAudioVolume(IChannelAudioVolume *iface) -{ - return CONTAINING_RECORD(iface, AudioSessionWrapper, IChannelAudioVolume_iface); -} - static inline ACImpl *impl_from_IAudioClock(IAudioClock *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClock_iface); @@ -1607,173 +1602,6 @@ static const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl = AudioStreamVolume_GetAllVolumes }; -static HRESULT WINAPI ChannelAudioVolume_QueryInterface( - IChannelAudioVolume *iface, REFIID riid, void **ppv) -{ - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IChannelAudioVolume)) - *ppv = iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); -} - -static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); -} - -static HRESULT WINAPI ChannelAudioVolume_GetChannelCount( - IChannelAudioVolume *iface, UINT32 *out) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - AudioSession *session = This->session; - - TRACE("(%p)->(%p)\n", session, out); - - if(!out) - return NULL_PTR_ERR; - - *out = session->channel_count; - - return S_OK; -} - -static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( - IChannelAudioVolume *iface, UINT32 index, float level, - const GUID *context) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - AudioSession *session = This->session; - ACImpl *client; - - TRACE("(%p)->(%d, %f, %s)\n", session, index, level, - wine_dbgstr_guid(context)); - - if(level < 0.f || level > 1.f) - return E_INVALIDARG; - - if(index >= session->channel_count) - return E_INVALIDARG; - - if(context) - FIXME("Notifications not supported yet\n"); - - sessions_lock(); - - session->channel_vols[index] = level; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) - set_stream_volumes(client); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( - IChannelAudioVolume *iface, UINT32 index, float *level) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - AudioSession *session = This->session; - - TRACE("(%p)->(%d, %p)\n", session, index, level); - - if(!level) - return NULL_PTR_ERR; - - if(index >= session->channel_count) - return E_INVALIDARG; - - *level = session->channel_vols[index]; - - return S_OK; -} - -static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( - IChannelAudioVolume *iface, UINT32 count, const float *levels, - const GUID *context) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - AudioSession *session = This->session; - ACImpl *client; - UINT32 i; - - TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, - wine_dbgstr_guid(context)); - - if(!levels) - return NULL_PTR_ERR; - - if(count != session->channel_count) - return E_INVALIDARG; - - if(context) - FIXME("Notifications not supported yet\n"); - - sessions_lock(); - - for(i = 0; i < count; ++i) - session->channel_vols[i] = levels[i]; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) - set_stream_volumes(client); - - sessions_unlock(); - - return S_OK; -} - -static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( - IChannelAudioVolume *iface, UINT32 count, float *levels) -{ - AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - AudioSession *session = This->session; - int i; - - TRACE("(%p)->(%d, %p)\n", session, count, levels); - - if(!levels) - return NULL_PTR_ERR; - - if(count != session->channel_count) - return E_INVALIDARG; - - for(i = 0; i < count; ++i) - levels[i] = session->channel_vols[i]; - - return S_OK; -} - -static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl = -{ - ChannelAudioVolume_QueryInterface, - ChannelAudioVolume_AddRef, - ChannelAudioVolume_Release, - ChannelAudioVolume_GetChannelCount, - ChannelAudioVolume_SetChannelVolume, - ChannelAudioVolume_GetChannelVolume, - ChannelAudioVolume_SetAllVolumes, - ChannelAudioVolume_GetAllVolumes -}; - HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device, AudioSessionWrapper **out) {

1 0