[2/3] pdh/tests: Make the test pass on Windows 2000.

Francois Gouget fgouget at free.fr
Thu Sep 15 18:04:03 CDT 2011


---

This makes the test pass on the W2KPROSP4 testbot box... though you 
won't notice until applying the next patch since it's not a 100% English 
box.

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

diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c
index 5ca1c24..e092d72 100644
--- a/dlls/pdh/tests/pdh.c
+++ b/dlls/pdh/tests/pdh.c
@@ -130,7 +130,9 @@ static void test_PdhAddCounterA( void )
     ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret);
 
     ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter );
-    ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret);
+    ok(ret == PDH_CSTATUS_NO_COUNTER ||
+       broken(ret == PDH_INVALID_PATH), /* Win2K */
+       "PdhAddCounterA failed 0x%08x\n", ret);
     ok(!counter, "PdhAddCounterA failed %p\n", counter);
 
     ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter );
@@ -177,7 +179,9 @@ static void test_PdhAddCounterW( void )
     ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret);
 
     ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter );
-    ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret);
+    ok(ret == PDH_CSTATUS_NO_COUNTER ||
+       broken(ret == PDH_INVALID_PATH), /* Win2K */
+       "PdhAddCounterW failed 0x%08x\n", ret);
     ok(!counter, "PdhAddCounterW failed %p\n", counter);
 
     ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter );
-- 
1.7.5.4




More information about the wine-patches mailing list