[PATCH 4/4] Fix some test failures with 9x/Me on VMware

Paul Vriens Paul.Vriens.Wine at gmail.com
Fri Oct 2 03:06:48 CDT 2009


---
 dlls/user32/tests/win.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 2a62400..ea02b29 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -3244,7 +3244,9 @@ static void test_scrollwindow( HWND hwnd)
     ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, NULL, NULL, NULL, SW_ERASE);
     /* expected: black should have scrolled to the upper half */
     colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2,  rc2.bottom / 4 );
-    ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+    ok ( colr == 0 ||
+         broken(colr == 0xffffff), /* Win9x/WinMe on VMware */
+         "pixel should be black, color is %08x\n", colr);
     /* Repeat that test of ScrollWindow(Ex) now with clip rectangle */
     /* paint the lower half of the window black */
     rc2 = rc;
@@ -3263,7 +3265,9 @@ static void test_scrollwindow( HWND hwnd)
     ScrollWindowEx( hwnd, 0, - rc2.top, &rc2, &rc3, NULL, NULL, SW_ERASE);
     /* expected: black should have scrolled to the upper half */
     colr = GetPixel( hdc, (rc2.left+rc2.right)/ 2,  rc2.bottom / 4 );
-    ok ( colr == 0, "pixel should be black, color is %08x\n", colr);
+    ok ( colr == 0 ||
+         broken(colr == 0xffffff), /* Win9x/WinMe on VMware */
+         "pixel should be black, color is %08x\n", colr);
 
     /* clean up */
     ReleaseDC( hwnd, hdc);
-- 
1.6.2.5


--------------060803060204090705050206--



More information about the wine-patches mailing list