[PATCH 10/17] sxs/tests: Use the available ARRAY_SIZE() macro

Michael Stefaniuc mstefani at winehq.org
Wed May 30 14:15:42 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/sxs/tests/cache.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/sxs/tests/cache.c b/dlls/sxs/tests/cache.c
index d0c4817c72..19dd4b865e 100644
--- a/dlls/sxs/tests/cache.c
+++ b/dlls/sxs/tests/cache.c
@@ -155,12 +155,12 @@ static void test_QueryAssemblyInfo( void )
     memset( &info, 0, sizeof(info) );
     info.cbAssemblyInfo = sizeof(info);
     info.pszCurrentAssemblyPathBuf = path;
-    info.cchBuf = sizeof(path)/sizeof(path[0]);
+    info.cchBuf = ARRAY_SIZE( path );
     hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, comctlW, &info );
     ok( hr == S_OK, "got %08x\n", hr );
     ok( info.dwAssemblyFlags == 1, "got %08x\n", info.dwAssemblyFlags );
     ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart );
-    ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf );
+    ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf );
     ok( path[0], "empty path\n" );
 
     memset( &info, 0, sizeof(info) );
@@ -193,13 +193,13 @@ static void test_QueryAssemblyInfo( void )
     memset( &info, 0, sizeof(info) );
     info.cbAssemblyInfo = sizeof(info);
     info.pszCurrentAssemblyPathBuf = path;
-    info.cchBuf = sizeof(path)/sizeof(path[0]);
+    info.cchBuf = ARRAY_SIZE( path );
     path[0] = 0;
     hr = IAssemblyCache_QueryAssemblyInfo( cache, 2, comctlW, &info );
     ok( hr == E_INVALIDARG, "got %08x\n", hr );
     ok( !info.dwAssemblyFlags, "got %08x\n", info.dwAssemblyFlags );
     ok( !info.uliAssemblySizeInKB.u.LowPart, "got %u\n", info.uliAssemblySizeInKB.u.LowPart );
-    ok( info.cchBuf == sizeof(path)/sizeof(path[0]), "got %u\n", info.cchBuf );
+    ok( info.cchBuf == ARRAY_SIZE( path ), "got %u\n", info.cchBuf );
     ok( !path[0], "got %s\n", wine_dbgstr_w(path) );
 
     IAssemblyCache_Release( cache );
-- 
2.14.3




More information about the wine-patches mailing list