[PATCH 5/5] amstream: Report a top-down DIB in set_mt_from_desc().

[Elizabeth Figura]

From: Elizabeth Figura

---
 dlls/amstream/ddrawstream.c    | 2 +-
 dlls/amstream/tests/amstream.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c
index e47c23749f0..9df61bfe885 100644
--- a/dlls/amstream/ddrawstream.c
+++ b/dlls/amstream/ddrawstream.c
@@ -568,7 +568,7 @@ static void set_mt_from_desc(AM_MEDIA_TYPE *mt, const DDSURFACEDESC *format, uns
     SetRect(&videoinfo->rcTarget, 0, 0, format->dwWidth, format->dwHeight);
     videoinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
     videoinfo->bmiHeader.biWidth = pitch * 8 / format->ddpfPixelFormat.dwRGBBitCount;
-    videoinfo->bmiHeader.biHeight = format->dwHeight;
+    videoinfo->bmiHeader.biHeight = -format->dwHeight;
     videoinfo->bmiHeader.biBitCount = format->ddpfPixelFormat.dwRGBBitCount;
     videoinfo->bmiHeader.biCompression = BI_RGB;
     videoinfo->bmiHeader.biPlanes = 1;
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 06f2e43f7f7..1f0cf7f7017 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -1212,7 +1212,7 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI
                 "Got format type %s.\n", debugstr_guid(&mt->formattype));
         ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk);
         ok(mt->cbFormat == sizeof(VIDEOINFO), "Got format size %lu.\n", mt->cbFormat);
-        todo_wine_if (expect_video_info.bmiHeader.biSizeImage || filter->query_accept_rgb8_palette)
+        todo_wine_if (filter->query_accept_rgb8_palette)
             ok(!memcmp(mt->pbFormat, &expect_video_info, mt->cbFormat), "Format blocks didn't match.\n");
     }

@@ -8863,7 +8863,7 @@ static void test_ddrawstream_mem_allocator(void)
             "Got format type %s.\n", debugstr_guid(&sample_mt->formattype));
     ok(!sample_mt->pUnk, "Got pUnk %p.\n", sample_mt->pUnk);
     ok(sample_mt->cbFormat == sizeof(VIDEOINFO), "Got format size %lu.\n", sample_mt->cbFormat);
-    todo_wine ok(!memcmp(sample_mt->pbFormat, &expect_video_info, sizeof(VIDEOINFO)), "Format blocks didn't match.\n");
+    ok(!memcmp(sample_mt->pbFormat, &expect_video_info, sizeof(VIDEOINFO)), "Format blocks didn't match.\n");

sample_mt->lSampleSize = 123;
     hr = IMediaSample_SetMediaType(media_sample1, sample_mt);
@@ -9114,7 +9114,7 @@ static void test_ddrawstream_mem_allocator(void)
             "Got format type %s.\n", debugstr_guid(&sample_mt->formattype));
     ok(!sample_mt->pUnk, "Got pUnk %p.\n", sample_mt->pUnk);
     ok(sample_mt->cbFormat == sizeof(VIDEOINFO), "Got format size %lu.\n", sample_mt->cbFormat);
-    todo_wine ok(!memcmp(sample_mt->pbFormat, &expect_video_info, sizeof(VIDEOINFO)), "Format blocks didn't match.\n");
+    ok(!memcmp(sample_mt->pbFormat, &expect_video_info, sizeof(VIDEOINFO)), "Format blocks didn't match.\n");

ref = IMediaSample_Release(media_sample1);
     ok(!ref, "Got refcount %ld.\n", ref);