[PATCH 9/9] quartz/tests: Test VMR7 AllocateSurface with a BITMAPV4HEADER.

[Matteo Bruni]

From: Matteo Bruni

---
 dlls/quartz/tests/vmr7.c | 51 +++++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 3d56bc09a39..e250695596a 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -3685,11 +3685,25 @@ static void test_default_presenter_allocate(void)
         .biPlanes = 1,
     };

+    BITMAPV4HEADER bitmap_v4_header =
+    {
+        .bV4Size = sizeof(BITMAPV4HEADER),
+        .bV4Width = 32,
+        .bV4Height = 16,
+        .bV4Planes = 1,
+        .bV4BitCount = 16,
+        .bV4V4Compression = BI_BITFIELDS,
+        .bV4RedMask = 0x00ff0000,
+        .bV4GreenMask = 0x0000ff00,
+        .bV4BlueMask = 0x000000ff,
+        .bV4AlphaMask = 0,
+    };
+
     static const struct
     {
         WORD depth;
         DWORD compression;
-        DDPIXELFORMAT format;
+        BOOL v4;
     }
     tests[] =
     {
@@ -3698,6 +3712,8 @@ static void test_default_presenter_allocate(void)
         {12, mmioFOURCC('Y','V','1','2')},
         {16, mmioFOURCC('U','Y','V','Y')},
         {16, mmioFOURCC('Y','U','Y','2')},
+        {32, BI_BITFIELDS},
+        {32, BI_BITFIELDS, TRUE},
     };

window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0,
@@ -3716,7 +3732,6 @@ static void test_default_presenter_allocate(void)
     info.dwInterlaceFlags = 0;
     info.szNativeSize.cx = info.szAspectRatio.cx = 640;
     info.szNativeSize.cy = info.szAspectRatio.cy = 480;
-    info.lpHdr = &bitmap_header;
     info.lpPixFmt = NULL;

for (unsigned int i = 0; i < ARRAY_SIZE(tests); ++i)
@@ -3725,10 +3740,25 @@ static void test_default_presenter_allocate(void)
         HRESULT expect_hr;
         DWORD count = 2;

-        winetest_push_context("Compression %#lx, depth %u", tests[i].compression, tests[i].depth);
+        winetest_push_context("Test %u: Compression %#lx, depth %u", i, tests[i].compression, tests[i].depth);

-        bitmap_header.biBitCount = tests[i].depth;
-        bitmap_header.biCompression = tests[i].compression;
+        if (tests[i].v4 || tests[i].compression == BI_BITFIELDS)
+        {
+            info.lpHdr = (BITMAPINFOHEADER *)&bitmap_v4_header;
+            bitmap_v4_header.bV4BitCount = tests[i].depth;
+            bitmap_v4_header.bV4V4Compression = tests[i].compression;
+            if (tests[i].v4)
+                bitmap_v4_header.bV4Size = sizeof(bitmap_v4_header);
+            else
+                bitmap_v4_header.bV4Size = sizeof(BITMAPINFOHEADER);
+        }
+        else
+        {
+            bitmap_header.biBitCount = tests[i].depth;
+            bitmap_header.biCompression = tests[i].compression;
+            info.lpHdr = &bitmap_header;
+            bitmap_header.biSize = sizeof(BITMAPINFOHEADER);
+        }

ddraw = create_ddraw(window);

@@ -3741,7 +3771,7 @@ static void test_default_presenter_allocate(void)
         desc.dwWidth = desc.dwHeight = 32;
         desc.dwBackBufferCount = 2;
         desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat);
-        if (tests[i].compression)
+        if (tests[i].compression != BI_RGB && tests[i].compression != BI_BITFIELDS)
         {
             desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC;
             desc.ddpfPixelFormat.dwFourCC = tests[i].compression;
@@ -3769,11 +3799,14 @@ static void test_default_presenter_allocate(void)

IDirectDraw7_Release(ddraw);

+        if (tests[i].v4)
+            expect_hr = DDERR_INVALIDPIXELFORMAT;
         hr = IVMRSurfaceAllocator_AllocateSurface(allocator, 0, &info, &count, &frontbuffer);
         ok(hr == expect_hr, "Got hr %#lx.\n", hr);
-        if (hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE)
+        if (FAILED(hr))
         {
-            skip("Format is not supported.\n");
+            if (hr == VFW_E_DDRAW_CAPS_NOT_SUITABLE)
+                skip("Format is not supported.\n");
             winetest_pop_context();
             continue;
         }
@@ -3794,7 +3827,7 @@ static void test_default_presenter_allocate(void)
         ok(desc.dwHeight == 16, "Got height %lu.\n", desc.dwHeight);
         ok(desc.ddpfPixelFormat.dwSize == sizeof(desc.ddpfPixelFormat),
                 "Got size %lu.\n", desc.ddpfPixelFormat.dwSize);
-        if (tests[i].compression)
+        if (tests[i].compression != BI_RGB && tests[i].compression != BI_BITFIELDS)
         {
             ok(desc.ddpfPixelFormat.dwFlags == DDPF_FOURCC, "Got flags %#lx.\n", desc.ddpfPixelFormat.dwFlags);
             ok(desc.ddpfPixelFormat.dwFourCC == bitmap_header.biCompression,