mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 22:30:15 +00:00
fusion: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
bb6398d545
commit
f77baaa830
|
@ -117,14 +117,14 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version,
|
|||
if (!strcmp(version, "v4.0.30319"))
|
||||
{
|
||||
strcpyW(dir + len, dotnet);
|
||||
len += sizeof(dotnet)/sizeof(WCHAR) -1;
|
||||
len += ARRAY_SIZE(dotnet) - 1;
|
||||
strcpyW(dir + len, gac + 1);
|
||||
len += sizeof(gac)/sizeof(WCHAR) - 2;
|
||||
len += ARRAY_SIZE(gac) - 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
strcpyW(dir + len, gac);
|
||||
len += sizeof(gac)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(gac) - 1;
|
||||
}
|
||||
switch (architecture)
|
||||
{
|
||||
|
@ -433,7 +433,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface,
|
|||
WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL;
|
||||
PEKIND architecture;
|
||||
char *clr_version;
|
||||
DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]);
|
||||
DWORD i, count = 0, src_len, dst_len = ARRAY_SIZE(format_v40);
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("(%p, %d, %s, %p)\n", iface, dwFlags,
|
||||
|
|
|
@ -144,9 +144,9 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath,
|
|||
case ASM_CACHE_GAC:
|
||||
{
|
||||
strcpyW(path + len, assembly);
|
||||
len += sizeof(assembly)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(assembly) - 1;
|
||||
strcpyW(path + len, gac);
|
||||
len += sizeof(gac)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(gac) - 1;
|
||||
break;
|
||||
}
|
||||
case ASM_CACHE_DOWNLOAD:
|
||||
|
@ -156,13 +156,13 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath,
|
|||
}
|
||||
case ASM_CACHE_ROOT:
|
||||
strcpyW(path + len, assembly);
|
||||
len += sizeof(assembly)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(assembly) - 1;
|
||||
break;
|
||||
case ASM_CACHE_ROOT_EX:
|
||||
strcpyW(path + len, dotnet);
|
||||
len += sizeof(dotnet)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(dotnet) - 1;
|
||||
strcpyW(path + len, assembly);
|
||||
len += sizeof(assembly)/sizeof(WCHAR) - 1;
|
||||
len += ARRAY_SIZE(assembly) - 1;
|
||||
break;
|
||||
default:
|
||||
return E_INVALIDARG;
|
||||
|
|
Loading…
Reference in a new issue