[PATCH 4/4] evr/tests: Vista does not set the native video ratio.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
 dlls/evr/tests/evr.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c
index 06a8b770088..568ee959cbc 100644
--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -1887,7 +1887,9 @@ static void test_presenter_native_video_size(void)
     hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio);
     ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
     ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy);
-    ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
+    ok((ratio.cx == 4 && ratio.cy == 3) ||
+       broken(ratio.cx == 0 && ratio.cy == 0) /* Vista */ ||
+       broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
             "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);
 
     /* Update input type. */
@@ -1900,7 +1902,9 @@ static void test_presenter_native_video_size(void)
     hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio);
     ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
     ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy);
-    ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
+    ok((ratio.cx == 4 && ratio.cy == 3) ||
+       broken(ratio.cx == 0 && ratio.cy == 0) /* Vista */ ||
+       broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
             "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);
 
     /* Negotiating types updates native video size. */
@@ -1909,8 +1913,12 @@ static void test_presenter_native_video_size(void)
 
     hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio);
     ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
-    ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy);
-    ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
+    ok((size.cx == 320 && size.cy == 240) ||
+       broken(size.cx == 640 && size.cy == 480) /* Vista */,
+       "Unexpected size %u x %u.\n", size.cx, size.cy);
+    ok((ratio.cx == 4 && ratio.cy == 3) ||
+       broken(ratio.cx == 0 && ratio.cy == 0) /* Vista */ ||
+       broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */,
             "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);
 
     IMFMediaType_Release(video_type);
-- 
2.20.1