May 2022 - Wine-Devel - list.winehq.org

[PATCH v4] wintypes: Implement IApiInformationStatics stubs.
by Zhiyi Zhang May 3, 2022

May 3, 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. configure.ac | 1 + dlls/wintypes/main.c | 207 ++++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 427 ++++++++++++++++++++++++++++++++ 4 files changed, 640 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 74c80fd7fa8..f0b39d172ba 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..fb81cf86e99 --- /dev/null +++ b/dlls/wintypes/tests/wintypes.c @@ -0,0 +1,427 @@ +/* + * 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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); +#endif + + 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.32.0

3 2

[tools 1/2] testbot/cgi: Allow overriding the collection block's property list.
by Francois Gouget May 3, 2022

May 3, 2022

GetPropertyDescriptors() can now be redefined which allows reordering the item's properties and inserting extra 'synthetic' ones. Neither of these was possible by redefining DisplayProperty(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This matches the FromPage behavior which only accesses the property list through GetPropertyDescriptors(). --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 594ed5649..08844d066 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -161,6 +161,29 @@ sub GenerateErrorPopup($) # Individual item property support # + +=pod +=over 12 + +=item C<GetPropertyDescriptors()> + +Returns the list of columns for the collection table. + +By default this matches the property list of the items in the collection and +that list is then pruned by DisplayProperty(). + +However it is possible to redefine this method to reorder the columns or add +extra columns where the values will be synthesized by GenerateDataView(). + +=back +=cut + +sub GetPropertyDescriptors($) +{ + my ($self) = @_; + return $self->{Collection}->GetPropertyDescriptors(); +} + =pod =over 12 @@ -430,7 +453,7 @@ sub GenerateList($) my ($self) = @_; my $Collection = $self->{Collection}; - my $PropertyDescriptors = $Collection->GetPropertyDescriptors(); + my $PropertyDescriptors = $self->GetPropertyDescriptors(); my $ColIndex = 0; my (@Cols, $HasDT); -- 2.30.2

1 1

[tools 1/2] winetest/build-patterns: Use CSS to highlight lines with new failure modes.
by Francois Gouget May 3, 2022

May 3, 2022

This also makes it possible to programmatically manipulate the pattern line labels. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 5 ++--- winetest/report.css | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 49b08e3cf..aa6a6e495 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1113,9 +1113,8 @@ sub write_pattern_line($$$) date_range($range_start, $range_end), $range_title, $range_symbol x $range_count; } - my $label = $reportdir; - $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n</div>"; + my $newmode = $has_newmode ? " newmode" : ""; + print $html "</div> <span class='label$newmode'>$reportdir</span>\n</div>"; } sub index2symbol($) diff --git a/winetest/report.css b/winetest/report.css index be49a0523..25f156d6f 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -91,6 +91,8 @@ div.pattern :link { color: black; text-decoration: none; } div.pattern :visited { color: black; text-decoration: none; } div.pattern :hover { color: black; text-decoration: underline; } +.newmode { font-weight: bold; } + .patA { /* no such test in this build */ background-color: lightgrey; } -- 2.30.2

1 1

[tools 1/2] testbot/web: Simplify the JobDetails page's GenerateDataView().
by Francois Gouget May 3, 2022

May 3, 2022

Undefined values don't need any special formatting so let the default implementation deal with them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 748153f28..b0ef2a733 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -91,11 +91,11 @@ sub GenerateDataView($$$) my $PropertyName = $Col->{Descriptor}->GetName(); if ($PropertyName eq "VM") { - print "<a href='#k", $StepTask->GetKey(), "'>"; - print $self->escapeHTML($StepTask->VM->Name); - print "</a>"; + print "<a href='#k", $StepTask->GetKey(), "'>", + $self->escapeHTML($StepTask->VM->Name), "</a>"; + return; } - elsif ($PropertyName eq "FileName") + if ($PropertyName eq "FileName") { my $FileName = $StepTask->GetFullFileName(); if ($FileName and -r $FileName) @@ -105,12 +105,9 @@ sub GenerateDataView($$$) print "<a href='", $self->escapeHTML($URI), "'>", $self->escapeHTML($StepTask->FileName), "</a>"; } - else - { - $self->SUPER::GenerateDataView($Row, $Col); - } + return; } - elsif ($PropertyName eq "CmdLineArg") + if ($PropertyName eq "CmdLineArg") { my $Args = $self->escapeHTML($StepTask->CmdLineArg); if ($Args eq "" or $StepTask->VM->Type eq "wine") @@ -127,23 +124,15 @@ sub GenerateDataView($$$) } } print $Args; + return; } - elsif ($PropertyName eq "Ended") - { - if (defined $StepTask->Ended) - { - my $Duration = $StepTask->Ended - $StepTask->Started; - GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); - } - else - { - print " "; - } - } - else + if ($PropertyName eq "Ended" and defined $StepTask->Ended) { - $self->SUPER::GenerateDataView($Row, $Col); + my $Duration = $StepTask->Ended - $StepTask->Started; + GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); + return; } + $self->SUPER::GenerateDataView($Row, $Col); } -- 2.30.2

1 1

[tools] testbot/web: Show canceled jobs in dark blue.
by Francois Gouget May 3, 2022

May 3, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a8756dfce..7b6389477 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,7 +387,7 @@ pre .badbuild { color: red; } .testfail { color: red; } .boterror { color: #e55600; } -.canceled { color: black; } +.canceled { color: darkblue; } .userrequest { color: #e55600; } .userapproved { color: green; } -- 2.30.2

1 0

[tools] testbot/cgi: Improve the CollectionBlock::GetDetailsLink() documentation.
by Francois Gouget May 3, 2022

May 3, 2022

Specifically, better document the escaping situation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b2ebb2eec..594ed5649 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -200,6 +200,10 @@ sub GetSortedItems($$) Returns the URL of the details page for the current row's object. +If the URL contains parameters those must already be encoded (see uri_escape()) +but the returned URL as a whole may still need to be escaped for use in HTML +documents (notably for the ampersands, see escapeHTML()). + See GenerateDataView() for details about the Row parameter. =back -- 2.30.2

1 0

[PATCH v2 0/10] MR28: winex11: PE conversion preparation
by Jacek Caban (＠jacek) May 3, 2022

May 3, 2022

-- v2: winex11: Directly use ntdll in more places. win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW. winex11: Reimplement EVENT_DropFromOffiX using get_dos_file_name. winex11: Use import_text_uri_list code in EVENT_DropURLs. winex11: Use ntdll for Unicode conversion. winex11: Directly use wine_nt_to_unix_file_name to get Unix path name. winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion. https://gitlab.winehq.org/wine/wine/-/merge_requests/28

2 11

[PATCH 0/10] MR28: winex11: PE conversion preparation
by Jacek Caban (＠jacek) May 3, 2022

May 3, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/28

3 11

[PATCH 5/5] wineoss: Build with msvcrt.
by Huw Davies May 3, 2022

May 3, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/Makefile.in | 2 -- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 13fb18b6004..d41aa0113c8 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = winmm EXTRALIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) EXTRAINCL = $(OSS4_CFLAGS) -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ midi.c \ midipatch.c \ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9e3380ca8d9..c282ff14f01 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -39,7 +39,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/unixlib.h" #include "unixlib.h" @@ -391,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int name_size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + unsigned int name_size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); unsigned int dev_size = strlen(params.endpoints[i].device) + 1; OSSDevice *oss_dev; -- 2.25.1

2 1

[PATCH 4/5] wineoss: Move AUXDM_GETVOLUME and AUXDM_SETVOLUME to the unixlib.
by Huw Davies May 3, 2022

May 3, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmaux.c | 135 --------------------------------------- dlls/wineoss.drv/oss.c | 121 +++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 135 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index a3a12a96bea..ae52293f944 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/soundcard.h> #include "windef.h" #include "winbase.h" @@ -42,125 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmaux); -#define MIXER_DEV "/dev/mixer" - -/*-----------------------------------------------------------------------*/ - -/************************************************************************** - * AUX_GetVolume [internal] - */ -static DWORD AUX_GetVolume(WORD wDevID, LPDWORD lpdwVol) -{ - int mixer, volume, left, right, cmd; - - TRACE("(%04X, %p);\n", wDevID, lpdwVol); - if (lpdwVol == NULL) return MMSYSERR_NOTENABLED; - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - switch(wDevID) { - case 0: - TRACE("SOUND_MIXER_READ_PCM !\n"); - cmd = SOUND_MIXER_READ_PCM; - break; - case 1: - TRACE("SOUND_MIXER_READ_SYNTH !\n"); - cmd = SOUND_MIXER_READ_SYNTH; - break; - case 2: - TRACE("SOUND_MIXER_READ_CD !\n"); - cmd = SOUND_MIXER_READ_CD; - break; - case 3: - TRACE("SOUND_MIXER_READ_LINE !\n"); - cmd = SOUND_MIXER_READ_LINE; - break; - case 4: - TRACE("SOUND_MIXER_READ_MIC !\n"); - cmd = SOUND_MIXER_READ_MIC; - break; - case 5: - TRACE("SOUND_MIXER_READ_VOLUME !\n"); - cmd = SOUND_MIXER_READ_VOLUME; - break; - default: - WARN("invalid device id=%04X !\n", wDevID); - close(mixer); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, cmd, &volume) == -1) { - WARN("unable to read mixer !\n"); - close(mixer); - return MMSYSERR_NOTENABLED; - } - close(mixer); - left = LOBYTE(LOWORD(volume)); - right = HIBYTE(LOWORD(volume)); - TRACE("left=%d right=%d !\n", left, right); - *lpdwVol = MAKELONG((left * 0xFFFFL) / 100, (right * 0xFFFFL) / 100); - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * AUX_SetVolume [internal] - */ -static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) -{ - int mixer; - int volume, left, right; - int cmd; - - TRACE("(%04X, %08X);\n", wDevID, dwParam); - - left = (LOWORD(dwParam) * 100) >> 16; - right = (HIWORD(dwParam) * 100) >> 16; - volume = (right << 8) | left; - - if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { - WARN("mixer device not available !\n"); - return MMSYSERR_NOTENABLED; - } - - switch(wDevID) { - case 0: - TRACE("SOUND_MIXER_WRITE_PCM !\n"); - cmd = SOUND_MIXER_WRITE_PCM; - break; - case 1: - TRACE("SOUND_MIXER_WRITE_SYNTH !\n"); - cmd = SOUND_MIXER_WRITE_SYNTH; - break; - case 2: - TRACE("SOUND_MIXER_WRITE_CD !\n"); - cmd = SOUND_MIXER_WRITE_CD; - break; - case 3: - TRACE("SOUND_MIXER_WRITE_LINE !\n"); - cmd = SOUND_MIXER_WRITE_LINE; - break; - case 4: - TRACE("SOUND_MIXER_WRITE_MIC !\n"); - cmd = SOUND_MIXER_WRITE_MIC; - break; - case 5: - TRACE("SOUND_MIXER_WRITE_VOLUME !\n"); - cmd = SOUND_MIXER_WRITE_VOLUME; - break; - default: - WARN("invalid device id=%04X !\n", wDevID); - close(mixer); - return MMSYSERR_NOTENABLED; - } - if (ioctl(mixer, cmd, &volume) == -1) { - WARN("unable to set mixer !\n"); - close(mixer); - return MMSYSERR_NOTENABLED; - } - close(mixer); - return MMSYSERR_NOERROR; -} - /************************************************************************** * auxMessage (WINEOSS.2) */ @@ -173,13 +45,6 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case AUXDM_GETVOLUME: - return AUX_GetVolume(wDevID, (LPDWORD)dwParam1); - case AUXDM_SETVOLUME: - return AUX_SetVolume(wDevID, dwParam1); - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index e387a2a4a71..6490081e069 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1444,6 +1444,121 @@ static UINT aux_get_devcaps(WORD dev_id, AUXCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT aux_get_volume(WORD dev_id, UINT *vol) +{ + int mixer, volume, left, right, cmd; + + TRACE("(%04X, %p);\n", dev_id, vol); + if (vol == NULL) return MMSYSERR_NOTENABLED; + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + switch(dev_id) + { + case 0: + TRACE("SOUND_MIXER_READ_PCM !\n"); + cmd = SOUND_MIXER_READ_PCM; + break; + case 1: + TRACE("SOUND_MIXER_READ_SYNTH !\n"); + cmd = SOUND_MIXER_READ_SYNTH; + break; + case 2: + TRACE("SOUND_MIXER_READ_CD !\n"); + cmd = SOUND_MIXER_READ_CD; + break; + case 3: + TRACE("SOUND_MIXER_READ_LINE !\n"); + cmd = SOUND_MIXER_READ_LINE; + break; + case 4: + TRACE("SOUND_MIXER_READ_MIC !\n"); + cmd = SOUND_MIXER_READ_MIC; + break; + case 5: + TRACE("SOUND_MIXER_READ_VOLUME !\n"); + cmd = SOUND_MIXER_READ_VOLUME; + break; + default: + WARN("invalid device id=%04X !\n", dev_id); + close(mixer); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, cmd, &volume) == -1) + { + WARN("unable to read mixer !\n"); + close(mixer); + return MMSYSERR_NOTENABLED; + } + close(mixer); + left = LOBYTE(LOWORD(volume)); + right = HIBYTE(LOWORD(volume)); + TRACE("left=%d right=%d !\n", left, right); + *vol = MAKELONG((left * 0xFFFFL) / 100, (right * 0xFFFFL) / 100); + return MMSYSERR_NOERROR; +} + +static UINT aux_set_volume(WORD dev_id, UINT vol) +{ + int mixer; + int volume, left, right; + int cmd; + + TRACE("(%04X, %08X);\n", dev_id, vol); + + left = (LOWORD(vol) * 100) >> 16; + right = (HIWORD(vol) * 100) >> 16; + volume = (right << 8) | left; + + if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) + { + WARN("mixer device not available !\n"); + return MMSYSERR_NOTENABLED; + } + + switch(dev_id) + { + case 0: + TRACE("SOUND_MIXER_WRITE_PCM !\n"); + cmd = SOUND_MIXER_WRITE_PCM; + break; + case 1: + TRACE("SOUND_MIXER_WRITE_SYNTH !\n"); + cmd = SOUND_MIXER_WRITE_SYNTH; + break; + case 2: + TRACE("SOUND_MIXER_WRITE_CD !\n"); + cmd = SOUND_MIXER_WRITE_CD; + break; + case 3: + TRACE("SOUND_MIXER_WRITE_LINE !\n"); + cmd = SOUND_MIXER_WRITE_LINE; + break; + case 4: + TRACE("SOUND_MIXER_WRITE_MIC !\n"); + cmd = SOUND_MIXER_WRITE_MIC; + break; + case 5: + TRACE("SOUND_MIXER_WRITE_VOLUME !\n"); + cmd = SOUND_MIXER_WRITE_VOLUME; + break; + default: + WARN("invalid device id=%04X !\n", dev_id); + close(mixer); + return MMSYSERR_NOTENABLED; + } + if (ioctl(mixer, cmd, &volume) == -1) + { + WARN("unable to set mixer !\n"); + close(mixer); + return MMSYSERR_NOTENABLED; + } + close(mixer); + return MMSYSERR_NOERROR; +} + static NTSTATUS aux_message(void *args) { struct aux_message_params *params = args; @@ -1468,6 +1583,12 @@ static NTSTATUS aux_message(void *args) TRACE("return %d;\n", num_aux); *params->err = num_aux; break; + case AUXDM_GETVOLUME: + *params->err = aux_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case AUXDM_SETVOLUME: + *params->err = aux_set_volume(params->dev_id, params->param_1); + break; default: WARN("unknown message !\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1