wine-commits May 2024

wine-commits@winehq.org

1 participants
705 discussions

Esme Povirk : gdiplus: Do not create gdi32 objects for Bitmap objects.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 6b19838162ca5af5211ec3cbce78442a95b6411a URL: https://gitlab.winehq.org/wine/wine/-/commit/6b19838162ca5af5211ec3cbce7844… Author: Esme Povirk <esme(a)codeweavers.com> Date: Thu May 2 16:17:35 2024 -0500 gdiplus: Do not create gdi32 objects for Bitmap objects. --- dlls/gdiplus/gdiplus_private.h | 4 +- dlls/gdiplus/graphics.c | 102 +++++++++++++++-------------------------- dlls/gdiplus/image.c | 81 +++----------------------------- dlls/gdiplus/tests/graphics.c | 2 +- 4 files changed, 46 insertions(+), 143 deletions(-)

1 0

Esme Povirk : gdiplus: Add a test for GdipWidenPath with Custom linecaps.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 101ffccebf5ef4067ce881eac6ed079224b9dc5e URL: https://gitlab.winehq.org/wine/wine/-/commit/101ffccebf5ef4067ce881eac6ed07… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue May 7 14:12:44 2024 -0500 gdiplus: Add a test for GdipWidenPath with Custom linecaps. --- dlls/gdiplus/tests/graphicspath.c | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index f6e0264b786..b5c42d8378d 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1767,6 +1767,33 @@ static path_test_t widenline_capsquareanchor_multifigure_path[] = { {57.071068, 17.071068, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*23*/ }; +static path_test_t widenline_customarrow_multifigure_path[] = { + {6.0, 9.5, PathPointTypeStart}, /*0*/ + {24.0, 9.5, PathPointTypeLine}, /*1*/ + {24.0, 10.5, PathPointTypeLine}, /*2*/ + {6.0, 10.5, PathPointTypeLine|PathPointTypeCloseSubpath}, /*3*/ + {30.5, 11.0, PathPointTypeStart}, /*4*/ + {30.5, 29.0, PathPointTypeLine}, /*5*/ + {29.5, 29.0, PathPointTypeLine}, /*6*/ + {29.5, 11.0, PathPointTypeLine|PathPointTypeCloseSubpath}, /*7*/ + {13.0, 14.0, PathPointTypeStart}, /*8*/ + {5.0, 10.0, PathPointTypeLine}, /*9*/ + {13.0, 6.0, PathPointTypeLine}, /*10*/ + {11.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath}, /*11*/ + {17.0, 6.0, PathPointTypeStart}, /*12*/ + {25.0, 10.0, PathPointTypeLine}, /*13*/ + {17.0, 14.0, PathPointTypeLine}, /*14*/ + {19.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath}, /*15*/ + {26.0, 18.0, PathPointTypeStart}, /*16*/ + {30.0, 10.0, PathPointTypeLine}, /*17*/ + {34.0, 18.0, PathPointTypeLine}, /*18*/ + {30.0, 16.0, PathPointTypeLine|PathPointTypeCloseSubpath}, /*19*/ + {34.0, 22.0, PathPointTypeStart}, /*20*/ + {30.0, 30.0, PathPointTypeLine}, /*21*/ + {26.0, 22.0, PathPointTypeLine}, /*22*/ + {30.0, 24.0, PathPointTypeLine|PathPointTypeCloseSubpath}, /*23*/ + }; + static void test_widen_cap(void) { struct @@ -1873,14 +1900,28 @@ static void test_widen_cap(void) ok_path_fudge(path, widenline_capsquareanchor_multifigure_path, ARRAY_SIZE(widenline_capsquareanchor_multifigure_path), FALSE, 0.000005); + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 25.0, 10.0); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + status = GdipAddPathLine(path, 30.0, 10.0, 30.0, 30.0); + expect(Ok, status); status = GdipCreateAdjustableArrowCap(4.0, 4.0, TRUE, &arrowcap); ok(status == Ok, "Failed to create adjustable cap, %d\n", status); status = GdipSetAdjustableArrowCapMiddleInset(arrowcap, 1.0); ok(status == Ok, "Failed to set middle inset inadjustable cap, %d\n", status); + status = GdipSetPenCustomStartCap(pen, (GpCustomLineCap*)arrowcap); + ok(status == Ok, "Failed to create custom end cap, %d\n", status); status = GdipSetPenCustomEndCap(pen, (GpCustomLineCap*)arrowcap); ok(status == Ok, "Failed to create custom end cap, %d\n", status); + status = GdipSetPenWidth(pen, 1.0); + expect(Ok, status); status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); + ok_path_fudge(path, widenline_customarrow_multifigure_path, + ARRAY_SIZE(widenline_customarrow_multifigure_path), FALSE, 0.000005); GdipDeletePen(pen);

1 0

Rémi Bernon : winemac: Set DEVMODEW dmSize field.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 33147b07b0acf95885e5640c2e8c47dd82303a78 URL: https://gitlab.winehq.org/wine/wine/-/commit/33147b07b0acf95885e5640c2e8c47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 15:50:56 2024 +0200 winemac: Set DEVMODEW dmSize field. --- dlls/winemac.drv/display.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c8e29cbf908..cc580e155ef 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -97,7 +97,7 @@ static BOOL display_mode_is_supported(CGDisplayModeRef display_mode) } -static void display_mode_to_devmode(CGDirectDisplayID display_id, CGDisplayModeRef display_mode, DEVMODEW *devmode) +static void display_mode_to_devmode_fields(CGDirectDisplayID display_id, CGDisplayModeRef display_mode, DEVMODEW *devmode) { uint32_t io_flags; double rotation; @@ -847,7 +847,11 @@ static DEVMODEW *display_get_modes(CGDirectDisplayID display_id, int *modes_coun for (i = 0; i < count; i++) { CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); - display_mode_to_devmode(display_id, mode, devmodes + i); + + memset(devmodes + i, 0, sizeof(*devmodes)); + devmodes[i].dmSize = sizeof(*devmodes); + + display_mode_to_devmode_fields(display_id, mode, devmodes + i); if (retina_enabled && display_mode_matches_descriptor(mode, desc)) { @@ -892,7 +896,7 @@ static void display_get_current_mode(struct macdrv_display *display, DEVMODEW *d devmode->dmPosition.y = CGRectGetMinY(display->frame); devmode->dmFields |= DM_POSITION; - display_mode_to_devmode(display_id, display_mode, devmode); + display_mode_to_devmode_fields(display_id, display_mode, devmode); if (retina_enabled) { struct display_mode_descriptor *desc = create_original_display_mode_descriptor(display_id);

1 0

Rémi Bernon : wineandroid: Set DEVMODEW dmSize field.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: d59e6d861b5f6dff75ca1c1dccb3859545344cd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d59e6d861b5f6dff75ca1c1dccb385… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 15:50:40 2024 +0200 wineandroid: Set DEVMODEW dmSize field. --- dlls/wineandroid.drv/init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index c8d997b7aa4..9a06d8f147b 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -282,6 +282,7 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }; const DEVMODEW mode = { + .dmSize = sizeof(mode), .dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = screen_bpp, .dmPelsWidth = screen_width, .dmPelsHeight = screen_height, .dmDisplayFrequency = 60,

1 0

Rémi Bernon : win32u: Set DEVMODEW dmSize field.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 0e1b93585a1afa342531d4eb566a5a05326a0bc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e1b93585a1afa342531d4eb566a5a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 15:56:19 2024 +0200 win32u: Set DEVMODEW dmSize field. --- dlls/win32u/sysparams.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e7262cd33f6..d25ac89f130 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1718,23 +1718,29 @@ static BOOL default_update_display_devices( BOOL force, struct device_manager_ct */ static const DEVMODEW modes[] = { - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 32, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 32, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 32, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 16, .dmPelsWidth = 640, .dmPelsHeight = 480, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 16, .dmPelsWidth = 800, .dmPelsHeight = 600, .dmDisplayFrequency = 60, }, - { .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + { .dmSize = sizeof(DEVMODEW), + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = 16, .dmPelsWidth = 1024, .dmPelsHeight = 768, .dmDisplayFrequency = 60, }, }; static const DWORD source_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; struct pci_id pci_id = {0}; struct gdi_monitor monitor = {0}; - DEVMODEW mode = {{0}}; + DEVMODEW mode = {.dmSize = sizeof(mode)}; if (!force) return TRUE; @@ -1838,6 +1844,7 @@ static void add_virtual_modes( struct device_manager_ctx *ctx, const DEVMODEW *c { DEVMODEW mode = { + .dmSize = sizeof(mode), .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmDisplayFrequency = 60, .dmBitsPerPel = depths[i], @@ -1872,7 +1879,7 @@ static void add_virtual_modes( struct device_manager_ctx *ctx, const DEVMODEW *c static BOOL add_virtual_source( struct device_manager_ctx *ctx ) { - DEVMODEW current, initial = ctx->primary, maximum = ctx->primary; + DEVMODEW current = {.dmSize = sizeof(current)}, initial = ctx->primary, maximum = ctx->primary; struct source virtual_source = { .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE,

1 0

Huw Davies : nsi/tests: Use NSI_IP_COMPARTMENT_TABLE instead of hard coding the integer.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 8af82d67ecbd0ec74d236dcdd116855c08c96fda URL: https://gitlab.winehq.org/wine/wine/-/commit/8af82d67ecbd0ec74d236dcdd11685… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 10:26:32 2024 +0100 nsi/tests: Use NSI_IP_COMPARTMENT_TABLE instead of hard coding the integer. --- dlls/nsi/tests/nsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 1bae78d2563..0c0644064f7 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -439,7 +439,8 @@ static void test_ip_cmpt( int family ) key = 1; for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) { - err = NsiGetAllParameters( 1, mod, 2, &key, sizeof(key), &rw, rw_sizes[i], &dyn, sizeof(dyn), NULL, 0 ); + err = NsiGetAllParameters( 1, mod, NSI_IP_COMPARTMENT_TABLE, &key, sizeof(key), &rw, rw_sizes[i], + &dyn, sizeof(dyn), NULL, 0 ); if (!err) break; } ok( !err, "got %lx\n", err );

1 0

Piotr Caban : ntdll: Don't use gmtime concurrently.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 04927ec80db6b6d3a7aae46d06e62d06f67fd9b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/04927ec80db6b6d3a7aae46d06e62d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 17 14:29:38 2024 +0200 ntdll: Don't use gmtime concurrently. The function may be called by NtQuerySystemInformation(SystemTimeOfDayInformation) and NtQuerySystemInformation(SystemCurrentTimeZoneInformation) concurrently. --- dlls/ntdll/unix/system.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b7c424b6548..b0d87dbc6bd 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2370,7 +2370,6 @@ static time_t find_dst_change(time_t start, time_t end, int *is_dst) static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) { - static pthread_mutex_t tz_mutex = PTHREAD_MUTEX_INITIALIZER; static RTL_DYNAMIC_TIME_ZONE_INFORMATION cached_tzi; static int current_year = -1, current_bias = 65535; struct tm *tm; @@ -2378,7 +2377,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) time_t year_start, year_end, tmp, dlt = 0, std = 0; int is_dst, bias; - mutex_lock( &tz_mutex ); + mutex_lock( &timezone_mutex ); year_start = time(NULL); tm = gmtime(&year_start); @@ -2388,7 +2387,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) if (current_year == tm->tm_year && current_bias == bias) { *tzi = cached_tzi; - mutex_unlock( &tz_mutex ); + mutex_unlock( &timezone_mutex ); return; } @@ -2481,7 +2480,7 @@ static void get_timezone_info( RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi ) find_reg_tz_info(tzi, tz_name, current_year + 1900); cached_tzi = *tzi; - mutex_unlock( &tz_mutex ); + mutex_unlock( &timezone_mutex ); }

1 0

Brendan McGrath : mplat/tests: Test Media Source is freed if immediately released.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ac32d3fd727af8db2e35f96aaf5fbd921d39f49b URL: https://gitlab.winehq.org/wine/wine/-/commit/ac32d3fd727af8db2e35f96aaf5fbd… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri May 17 15:27:23 2024 +1000 mplat/tests: Test Media Source is freed if immediately released. Tests that the Media Source and its associated resources are freed if Release is called immediately after creation. That is, without a call to either Start or Shutdown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56686 --- dlls/mfplat/tests/mfplat.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21977807ac2..40853f6fc00 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -966,6 +966,7 @@ static void test_source_resolver(void) GUID guid; float rate; UINT32 rotation; + ULONG refcount; if (!pMFCreateSourceResolver) { @@ -1045,12 +1046,6 @@ static void test_source_resolver(void) hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - /* Wrap ::Close to test when the media source calls it */ - bytestream_vtbl_orig = stream->lpVtbl; - bytestream_vtbl_wrapper = *bytestream_vtbl_orig; - bytestream_vtbl_wrapper.Close = bytestream_wrapper_Close; - stream->lpVtbl = &bytestream_vtbl_wrapper; - hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); @@ -1077,6 +1072,33 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + refcount = IMFMediaSource_Release(mediasource); + todo_wine + ok(!refcount, "Unexpected refcount %ld\n", refcount); + IMFByteStream_Release(stream); + + /* We have to create a new bytestream here, because all following + * calls to CreateObjectFromByteStream will fail. */ + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* Wrap ::Close to test when the media source calls it */ + bytestream_vtbl_orig = stream->lpVtbl; + bytestream_vtbl_wrapper = *bytestream_vtbl_orig; + bytestream_vtbl_wrapper.Close = bytestream_wrapper_Close; + stream->lpVtbl = &bytestream_vtbl_wrapper; + + hr = IMFByteStream_QueryInterface(stream, &IID_IMFAttributes, (void **)&attributes); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"video/mp4"); + ok(hr == S_OK, "Failed to set string value, hr %#lx.\n", hr); + IMFAttributes_Release(attributes); + + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&mediasource); + ok(mediasource != NULL, "got %p\n", mediasource); + ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); + check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE);

1 0

Rémi Bernon : mfreadwrite/reader: Fixup MFVideoFormat_ABGR32 subtype to enumerate the video processor.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f0e77b163dad11e47576d71561cf03f09b9187fc URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e77b163dad11e47576d71561cf03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:19:38 2024 +0200 mfreadwrite/reader: Fixup MFVideoFormat_ABGR32 subtype to enumerate the video processor. --- dlls/mfreadwrite/reader.c | 13 +++++++++++++ dlls/mfreadwrite/tests/mfplat.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 87ed0fe6cfc..0e0ba10b076 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); + struct stream_response { struct list entry; @@ -2036,6 +2038,17 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL entry->min_buffer_size = max(entry->min_buffer_size, bytes_per_second); } + if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Video) && IsEqualGUID(&out_type.guidSubtype, &MFVideoFormat_ABGR32) + && IsEqualGUID(&category, &MFT_CATEGORY_VIDEO_PROCESSOR)) + { + /* The video processor isn't registered for MFVideoFormat_ABGR32, and native even only supports that format when + * D3D-enabled, we still want to instantiate a video processor in such case, so fixup the subtype for MFTEnumEx. + */ + WARN("Fixing up MFVideoFormat_ABGR32 subtype for the video processor\n"); + out_type.guidSubtype = MFVideoFormat_RGB32; + } + + count = 0; if (SUCCEEDED(hr = MFTEnumEx(category, 0, &in_type, allow_processor ? NULL : &out_type, &activates, &count))) { diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index b819b2238e9..b6981479a1b 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -3417,7 +3417,7 @@ static void test_source_reader_transforms_d3d11(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_media_type(media_type, abgr32_stream_type_desc, -1); hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); - todo_wine ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* needs a GPU */, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* needs a GPU */, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); if (hr == S_OK)

1 0

Rémi Bernon : winegstreamer: Support MFVideoFormat_ABGR32 output in the video processor.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: f131faaa5acea8e245a63fdd2ea9cb0fb1d8240f URL: https://gitlab.winehq.org/wine/wine/-/commit/f131faaa5acea8e245a63fdd2ea9cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 10 17:12:17 2024 +0200 winegstreamer: Support MFVideoFormat_ABGR32 output in the video processor. --- dlls/mf/tests/transform.c | 14 +++++++------- dlls/winegstreamer/main.c | 2 ++ dlls/winegstreamer/mfplat.c | 2 ++ dlls/winegstreamer/quartz_parser.c | 6 ++++++ dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/video_processor.c | 3 +++ dlls/winegstreamer/wg_format.c | 3 +++ 7 files changed, 24 insertions(+), 7 deletions(-)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
71
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 May 2024