ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fusion: Add support for enumerating version 4.0 assemblies.

This commit is contained in:
Hans Leidekker 2012-05-21 11:25:43 +02:00 committed by Alexandre Julliard
parent f408fa83ee
commit 0c6ab2464f
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/fusion/asmenum.c
View File

@ -382,32 +382,50 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name,
static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName)
{ {
WCHAR path[MAX_PATH]; static const WCHAR gac[] = {'\\','G','A','C',0};
WCHAR buf[MAX_PATH]; static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0};
static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0};
WCHAR path[MAX_PATH], buf[MAX_PATH];
HRESULT hr; HRESULT hr;
DWORD size; DWORD size;
static WCHAR under32[] = {'_','3','2',0}; size = MAX_PATH;
static WCHAR msil[] = {'_','M','S','I','L',0}; hr = GetCachePath(ASM_CACHE_ROOT_EX, buf, &size);
if (FAILED(hr))
return hr;
strcpyW(path, buf);
strcpyW(path + size - 1, gac_32);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr))
return hr;
strcpyW(path, buf);
strcpyW(path + size - 1, gac_msil);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr))
return hr;
size = MAX_PATH; size = MAX_PATH;
hr = GetCachePath(ASM_CACHE_GAC, buf, &size); hr = GetCachePath(ASM_CACHE_ROOT, buf, &size);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
lstrcpyW(path, buf); strcpyW(path, buf);
lstrcatW(path, under32); strcpyW(path + size - 1, gac_32);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
lstrcpyW(path, buf); strcpyW(path, buf);
lstrcatW(path, msil); strcpyW(path + size - 1, gac_msil);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, buf); strcpyW(path, buf);
strcpyW(path + size - 1, gac);
hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;