ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32/tests: Avoid ARRAY_SIZE-like macros. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-06-27 20:56:44 +02:00 committed by Alexandre Julliard
parent 20b43a9a93
commit 6a04cf4a69
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/kernel32/tests/comm.c
View File

@ -410,8 +410,6 @@ static const TEST test[] =
}, },
}; };
#define TEST_COUNT (sizeof(test) / sizeof(TEST))
/* This function can be useful if you are modifying the test cases and want to /* This function can be useful if you are modifying the test cases and want to
output the contents of a DCB structure. */ output the contents of a DCB structure. */
/*static print_dcb(DCB *pdcb) /*static print_dcb(DCB *pdcb)
@ -656,7 +654,7 @@ static void test_BuildCommDCB(void)
if(!port) if(!port)
trace("Could not find a valid COM port. Some tests will be skipped.\n"); trace("Could not find a valid COM port. Some tests will be skipped.\n");
for(i = 0; i < TEST_COUNT; i++) for(i = 0; i < ARRAY_SIZE(test); i++)
{ {
char string[sizeof(test[i].string)]; char string[sizeof(test[i].string)];

8
dlls/kernel32/tests/toolhelp.c
View File

@ -217,8 +217,6 @@ static const char* sub_expected_modules[] =
"ntdll.dll" "ntdll.dll"
}; };
#define NUM_OF(x) (sizeof(x) / sizeof(x[0]))
static void test_module(DWORD pid, const char* expected[], unsigned num_expected) static void test_module(DWORD pid, const char* expected[], unsigned num_expected)
{ {
HANDLE hSnapshot; HANDLE hSnapshot;
@ -229,7 +227,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected
unsigned i; unsigned i;
int num = 0; int num = 0;
ok(NUM_OF(found) >= num_expected, "Internal: bump found[] size\n"); ok(ARRAY_SIZE(found) >= num_expected, "Internal: bump found[] size\n");
hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPMODULE, pid ); hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPMODULE, pid );
ok(hSnapshot != NULL, "Cannot create snapshot\n"); ok(hSnapshot != NULL, "Cannot create snapshot\n");
@ -341,8 +339,8 @@ START_TEST(toolhelp)
test_process(pid, info.dwProcessId); test_process(pid, info.dwProcessId);
test_thread(pid, info.dwProcessId); test_thread(pid, info.dwProcessId);
test_module(pid, curr_expected_modules, NUM_OF(curr_expected_modules)); test_module(pid, curr_expected_modules, ARRAY_SIZE(curr_expected_modules));
test_module(info.dwProcessId, sub_expected_modules, NUM_OF(sub_expected_modules)); test_module(info.dwProcessId, sub_expected_modules, ARRAY_SIZE(sub_expected_modules));
SetEvent(ev2); SetEvent(ev2);
winetest_wait_child_process( info.hProcess ); winetest_wait_child_process( info.hProcess );