Commit 55ef1f4d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

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

parent 44bd013e
...@@ -74,7 +74,7 @@ static BOOL init_access_tests(void) ...@@ -74,7 +74,7 @@ static BOOL init_access_tests(void)
BOOL rc; BOOL rc;
user_name[0] = 0; user_name[0] = 0;
dwSize = sizeof(user_name)/sizeof(WCHAR); dwSize = ARRAY_SIZE(user_name);
rc=GetUserNameW(user_name, &dwSize); rc=GetUserNameW(user_name, &dwSize);
if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
{ {
...@@ -84,7 +84,7 @@ static BOOL init_access_tests(void) ...@@ -84,7 +84,7 @@ static BOOL init_access_tests(void)
ok(rc, "User Name Retrieved\n"); ok(rc, "User Name Retrieved\n");
computer_name[0] = 0; computer_name[0] = 0;
dwSize = sizeof(computer_name)/sizeof(WCHAR); dwSize = ARRAY_SIZE(computer_name);
ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n");
return TRUE; return TRUE;
} }
...@@ -521,7 +521,7 @@ static void test_DavGetHTTPFromUNCPath(void) ...@@ -521,7 +521,7 @@ static void test_DavGetHTTPFromUNCPath(void)
ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret );
ok( size == 12, "got %u\n", size ); ok( size == 12, "got %u\n", size );
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) for (i = 0; i < ARRAY_SIZE(tests); i++)
{ {
buf[0] = 0; buf[0] = 0;
size = tests[i].size; size = tests[i].size;
...@@ -685,7 +685,7 @@ static void test_DavGetUNCFromHTTPPath(void) ...@@ -685,7 +685,7 @@ static void test_DavGetUNCFromHTTPPath(void)
ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret );
ok( size == 25, "got %u\n", size ); ok( size == 25, "got %u\n", size );
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) for (i = 0; i < ARRAY_SIZE(tests); i++)
{ {
buf[0] = 0; buf[0] = 0;
size = tests[i].size; size = tests[i].size;
......
...@@ -50,7 +50,7 @@ static BOOL init_wksta_tests(void) ...@@ -50,7 +50,7 @@ static BOOL init_wksta_tests(void)
BOOL rc; BOOL rc;
user_name[0] = 0; user_name[0] = 0;
dwSize = sizeof(user_name)/sizeof(user_name[0]); dwSize = ARRAY_SIZE(user_name);
rc=GetUserNameW(user_name, &dwSize); rc=GetUserNameW(user_name, &dwSize);
if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) {
win_skip("GetUserNameW is not implemented\n"); win_skip("GetUserNameW is not implemented\n");
...@@ -59,7 +59,7 @@ static BOOL init_wksta_tests(void) ...@@ -59,7 +59,7 @@ static BOOL init_wksta_tests(void)
ok(rc, "User Name Retrieved\n"); ok(rc, "User Name Retrieved\n");
computer_name[0] = 0; computer_name[0] = 0;
dwSize = sizeof(computer_name)/sizeof(computer_name[0]); dwSize = ARRAY_SIZE(computer_name);
ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n");
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment