Michael Stefaniuc : ddraw/tests: Remove some no longer needed broken(TRUE) .

Alexandre Julliard julliard at winehq.org
Fri Jan 20 16:35:58 CST 2017


Module: wine
Branch: master
Commit: 34737c6704d0a20ec8adb15fbcd54260d9a788a2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=34737c6704d0a20ec8adb15fbcd54260d9a788a2

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Jan 19 15:18:20 2017 +0100

ddraw/tests: Remove some no longer needed broken(TRUE).

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ddraw/tests/ddraw1.c | 3 +--
 dlls/ddraw/tests/ddraw2.c | 3 +--
 dlls/ddraw/tests/ddraw4.c | 3 +--
 dlls/ddraw/tests/ddraw7.c | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 5acbee6..ed4c5ec 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -6226,8 +6226,7 @@ static void test_palette_gdi(void)
     ok(color == 0x00252423, "Clear index 4: Got unexpected color 0x%08x.\n", color);
 
     ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE);
-    /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */
-    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE),
+    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE),
             "Got unexpected palette %p, expected %p.\n",
             ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE));
     SelectPalette(dc, ddraw_palette_handle, FALSE);
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index dc8801c..ce3f6de 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -7469,8 +7469,7 @@ static void test_palette_gdi(void)
     ok(color == 0x00252423, "Clear index 4: Got unexpected color 0x%08x.\n", color);
 
     ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE);
-    /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */
-    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE),
+    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE),
             "Got unexpected palette %p, expected %p.\n",
             ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE));
     SelectPalette(dc, ddraw_palette_handle, FALSE);
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index f2b3e0c..1ace50a 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -8432,8 +8432,7 @@ static void test_palette_gdi(void)
     ok(color == 0x00252423, "Clear index 4: Got unexpected color 0x%08x.\n", color);
 
     ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE);
-    /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */
-    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE),
+    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE),
             "Got unexpected palette %p, expected %p.\n",
             ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE));
     SelectPalette(dc, ddraw_palette_handle, FALSE);
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index 633ea9f..0139bfd 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -8243,8 +8243,7 @@ static void test_palette_gdi(void)
     ok(color == 0x00252423, "Clear index 4: Got unexpected color 0x%08x.\n", color);
 
     ddraw_palette_handle = SelectPalette(dc, GetStockObject(DEFAULT_PALETTE), FALSE);
-    /* Windows 2000 on the testbot assigns a different palette to the primary. Refrast? */
-    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE) || broken(TRUE),
+    ok(ddraw_palette_handle == GetStockObject(DEFAULT_PALETTE),
             "Got unexpected palette %p, expected %p.\n",
             ddraw_palette_handle, GetStockObject(DEFAULT_PALETTE));
     SelectPalette(dc, ddraw_palette_handle, FALSE);




More information about the wine-cvs mailing list