https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe0fd16499730f80351eec0a6f325f1dcf8e64db
commit fe0fd16499730f80351eec0a6f325f1dcf8e64db Author: Amine Khaldi <[email protected]> AuthorDate: Mon Oct 1 12:49:44 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Mon Oct 1 12:49:44 2018 +0100 [FUSION] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/fusion/asmcache.c | 8 ++++---- dll/win32/fusion/fusion.c | 10 +++++----- media/doc/README.WINE | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/fusion/asmcache.c b/dll/win32/fusion/asmcache.c index 668aa8777e..deca5f4c37 100644 --- a/dll/win32/fusion/asmcache.c +++ b/dll/win32/fusion/asmcache.c @@ -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, diff --git a/dll/win32/fusion/fusion.c b/dll/win32/fusion/fusion.c index b038b38092..a57d7e067c 100644 --- a/dll/win32/fusion/fusion.c +++ b/dll/win32/fusion/fusion.c @@ -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; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index ee52066a8b..e218e01830 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -67,7 +67,7 @@ reactos/dll/win32/dbghelp # Synced to WineStaging-3.9 reactos/dll/win32/dciman32 # Synced to WineStaging-3.3 reactos/dll/win32/faultrep # Synced to WineStaging-2.9 reactos/dll/win32/fontsub # Synced to WineStaging-2.9 -reactos/dll/win32/fusion # Synced to WineStaging-3.3 +reactos/dll/win32/fusion # Synced to WineStaging-3.17 reactos/dll/win32/gdiplus # Synced to WineStaging-3.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3 reactos/dll/win32/hlink # Synced to WineStaging-3.3
