[PATCH] pdh/tests: Use the available ARRAY_SIZE() macro

Michael Stefaniuc mstefani at winehq.org
Fri Jun 1 18:54:25 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/pdh/tests/pdh.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c
index 573bcc3a10..0a17906afb 100644
--- a/dlls/pdh/tests/pdh.c
+++ b/dlls/pdh/tests/pdh.c
@@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void )
     ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size );
     ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
 
-    size = sizeof(buffer) / sizeof(WCHAR);
+    size = ARRAY_SIZE(buffer);
     ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size );
     ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
-    ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size);
+    ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size);
 
-    size = sizeof(buffer) / sizeof(WCHAR);
+    size = ARRAY_SIZE(buffer);
     ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size );
     ok(ret == PDH_INVALID_ARGUMENT ||
        ret == PDH_MORE_DATA, /* win2k3 */
        "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
 
-    size = sizeof(buffer) / sizeof(WCHAR);
+    size = ARRAY_SIZE(buffer);
     ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size );
     ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret);
-    ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size);
+    ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size);
 }
 
 static void test_PdhValidatePathA( void )
-- 
2.14.4




More information about the wine-devel mailing list