James Hawkins : comctl32: Fix a failing test in win9x.
Alexandre Julliard
julliard at winehq.org
Tue Sep 30 11:15:58 CDT 2008
Module: wine
Branch: master
Commit: e1d56fa4bd62e37ae218ee00acecb9b7a08857e0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d56fa4bd62e37ae218ee00acecb9b7a08857e0
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Sun Sep 28 11:15:49 2008 -0500
comctl32: Fix a failing test in win9x.
---
dlls/gdi32/tests/brush.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c
index 3d96a34..70d608f 100644
--- a/dlls/gdi32/tests/brush.c
+++ b/dlls/gdi32/tests/brush.c
@@ -52,7 +52,9 @@ static void test_solidbrush(void)
if(stock[i].stockobj != -1) {
stockBrush = (HBRUSH)GetStockObject(stock[i].stockobj);
- ok(stockBrush!=solidBrush, "Stock %s brush equals solid %s brush\n", stock[i].name, stock[i].name);
+ ok(stockBrush!=solidBrush ||
+ broken(stockBrush==solidBrush), /* win9x does return stock object */
+ "Stock %s brush equals solid %s brush\n", stock[i].name, stock[i].name);
}
else
stockBrush = NULL;
@@ -70,7 +72,10 @@ static void test_solidbrush(void)
}
DeleteObject(solidBrush);
- ok(GetObject(solidBrush, sizeof(br), &br)==0, "GetObject succeeded on a deleted %s brush\n", stock[i].name);
+ ret = GetObject(solidBrush, sizeof(br), &br);
+ ok(ret==0 ||
+ broken(ret!=0), /* win9x */
+ "GetObject succeeded on a deleted %s brush\n", stock[i].name);
}
}
More information about the wine-cvs
mailing list