https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08e76d60874bd12844c2f0084e54fab51dbe1fa0
commit 08e76d60874bd12844c2f0084e54fab51dbe1fa0 Author: Amine Khaldi <[email protected]> AuthorDate: Tue Jan 29 13:12:45 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Tue Jan 29 13:12:45 2019 +0100 [NETAPI32_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/netapi32/access.c | 8 ++++---- modules/rostests/winetests/netapi32/wksta.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/netapi32/access.c b/modules/rostests/winetests/netapi32/access.c index f095d77320..a284b65401 100644 --- a/modules/rostests/winetests/netapi32/access.c +++ b/modules/rostests/winetests/netapi32/access.c @@ -74,7 +74,7 @@ static BOOL init_access_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { @@ -84,7 +84,7 @@ static BOOL init_access_tests(void) ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; - dwSize = sizeof(computer_name)/sizeof(WCHAR); + dwSize = ARRAY_SIZE(computer_name); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); return TRUE; } @@ -521,7 +521,7 @@ static void test_DavGetHTTPFromUNCPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); 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; size = tests[i].size; @@ -685,7 +685,7 @@ static void test_DavGetUNCFromHTTPPath(void) ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); 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; size = tests[i].size; diff --git a/modules/rostests/winetests/netapi32/wksta.c b/modules/rostests/winetests/netapi32/wksta.c index 418a1ad626..ba4a7f9aa0 100644 --- a/modules/rostests/winetests/netapi32/wksta.c +++ b/modules/rostests/winetests/netapi32/wksta.c @@ -50,7 +50,7 @@ static BOOL init_wksta_tests(void) BOOL rc; user_name[0] = 0; - dwSize = sizeof(user_name)/sizeof(user_name[0]); + dwSize = ARRAY_SIZE(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); @@ -59,7 +59,7 @@ static BOOL init_wksta_tests(void) ok(rc, "User Name Retrieved\n"); 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"); return TRUE; }
