- Wine-Devel - list.winehq.org

[PATCH 0/1] MR42: dllhost: Try to load the dll server's factory at the start.
by Huw Davies (＠huw) May 6, 2022

May 6, 2022

This lets dllhost quit early if the factory cannot be loaded. Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/42

2 1

[PATCH] d2d1: Implement ID2D1DeviceContext::CreateImageBrush().
by Dmitry Timoshkov May 6, 2022

May 6, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/device.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 13c99458cfa..fbee558d087 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1929,10 +1929,33 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1Device ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush) { - FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n", - iface, image, image_brush_desc, brush_desc, brush); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_brush *object; + ID2D1Bitmap *bitmap; + D2D1_BITMAP_BRUSH_PROPERTIES1 bitmap_brush_desc; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p.\n", iface, image, image_brush_desc, + brush_desc, brush); + + hr = ID2D1Image_QueryInterface(image, &IID_ID2D1Bitmap, (void **)&bitmap); + if (FAILED(hr)) + { + FIXME("ID2D1Image doesn't support ID2D1Bitmap interface.\n"); + return hr; + } + + bitmap_brush_desc.extendModeX = image_brush_desc->extendModeX; + bitmap_brush_desc.extendModeY = image_brush_desc->extendModeY; + bitmap_brush_desc.interpolationMode = image_brush_desc->interpolationMode; + + if (SUCCEEDED(hr = d2d_bitmap_brush_create(context->factory, bitmap, &bitmap_brush_desc, + brush_desc, &object))) + *brush = (ID2D1ImageBrush *)&object->ID2D1Brush_iface; + + ID2D1Bitmap_Release(bitmap); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface, -- 2.35.3

2 2

[PATCH v5] wintypes: Implement IApiInformationStatics stubs.
by Zhiyi Zhang May 6, 2022

May 6, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 233207. Add tests. v4: Supersede 233864. Link to combase function directly. v5: Supersede 234405. Use if (0) instead of macros. configure.ac | 1 + dlls/wintypes/main.c | 207 +++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 437 ++++++++++++++++++++++++++++++++ 4 files changed, 650 insertions(+) create mode 100644 dlls/wintypes/tests/Makefile.in create mode 100644 dlls/wintypes/tests/wintypes.c diff --git a/configure.ac b/configure.ac index 98f56fc849f..a405bf1773f 100644 --- a/configure.ac +++ b/configure.ac @@ -3142,6 +3142,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32/tests) WINE_CONFIG_MAKEFILE(dlls/wintrust) WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) WINE_CONFIG_MAKEFILE(dlls/wintypes) +WINE_CONFIG_MAKEFILE(dlls/wintypes/tests) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index e5fea2f7d30..1ca8d94cd67 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -28,6 +28,9 @@ #include "activation.h" +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + WINE_DEFAULT_DEBUG_CHANNEL(wintypes); static const char *debugstr_hstring(HSTRING hstr) @@ -43,6 +46,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct wintypes { IActivationFactory IActivationFactory_iface; + IApiInformationStatics IApiInformationStatics_iface; LONG ref; }; @@ -51,9 +55,16 @@ static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory * return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); } +static inline struct wintypes *impl_from_IApiInformationStatics(IApiInformationStatics *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IApiInformationStatics_iface); +} + static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) { + struct wintypes *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) @@ -66,6 +77,13 @@ static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *ifa return S_OK; } + if (IsEqualGUID(iid, &IID_IApiInformationStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IApiInformationStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -128,9 +146,198 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = wintypes_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE api_information_statics_QueryInterface( + IApiInformationStatics *iface, REFIID iid, void **out) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_AddRef( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_Release( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetIids( + IApiInformationStatics *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 api_information_statics_GetRuntimeClassName( + IApiInformationStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetTrustLevel( + IApiInformationStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsTypePresent( + IApiInformationStatics *iface, HSTRING type_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, value %p stub!\n", iface, debugstr_hstring(type_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresentWithArity( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, + UINT32 input_parameter_count, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, input_parameter_count %u, value %p stub!\n", + iface, debugstr_hstring(type_name), debugstr_hstring(method_name), + input_parameter_count, value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEventPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING event_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, event_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(event_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsReadOnlyPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, + BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsWriteablePropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + + if (!type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent( + IApiInformationStatics *iface, HSTRING enum_type_name, HSTRING value_name, BOOLEAN *value) +{ + FIXME("iface %p, enum_type_name %s, value_name %s, value %p stub!\n", iface, + debugstr_hstring(enum_type_name), debugstr_hstring(value_name), value); + + if (!enum_type_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, value); + + if (!contract_name) + return E_INVALIDARG; + + *value = FALSE; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajorAndMinor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, + UINT16 minor_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, minor_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, minor_version, value); + + if (!contract_name) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +static const struct IApiInformationStaticsVtbl api_information_statics_vtbl = +{ + api_information_statics_QueryInterface, + api_information_statics_AddRef, + api_information_statics_Release, + /* IInspectable methods */ + api_information_statics_GetIids, + api_information_statics_GetRuntimeClassName, + api_information_statics_GetTrustLevel, + /* IApiInformationStatics methods */ + api_information_statics_IsTypePresent, + api_information_statics_IsMethodPresent, + api_information_statics_IsMethodPresentWithArity, + api_information_statics_IsEventPresent, + api_information_statics_IsPropertyPresent, + api_information_statics_IsReadOnlyPropertyPresent, + api_information_statics_IsWriteablePropertyPresent, + api_information_statics_IsEnumNamedValuePresent, + api_information_statics_IsApiContractPresentByMajor, + api_information_statics_IsApiContractPresentByMajorAndMinor +}; + static struct wintypes wintypes = { {&activation_factory_vtbl}, + {&api_information_statics_vtbl}, 1 }; diff --git a/dlls/wintypes/tests/Makefile.in b/dlls/wintypes/tests/Makefile.in new file mode 100644 index 00000000000..457551548f9 --- /dev/null +++ b/dlls/wintypes/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wintypes.dll +IMPORTS = combase uuid + +C_SRCS = \ + wintypes.c diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c new file mode 100644 index 00000000000..dd6401c212b --- /dev/null +++ b/dlls/wintypes/tests/wintypes.c @@ -0,0 +1,437 @@ +/* + * Copyright 2022 Zhiyi Zhang 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "initguid.h" +#include "roapi.h" + +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + +#include "wine/test.h" + +static void test_IApiInformationStatics(void) +{ + static const WCHAR *class_name = L"Windows.Foundation.Metadata.ApiInformation"; + IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + IInspectable *inspectable = NULL, *tmp_inspectable = NULL; + IApiInformationStatics *statics = NULL; + IActivationFactory *factory = NULL; + HSTRING str, str2; + BOOLEAN ret; + HRESULT hr; + + hr = RoInitialize(RO_INIT_MULTITHREADED); + ok(hr == S_OK, "RoInitialize failed, hr %#lx.\n", hr); + + hr = WindowsCreateString(class_name, wcslen(class_name), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx.\n", hr); + WindowsDeleteString(str); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(class_name)); + RoUninitialize(); + return; + } + + hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); + ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); + ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr); + + hr = IActivationFactory_QueryInterface(factory, &IID_IApiInformationStatics, (void **)&statics); + ok(hr == S_OK, "QueryInterface IID_IApiInformationStatics failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_QueryInterface(statics, &IID_IInspectable, (void **)&tmp_inspectable); + ok(hr == S_OK, "QueryInterface IID_IInspectable failed, hr %#lx.\n", hr); + ok(tmp_inspectable == inspectable, "QueryInterface IID_IInspectable returned %p, expected %p.\n", + tmp_inspectable, inspectable); + IInspectable_Release(tmp_inspectable); + + hr = IApiInformationStatics_QueryInterface(statics, &IID_IAgileObject, (void **)&tmp_agile_object); + ok(hr == S_OK, "QueryInterface IID_IAgileObject failed, hr %#lx.\n", hr); + ok(tmp_agile_object == agile_object, "QueryInterface IID_IAgileObject returned %p, expected %p.\n", + tmp_agile_object, agile_object); + IAgileObject_Release(tmp_agile_object); + + /* IsTypePresent() */ + hr = WindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsTypePresent(statics, NULL, &ret); + ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsTypePresent(statics, str, NULL); + ok(hr == E_INVALIDARG, "IsTypePresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsTypePresent(statics, str, &ret); + todo_wine + ok(hr == S_OK, "IsTypePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsTypePresent returned FALSE.\n"); + + WindowsDeleteString(str); + + /* IsMethodPresent() */ + hr = WindowsCreateString(L"Windows.Foundation.Metadata.IApiInformationStatics", + wcslen(L"Windows.Foundation.Metadata.IApiInformationStatics"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"IsTypePresent", wcslen(L"IsTypePresent"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsMethodPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresent returned TRUE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsMethodPresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsMethodPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsMethodPresent returned FALSE.\n"); + + /* IsMethodPresentWithArity() */ + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, NULL, str2, 1, &ret); + ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, NULL, 1, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 0, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 2, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsMethodPresentWithArity returned FALSE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, NULL); + ok(hr == E_INVALIDARG, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsMethodPresentWithArity(statics, str, str2, 1, &ret); + todo_wine + ok(hr == S_OK, "IsMethodPresentWithArity failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsMethodPresentWithArity returned FALSE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsEventPresent() */ + hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"Added", wcslen(L"Added"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsEventPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsEventPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEventPresent returned FALSE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsEventPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsEventPresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsEventPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsEventPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsEventPresent returned FALSE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsPropertyPresent() */ + hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"Status", wcslen(L"Status"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsPropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsPropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsPropertyPresent returned TRUE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsPropertyPresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsPropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsPropertyPresent returned FALSE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsReadOnlyPropertyPresent() */ + hr = WindowsCreateString(L"Windows.Devices.Enumeration.IDeviceWatcher", + wcslen(L"Windows.Devices.Enumeration.IDeviceWatcher"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"Id", wcslen(L"Id"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + } + + ret = TRUE; + hr = IApiInformationStatics_IsReadOnlyPropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsReadOnlyPropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsReadOnlyPropertyPresent returned TRUE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsWriteablePropertyPresent() */ + hr = WindowsCreateString(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect", + wcslen(L"Windows.Gaming.Input.ForceFeedback.IForceFeedbackEffect"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"Gain", wcslen(L"Gain"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsWriteablePropertyPresent returned TRUE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsWriteablePropertyPresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsWriteablePropertyPresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */, + "IsWriteablePropertyPresent returned FALSE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsEnumNamedValuePresent */ + hr = WindowsCreateString(L"Windows.Foundation.Metadata.GCPressureAmount", + wcslen(L"Windows.Foundation.Metadata.GCPressureAmount"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + hr = WindowsCreateString(L"Low", wcslen(L"Low"), &str2); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, NULL, str2, &ret); + ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + + ret = TRUE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, NULL, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n"); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, NULL); + ok(hr == E_INVALIDARG, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str2, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsEnumNamedValuePresent returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsEnumNamedValuePresent(statics, str, str, &ret); + todo_wine + ok(hr == S_OK, "IsEnumNamedValuePresent failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsEnumNamedValuePresent returned TRUE.\n"); + + WindowsDeleteString(str2); + WindowsDeleteString(str); + + /* IsApiContractPresentByMajor */ + hr = WindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, NULL, 1, &ret); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, NULL); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 1, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 0, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, 999, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx.\n", hr); + ok(ret == FALSE, "IsApiContractPresentByMajor returned TRUE.\n"); + + WindowsDeleteString(str); + + /* IsApiContractPresentByMajorAndMinor */ + hr = WindowsCreateString(L"Windows.Foundation.FoundationContract", + wcslen(L"Windows.Foundation.FoundationContract"), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, NULL, 1, 0, &ret); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + + if (0) /* Crash on Windows */ + { + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, NULL); + ok(hr == E_INVALIDARG, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + } + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 0, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 0, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE, "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 1, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == TRUE || broken(ret == FALSE) /* Win10 1507 */, + "IsApiContractPresentByMajorAndMinor returned FALSE.\n"); + + ret = TRUE; + hr = IApiInformationStatics_IsApiContractPresentByMajorAndMinor(statics, str, 999, 999, &ret); + todo_wine + ok(hr == S_OK, "IsApiContractPresentByMajorAndMinor failed, hr %#lx.\n", hr); + todo_wine + ok(ret == FALSE, "IsApiContractPresentByMajorAndMinor returned TRUE.\n"); + + WindowsDeleteString(str); + + IApiInformationStatics_Release(statics); + IAgileObject_Release(agile_object); + IInspectable_Release(inspectable); + IActivationFactory_Release(factory); + RoUninitialize(); +} + +START_TEST(wintypes) +{ + test_IApiInformationStatics(); +} -- 2.34.1

1 0

[PATCH 0/1] MR4: wined3d: Don't transition GENERAL layouts for blits.
by Stefan Dösinger May 6, 2022

May 6, 2022

On Radeon GPUs VK_IMAGE_LAYOUT_GENERAL images don't use Delta Color Compression, but SRC/DST optimal images do. Transitioning from GENERAL to SRC/DST causes a big performance hit. As a next step we should try harder to avoid VK_IMAGE_LAYOUT_GENERAL. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- This improves Rocket League from 50fps to 67fps when it is GPU limited. Using VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL instead of GENERAL further improves it to 80 fps. Switching from COLOR_ATTACHMENT_OPTIMAL to SRC/DST optimal seems cheap (it just stays compressed), but first we need logic to transition BIND_RENDER_TARGET | BIND_SHADER_RESOURCE textures between COLOR_ATTACHMENT_OPTIMAL and SHADER_READ_ONLY_OPTIMAL. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4

2 2

[PATCH v3 1/7] winegstreamer: Convert MPEG-1 audio to a major type.
by Zebediah Figura May 6, 2022

May 6, 2022

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 1 + dlls/winegstreamer/quartz_parser.c | 149 ++++++++++++++++------------- dlls/winegstreamer/unixlib.h | 11 ++- dlls/winegstreamer/wg_format.c | 22 ++--- dlls/winegstreamer/wg_transform.c | 2 + dlls/winegstreamer/wm_reader.c | 4 + 6 files changed, 104 insertions(+), 85 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 97e27bb7301..4d8476d7b49 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -661,6 +661,7 @@ IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) { case WG_MAJOR_TYPE_H264: case WG_MAJOR_TYPE_WMA: + case WG_MAJOR_TYPE_MPEG1_AUDIO: FIXME("Format %u not implemented!\n", format->major_type); /* fallthrough */ case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 7b82f3efbc9..34848c0b503 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -111,50 +111,6 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format * case WG_AUDIO_FORMAT_UNKNOWN: return false; - case WG_AUDIO_FORMAT_MPEG1_LAYER1: - case WG_AUDIO_FORMAT_MPEG1_LAYER2: - { - MPEG1WAVEFORMAT *wave_format; - - if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format)))) - return false; - memset(wave_format, 0, sizeof(*wave_format)); - - mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; - mt->cbFormat = sizeof(*wave_format); - mt->pbFormat = (BYTE *)wave_format; - wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG; - wave_format->wfx.nChannels = format->u.audio.channels; - wave_format->wfx.nSamplesPerSec = format->u.audio.rate; - wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); - wave_format->fwHeadLayer = (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1 ? 1 : 2); - return true; - } - - case WG_AUDIO_FORMAT_MPEG1_LAYER3: - { - MPEGLAYER3WAVEFORMAT *wave_format; - - if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format)))) - return false; - memset(wave_format, 0, sizeof(*wave_format)); - - mt->subtype = MEDIASUBTYPE_MP3; - mt->cbFormat = sizeof(*wave_format); - mt->pbFormat = (BYTE *)wave_format; - wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; - wave_format->wfx.nChannels = format->u.audio.channels; - wave_format->wfx.nSamplesPerSec = format->u.audio.rate; - wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); - /* FIXME: We can't get most of the MPEG data from the caps. We may have - * to manually parse the header. */ - wave_format->wID = MPEGLAYER3_ID_MPEG; - wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON; - wave_format->nFramesPerBlock = 1; - wave_format->nCodecDelay = 1393; - return true; - } - case WG_AUDIO_FORMAT_U8: case WG_AUDIO_FORMAT_S16LE: case WG_AUDIO_FORMAT_S24LE: @@ -238,6 +194,62 @@ static bool amt_from_wg_format_audio(AM_MEDIA_TYPE *mt, const struct wg_format * return false; } +static bool amt_from_wg_format_mpeg1_audio(AM_MEDIA_TYPE *mt, const struct wg_format *format) +{ + mt->majortype = MEDIATYPE_Audio; + mt->formattype = FORMAT_WaveFormatEx; + + switch (format->u.mpeg1_audio.layer) + { + case 1: + case 2: + { + MPEG1WAVEFORMAT *wave_format; + + if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format)))) + return false; + memset(wave_format, 0, sizeof(*wave_format)); + + mt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; + mt->cbFormat = sizeof(*wave_format); + mt->pbFormat = (BYTE *)wave_format; + wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEG; + wave_format->wfx.nChannels = format->u.mpeg1_audio.channels; + wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate; + wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); + wave_format->fwHeadLayer = format->u.mpeg1_audio.layer; + return true; + } + + case 3: + { + MPEGLAYER3WAVEFORMAT *wave_format; + + if (!(wave_format = CoTaskMemAlloc(sizeof(*wave_format)))) + return false; + memset(wave_format, 0, sizeof(*wave_format)); + + mt->subtype = MEDIASUBTYPE_MP3; + mt->cbFormat = sizeof(*wave_format); + mt->pbFormat = (BYTE *)wave_format; + wave_format->wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + wave_format->wfx.nChannels = format->u.mpeg1_audio.channels; + wave_format->wfx.nSamplesPerSec = format->u.mpeg1_audio.rate; + wave_format->wfx.cbSize = sizeof(*wave_format) - sizeof(WAVEFORMATEX); + /* FIXME: We can't get most of the MPEG data from the caps. We may have + * to manually parse the header. */ + wave_format->wID = MPEGLAYER3_ID_MPEG; + wave_format->fdwFlags = MPEGLAYER3_FLAG_PADDING_ON; + wave_format->nFramesPerBlock = 1; + wave_format->nCodecDelay = 1393; + return true; + } + } + + assert(0); + return false; +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_max_size(const struct wg_format *format) @@ -312,15 +324,6 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) case WG_AUDIO_FORMAT_F64LE: return rate * channels * 8; - case WG_AUDIO_FORMAT_MPEG1_LAYER1: - return 56000; - - case WG_AUDIO_FORMAT_MPEG1_LAYER2: - return 48000; - - case WG_AUDIO_FORMAT_MPEG1_LAYER3: - return 40000; - case WG_AUDIO_FORMAT_UNKNOWN: FIXME("Cannot guess maximum sample size for unknown audio format.\n"); return 0; @@ -328,6 +331,20 @@ unsigned int wg_format_get_max_size(const struct wg_format *format) break; } + case WG_MAJOR_TYPE_MPEG1_AUDIO: + switch (format->u.mpeg1_audio.layer) + { + case 1: + return 56000; + + case 2: + return 48000; + + case 3: + return 40000; + } + break; + case WG_MAJOR_TYPE_H264: case WG_MAJOR_TYPE_WMA: FIXME("Format %u not implemented!\n", format->major_type); @@ -431,6 +448,9 @@ bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool case WG_MAJOR_TYPE_UNKNOWN: return false; + case WG_MAJOR_TYPE_MPEG1_AUDIO: + return amt_from_wg_format_mpeg1_audio(mt, format); + case WG_MAJOR_TYPE_AUDIO: return amt_from_wg_format_audio(mt, format); @@ -526,17 +546,10 @@ static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_form return false; } - format->major_type = WG_MAJOR_TYPE_AUDIO; - format->u.audio.channels = audio_format->wfx.nChannels; - format->u.audio.rate = audio_format->wfx.nSamplesPerSec; - if (audio_format->fwHeadLayer == 1) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1; - else if (audio_format->fwHeadLayer == 2) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2; - else if (audio_format->fwHeadLayer == 3) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; - else - return false; + format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO; + format->u.mpeg1_audio.channels = audio_format->wfx.nChannels; + format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec; + format->u.mpeg1_audio.layer = audio_format->fwHeadLayer; return true; } @@ -555,10 +568,10 @@ static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct return false; } - format->major_type = WG_MAJOR_TYPE_AUDIO; - format->u.audio.channels = audio_format->wfx.nChannels; - format->u.audio.rate = audio_format->wfx.nSamplesPerSec; - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO; + format->u.mpeg1_audio.channels = audio_format->wfx.nChannels; + format->u.mpeg1_audio.rate = audio_format->wfx.nSamplesPerSec; + format->u.mpeg1_audio.layer = 3; return true; } diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index f4e2ea4966b..881eb720b6c 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -37,6 +37,7 @@ struct wg_format WG_MAJOR_TYPE_UNKNOWN, WG_MAJOR_TYPE_VIDEO, WG_MAJOR_TYPE_AUDIO, + WG_MAJOR_TYPE_MPEG1_AUDIO, WG_MAJOR_TYPE_WMA, WG_MAJOR_TYPE_H264, } major_type; @@ -80,10 +81,6 @@ struct wg_format WG_AUDIO_FORMAT_S32LE, WG_AUDIO_FORMAT_F32LE, WG_AUDIO_FORMAT_F64LE, - - WG_AUDIO_FORMAT_MPEG1_LAYER1, - WG_AUDIO_FORMAT_MPEG1_LAYER2, - WG_AUDIO_FORMAT_MPEG1_LAYER3, } format; uint32_t channels; @@ -91,6 +88,12 @@ struct wg_format uint32_t rate; } audio; struct + { + uint32_t layer; + uint32_t rate; + uint32_t channels; + } mpeg1_audio; + struct { uint32_t version; uint32_t bitrate; diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 7f3b2b0a7dd..582bee2d38c 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -177,7 +177,7 @@ static void wg_format_from_video_info(struct wg_format *format, const GstVideoIn format->u.video.fps_d = GST_VIDEO_INFO_FPS_D(info); } -static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCaps *caps) +static void wg_format_from_caps_audio_mpeg1(struct wg_format *format, const GstCaps *caps) { const GstStructure *structure = gst_caps_get_structure(caps, 0); gint layer, channels, rate; @@ -198,17 +198,10 @@ static void wg_format_from_caps_audio_mpeg(struct wg_format *format, const GstCa return; } - format->major_type = WG_MAJOR_TYPE_AUDIO; - - if (layer == 1) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1; - else if (layer == 2) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2; - else if (layer == 3) - format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; - - format->u.audio.channels = channels; - format->u.audio.rate = rate; + format->major_type = WG_MAJOR_TYPE_MPEG1_AUDIO; + format->u.mpeg1_audio.layer = layer; + format->u.mpeg1_audio.channels = channels; + format->u.mpeg1_audio.rate = rate; } static void wg_format_from_caps_video_cinepak(struct wg_format *format, const GstCaps *caps) @@ -263,7 +256,7 @@ void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) } else if (!strcmp(name, "audio/mpeg")) { - wg_format_from_caps_audio_mpeg(format, caps); + wg_format_from_caps_audio_mpeg1(format, caps); } else if (!strcmp(name, "video/x-cinepak")) { @@ -505,6 +498,8 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) { case WG_MAJOR_TYPE_UNKNOWN: return gst_caps_new_any(); + case WG_MAJOR_TYPE_MPEG1_AUDIO: + return NULL; case WG_MAJOR_TYPE_WMA: return wg_format_to_caps_wma(format); case WG_MAJOR_TYPE_H264: @@ -525,6 +520,7 @@ bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) switch (a->major_type) { + case WG_MAJOR_TYPE_MPEG1_AUDIO: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_H264: GST_FIXME("Format %u not implemented!", a->major_type); diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 49c7bfaa927..dca85e7366e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -233,6 +233,7 @@ NTSTATUS wg_transform_create(void *args) } break; + case WG_MAJOR_TYPE_MPEG1_AUDIO: case WG_MAJOR_TYPE_AUDIO: case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_UNKNOWN: @@ -266,6 +267,7 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_VIDEO: break; + case WG_MAJOR_TYPE_MPEG1_AUDIO: case WG_MAJOR_TYPE_H264: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_UNKNOWN: diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 57ba8633a84..03adea8a318 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1686,6 +1686,7 @@ HRESULT wm_reader_get_output_format_count(struct wm_reader *reader, DWORD output *count = ARRAY_SIZE(video_formats); break; + case WG_MAJOR_TYPE_MPEG1_AUDIO: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_H264: FIXME("Format %u not implemented!\n", format.major_type); @@ -1736,6 +1737,7 @@ HRESULT wm_reader_get_output_format(struct wm_reader *reader, DWORD output, format.u.audio.format = WG_AUDIO_FORMAT_S16LE; break; + case WG_MAJOR_TYPE_MPEG1_AUDIO: case WG_MAJOR_TYPE_WMA: case WG_MAJOR_TYPE_H264: FIXME("Format %u not implemented!\n", format.major_type); @@ -1815,6 +1817,8 @@ static const char *get_major_type_string(enum wg_major_type type) return "video"; case WG_MAJOR_TYPE_UNKNOWN: return "unknown"; + case WG_MAJOR_TYPE_MPEG1_AUDIO: + return "mpeg1-audio"; case WG_MAJOR_TYPE_WMA: return "wma"; case WG_MAJOR_TYPE_H264: -- 2.36.0

2 7

[PATCH 1/2] dlls/wineoss.drv-longtypes: use correct integral type
by Eric Pouech May 6, 2022

May 6, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/ossmidi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9c1261ce05cc..0a7c2011c63f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1315,7 +1315,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, params.stream = This->stream; params.data = data; params.frames = frames; - params.flags = flags; + params.flags = (UINT*)flags; params.devpos = devpos; params.qpcpos = qpcpos; OSS_CALL(get_capture_buffer, &params); diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 09eed8085c42..b6fde8175ae8 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -396,8 +396,8 @@ static UINT midi_init(void) if (sinfo.capabilities & SYNTH_CAP_INPUT) FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); - TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%lx\n", - i, sinfo.synth_type, sinfo.synth_subtype, (long)sinfo.capabilities); + TRACE("SynthOut[%d]\tOSS info: synth type=%d/%d capa=%x\n", + i, sinfo.synth_type, sinfo.synth_subtype, sinfo.capabilities); } TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n", @@ -489,10 +489,10 @@ static UINT midi_init(void) } src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - TRACE("OSS info: midi[%d] dev-type=%d capa=%lx\n" + TRACE("OSS info: midi[%d] dev-type=%d capa=%x\n" "\tMidiOut[%d] name='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" "\tMidiIn [%d] name='%s' support=%d\n", - i, minfo.dev_type, (long)minfo.capabilities, + i, minfo.dev_type, minfo.capabilities, synth_devs + i, wine_dbgstr_w(dest->caps.szPname), dest->caps.wTechnology, dest->caps.wVoices, dest->caps.wNotes, dest->caps.wChannelMask, dest->caps.dwSupport, i, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport);

1 1

[PATCH] server: Remove a redundant call to set_fd_events().
by Zebediah Figura May 6, 2022

May 6, 2022

We will always call set_fd_events() again in sock_reselect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 2230f58554e..247780a3b71 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1120,9 +1120,6 @@ static void sock_poll_event( struct fd *fd, int event ) if (debug_level) fprintf(stderr, "socket %p select event: %x\n", sock, event); - /* we may change event later, remove from loop here */ - if (event & (POLLERR|POLLHUP)) set_fd_events( sock->fd, -1 ); - switch (sock->state) { case SOCK_UNCONNECTED: -- 2.34.1

1 0

[PATCH 1/5] mf/tests: Skip todo_wine tests with a goto statement.
by Rémi Bernon May 5, 2022

May 5, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 48 ++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 37520d48292..6f6213b1e26 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6999,33 +6999,31 @@ static void test_h264_decoder(void) ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); ok(!output.pEvents, "got pEvents %p\n", output.pEvents); ok(status == 0, "got status %#lx\n", status); - if (hr == S_OK) - { - /* Win8 and before pad the data with garbage instead of original - * buffer data, make sure it's consistent. */ - hr = IMFSample_ConvertToContiguousBuffer(output.pSample, &media_buffer); - ok(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr); - hr = IMFMediaBuffer_Lock(media_buffer, &data, NULL, &length); - ok(hr == S_OK, "Lock returned %#lx\n", hr); - todo_wine - ok(length == nv12_frame_len, "got length %lu\n", length); - if (length == nv12_frame_len) - { - for (i = 0; i < actual_aperture.Area.cy; ++i) - { - memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); - memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); - } - memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width); - memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width); - } - hr = IMFMediaBuffer_Unlock(media_buffer); - ok(hr == S_OK, "Unlock returned %#lx\n", hr); - IMFMediaBuffer_Release(media_buffer); + if (hr != S_OK) goto skip_nv12_tests; - if (length == nv12_frame_len) - check_sample(output.pSample, nv12_frame_data, output_file); + /* Win8 and before pad the data with garbage instead of original + * buffer data, make sure it's consistent. */ + hr = IMFSample_ConvertToContiguousBuffer(output.pSample, &media_buffer); + ok(hr == S_OK, "ConvertToContiguousBuffer returned %#lx\n", hr); + hr = IMFMediaBuffer_Lock(media_buffer, &data, NULL, &length); + ok(hr == S_OK, "Lock returned %#lx\n", hr); + ok(length == nv12_frame_len, "got length %lu\n", length); + + for (i = 0; i < actual_aperture.Area.cy; ++i) + { + memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); + memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); } + memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width); + memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width); + + hr = IMFMediaBuffer_Unlock(media_buffer); + ok(hr == S_OK, "Unlock returned %#lx\n", hr); + IMFMediaBuffer_Release(media_buffer); + + check_sample(output.pSample, nv12_frame_data, output_file); + +skip_nv12_tests: ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %lu\n", ret); -- 2.35.1

3 10

[PATCH 0/5] MR22: winegstreamer: Implement more sample attributes and timestamps.
by Rémi Bernon May 5, 2022

May 5, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/22

3 14

[PATCH v2 1/6] winegstreamer: Support MPEG-1 audio in wg_transform.
by Anton Baskanov May 5, 2022

May 5, 2022

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- v2: * Added "parsed" field to MPEG-1 audio caps. * Allow mpg123audiodec to be used. * Use WG_MAJOR_TYPE_AUDIO instead of WG_MAJOR_TYPE_MPEG1_AUDIO. --- dlls/winegstreamer/wg_format.c | 29 +++++++++++++++++++++++++++++ dlls/winegstreamer/wg_transform.c | 13 +++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index ff9238a6a69..038ec956a42 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -338,12 +338,41 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t } } +static GstCaps *wg_format_to_caps_mpeg1_audio(const struct wg_format *format) +{ + GstCaps *caps; + int layer; + + if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1) + layer = 1; + else if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2) + layer = 2; + else if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3) + layer = 3; + + if (!(caps = gst_caps_new_empty_simple("audio/mpeg"))) + return NULL; + + gst_caps_set_simple(caps, "mpegversion", G_TYPE_INT, 1, NULL); + gst_caps_set_simple(caps, "layer", G_TYPE_INT, layer, NULL); + gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.audio.rate, NULL); + gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.audio.channels, NULL); + gst_caps_set_simple(caps, "parsed", G_TYPE_BOOLEAN, TRUE, NULL); + + return caps; +} + static GstCaps *wg_format_to_caps_audio(const struct wg_format *format) { GstAudioChannelPosition positions[32]; GstAudioFormat audio_format; GstAudioInfo info; + if (format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1 + || format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2 + || format->u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3) + return wg_format_to_caps_mpeg1_audio(format); + if ((audio_format = wg_audio_format_to_gst(format->u.audio.format)) == GST_AUDIO_FORMAT_UNKNOWN) return NULL; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 49c7bfaa927..d8fe896f31e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -234,6 +234,19 @@ NTSTATUS wg_transform_create(void *args) break; case WG_MAJOR_TYPE_AUDIO: + if (input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER1 + || input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER2 + || input_format.u.audio.format == WG_AUDIO_FORMAT_MPEG1_LAYER3) + { + if (!(element = transform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) + || !transform_append_element(transform, element, &first, &last)) + { + gst_caps_unref(raw_caps); + goto out; + } + break; + } + /* fallthrough */ case WG_MAJOR_TYPE_VIDEO: case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", input_format.major_type); -- 2.34.1

2 6