[PATCH 8/8] ddraw: Mark tests which no longer pass due to reverts as todo_wine.
Ken Thomases
ken at codeweavers.com
Mon Nov 2 14:37:50 CST 2015
---
dlls/ddraw/tests/ddraw1.c | 12 ++++++------
dlls/ddraw/tests/ddraw2.c | 12 ++++++------
dlls/ddraw/tests/ddraw4.c | 12 ++++++------
dlls/ddraw/tests/ddraw7.c | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index b52bf48..268c8b8 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -4760,7 +4760,7 @@ static void test_pixel_format(void)
}
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -4770,7 +4770,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -4785,7 +4785,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -4799,7 +4799,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -4811,12 +4811,12 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
test_format = GetPixelFormat(hdc2);
- ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
}
cleanup:
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 67a0e1e..8ee77c5 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -5804,7 +5804,7 @@ static void test_pixel_format(void)
}
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -5814,7 +5814,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -5829,7 +5829,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -5843,7 +5843,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -5855,12 +5855,12 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
test_format = GetPixelFormat(hdc2);
- ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
}
cleanup:
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 6ac725d..46f3494 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -7325,7 +7325,7 @@ static void test_pixel_format(void)
}
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -7335,7 +7335,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -7350,7 +7350,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -7364,7 +7364,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -7376,12 +7376,12 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
test_format = GetPixelFormat(hdc2);
- ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
}
cleanup:
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index fe02396..2634b30 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -7102,7 +7102,7 @@ static void test_pixel_format(void)
}
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -7112,7 +7112,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -7127,7 +7127,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
@@ -7141,7 +7141,7 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
test_format = GetPixelFormat(hdc2);
ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
@@ -7153,12 +7153,12 @@ static void test_pixel_format(void)
ok(SUCCEEDED(hr), "Failed to clear source surface, hr %#x.\n", hr);
test_format = GetPixelFormat(hdc);
- ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format);
if (hdc2)
{
test_format = GetPixelFormat(hdc2);
- ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
+ todo_wine ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format);
}
cleanup:
--
2.6.0
More information about the wine-patches
mailing list