James Hawkins : pdh: Fix two tests that fail on win2k3.
Alexandre Julliard
julliard at winehq.org
Thu Apr 24 06:23:28 CDT 2008
Module: wine
Branch: master
Commit: 6c59a15a1912e75e79f5ae661e8995493aa7c797
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c59a15a1912e75e79f5ae661e8995493aa7c797
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Wed Apr 23 18:05:02 2008 -0500
pdh: Fix two tests that fail on win2k3.
---
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 7b31cb4..4b7c562 100644
--- a/dlls/pdh/tests/pdh.c
+++ b/dlls/pdh/tests/pdh.c
@@ -647,7 +647,9 @@ static void test_PdhLookupPerfNameByIndexA( void )
size = sizeof(buffer);
ret = PdhLookupPerfNameByIndexA( NULL, 674, NULL, &size );
- ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret);
+ ok(ret == PDH_INVALID_ARGUMENT ||
+ ret == PDH_MORE_DATA, /* win2k3 */
+ "PdhLookupPerfNameByIndexA failed 0x%08x\n", ret);
size = sizeof(buffer);
ret = PdhLookupPerfNameByIndexA( NULL, 674, buffer, &size );
@@ -677,7 +679,9 @@ static void test_PdhLookupPerfNameByIndexW( void )
size = sizeof(buffer) / sizeof(WCHAR);
ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size );
- ok(ret == PDH_INVALID_ARGUMENT, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
+ ok(ret == PDH_INVALID_ARGUMENT ||
+ ret == PDH_MORE_DATA, /* win2k3 */
+ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
size = sizeof(buffer) / sizeof(WCHAR);
ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size );
More information about the wine-cvs
mailing list