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

mscoree: Extract a helper function for getting file name from assembly.

This commit is contained in:
Daniel Jelinski 2013-06-04 21:10:27 +02:00 committed by Alexandre Julliard
parent c8d1d4aadc
commit 0eaa3ec9fb
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dlls/mscoree/metahost.c
View File

@ -1210,31 +1210,15 @@ HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj)
return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj);
}
static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)
HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length)
{
loaded_mono *mono = user_data;
HRESULT hr=S_OK;
MonoAssembly *result=NULL;
char *stringname=NULL;
LPWSTR stringnameW;
int stringnameW_size;
IAssemblyCache *asmcache;
ASSEMBLY_INFO info;
WCHAR path[MAX_PATH];
char *pathA;
MonoImageOpenStatus stat;
static WCHAR fusiondll[] = {'f','u','s','i','o','n',0};
HMODULE hfusion=NULL;
static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD);
stringname = mono->mono_stringify_assembly_name(aname);
TRACE("%s\n", debugstr_a(stringname));
if (!stringname) return NULL;
/* FIXME: We should search the given paths before the GAC. */
if (!pCreateAssemblyCache)
{
hr = LoadLibraryShim(fusiondll, NULL, NULL, &hfusion);
@ -1252,29 +1236,53 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char
if (SUCCEEDED(hr))
{
stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0);
info.cbAssemblyInfo = sizeof(info);
info.pszCurrentAssemblyPathBuf = assemblies_path;
info.cchBuf = path_length;
assemblies_path[0] = 0;
stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR));
if (stringnameW)
MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size);
else
hr = E_OUTOFMEMORY;
if (SUCCEEDED(hr))
{
info.cbAssemblyInfo = sizeof(info);
info.pszCurrentAssemblyPathBuf = path;
info.cchBuf = MAX_PATH;
path[0] = 0;
hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info);
}
HeapFree(GetProcessHeap(), 0, stringnameW);
hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info);
IAssemblyCache_Release(asmcache);
}
return hr;
}
static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)
{
loaded_mono *mono = user_data;
HRESULT hr;
MonoAssembly *result=NULL;
char *stringname=NULL;
LPWSTR stringnameW;
int stringnameW_size;
WCHAR path[MAX_PATH];
char *pathA;
MonoImageOpenStatus stat;
stringname = mono->mono_stringify_assembly_name(aname);
TRACE("%s\n", debugstr_a(stringname));
if (!stringname) return NULL;
/* FIXME: We should search the given paths before the GAC. */
stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0);
stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR));
if (stringnameW)
{
MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size);
hr = get_file_from_strongname(stringnameW, path, MAX_PATH);
HeapFree(GetProcessHeap(), 0, stringnameW);
}
else
hr = E_OUTOFMEMORY;
if (SUCCEEDED(hr))
{
TRACE("found: %s\n", debugstr_w(path));

2
dlls/mscoree/mscoree_private.h
View File

@ -204,6 +204,8 @@ extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) D
extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN;
extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) DECLSPEC_HIDDEN;
extern void runtimehost_init(void);
extern void runtimehost_uninit(void);