May 2024 - Wine-Commits - list.winehq.org

Esme Povirk : gdiplus: Bracket HDC use in GdipDrawImagePointsRect.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: eeb1227b21699b55964705479c7abfef0f512565 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb1227b21699b55964705479c7abf… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:20:49 2024 +0000 gdiplus: Bracket HDC use in GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2fbe55756d4..f04d4941310 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3401,7 +3401,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } else { - HDC hdc; + HDC src_hdc, dst_hdc; HBITMAP hbitmap, old_hbm=NULL; HRGN hrgn; INT save_state; @@ -3409,7 +3409,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image BYTE *temp_bits; PixelFormat dst_format; - hdc = CreateCompatibleDC(0); + src_hdc = CreateCompatibleDC(0); if (bitmap->format == PixelFormat16bppRGB555 || bitmap->format == PixelFormat24bppRGB) @@ -3431,7 +3431,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image bih.biClrUsed = 0; bih.biClrImportant = 0; - hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, + hbitmap = CreateDIBSection(src_hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); convert_pixels(bitmap->width, bitmap->height, @@ -3439,15 +3439,17 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); - old_hbm = SelectObject(hdc, hbitmap); + old_hbm = SelectObject(src_hdc, hbitmap); - save_state = SaveDC(graphics->hdc); + gdi_dc_acquire(graphics, &dst_hdc); + + save_state = SaveDC(dst_hdc); stat = get_clip_hrgn(graphics, &hrgn); if (stat == Ok) { - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(dst_hdc, hrgn, RGN_COPY); DeleteObject(hrgn); } @@ -3456,20 +3458,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, - hdc, srcx, srcy, srcwidth, srcheight); + src_hdc, srcx, srcy, srcwidth, srcheight); } else { - StretchBlt(graphics->hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, - hdc, srcx, srcy, srcwidth, srcheight, SRCCOPY); + StretchBlt(dst_hdc, pti[0].x, pti[0].y, pti[1].x-pti[0].x, pti[2].y-pti[0].y, + src_hdc, srcx, srcy, srcwidth, srcheight, SRCCOPY); } gdi_transform_release(graphics); - RestoreDC(graphics->hdc, save_state); + RestoreDC(dst_hdc, save_state); - SelectObject(hdc, old_hbm); - DeleteDC(hdc); + gdi_dc_release(graphics, dst_hdc); + + SelectObject(src_hdc, old_hbm); + DeleteDC(src_hdc); DeleteObject(hbitmap); } }

1 0

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipFillPath.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 1c360a01c9cd92563d03ab1c3d4cd262ea810461 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c360a01c9cd92563d03ab1c3d4cd2… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:35:52 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipFillPath. --- dlls/gdiplus/graphics.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f04d4941310..1cf5da6f1f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4433,42 +4433,47 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { + HDC hdc; INT save_state; GpStatus retval; HRGN hrgn=NULL; - if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) + if(!brush_can_fill_path(brush, TRUE)) return NotImplemented; - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE - : WINDING)); + retval = gdi_dc_acquire(graphics, &hdc); + if (retval != Ok) + return retval; + + save_state = SaveDC(hdc); + EndPath(hdc); + SetPolyFillMode(hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); retval = get_clip_hrgn(graphics, &hrgn); if (retval != Ok) goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); gdi_transform_acquire(graphics); - BeginPath(graphics->hdc); + BeginPath(hdc); retval = draw_poly(graphics, NULL, path->pathdata.Points, path->pathdata.Types, path->pathdata.Count, FALSE); if(retval == Ok) { - EndPath(graphics->hdc); + EndPath(hdc); retval = brush_fill_path(graphics, brush); } gdi_transform_release(graphics); end: - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); DeleteObject(hrgn); + gdi_dc_release(graphics, hdc); return retval; }

1 0

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

May 17, 2024

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

Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipFillRegion.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: ef371697e028335d59861c16e86f33a7d17a58ec URL: https://gitlab.winehq.org/wine/wine/-/commit/ef371697e028335d59861c16e86f33… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 19:45:52 2024 +0000 gdiplus: Bracket HDC use in GDI32_GdipFillRegion. --- dlls/gdiplus/graphics.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1cf5da6f1f8..4c12cc18f11 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4734,47 +4734,47 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush, { INT save_state; GpStatus status; + HDC hdc; HRGN hrgn; RECT rc; - if(!graphics->hdc || !brush_can_fill_path(brush, TRUE)) + if(!brush_can_fill_path(brush, TRUE)) return NotImplemented; - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); + status = gdi_dc_acquire(graphics, &hdc); + if (status != Ok) + return status; + + save_state = SaveDC(hdc); + EndPath(hdc); hrgn = NULL; status = get_clip_hrgn(graphics, &hrgn); if (status != Ok) - { - RestoreDC(graphics->hdc, save_state); - return status; - } + goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY); + ExtSelectClipRgn(hdc, hrgn, RGN_COPY); DeleteObject(hrgn); status = GdipGetRegionHRgn(region, graphics, &hrgn); if (status != Ok) - { - RestoreDC(graphics->hdc, save_state); - return status; - } + goto end; - ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND); + ExtSelectClipRgn(hdc, hrgn, RGN_AND); DeleteObject(hrgn); - if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + if (GetClipBox(hdc, &rc) != NULLREGION) { - BeginPath(graphics->hdc); - Rectangle(graphics->hdc, rc.left, rc.top, rc.right, rc.bottom); - EndPath(graphics->hdc); + BeginPath(hdc); + Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom); + EndPath(hdc); status = brush_fill_path(graphics, brush); } - RestoreDC(graphics->hdc, save_state); - +end: + RestoreDC(hdc, save_state); + gdi_dc_release(graphics, hdc); return status; }

1 0

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

May 17, 2024

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

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

May 17, 2024

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

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

May 17, 2024

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

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

May 17, 2024

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 : mf/tests: Add video processor tests with MFVideoFormat_ABGR32 format.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 1c1f03a8b84064a770e0d1d7f371bd93aae62b8b URL: https://gitlab.winehq.org/wine/wine/-/commit/1c1f03a8b84064a770e0d1d7f371bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 25 10:31:53 2024 +0200 mf/tests: Add video processor tests with MFVideoFormat_ABGR32 format. --- dlls/mf/tests/abgr32frame-crop.bmp | Bin 0 -> 27606 bytes dlls/mf/tests/resource.rc | 8 + dlls/mf/tests/rgb32frame-crop-flip.bmp | Bin 0 -> 27606 bytes dlls/mf/tests/rgb32frame-crop.bmp | Bin 27606 -> 27606 bytes dlls/mf/tests/transform.c | 372 ++++++++++++++++++++++++++++++--- 5 files changed, 350 insertions(+), 30 deletions(-)

1 0

Rémi Bernon : mfplat: Add MFVideoFormat_ABGR32 format information.
by Alexandre Julliard May 17, 2024

May 17, 2024

Module: wine Branch: master Commit: 47884f6fbae0f886c9998a76ee53b7ecea510e59 URL: https://gitlab.winehq.org/wine/wine/-/commit/47884f6fbae0f886c9998a76ee53b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 23 00:45:19 2023 +0100 mfplat: Add MFVideoFormat_ABGR32 format information. --- dlls/mfplat/mediatype.c | 4 ++++ dlls/mfplat/tests/mfplat.c | 30 +++++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index dd0b29fac32..3944d64849e 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -39,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB1, D3DFMT_A1); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB4, MAKEFOURCC('4','P','x','x')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB1555, D3DFMT_A1R5G5B5); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB4444, D3DFMT_A4R4G4B4); /* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ @@ -2713,6 +2714,7 @@ static struct uncompressed_video_format video_formats[] = { &MFVideoFormat_RGB32, 32, 3, 1, 0, BI_RGB }, { &MFVideoFormat_RGB565, 16, 3, 1, 0, BI_BITFIELDS }, { &MFVideoFormat_RGB555, 16, 3, 1, 0, BI_RGB }, + { &MFVideoFormat_ABGR32, 32, 3, 1, 0, BI_RGB }, { &MFVideoFormat_A2R10G10B10, 32, 3, 1, 0, -1 }, { &MFVideoFormat_A2B10G10R10, 32, 3, 1, 0, -1 }, { &MFVideoFormat_RGB8, 8, 3, 1, 0, BI_RGB }, @@ -3632,6 +3634,8 @@ DXGI_FORMAT WINAPI MFMapDX9FormatToDXGIFormat(DWORD format) return DXGI_FORMAT_B8G8R8A8_UNORM; case D3DFMT_X8R8G8B8: return DXGI_FORMAT_B8G8R8X8_UNORM; + case D3DFMT_A8B8G8R8: + return DXGI_FORMAT_R8G8B8A8_UNORM; case MAKEFOURCC('A','Y','U','V'): return DXGI_FORMAT_AYUV; case MAKEFOURCC('Y','4','1','0'): diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4ca567367c..21977807ac2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -67,9 +67,11 @@ DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23, extern const CLSID CLSID_FileSchemePlugin; DEFINE_MEDIATYPE_GUID(MEDIASUBTYPE_Base,0); +DEFINE_GUID(MEDIASUBTYPE_ABGR32,D3DFMT_A8B8G8R8,0x524f,0x11ce,0x9f,0x53,0x00,0x20,0xaf,0x0b,0xa7,0x70); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB1, D3DFMT_A1); DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB4, MAKEFOURCC('4','P','x','x')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_ABGR32, D3DFMT_A8B8G8R8); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB1555, D3DFMT_A1R5G5B5); DEFINE_MEDIATYPE_GUID(MFVideoFormat_ARGB4444, D3DFMT_A4R4G4B4); /* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ @@ -4748,6 +4750,9 @@ image_size_tests[] = { &MFVideoFormat_ARGB32, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_ARGB32, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_ARGB32, 320, 240, 307200, 0, 307200, 307200, 1280 }, + { &MFVideoFormat_ABGR32, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_ABGR32, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_ABGR32, 320, 240, 307200, 0, 307200, 307200, 1280 }, { &MFVideoFormat_A2R10G10B10, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_A2R10G10B10, 320, 240, 307200, 0, 307200, 307200, 1280 }, @@ -4910,12 +4915,16 @@ static void test_MFCalculateImageSize(void) /* Those are supported since Win10. */ BOOL is_broken = IsEqualGUID(ptr->subtype, &MFVideoFormat_A16B16G16R16F) || - IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10); + IsEqualGUID(ptr->subtype, &MFVideoFormat_A2R10G10B10) || + IsEqualGUID(ptr->subtype, &MFVideoFormat_ABGR32); hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); - ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); - ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, - ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); + ok(hr == S_OK || broken(is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); + if (hr == S_OK) + { + ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, + ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); + } } } @@ -6224,6 +6233,8 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_RGB32, 1, -4 }, { &MFVideoFormat_ARGB32, 3, -12 }, { &MFVideoFormat_ARGB32, 1, -4 }, + { &MFVideoFormat_ABGR32, 3, -12 }, + { &MFVideoFormat_ABGR32, 1, -4 }, { &MFVideoFormat_A2R10G10B10, 3, -12 }, { &MFVideoFormat_A2R10G10B10, 1, -4 }, { &MFVideoFormat_A2B10G10R10, 3, -12 }, @@ -9272,6 +9283,7 @@ static void test_MFMapDXGIFormatToDX9Format(void) { DXGI_FORMAT dxgi_format; DWORD d3d9_format; + BOOL broken; } formats_map[] = { @@ -9304,6 +9316,7 @@ static void test_MFMapDXGIFormatToDX9Format(void) { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, { DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3DFMT_A8R8G8B8 }, { DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D3DFMT_A8B8G8R8, .broken = TRUE /* <= w1064v1507 */ }, { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, @@ -9332,7 +9345,8 @@ static void test_MFMapDXGIFormatToDX9Format(void) for (i = 0; i < ARRAY_SIZE(formats_map); ++i) { format = pMFMapDXGIFormatToDX9Format(formats_map[i].dxgi_format); - ok(format == formats_map[i].d3d9_format, "Unexpected d3d9 format %#lx, dxgi format %#x.\n", format, formats_map[i].dxgi_format); + ok(format == formats_map[i].d3d9_format || broken(formats_map[i].broken && format == 0), + "Unexpected d3d9 format %#lx, dxgi format %#x.\n", format, formats_map[i].dxgi_format); } } @@ -9342,6 +9356,7 @@ static void test_MFMapDX9FormatToDXGIFormat(void) { DXGI_FORMAT dxgi_format; DWORD d3d9_format; + BOOL broken; } formats_map[] = { @@ -9369,6 +9384,7 @@ static void test_MFMapDX9FormatToDXGIFormat(void) { DXGI_FORMAT_BC3_UNORM, D3DFMT_DXT4 }, { DXGI_FORMAT_B8G8R8A8_UNORM, D3DFMT_A8R8G8B8 }, { DXGI_FORMAT_B8G8R8X8_UNORM, D3DFMT_X8R8G8B8 }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D3DFMT_A8B8G8R8, .broken = TRUE }, { DXGI_FORMAT_AYUV, MAKEFOURCC('A','Y','U','V') }, { DXGI_FORMAT_Y410, MAKEFOURCC('Y','4','1','0') }, { DXGI_FORMAT_Y416, MAKEFOURCC('Y','4','1','6') }, @@ -9397,8 +9413,8 @@ static void test_MFMapDX9FormatToDXGIFormat(void) for (i = 0; i < ARRAY_SIZE(formats_map); ++i) { format = pMFMapDX9FormatToDXGIFormat(formats_map[i].d3d9_format); - ok(format == formats_map[i].dxgi_format, "Unexpected DXGI format %#x, d3d9 format %#lx.\n", - format, formats_map[i].d3d9_format); + ok(format == formats_map[i].dxgi_format || broken(formats_map[i].broken && format == 0), + "Unexpected DXGI format %#x, d3d9 format %#lx.\n", format, formats_map[i].d3d9_format); } }

1 0