Commit 84769355 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

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

parent 185d9ee7
...@@ -141,7 +141,7 @@ static void test_select( IWbemServices *services ) ...@@ -141,7 +141,7 @@ static void test_select( IWbemServices *services )
hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result );
ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr );
for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) for (i = 0; i < ARRAY_SIZE( test ); i++)
{ {
hr = exec_query( services, test[i], &result ); hr = exec_query( services, test[i], &result );
ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); ok( hr == S_OK, "query %u failed: %08x\n", i, hr );
...@@ -168,7 +168,7 @@ static void test_associators( IWbemServices *services ) ...@@ -168,7 +168,7 @@ static void test_associators( IWbemServices *services )
IEnumWbemClassObject *result; IEnumWbemClassObject *result;
UINT i; UINT i;
for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) for (i = 0; i < ARRAY_SIZE( test ); i++)
{ {
hr = exec_query( services, test[i], &result ); hr = exec_query( services, test[i], &result );
todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr ); todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr );
...@@ -433,7 +433,7 @@ static void test_Win32_Process( IWbemServices *services ) ...@@ -433,7 +433,7 @@ static void test_Win32_Process( IWbemServices *services )
out = NULL; out = NULL;
method = SysAllocString( getownerW ); method = SysAllocString( getownerW );
class = SysAllocStringLen( NULL, sizeof(fmtW)/sizeof(fmtW[0]) + 10 ); class = SysAllocStringLen( NULL, ARRAY_SIZE( fmtW ) + 10 );
wsprintfW( class, fmtW, GetCurrentProcessId() ); wsprintfW( class, fmtW, GetCurrentProcessId() );
hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL );
ok( hr == S_OK, "failed to execute method %08x\n", hr ); ok( hr == S_OK, "failed to execute method %08x\n", hr );
...@@ -524,13 +524,13 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) ...@@ -524,13 +524,13 @@ static void test_Win32_ComputerSystem( IWbemServices *services )
WCHAR username[128]; WCHAR username[128];
DWORD len, count; DWORD len, count;
len = sizeof(compname) / sizeof(compname[0]); len = ARRAY_SIZE( compname );
if (!GetComputerNameW( compname, &len )) if (!GetComputerNameW( compname, &len ))
compname[0] = 0; compname[0] = 0;
lstrcpyW( username, compname ); lstrcpyW( username, compname );
lstrcatW( username, backslashW ); lstrcatW( username, backslashW );
len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); len = ARRAY_SIZE( username ) - lstrlenW( username );
if (!GetUserNameW( username + lstrlenW( username ), &len )) if (!GetUserNameW( username + lstrlenW( username ), &len ))
username[0] = 0; username[0] = 0;
......
...@@ -164,7 +164,7 @@ static void test_IWbemLocator(void) ...@@ -164,7 +164,7 @@ static void test_IWbemLocator(void)
} }
ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr ); ok( hr == S_OK, "failed to create IWbemLocator interface %08x\n", hr );
for (i = 0; i < sizeof(test) / sizeof(test[0]); i++) for (i = 0; i < ARRAY_SIZE( test ); i++)
{ {
resource = SysAllocString( test[i].path ); resource = SysAllocString( test[i].path );
hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services );
......
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