Michael Stefaniuc : advapi32/tests: Use the available ARRAY_SIZE() macro.

Alexandre Julliard julliard at winehq.org
Thu Mar 29 19:13:30 CDT 2018


Module: wine
Branch: master
Commit: 716103b1bb9947ec93852bf7277c2372eef52a3a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=716103b1bb9947ec93852bf7277c2372eef52a3a

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Thu Mar 29 17:14:14 2018 +0200

advapi32/tests: Use the available ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/advapi32/tests/registry.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index cc17b80..1df117b 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1755,7 +1755,7 @@ static void test_reg_query_value(void)
 
     /* unicode - try size in WCHARS */
     SetLastError(0xdeadbeef);
-    size = sizeof(valW) / sizeof(WCHAR);
+    size = ARRAY_SIZE(valW);
     ret = RegQueryValueW(subkey, NULL, valW, &size);
     ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret);
     ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());
@@ -2010,7 +2010,7 @@ static void test_reg_query_info(void)
     lstrcpyW(expectbufferW, subkey_classW);
     ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)),
        "classbufferW = %s, expected %s\n",
-       wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW));
+       wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW));
 
     memset(classbufferW, 0x55, sizeof(classbufferW));
     classlen = 0xdeadbeef;
@@ -2021,7 +2021,7 @@ static void test_reg_query_info(void)
     lstrcpyW(expectbufferW, subkey_classW);
     ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)),
        "classbufferW = %s, expected %s\n",
-       wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW));
+       wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW));
 
     RegDeleteKeyA(subsubkey, "");
     RegCloseKey(subsubkey);




More information about the wine-cvs mailing list