wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Zebediah Figura : user32: Also scan for mouse devices in GetRawInputDeviceList().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 19c6524e48db1d785095953d25591f1e2d2872d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c6524e48db1d785095953d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:43 2020 -0500 user32: Also scan for mouse devices in GetRawInputDeviceList(). Halo: Spartan Strike attempts to discover input devices using rawinput. It expects to be able to open at least one device file with a zero access mask. It does not perform any other operations on the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 47 ++++++++++++++++++++++++++++++++++------------- dlls/user32/tests/input.c | 5 ++--- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e89bb027f3..2465262f74 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -37,13 +37,16 @@ #include "user_private.h" +#include "initguid.h" +#include "ntddmou.h" + WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device { WCHAR *path; HANDLE file; - RID_DEVICE_INFO_HID info; + RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; }; @@ -139,6 +142,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; + device->info.cbSize = sizeof(RID_DEVICE_INFO); return device; } @@ -161,8 +165,6 @@ static void find_devices(void) HidD_GetHidGuid(&hid_guid); - set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ @@ -171,8 +173,10 @@ static void find_devices(void) CloseHandle(rawinput_devices[idx].file); heap_free(rawinput_devices[idx].path); } - rawinput_devices_count = 0; + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -181,9 +185,11 @@ static void find_devices(void) attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes(device->file, &attr)) WARN("Failed to get attributes.\n"); - device->info.dwVendorId = attr.VendorID; - device->info.dwProductId = attr.ProductID; - device->info.dwVersionNumber = attr.VersionNumber; + + device->info.dwType = RIM_TYPEHID; + device->info.u.hid.dwVendorId = attr.VendorID; + device->info.u.hid.dwProductId = attr.ProductID; + device->info.u.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); @@ -191,12 +197,28 @@ static void find_devices(void) if (!HidP_GetCaps(device->data, &caps)) WARN("Failed to get caps.\n"); - device->info.usUsagePage = caps.UsagePage; - device->info.usUsage = caps.Usage; + device->info.u.hid.usUsagePage = caps.UsagePage; + device->info.u.hid.usUsage = caps.Usage; + } + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) + { + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + + if (!(device = add_device(set, &iface))) + continue; + + device->info.dwType = RIM_TYPEMOUSE; + device->info.u.mouse = mouse_info; } - LeaveCriticalSection(&rawinput_devices_cs); SetupDiDestroyDeviceInfoList(set); + + LeaveCriticalSection(&rawinput_devices_cs); } /*********************************************************************** @@ -243,7 +265,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun for (i = 0; i < rawinput_devices_count; ++i) { devices[2 + i].hDevice = &rawinput_devices[i]; - devices[2 + i].dwType = RIM_TYPEHID; + devices[2 + i].dwType = rawinput_devices[i].info.dwType; } return 2 + rawinput_devices_count; @@ -461,8 +483,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT } else { - info.dwType = RIM_TYPEHID; - info.u.hid = device->info; + info = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3fc84f6108..43fdd34191 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1686,7 +1686,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType != RIM_TYPEHID) + todo_wine_if(i == 0 || i == 1) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; @@ -1716,8 +1716,7 @@ static void test_GetRawInputDeviceList(void) { /* succeeds on hardware, fails in some VMs */ br = HidD_GetPreparsedData(file, &preparsed); - todo_wine - ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); } if (br)

1 0

Zebediah Figura : user32: Rename hid_devices_* variables to rawinput_devices_*.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: da87589ee2e3be826a197604be2a63b65f67b68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=da87589ee2e3be826a197604… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:42 2020 -0500 user32: Rename hid_devices_* variables to rawinput_devices_*. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 54d836b22b..e89bb027f3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -47,17 +47,17 @@ struct device PHIDP_PREPARSED_DATA data; }; -static struct device *hid_devices; -static unsigned int hid_devices_count, hid_devices_max; +static struct device *rawinput_devices; +static unsigned int rawinput_devices_count, rawinput_devices_max; -static CRITICAL_SECTION hid_devices_cs; -static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = +static CRITICAL_SECTION rawinput_devices_cs; +static CRITICAL_SECTION_DEBUG rawinput_devices_cs_debug = { - 0, 0, &hid_devices_cs, - { &hid_devices_cs_debug.ProcessLocksList, &hid_devices_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": hid_devices_cs") } + 0, 0, &rawinput_devices_cs, + { &rawinput_devices_cs_debug.ProcessLocksList, &rawinput_devices_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": rawinput_devices_cs") } }; -static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION rawinput_devices_cs = { &rawinput_devices_cs_debug, -1, 0, 0, 0, 0 }; static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) { @@ -127,7 +127,8 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - if (!array_reserve((void **)&hid_devices, &hid_devices_max, hid_devices_count + 1, sizeof(*hid_devices))) + if (!array_reserve((void **)&rawinput_devices, &rawinput_devices_max, + rawinput_devices_count + 1, sizeof(*rawinput_devices))) { ERR("Failed to allocate memory.\n"); CloseHandle(file); @@ -135,14 +136,14 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - device = &hid_devices[hid_devices_count++]; + device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; return device; } -static void find_hid_devices(void) +static void find_devices(void) { static ULONGLONG last_check; @@ -162,16 +163,16 @@ static void find_hid_devices(void) set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - EnterCriticalSection(&hid_devices_cs); + EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ - for (idx = 0; idx < hid_devices_count; ++idx) + for (idx = 0; idx < rawinput_devices_count; ++idx) { - CloseHandle(hid_devices[idx].file); - heap_free(hid_devices[idx].path); + CloseHandle(rawinput_devices[idx].file); + heap_free(rawinput_devices[idx].path); } - hid_devices_count = 0; + rawinput_devices_count = 0; for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -194,7 +195,7 @@ static void find_hid_devices(void) device->info.usUsage = caps.Usage; } - LeaveCriticalSection(&hid_devices_cs); + LeaveCriticalSection(&rawinput_devices_cs); SetupDiDestroyDeviceInfoList(set); } @@ -219,18 +220,18 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - find_hid_devices(); + find_devices(); if (!devices) { - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return 0; } - if (*device_count < 2 + hid_devices_count) + if (*device_count < 2 + rawinput_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return ~0U; } @@ -239,13 +240,13 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun devices[1].hDevice = WINE_KEYBOARD_HANDLE; devices[1].dwType = RIM_TYPEKEYBOARD; - for (i = 0; i < hid_devices_count; ++i) + for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = &hid_devices[i]; + devices[2 + i].hDevice = &rawinput_devices[i]; devices[2 + i].dwType = RIM_TYPEHID; } - return 2 + hid_devices_count; + return 2 + rawinput_devices_count; } /***********************************************************************

1 0

Zebediah Figura : user32: Rename the "hid_device" structure to "device".
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 9e195ba9a64ab88a04e26c7f2a3c0837993f2581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e195ba9a64ab88a04e26c7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:41 2020 -0500 user32: Rename the "hid_device" structure to "device". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 85ff0c5e80..54d836b22b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -struct hid_device +struct device { WCHAR *path; HANDLE file; @@ -47,7 +47,7 @@ struct hid_device PHIDP_PREPARSED_DATA data; }; -static struct hid_device *hid_devices; +static struct device *hid_devices; static unsigned int hid_devices_count, hid_devices_max; static CRITICAL_SECTION hid_devices_cs; @@ -86,10 +86,10 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_device *device; + struct device *device; HANDLE file; WCHAR *path; DWORD size; @@ -147,7 +147,7 @@ static void find_hid_devices(void) static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct hid_device *device; + struct device *device; HIDD_ATTRIBUTES attr; HIDP_CAPS caps; GUID hid_guid; @@ -398,7 +398,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT /*********************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { /* FIXME: Most of this is made up. */ static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; @@ -407,12 +407,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; RID_DEVICE_INFO info; - struct hid_device *hid_device = device; + struct device *device = handle; const void *to_copy; UINT to_copy_bytes, avail_bytes; - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); + TRACE("handle %p, command %#x, data %p, data_size %p.\n", + handle, command, data, data_size); if (!data_size) return ~0U; @@ -427,20 +427,20 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { *data_size = ARRAY_SIZE(mouse_name); to_copy = mouse_name; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { *data_size = ARRAY_SIZE(keyboard_name); to_copy = keyboard_name; } else { - *data_size = strlenW(hid_device->path) + 1; - to_copy = hid_device->path; + *data_size = strlenW(device->path) + 1; + to_copy = device->path; } to_copy_bytes = *data_size * sizeof(WCHAR); break; @@ -448,12 +448,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { info.dwType = RIM_TYPEMOUSE; info.u.mouse = mouse_info; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { info.dwType = RIM_TYPEKEYBOARD; info.u.keyboard = keyboard_info; @@ -461,7 +461,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT else { info.dwType = RIM_TYPEHID; - info.u.hid = hid_device->info; + info.u.hid = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; @@ -470,8 +470,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (device == WINE_MOUSE_HANDLE || - device == WINE_KEYBOARD_HANDLE) + if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE) { to_copy_bytes = 0; *data_size = 0; @@ -479,9 +478,9 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; *data_size = to_copy_bytes; - to_copy = hid_device->data; + to_copy = device->data; } break;

1 0

Alistair Leslie-Hughes : secur32: Fix compile for older gnutls libraries.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 353c16f0d60f591b683ab75ab78d13cc94ee0891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=353c16f0d60f591b683ab75a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 10 13:30:44 2020 +1000 secur32: Fix compile for older gnutls libraries. GNUTLS_ALPN_SERVER_PRECEDENCE was introduced into 3.5. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index f177d90dfd..c4a36a899a 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -119,7 +119,7 @@ MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #define GNUTLS_KX_ECDHE_PSK 14 #endif -#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 2) +#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 5) #define GNUTLS_ALPN_SERVER_PRECEDENCE (1<<1) #endif

1 0

Jacek Caban : dbghelp: Use debuggee environment variables in search_dll_path.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 2b0977fc711e1faadfef69e3a46c2d1848b4826b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0977fc711e1faadfef69e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 9 19:59:57 2020 +0200 dbghelp: Use debuggee environment variables in search_dll_path. This fixes searching wow32 binaries, where debuggee search path is different than debugger's. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 75 ++++++++++++++++++++++++++++++++++++++---- dlls/dbghelp/dbghelp_private.h | 5 ++- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/path.c | 18 +++++----- dlls/dbghelp/pe_module.c | 2 +- 6 files changed, 86 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2b0977fc711e1faadfef…

1 0

Hans Leidekker : secur32: Add TLS application protocol negotiation support.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 0527cf89fb907c330bc4fad3b135a1c85208fa9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0527cf89fb907c330bc4fad3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 9 17:25:32 2020 +0200 secur32: Add TLS application protocol negotiation support. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 25 ++++-- dlls/secur32/schannel_gnutls.c | 112 +++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 4 +- dlls/secur32/tests/schannel.c | 198 +++++++++++++++++++++++++++++++++-------- include/sspi.h | 26 ++++++ 5 files changed, 323 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0527cf89fb907c330bc4…

1 0

Nikolay Sivov : mf: Add IMFAudioPolicy stub for SAR.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 86d20a47f48f40ad3de681139d2ef71c9439c181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86d20a47f48f40ad3de68113… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 9 15:36:21 2020 +0300 mf: Add IMFAudioPolicy stub for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 6 ++++ include/mfidl.idl | 16 +++++++++ 3 files changed, 117 insertions(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 04b1d7a684..7fefadeef2 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -51,6 +51,7 @@ struct audio_renderer IMFGetService IMFGetService_iface; IMFSimpleAudioVolume IMFSimpleAudioVolume_iface; IMFAudioStreamVolume IMFAudioStreamVolume_iface; + IMFAudioPolicy IMFAudioPolicy_iface; LONG refcount; IMFMediaEventQueue *event_queue; IMFPresentationClock *clock; @@ -94,6 +95,11 @@ static struct audio_renderer *impl_from_IMFAudioStreamVolume(IMFAudioStreamVolum return CONTAINING_RECORD(iface, struct audio_renderer, IMFAudioStreamVolume_iface); } +static struct audio_renderer *impl_from_IMFAudioPolicy(IMFAudioPolicy *iface) +{ + return CONTAINING_RECORD(iface, struct audio_renderer, IMFAudioPolicy_iface); +} + static struct audio_renderer_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct audio_renderer_stream, IMFStreamSink_iface); @@ -577,6 +583,10 @@ static HRESULT WINAPI audio_renderer_get_service_GetService(IMFGetService *iface { *obj = &renderer->IMFAudioStreamVolume_iface; } + else if (IsEqualGUID(service, &MR_AUDIO_POLICY_SERVICE) && IsEqualIID(riid, &IID_IMFAudioPolicy)) + { + *obj = &renderer->IMFAudioPolicy_iface; + } else FIXME("Unsupported service %s, interface %s.\n", debugstr_guid(service), debugstr_guid(riid)); @@ -739,6 +749,90 @@ static const IMFAudioStreamVolumeVtbl audio_renderer_stream_volume_vtbl = audio_renderer_stream_volume_GetAllVolumes, }; +static HRESULT WINAPI audio_renderer_policy_QueryInterface(IMFAudioPolicy *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAudioPolicy) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAudioPolicy_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI audio_renderer_policy_AddRef(IMFAudioPolicy *iface) +{ + struct audio_renderer *renderer = impl_from_IMFAudioPolicy(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI audio_renderer_policy_Release(IMFAudioPolicy *iface) +{ + struct audio_renderer *renderer = impl_from_IMFAudioPolicy(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI audio_renderer_policy_SetGroupingParam(IMFAudioPolicy *iface, REFGUID param) +{ + FIXME("%p, %s.\n", iface, debugstr_guid(param)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_policy_GetGroupingParam(IMFAudioPolicy *iface, GUID *param) +{ + FIXME("%p, %p.\n", iface, param); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_policy_SetDisplayName(IMFAudioPolicy *iface, const WCHAR *name) +{ + FIXME("%p, %s.\n", iface, debugstr_w(name)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_policy_GetDisplayName(IMFAudioPolicy *iface, WCHAR **name) +{ + FIXME("%p, %p.\n", iface, name); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_policy_SetIconPath(IMFAudioPolicy *iface, const WCHAR *path) +{ + FIXME("%p, %s.\n", iface, debugstr_w(path)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_policy_GetIconPath(IMFAudioPolicy *iface, WCHAR **path) +{ + FIXME("%p, %p.\n", iface, path); + + return E_NOTIMPL; +} + +static const IMFAudioPolicyVtbl audio_renderer_policy_vtbl = +{ + audio_renderer_policy_QueryInterface, + audio_renderer_policy_AddRef, + audio_renderer_policy_Release, + audio_renderer_policy_SetGroupingParam, + audio_renderer_policy_GetGroupingParam, + audio_renderer_policy_SetDisplayName, + audio_renderer_policy_GetDisplayName, + audio_renderer_policy_SetIconPath, + audio_renderer_policy_GetIconPath, +}; + static HRESULT sar_create_mmdevice(IMFAttributes *attributes, IMMDevice **device) { WCHAR *endpoint; @@ -1115,6 +1209,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->IMFGetService_iface.lpVtbl = &audio_renderer_get_service_vtbl; renderer->IMFSimpleAudioVolume_iface.lpVtbl = &audio_renderer_simple_volume_vtbl; renderer->IMFAudioStreamVolume_iface.lpVtbl = &audio_renderer_stream_volume_vtbl; + renderer->IMFAudioPolicy_iface.lpVtbl = &audio_renderer_policy_vtbl; renderer->refcount = 1; InitializeCriticalSection(&renderer->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index fbcbb6272b..789b4d0494 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2820,6 +2820,12 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IUnknown_Release(unk); + hr = MFGetService((IUnknown *)sink, &MR_AUDIO_POLICY_SERVICE, &IID_IMFAudioPolicy, (void **)&unk); +todo_wine + ok(hr == MF_E_NOT_INITIALIZED, "Failed to get interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + /* Shutdown */ hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); diff --git a/include/mfidl.idl b/include/mfidl.idl index 13286296bc..4e7a43f5ff 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -989,6 +989,21 @@ interface IMFAudioStreamVolume : IUnknown [out, size_is(count)] float *volumes); } +[ + object, + uuid(a0638c2b-6465-4395-9ae7-a321a9fd2856), + local +] +interface IMFAudioPolicy : IUnknown +{ + HRESULT SetGroupingParam([in] REFGUID param); + HRESULT GetGroupingParam([out] GUID *param); + HRESULT SetDisplayName([in] LPCWSTR name); + HRESULT GetDisplayName([out] LPWSTR *name); + HRESULT SetIconPath([in] LPCWSTR path); + HRESULT GetIconPath([out] LPWSTR *path); +} + cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") cpp_quote("{") @@ -1092,6 +1107,7 @@ cpp_quote("EXTERN_C const GUID MF_SCRUBBING_SERVICE;") cpp_quote("EXTERN_GUID(MR_POLICY_VOLUME_SERVICE, 0x1abaa2ac, 0x9d3b, 0x47c6, 0xab, 0x48, 0xc5, 0x95, 0x06, 0xde, 0x78, 0x4d);") cpp_quote("EXTERN_GUID(MR_CAPTURE_POLICY_VOLUME_SERVICE, 0x24030acd, 0x107a, 0x4265, 0x97, 0x5c, 0x41, 0x4e, 0x33, 0xe6, 0x5f, 0x2a);") cpp_quote("EXTERN_GUID(MR_STREAM_VOLUME_SERVICE, 0xf8b5fa2f, 0x32ef, 0x46f5, 0xb1, 0x72, 0x13, 0x21, 0x21, 0x2f, 0xb2, 0xc4);") +cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6, 0x14, 0x29, 0x78, 0x62, 0xfd, 0xac, 0x88);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);")

1 0

Nikolay Sivov : mf: Add volume control stubs for SAR.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: e609427dfd1be7cedf6ac10a728693ba153427ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=e609427dfd1be7cedf6ac10a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 9 15:36:20 2020 +0300 mf: Add volume control stubs for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 9 +++ include/mfidl.idl | 36 +++++++++ 3 files changed, 266 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e609427dfd1be7cedf6a…

1 0

Nikolay Sivov : mfplat: Initial support for WAVE_FORMAT_EXTENSIBLE in MFInitMediaTypeFromWaveFormatEx().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 1ff8014a77692adc6804e9bda753c3e0225f2576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff8014a77692adc6804e9bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 9 15:33:40 2020 +0300 mfplat: Initial support for WAVE_FORMAT_EXTENSIBLE in MFInitMediaTypeFromWaveFormatEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 58 ++++++++++++--------- dlls/mfplat/tests/mfplat.c | 127 ++++++++++++++++++++++++++++++++------------- 2 files changed, 125 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff8014a77692adc6804…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: d5c5e7363838d8b9935cd269d314545a5c39a86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c5e7363838d8b9935cd269… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 9 14:51:43 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/po/fi.po b/po/fi.po index 85840fdc1c..3fc1de5e6e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8428,7 +8428,7 @@ msgstr "Valitse tarjoaja." msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "Tarjoajaa ei ole enää saatavilla. Varmista, että se on asennettu." #: version.rc:36 msgid "Data Link Properties" @@ -9876,16 +9876,12 @@ msgid "Argentina Daylight Time" msgstr "Argentiinan kesäaika" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Mauritiuksen normaaliaika" +msgstr "Marquesassaarten normaaliaika" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Mauritiuksen kesäaika" +msgstr "Marquesassaarten kesäaika" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10260,16 +10256,12 @@ msgid "Venezuela Daylight Time" msgstr "Venezuelan kesäaika" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Kalliovuorten normaaliaika" +msgstr "Bougainvillen normaaliaika" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Kalliovuorten kesäaika" +msgstr "Bougainvillen kesäaika" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10384,16 +10376,12 @@ msgid "Korea Daylight Time" msgstr "Korean kesäaika" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Pääsiäissaarten normaaliaika" +msgstr "Chathamsaarten normaaliaika" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Pääsiäissaarten kesäaika" +msgstr "Chathamsaarten kesäaika" #: tzres.rc:92 msgid "E. Africa Standard Time"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020