- Wine-Devel - list.winehq.org

[PATCH 1/3] mmdevapi: Support device ID paths in ActivateAudioInterfaceAsync
by Andrew Eikum April 13, 2021

April 13, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/mmdevapi/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index eac1da28f18..e9453da5ad2 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -413,6 +413,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev static const WCHAR DEVINTERFACE_AUDIO_RENDER_WSTR[] = L"{E6327CAD-DCEC-4949-AE8A-991E976A79D2}"; static const WCHAR DEVINTERFACE_AUDIO_CAPTURE_WSTR[] = L"{2EEF81BE-33FA-4800-9670-1CD474972C3F}"; + static const WCHAR MMDEV_PATH_PREFIX[] = L"\\\\?\\SWD#MMDEVAPI#"; hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { @@ -424,8 +425,15 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eMultimedia, mmdev); } else if (!lstrcmpiW(path, DEVINTERFACE_AUDIO_CAPTURE_WSTR)){ hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eCapture, eMultimedia, mmdev); + } else if (!memcmp(path, MMDEV_PATH_PREFIX, sizeof(MMDEV_PATH_PREFIX) - sizeof(WCHAR))) { + WCHAR device_id[56]; // == strlen("{0.0.1.00000000}.{fd47d9cc-4218-4135-9ce2-0c195c87405b}") + 1 + + wcsncpy(device_id, path + (ARRAY_SIZE(MMDEV_PATH_PREFIX) - 1), ARRAY_SIZE(device_id)); + device_id[ARRAY_SIZE(device_id) - 1] = 0; + + hr = IMMDeviceEnumerator_GetDevice(devenum, device_id, mmdev); } else { - FIXME("How to map path to device id? %s\n", debugstr_w(path)); + FIXME("Unrecognized device id format: %s\n", debugstr_w(path)); hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } -- 2.31.1

1 0

[PATCH] mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Connor McAdams April 13, 2021

April 13, 2021

Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- Somehow this got messed up when I first sent it, I think I may have accidentally sent this twice. --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..45781d3725a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3965,6 +3965,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5293,6 +5299,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride; -- 2.25.1

3 2

[PATCH 2/2] windows.media.devices: Stub implement IMediaDeviceStatics
by Andrew Eikum April 13, 2021

April 13, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 2 + dlls/windows.media.devices/classes.idl | 24 +++ dlls/windows.media.devices/main.c | 149 ++++++++++++++++++- dlls/windows.media.devices/tests/Makefile.in | 5 + dlls/windows.media.devices/tests/devices.c | 123 +++++++++++++++ include/Makefile.in | 1 + include/windows.media.devices.idl | 126 ++++++++++++++++ 8 files changed, 430 insertions(+), 1 deletion(-) create mode 100644 dlls/windows.media.devices/classes.idl create mode 100644 dlls/windows.media.devices/tests/Makefile.in create mode 100644 dlls/windows.media.devices/tests/devices.c create mode 100644 include/windows.media.devices.idl diff --git a/configure.ac b/configure.ac index 408612324b8..6c0c1a33c66 100644 --- a/configure.ac +++ b/configure.ac @@ -3802,6 +3802,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) WINE_CONFIG_MAKEFILE(dlls/windows.globalization/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) +WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in index b5a3482277c..c0a8649eeb6 100644 --- a/dlls/windows.media.devices/Makefile.in +++ b/dlls/windows.media.devices/Makefile.in @@ -5,3 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.media.devices/classes.idl b/dlls/windows.media.devices/classes.idl new file mode 100644 index 00000000000..9d6f482d395 --- /dev/null +++ b/dlls/windows.media.devices/classes.idl @@ -0,0 +1,24 @@ +/* + * Runtime Classes for windows.media.devices.dll + * + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.media.devices.idl" diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c index 8e83c4e4061..9797644d71a 100644 --- a/dlls/windows.media.devices/main.c +++ b/dlls/windows.media.devices/main.c @@ -29,7 +29,11 @@ #include "activation.h" +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" +#define WIDL_using_Windows_Media_Devices +#include "windows.media.devices.h" WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); @@ -45,6 +49,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct windows_media_devices { IActivationFactory IActivationFactory_iface; + IMediaDeviceStatics IMediaDeviceStatics_iface; LONG ref; }; @@ -53,10 +58,17 @@ static inline struct windows_media_devices *impl_from_IActivationFactory(IActiva return CONTAINING_RECORD(iface, struct windows_media_devices, IActivationFactory_iface); } +static inline struct windows_media_devices *impl_from_IMediaDeviceStatics(IMediaDeviceStatics *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_devices, IMediaDeviceStatics_iface); +} + static HRESULT STDMETHODCALLTYPE windows_media_devices_QueryInterface( IActivationFactory *iface, REFIID iid, void **out) { - TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + + TRACE("iface %p, iid %s, out %p\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || @@ -68,6 +80,13 @@ static HRESULT STDMETHODCALLTYPE windows_media_devices_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_IMediaDeviceStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IMediaDeviceStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -132,9 +151,137 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = windows_media_devices_ActivateInstance, }; +static HRESULT WINAPI media_device_statics_QueryInterface(IMediaDeviceStatics *iface, + REFIID riid, void **ppvObject) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_QueryInterface(&This->IActivationFactory_iface, riid, ppvObject); +} + +static ULONG WINAPI media_device_statics_AddRef(IMediaDeviceStatics *iface) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_AddRef(&This->IActivationFactory_iface); +} + +static ULONG WINAPI media_device_statics_Release(IMediaDeviceStatics *iface) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_Release(&This->IActivationFactory_iface); +} + +static HRESULT WINAPI media_device_statics_GetIids(IMediaDeviceStatics *iface, + ULONG *iidCount, IID **iids) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_GetIids(&This->IActivationFactory_iface, iidCount, iids); +} + +static HRESULT WINAPI media_device_statics_GetRuntimeClassName(IMediaDeviceStatics *iface, + HSTRING *className) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_GetRuntimeClassName(&This->IActivationFactory_iface, className); +} + +static HRESULT WINAPI media_device_statics_GetTrustLevel(IMediaDeviceStatics *iface, + TrustLevel *trustLevel) +{ + struct windows_media_devices *This = impl_from_IMediaDeviceStatics(iface); + return windows_media_devices_GetTrustLevel(&This->IActivationFactory_iface, trustLevel); +} + +static HRESULT WINAPI media_device_statics_GetAudioCaptureSelector(IMediaDeviceStatics *iface, + HSTRING *value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_GetAudioRenderSelector(IMediaDeviceStatics *iface, + HSTRING *value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_GetVideoCaptureSelector(IMediaDeviceStatics *iface, + HSTRING *value) +{ + FIXME("iface %p, value %p stub!\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_GetDefaultAudioCaptureId(IMediaDeviceStatics *iface, + AudioDeviceRole role, HSTRING *value) +{ + FIXME("iface %p, role 0x%x, value %p stub!\n", iface, role, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_GetDefaultAudioRenderId(IMediaDeviceStatics *iface, + AudioDeviceRole role, HSTRING *value) +{ + FIXME("iface %p, role 0x%x, value %p stub!\n", iface, role, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_add_DefaultAudioCaptureDeviceChanged( + IMediaDeviceStatics *iface, + ITypedEventHandler_IInspectable_DefaultAudioCaptureDeviceChangedEventArgs *handler, + EventRegistrationToken *token) +{ + FIXME("iface %p, handler %p token %p stub!\n", iface, handler, token); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_remove_DefaultAudioCaptureDeviceChanged( + IMediaDeviceStatics *iface, + EventRegistrationToken token) +{ + FIXME("iface %p, token %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_add_DefaultAudioRenderDeviceChanged( + IMediaDeviceStatics *iface, + ITypedEventHandler_IInspectable_DefaultAudioRenderDeviceChangedEventArgs *handler, + EventRegistrationToken *token) +{ + FIXME("iface %p, handler %p token %p stub!\n", iface, handler, token); + return E_NOTIMPL; +} + +static HRESULT WINAPI media_device_statics_remove_DefaultAudioRenderDeviceChanged( + IMediaDeviceStatics *iface, + EventRegistrationToken token) +{ + FIXME("iface %p, token %#I64x stub!\n", iface, token.value); + return E_NOTIMPL; +} + +static IMediaDeviceStaticsVtbl media_device_statics_vtbl = { + media_device_statics_QueryInterface, + media_device_statics_AddRef, + media_device_statics_Release, + media_device_statics_GetIids, + media_device_statics_GetRuntimeClassName, + media_device_statics_GetTrustLevel, + media_device_statics_GetAudioCaptureSelector, + media_device_statics_GetAudioRenderSelector, + media_device_statics_GetVideoCaptureSelector, + media_device_statics_GetDefaultAudioCaptureId, + media_device_statics_GetDefaultAudioRenderId, + media_device_statics_add_DefaultAudioCaptureDeviceChanged, + media_device_statics_remove_DefaultAudioCaptureDeviceChanged, + media_device_statics_add_DefaultAudioRenderDeviceChanged, + media_device_statics_remove_DefaultAudioRenderDeviceChanged, +}; + static struct windows_media_devices windows_media_devices = { {&activation_factory_vtbl}, + {&media_device_statics_vtbl}, 1 }; diff --git a/dlls/windows.media.devices/tests/Makefile.in b/dlls/windows.media.devices/tests/Makefile.in new file mode 100644 index 00000000000..42aa4ac9b10 --- /dev/null +++ b/dlls/windows.media.devices/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = windows.media.devices.dll +IMPORTS = ole32 + +C_SRCS = \ + devices.c diff --git a/dlls/windows.media.devices/tests/devices.c b/dlls/windows.media.devices/tests/devices.c new file mode 100644 index 00000000000..9c3019de773 --- /dev/null +++ b/dlls/windows.media.devices/tests/devices.c @@ -0,0 +1,123 @@ +/* + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include "initguid.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "mmdeviceapi.h" +#include "audioclient.h" +#include "roapi.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Media_Devices +#include "windows.media.devices.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); +static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); +static void (WINAPI *pRoUninitialize)(void); +static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); + +static void test_MediaDeviceStatics(void) +{ + static const WCHAR *media_device_statics_name = L"Windows.Media.Devices.MediaDevice"; + + IMediaDeviceStatics *media_device_statics = NULL; + IActivationFactory *factory = NULL; + IInspectable *inspectable = NULL, *tmp_inspectable = NULL; + IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + HSTRING str; + HRESULT hr; + + hr = pWindowsCreateString(media_device_statics_name, wcslen(media_device_statics_name), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr); + pWindowsDeleteString(str); + + /* interface tests */ + hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IMediaDeviceStatics, (void **)&media_device_statics); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IMediaDeviceStatics failed, hr %#x\n", hr); + + hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IInspectable, (void **)&tmp_inspectable); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(tmp_inspectable == inspectable, "IMediaDeviceStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IMediaDeviceStatics_QueryInterface(media_device_statics, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(hr == S_OK, "IMediaDeviceStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(tmp_agile_object == agile_object, "IMediaDeviceStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); + IAgileObject_Release(tmp_agile_object); + + IAgileObject_Release(agile_object); + IInspectable_Release(inspectable); + IActivationFactory_Release(factory); + + /* cleanup */ + IMediaDeviceStatics_Release(media_device_statics); +} + +START_TEST(devices) +{ + HMODULE combase; + HRESULT hr; + + if (!(combase = LoadLibraryW(L"combase.dll"))) + { + win_skip("Failed to load combase.dll, skipping tests\n"); + return; + } + +#define LOAD_FUNCPTR(x) \ + if (!(p##x = (void*)GetProcAddress(combase, #x))) \ + { \ + win_skip("Failed to find %s in combase.dll, skipping tests.\n", #x); \ + return; \ + } + + LOAD_FUNCPTR(RoGetActivationFactory); + LOAD_FUNCPTR(RoInitialize); + LOAD_FUNCPTR(RoUninitialize); + LOAD_FUNCPTR(WindowsCreateString); + LOAD_FUNCPTR(WindowsDeleteString); +#undef LOAD_FUNCPTR + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + + test_MediaDeviceStatics(); + + pRoUninitialize(); +} diff --git a/include/Makefile.in b/include/Makefile.in index 3b60e1be303..78297a63524 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -756,6 +756,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.system.idl \ windows.system.userprofile.idl \ diff --git a/include/windows.media.devices.idl b/include/windows.media.devices.idl new file mode 100644 index 00000000000..d0b3fcef873 --- /dev/null +++ b/include/windows.media.devices.idl @@ -0,0 +1,126 @@ +/* + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2020 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "eventtoken.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + namespace Devices { + typedef enum AudioDeviceRole AudioDeviceRole; + interface IDefaultAudioDeviceChangedEventArgs; + interface IMediaDeviceStatics; + runtimeclass DefaultAudioCaptureDeviceChangedEventArgs; + runtimeclass DefaultAudioRenderDeviceChangedEventArgs; + runtimeclass MediaDevice; + } + } +} + +namespace Windows { + namespace Media { + namespace Devices { + declare { + interface Windows.Foundation.TypedEventHandler<IInspectable *, Windows.Media.Devices.DefaultAudioCaptureDeviceChangedEventArgs *>; + interface Windows.Foundation.TypedEventHandler<IInspectable *, Windows.Media.Devices.DefaultAudioRenderDeviceChangedEventArgs *>; + } + } + } +} + +namespace Windows { + namespace Media { + namespace Devices { + enum AudioDeviceRole { + Default = 0, + Communications = 1, + }; + } + } +} + +namespace Windows { + namespace Media { + namespace Devices { + [ + uuid(110f882f-1c05-4657-a18e-47c9b69f07ab) + ] + interface IDefaultAudioDeviceChangedEventArgs : IInspectable + { + [propget] HRESULT Id([out] [retval] HSTRING *value); + [propget] HRESULT Role([out] [retval] Windows.Media.Devices.AudioDeviceRole *value); + } + + [ + exclusiveto(Windows.Media.Devices.MediaDevice), + uuid(aa2d9a40-909f-4bba-bf8b-0c0d296f14f0) + ] + interface IMediaDeviceStatics : IInspectable + { + HRESULT GetAudioCaptureSelector([out] [retval] HSTRING *value); + HRESULT GetAudioRenderSelector([out] [retval] HSTRING *value); + HRESULT GetVideoCaptureSelector([out] [retval] HSTRING *value); + HRESULT GetDefaultAudioCaptureId([in] Windows.Media.Devices.AudioDeviceRole role, [out] [retval] HSTRING *value); + HRESULT GetDefaultAudioRenderId([in] Windows.Media.Devices.AudioDeviceRole role, [out] [retval] HSTRING *value); + + [eventadd] HRESULT DefaultAudioCaptureDeviceChanged( + [in] Windows.Foundation.TypedEventHandler<IInspectable *, Windows.Media.Devices.DefaultAudioCaptureDeviceChangedEventArgs *> *handler, + [out, retval] EventRegistrationToken* token); + [eventremove] HRESULT DefaultAudioCaptureDeviceChanged( + [in] EventRegistrationToken token); + + [eventadd] HRESULT DefaultAudioRenderDeviceChanged( + [in] Windows.Foundation.TypedEventHandler<IInspectable *, Windows.Media.Devices.DefaultAudioRenderDeviceChangedEventArgs *> *handler, + [out, retval] EventRegistrationToken* token); + [eventremove] HRESULT DefaultAudioRenderDeviceChanged( + [in] EventRegistrationToken token); + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Media.Devices.IMediaDeviceStatics, Windows.Foundation.UniversalApiContract, 1.0), + ] + runtimeclass MediaDevice + { + } + + [ + marshaling_behavior(agile) + ] + runtimeclass DefaultAudioRenderDeviceChangedEventArgs + { + [default] interface Windows.Media.Devices.IDefaultAudioDeviceChangedEventArgs; + } + + [ + marshaling_behavior(agile) + ] + runtimeclass DefaultAudioCaptureDeviceChangedEventArgs + { + [default] interface Windows.Media.Devices.IDefaultAudioDeviceChangedEventArgs; + } + } + } +} -- 2.31.1

2 1

[PATCH 1/2] windows.media.devices: Stub DLL
by Andrew Eikum April 13, 2021

April 13, 2021

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 1 + dlls/windows.media.devices/Makefile.in | 7 + dlls/windows.media.devices/main.c | 158 ++++++++++++++++++ .../windows.media.devices.spec | 3 + 4 files changed, 169 insertions(+) create mode 100644 dlls/windows.media.devices/Makefile.in create mode 100644 dlls/windows.media.devices/main.c create mode 100644 dlls/windows.media.devices/windows.media.devices.spec diff --git a/configure.ac b/configure.ac index 5c364bef0d9..408612324b8 100644 --- a/configure.ac +++ b/configure.ac @@ -3801,6 +3801,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) WINE_CONFIG_MAKEFILE(dlls/windows.globalization/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) diff --git a/dlls/windows.media.devices/Makefile.in b/dlls/windows.media.devices/Makefile.in new file mode 100644 index 00000000000..b5a3482277c --- /dev/null +++ b/dlls/windows.media.devices/Makefile.in @@ -0,0 +1,7 @@ +MODULE = windows.media.devices.dll +IMPORTS = combase + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + main.c diff --git a/dlls/windows.media.devices/main.c b/dlls/windows.media.devices/main.c new file mode 100644 index 00000000000..8e83c4e4061 --- /dev/null +++ b/dlls/windows.media.devices/main.c @@ -0,0 +1,158 @@ +/* + * Copyright 2021 Andrew Eikum for CodeWeavers + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +#include "windows.foundation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_media_devices +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_media_devices *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_media_devices, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_AddRef( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_media_devices_Release( + IActivationFactory *iface) +{ + struct windows_media_devices *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_media_devices_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_media_devices_QueryInterface, + windows_media_devices_AddRef, + windows_media_devices_Release, + /* IInspectable methods */ + windows_media_devices_GetIids, + windows_media_devices_GetRuntimeClassName, + windows_media_devices_GetTrustLevel, + /* IActivationFactory methods */ + windows_media_devices_ActivateInstance, +}; + +static struct windows_media_devices windows_media_devices = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_media_devices.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.media.devices/windows.media.devices.spec b/dlls/windows.media.devices/windows.media.devices.spec new file mode 100644 index 00000000000..721493229c2 --- /dev/null +++ b/dlls/windows.media.devices/windows.media.devices.spec @@ -0,0 +1,3 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) -- 2.31.1

1 0

[PATCH 1/4] winevulkan: Use standard CRT memory allocators.
by Jacek Caban April 13, 2021

April 13, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- In preparation for split PE/.so parts. dlls/winevulkan/make_vulkan | 8 +-- dlls/winevulkan/vulkan.c | 111 ++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 59 deletions(-)

4 11

[PATCH 1/5] wined3d: Map resources through wined3d_device_context_ops.
by Zebediah Figura April 13, 2021

April 13, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/cs.c | 22 +++++++++++++++------- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 9 +++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 32ea900e27d..bb11851c1be 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2279,9 +2279,11 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_desc, op->box, op->flags); } -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +static HRESULT wined3d_cs_map(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_map *op; HRESULT hr; @@ -2289,7 +2291,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2298,7 +2300,7 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, op->flags = flags; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2312,20 +2314,22 @@ static void wined3d_cs_exec_unmap(struct wined3d_cs *cs, const void *data) *op->hr = resource->resource_ops->resource_sub_resource_unmap(resource, op->sub_resource_idx); } -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) +static HRESULT wined3d_cs_unmap(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_unmap *op; HRESULT hr; wined3d_not_from_cs(cs); - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_MAP); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; op->hr = &hr; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_MAP); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_MAP); return hr; @@ -2790,6 +2794,8 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_st_submit, wined3d_cs_st_finish, wined3d_cs_st_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -2911,6 +2917,8 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_mt_submit, wined3d_cs_mt_finish, wined3d_cs_mt_push_constants, + wined3d_cs_map, + wined3d_cs_unmap, }; static void poll_queries(struct wined3d_cs *cs) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 8f2dc9ad095..6c937fa79b2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -376,14 +376,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i flags = wined3d_resource_sanitise_map_flags(resource, flags); wined3d_resource_wait_idle(resource); - return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); + return resource->device->cs->c.ops->map(&resource->device->cs->c, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx); + return resource->device->cs->c.ops->unmap(&resource->device->cs->c, resource, sub_resource_idx); } void CDECL wined3d_resource_preload(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..26d3efda24d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4686,6 +4686,11 @@ struct wined3d_device_context_ops void (*finish)(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id); void (*push_constants)(struct wined3d_device_context *context, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants); + HRESULT (*map)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, + unsigned int flags); + HRESULT (*unmap)(struct wined3d_device_context *context, struct wined3d_resource *resource, + unsigned int sub_resource_idx); }; struct wined3d_device_context @@ -4755,10 +4760,6 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; -HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, - unsigned int sub_resource_idx) DECLSPEC_HIDDEN; static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id queue_id) { -- 2.30.2

3 11

[PATCH] wined3d: Add GPU information for Radeon RX 6800(XT) / 6900 XT
by Andrew Sheldon April 13, 2021

April 13, 2021

Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7287b333f97..0a3c547e7a9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -514,6 +514,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34ec814685c..af7237ae4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,6 +2903,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, + CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020, -- 2.26.3

2 1

[PATCH] d2d1: Remove unnecessary return statements.
by Nikolay Sivov April 13, 2021

April 13, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/factory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b65727d3a32..5f081a1c12d 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -639,7 +639,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Enter(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return EnterCriticalSection(&factory->cs); + EnterCriticalSection(&factory->cs); } static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) @@ -648,7 +648,7 @@ static void STDMETHODCALLTYPE d2d_factory_mt_Leave(ID2D1Multithread *iface) TRACE("%p.\n", iface); - return LeaveCriticalSection(&factory->cs); + LeaveCriticalSection(&factory->cs); } static BOOL STDMETHODCALLTYPE d2d_factory_st_GetMultithreadProtected(ID2D1Multithread *iface) -- 2.30.2

2 1

[PATCH] winemac.drv: Fix setting DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag on adapters.
by Piotr Caban April 13, 2021

April 13, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tools] testbot/Janitor: Round the file age down when purging.
by Francois Gouget April 13, 2021

April 13, 2021

There is not much point in rounding to nearest and rounding down is simpler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Obsolete files will stay around an extra 12 hours on average. That shouldn't make any difference. --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 35a7e5d4f..c68920e7c 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -269,7 +269,7 @@ if (opendir(my $dh, "$DataDir/staging")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # FIXME: There are still some obsolete unexpired 31 characters session ids. @@ -326,7 +326,7 @@ if (opendir(my $dh, "$DataDir/latest")) $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); + my $Age = int(-M $FileName); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; # Keep the regexp in sync with WineTestBot::Task::GetRefReportName() -- 2.20.1

1 0