wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Rémi Bernon : winebus: Remove devices that are ignored wrt hidraw preferences.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: de265dfa0bc41fefec3525cd6a1db5d1e1d57029 URL: https://gitlab.winehq.org/wine/wine/-/commit/de265dfa0bc41fefec3525cd6a1db5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 12:29:50 2024 +0100 winebus: Remove devices that are ignored wrt hidraw preferences. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56450 --- dlls/winebus.sys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 5244d7dda54..8d3b72d93f1 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -670,8 +670,10 @@ static DWORD CALLBACK bus_main_thread(void *args) if (desc.is_hidraw && !desc.usages.UsagePage) desc.usages = get_hidraw_device_usages(event->device); if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid, &desc.usages)) { + struct device_remove_params params = {.device = event->device}; WARN("ignoring %shidraw device %04x:%04x with usages %04x:%04x\n", desc.is_hidraw ? "" : "non-", desc.vid, desc.pid, desc.usages.UsagePage, desc.usages.Usage); + winebus_call(device_remove, &params); break; }

1 0

Rémi Bernon : winebus: Prefer hidraw for everything that is not a game controller.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 8b41c2cfddba1f9973246f61e39d4a4d92912da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b41c2cfddba1f9973246f61e39d4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 18 15:46:31 2024 +0100 winebus: Prefer hidraw for everything that is not a game controller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56450 --- dlls/winebus.sys/main.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 044b5e0141c..5244d7dda54 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -388,7 +388,7 @@ static DWORD check_bus_option(const WCHAR *option, DWORD default_value) return default_value; } -static BOOL is_hidraw_enabled(WORD vid, WORD pid) +static BOOL is_hidraw_enabled(WORD vid, WORD pid, const USAGE_AND_PAGE *usages) { char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[1024])]; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; @@ -398,6 +398,8 @@ static BOOL is_hidraw_enabled(WORD vid, WORD pid) DWORD size; if (check_bus_option(L"DisableHidraw", FALSE)) return FALSE; + if (usages->UsagePage != HID_USAGE_PAGE_GENERIC) return TRUE; + if (usages->Usage != HID_USAGE_GENERIC_GAMEPAD && usages->Usage != HID_USAGE_GENERIC_JOYSTICK) return TRUE; if (!check_bus_option(L"Enable SDL", 1) && check_bus_option(L"DisableInput", 0)) prefer_hidraw = TRUE; @@ -666,12 +668,16 @@ static DWORD CALLBACK bus_main_thread(void *args) { struct device_desc desc = event->device_created.desc; if (desc.is_hidraw && !desc.usages.UsagePage) desc.usages = get_hidraw_device_usages(event->device); - if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid)) + if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid, &desc.usages)) { - WARN("ignoring %shidraw device %04x:%04x\n", desc.is_hidraw ? "" : "non-", desc.vid, desc.pid); + WARN("ignoring %shidraw device %04x:%04x with usages %04x:%04x\n", desc.is_hidraw ? "" : "non-", + desc.vid, desc.pid, desc.usages.UsagePage, desc.usages.Usage); break; } + TRACE("creating %shidraw device %04x:%04x with usages %04x:%04x\n", desc.is_hidraw ? "" : "non-", + desc.vid, desc.pid, desc.usages.UsagePage, desc.usages.Usage); + device = bus_create_hid_device(&event->device_created.desc, event->device); if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); else

1 0

Rémi Bernon : winebus: Read hidraw device usages from their report descriptors.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: ebfe2653ead71aca427d233f0fcd42a56bac5078 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebfe2653ead71aca427d233f0fcd42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 18 15:46:31 2024 +0100 winebus: Read hidraw device usages from their report descriptors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56450 --- dlls/winebus.sys/main.c | 119 +++++++++++++++++++++++++++++++----------------- 1 file changed, 77 insertions(+), 42 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index dceba4747b8..044b5e0141c 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -119,19 +119,6 @@ static NTSTATUS unix_device_start(DEVICE_OBJECT *device) return winebus_call(device_start, &params); } -static NTSTATUS unix_device_get_report_descriptor(DEVICE_OBJECT *device, BYTE *buffer, UINT length, UINT *out_length) -{ - struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct device_descriptor_params params = - { - .device = ext->unix_device, - .buffer = buffer, - .length = length, - .out_length = out_length - }; - return winebus_call(device_get_report_descriptor, &params); -} - static void unix_device_set_output_report(DEVICE_OBJECT *device, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; @@ -572,6 +559,66 @@ static void keyboard_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static NTSTATUS get_device_descriptors(UINT64 unix_device, BYTE **report_desc, UINT *report_desc_length, + HIDP_DEVICE_DESC *device_desc) +{ + struct device_descriptor_params params = + { + .device = unix_device, + .out_length = report_desc_length, + }; + NTSTATUS status; + + status = winebus_call(device_get_report_descriptor, &params); + if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + { + ERR("Failed to get device %#I64x report descriptor, status %#lx\n", unix_device, status); + return status; + } + + if (!(params.buffer = RtlAllocateHeap(GetProcessHeap(), 0, *report_desc_length))) + return STATUS_NO_MEMORY; + params.length = *report_desc_length; + + if ((status = winebus_call(device_get_report_descriptor, &params))) + { + ERR("Failed to get device %#I64x report descriptor, status %#lx\n", unix_device, status); + RtlFreeHeap(GetProcessHeap(), 0, params.buffer); + return status; + } + + params.length = *report_desc_length; + status = HidP_GetCollectionDescription(params.buffer, params.length, PagedPool, device_desc); + if (status != HIDP_STATUS_SUCCESS) + { + ERR("Failed to get device %#I64x report descriptor, status %#lx\n", unix_device, status); + RtlFreeHeap(GetProcessHeap(), 0, params.buffer); + return status; + } + + *report_desc = params.buffer; + return STATUS_SUCCESS; +} + +static USAGE_AND_PAGE get_hidraw_device_usages(UINT64 unix_device) +{ + HIDP_DEVICE_DESC device_desc; + USAGE_AND_PAGE usages = {0}; + UINT report_desc_length; + BYTE *report_desc; + NTSTATUS status; + + if (!(status = get_device_descriptors(unix_device, &report_desc, &report_desc_length, &device_desc))) + { + usages.UsagePage = device_desc.CollectionDesc[0].UsagePage; + usages.Usage = device_desc.CollectionDesc[0].Usage; + HidP_FreeCollectionDescription(&device_desc); + RtlFreeHeap(GetProcessHeap(), 0, report_desc); + } + + return usages; +} + static DWORD bus_count; static HANDLE bus_thread[16]; @@ -617,10 +664,11 @@ static DWORD CALLBACK bus_main_thread(void *args) break; case BUS_EVENT_TYPE_DEVICE_CREATED: { - const struct device_desc *desc = &event->device_created.desc; - if (!desc->is_hidraw != !is_hidraw_enabled(desc->vid, desc->pid)) + struct device_desc desc = event->device_created.desc; + if (desc.is_hidraw && !desc.usages.UsagePage) desc.usages = get_hidraw_device_usages(event->device); + if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid)) { - WARN("ignoring %shidraw device %04x:%04x\n", desc->is_hidraw ? "" : "non-", desc->vid, desc->pid); + WARN("ignoring %shidraw device %04x:%04x\n", desc.is_hidraw ? "" : "non-", desc.vid, desc.pid); break; } @@ -899,37 +947,24 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) else if (ext->state == DEVICE_STATE_REMOVED) status = STATUS_DELETE_PENDING; else if ((status = unix_device_start(device))) ERR("Failed to start device %p, status %#lx\n", device, status); - else + else if (!(status = get_device_descriptors(ext->unix_device, &ext->report_desc, &ext->report_desc_length, + &ext->collection_desc))) { - status = unix_device_get_report_descriptor(device, NULL, 0, &ext->report_desc_length); - if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) - ERR("Failed to get device %p report descriptor, status %#lx\n", device, status); - else if (!(ext->report_desc = RtlAllocateHeap(GetProcessHeap(), 0, ext->report_desc_length))) - status = STATUS_NO_MEMORY; - else if ((status = unix_device_get_report_descriptor(device, ext->report_desc, ext->report_desc_length, - &ext->report_desc_length))) - ERR("Failed to get device %p report descriptor, status %#lx\n", device, status); - else if ((status = HidP_GetCollectionDescription(ext->report_desc, ext->report_desc_length, - PagedPool, &ext->collection_desc)) != HIDP_STATUS_SUCCESS) - ERR("Failed to parse device %p report descriptor, status %#lx\n", device, status); - else + status = STATUS_SUCCESS; + reports = ext->collection_desc.ReportIDs; + for (i = 0; i < ext->collection_desc.ReportIDsLength; ++i) { - status = STATUS_SUCCESS; - reports = ext->collection_desc.ReportIDs; - for (i = 0; i < ext->collection_desc.ReportIDsLength; ++i) + if (!(size = reports[i].InputLength)) continue; + size = offsetof( struct hid_report, buffer[size] ); + if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; + else { - if (!(size = reports[i].InputLength)) continue; - size = offsetof( struct hid_report, buffer[size] ); - if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; - else - { - report->length = reports[i].InputLength; - report->buffer[0] = reports[i].ReportID; - ext->last_reports[reports[i].ReportID] = report; - } + report->length = reports[i].InputLength; + report->buffer[0] = reports[i].ReportID; + ext->last_reports[reports[i].ReportID] = report; } - if (!status) ext->state = DEVICE_STATE_STARTED; } + if (!status) ext->state = DEVICE_STATE_STARTED; } RtlLeaveCriticalSection(&ext->cs); break;

1 0

Rémi Bernon : winebus: Add HID usages in the device descriptor when possible.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: d48e25083565e78a0553e2ab158907218a139748 URL: https://gitlab.winehq.org/wine/wine/-/commit/d48e25083565e78a0553e2ab158907… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 11:34:51 2024 +0100 winebus: Add HID usages in the device descriptor when possible. As a hint for the frontend to decide whether to use hidraw. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56450 --- dlls/winebus.sys/bus_iohid.c | 9 ++++----- dlls/winebus.sys/bus_sdl.c | 4 ++++ dlls/winebus.sys/bus_udev.c | 3 +++ dlls/winebus.sys/unixlib.h | 7 +++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index a44944576e9..e7960e185e9 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -276,18 +276,17 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * }; struct iohid_device *impl; CFStringRef str; - UINT usage_page, usage; - usage_page = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); - usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); + desc.usages.UsagePage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey))); + desc.usages.Usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey))); desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); - if (usage_page != HID_USAGE_PAGE_GENERIC || - !(usage == HID_USAGE_GENERIC_JOYSTICK || usage == HID_USAGE_GENERIC_GAMEPAD)) + if (desc.usages.UsagePage != HID_USAGE_PAGE_GENERIC || + !(desc.usages.Usage == HID_USAGE_GENERIC_JOYSTICK || desc.usages.Usage == HID_USAGE_GENERIC_GAMEPAD)) { /* winebus isn't currently meant to handle anything but these, and * opening keyboards, mice, or the Touch Bar on older MacBooks triggers diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 7b43df82f83..2a60f112a83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -990,6 +990,8 @@ static void sdl_add_device(unsigned int index) if (controller) { desc.is_gamepad = TRUE; + desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC; + desc.usages.Usage = HID_USAGE_GENERIC_GAMEPAD; axis_count = 6; } else @@ -997,6 +999,8 @@ static void sdl_add_device(unsigned int index) int button_count = pSDL_JoystickNumButtons(joystick); axis_count = pSDL_JoystickNumAxes(joystick); desc.is_gamepad = (axis_count == 6 && button_count >= 14); + desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC; + desc.usages.Usage = HID_USAGE_GENERIC_JOYSTICK; } for (axis_offset = 0; axis_offset < axis_count; axis_offset += (options.split_controllers ? 6 : axis_count)) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f8c6ccb9060..419de2e7af3 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1332,6 +1332,7 @@ static void udev_add_device(struct udev_device *dev, int fd) #ifdef HAS_PROPER_INPUT_HEADER else if (!strcmp(subsystem, "input")) { + const USAGE_AND_PAGE device_usage = *what_am_I(dev, fd); static const WCHAR evdev[] = {'e','v','d','e','v',0}; struct input_id device_id = {0}; char buffer[MAX_PATH]; @@ -1352,6 +1353,8 @@ static void udev_add_device(struct udev_device *dev, int fd) if (!desc.serialnumber[0] && ioctl(fd, EVIOCGUNIQ(sizeof(buffer)), buffer) >= 0) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); + + desc.usages = device_usage; } #endif diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 80852696dd1..753886304db 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -25,6 +25,7 @@ #include <winbase.h> #include <winternl.h> #include <ddk/hidclass.h> +#include <ddk/hidpi.h> #include <hidusage.h> #include "wine/debug.h" @@ -37,6 +38,7 @@ struct device_desc UINT version; UINT input; UINT uid; + USAGE_AND_PAGE usages; BOOL is_gamepad; BOOL is_hidraw; @@ -148,8 +150,9 @@ enum unix_funcs static inline const char *debugstr_device_desc(struct device_desc *desc) { if (!desc) return "(null)"; - return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u, is_hidraw %u}", - desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad, desc->is_hidraw); + return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, usage %04x:%04x, is_gamepad %u, is_hidraw %u}", + desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->usages.UsagePage, desc->usages.Usage, + desc->is_gamepad, desc->is_hidraw); } static inline BOOL is_xbox_gamepad(WORD vid, WORD pid)

1 0

Rémi Bernon : mfplat/mediatype: Implement MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: eac5ad2a2618218028b7c563b5b3e0b6efafdf76 URL: https://gitlab.winehq.org/wine/wine/-/commit/eac5ad2a2618218028b7c563b5b3e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 11 11:53:36 2024 +0100 mfplat/mediatype: Implement MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/mediatype.c | 91 ++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 109 --------------------------------------------- 2 files changed, 89 insertions(+), 111 deletions(-)

1 0

Rémi Bernon : mfplat/tests: Add tests for MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 899abeafe42cfe9b2ca717bfdfc96ae79391eec5 URL: https://gitlab.winehq.org/wine/wine/-/commit/899abeafe42cfe9b2ca717bfdfc96a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 08:01:50 2024 +0100 mfplat/tests: Add tests for MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/tests/mfplat.c | 557 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 557 insertions(+)

1 0

Rémi Bernon : mfplat/mediatype: Stub MFInitMediaTypeFromMFVideoFormat.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: a712d7ec871e5bd87ec0edfdf1e95991faadbd43 URL: https://gitlab.winehq.org/wine/wine/-/commit/a712d7ec871e5bd87ec0edfdf1e959… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 mfplat/mediatype: Stub MFInitMediaTypeFromMFVideoFormat. --- dlls/mfplat/mediatype.c | 9 +++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b550649022f..edd249979eb 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3756,6 +3756,15 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromVideoInfoHeader(const KS_VIDEOINFOHEADE return E_NOTIMPL; } +/*********************************************************************** + * MFInitMediaTypeFromMFVideoFormat (mfplat.@) + */ +HRESULT WINAPI MFInitMediaTypeFromMFVideoFormat(IMFMediaType *media_type, const MFVIDEOFORMAT *format, UINT32 size) +{ + FIXME("%p, %p, %u\n", media_type, format, size); + return E_NOTIMPL; +} + /*********************************************************************** * MFInitMediaTypeFromVideoInfoHeader2 (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 44d1b89fff5..d8a6eb5ce83 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -120,7 +120,7 @@ @ stdcall MFInitAMMediaTypeFromMFMediaType(ptr int128 ptr) @ stdcall MFInitAttributesFromBlob(ptr ptr long) @ stdcall MFInitMediaTypeFromAMMediaType(ptr ptr) -@ stub MFInitMediaTypeFromMFVideoFormat +@ stdcall MFInitMediaTypeFromMFVideoFormat(ptr ptr long) @ stub MFInitMediaTypeFromMPEG1VideoInfo @ stub MFInitMediaTypeFromMPEG2VideoInfo @ stdcall MFInitMediaTypeFromVideoInfoHeader2(ptr ptr long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index 27b0f4fd841..f986edd0d5a 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -593,6 +593,7 @@ BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID format, AM_MEDIA_TYPE *am_type); HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *mediatype, const AM_MEDIA_TYPE *am_type); +HRESULT WINAPI MFInitMediaTypeFromMFVideoFormat(IMFMediaType *media_type, const MFVIDEOFORMAT *format, UINT32 size); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, const GUID *subtype); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader2(IMFMediaType *media_type, const VIDEOINFOHEADER2 *vih,

1 0

Rémi Bernon : mfplat/tests: Check the conditions for the MFVideoFlag_BottomUpLinearRep flags.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: fe0c129e0bfcdf38360b2ebca33e2a3c0d2c43bf URL: https://gitlab.winehq.org/wine/wine/-/commit/fe0c129e0bfcdf38360b2ebca33e2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 19 10:18:09 2024 +0100 mfplat/tests: Check the conditions for the MFVideoFlag_BottomUpLinearRep flags. --- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4e580d5d2b9..dcdb886ae41 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7137,6 +7137,37 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)123 << 32 | 456); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_SAMPLE_SIZE, 123 * 456 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.dwWidth == 123, "got %lu.\n", video_format->videoInfo.dwWidth); + ok(video_format->videoInfo.dwHeight == 456, "got %lu.\n", video_format->videoInfo.dwHeight); + ok(video_format->videoInfo.VideoFlags == 0, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, 123 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.VideoFlags == 0, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, -123 * 4); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_format->videoInfo.VideoFlags == MFVideoFlag_BottomUpLinearRep, "got %#I64x.\n", video_format->videoInfo.VideoFlags); + CoTaskMemFree(video_format); + + memset(palette, 0xa5, sizeof(palette)); expect_size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[ARRAY_SIZE(palette) + 1]); hr = IMFMediaType_SetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette));

1 0

Rémi Bernon : mfplat/mediatype: Append user data in MFCreateMFVideoFormatFromMFMediaType.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: b1d7c03514b7f7a5a490c9208a80fdc9c7a38d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d7c03514b7f7a5a490c9208a80fd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 12 19:40:24 2024 +0100 mfplat/mediatype: Append user data in MFCreateMFVideoFormatFromMFMediaType. --- dlls/mfplat/mediatype.c | 16 ++++++++++++---- dlls/mfplat/tests/mfplat.c | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 35fce38652b..b550649022f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3247,17 +3247,20 @@ static UINT32 media_type_get_uint32(IMFMediaType *media_type, REFGUID guid) */ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MFVIDEOFORMAT **video_format, UINT32 *size) { - UINT32 palette_size = 0; + UINT32 palette_size = 0, user_data_size = 0; MFVIDEOFORMAT *format; INT32 stride; GUID guid; TRACE("%p, %p, %p.\n", media_type, video_format, size); - *size = sizeof(*format); - if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_PALETTE, &palette_size))) - *size += palette_size; + *size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[palette_size / sizeof(MFPaletteEntry) + 1]); + else + *size = sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetBlobSize(media_type, &MF_MT_USER_DATA, &user_data_size))) + *size += user_data_size; if (!(format = CoTaskMemAlloc(*size))) return E_OUTOFMEMORY; @@ -3316,6 +3319,11 @@ HRESULT WINAPI MFCreateMFVideoFormatFromMFMediaType(IMFMediaType *media_type, MF IMFMediaType_GetBlob(media_type, &MF_MT_PALETTE, (UINT8 *)format->surfaceInfo.Palette, palette_size, NULL); } + if (user_data_size) + { + IMFMediaType_GetBlob(media_type, &MF_MT_USER_DATA, (UINT8 *)format + *size - user_data_size, user_data_size, NULL); + } + return S_OK; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 860a7424170..4e580d5d2b9 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7144,7 +7144,7 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(size == expect_size, "Unexpected size %u.\n", size); ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); @@ -7155,7 +7155,7 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(size == expect_size, "Unexpected size %u.\n", size); ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format);

1 0

Rémi Bernon : mfplat/tests: Test that MFCreateMFVideoFormatFromMFMediaType appends user data.
by Alexandre Julliard 19 Mar '24

19 Mar '24

Module: wine Branch: master Commit: 75a5263c60882e4ed6e523ad69bf2dc0fb019a42 URL: https://gitlab.winehq.org/wine/wine/-/commit/75a5263c60882e4ed6e523ad69bf2d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 7 22:46:07 2024 +0100 mfplat/tests: Test that MFCreateMFVideoFormatFromMFMediaType appends user data. --- dlls/mfplat/tests/mfplat.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39fb439b65a..860a7424170 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7120,16 +7120,43 @@ static void test_MFCreateMFVideoFormatFromMFMediaType(void) { MFVIDEOFORMAT *video_format; IMFMediaType *media_type; - UINT32 size; + UINT32 size, expect_size; + PALETTEENTRY palette[64]; + BYTE codec_data[32]; HRESULT hr; + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + expect_size = sizeof(*video_format); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!video_format, "Unexpected format.\n"); + ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); + CoTaskMemFree(video_format); + + memset(palette, 0xa5, sizeof(palette)); + expect_size = offsetof(MFVIDEOFORMAT, surfaceInfo.Palette[ARRAY_SIZE(palette) + 1]); + hr = IMFMediaType_SetBlob(media_type, &MF_MT_PALETTE, (BYTE *)palette, sizeof(palette)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!video_format, "Unexpected format.\n"); + todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); + CoTaskMemFree(video_format); + + memset(codec_data, 0xcd, sizeof(codec_data)); + expect_size += sizeof(codec_data); + hr = IMFMediaType_SetBlob(media_type, &MF_MT_USER_DATA, codec_data, sizeof(codec_data)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFCreateMFVideoFormatFromMFMediaType(media_type, &video_format, &size); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!video_format, "Unexpected format.\n"); - ok(video_format->dwSize == size && size == sizeof(*video_format), "Unexpected size %u.\n", size); + todo_wine ok(size == expect_size, "Unexpected size %u.\n", size); + ok(video_format->dwSize == size, "Unexpected size %u.\n", size); CoTaskMemFree(video_format); IMFMediaType_Release(media_type);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
78
Older →

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 March 2024