Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-31 15:08:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 12:49:44 +01:00
parent 4fc4698f2a
commit fe0fd16499
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/fusion/asmcache.c
View file

@ -117,14 +117,14 @@ static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version,
if (!strcmp(version, "v4.0.30319")) if (!strcmp(version, "v4.0.30319"))
{ {
strcpyW(dir + len, dotnet); strcpyW(dir + len, dotnet);
len += sizeof(dotnet)/sizeof(WCHAR) -1; len += ARRAY_SIZE(dotnet) - 1;
strcpyW(dir + len, gac + 1); strcpyW(dir + len, gac + 1);
len += sizeof(gac)/sizeof(WCHAR) - 2; len += ARRAY_SIZE(gac) - 2;
} }
else else
{ {
strcpyW(dir + len, gac); strcpyW(dir + len, gac);
len += sizeof(gac)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(gac) - 1;
} }
switch (architecture) switch (architecture)
{ {
@ -433,7 +433,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface,
WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL;
PEKIND architecture; PEKIND architecture;
char *clr_version; 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; HRESULT hr;
TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, TRACE("(%p, %d, %s, %p)\n", iface, dwFlags,

10
dll/win32/fusion/fusion.c
View file

@ -144,9 +144,9 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath,
case ASM_CACHE_GAC: case ASM_CACHE_GAC:
{ {
strcpyW(path + len, assembly); strcpyW(path + len, assembly);
len += sizeof(assembly)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(assembly) - 1;
strcpyW(path + len, gac); strcpyW(path + len, gac);
len += sizeof(gac)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(gac) - 1;
break; break;
} }
case ASM_CACHE_DOWNLOAD: case ASM_CACHE_DOWNLOAD:
@ -156,13 +156,13 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath,
} }
case ASM_CACHE_ROOT: case ASM_CACHE_ROOT:
strcpyW(path + len, assembly); strcpyW(path + len, assembly);
len += sizeof(assembly)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(assembly) - 1;
break; break;
case ASM_CACHE_ROOT_EX: case ASM_CACHE_ROOT_EX:
strcpyW(path + len, dotnet); strcpyW(path + len, dotnet);
len += sizeof(dotnet)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(dotnet) - 1;
strcpyW(path + len, assembly); strcpyW(path + len, assembly);
len += sizeof(assembly)/sizeof(WCHAR) - 1; len += ARRAY_SIZE(assembly) - 1;
break; break;
default: default:
return E_INVALIDARG; return E_INVALIDARG;

2
media/doc/README.WINE
View file

@ -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/dciman32 # Synced to WineStaging-3.3
reactos/dll/win32/faultrep # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9
reactos/dll/win32/fontsub # 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/gdiplus # Synced to WineStaging-3.9
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-3.3
reactos/dll/win32/hlink # Synced to WineStaging-3.3 reactos/dll/win32/hlink # Synced to WineStaging-3.3