system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 21:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mscoree: Replace uses of mono_domain_assembly_open.

Browse source 
This function is only intended to be used for the entry point
assembly.

Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Vincent Povirk 2020-04-18 22:01:16 -05:00 committed by Alexandre Julliard
parent 049e50bcaa
commit e3e0cb8ebc
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/mscoree/corruntimehost.c
View file

@ -206,10 +206,11 @@ static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname,
}
else
{
assembly = mono_domain_assembly_open(domain, assemblyname);
MonoImageOpenStatus status;
assembly = mono_assembly_open(assemblyname, &status);
if (!assembly)
{
ERR("Cannot load assembly %s\n", assemblyname);
ERR("Cannot load assembly %s, status=%i\n", assemblyname, status);
return FALSE;
}
@ -1819,6 +1820,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj )
MonoClass *klass;
MonoObject *result;
MonoDomain *prev_domain;
MonoImageOpenStatus status;
IUnknown *unk = NULL;
char *filenameA, *ns;
char *classA;
@ -1828,11 +1830,11 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj )
prev_domain = domain_attach(domain);
filenameA = WtoA(filename);
assembly = mono_domain_assembly_open(domain, filenameA);
assembly = mono_assembly_open(filenameA, &status);
HeapFree(GetProcessHeap(), 0, filenameA);
if (!assembly)
{
ERR("Cannot open assembly %s\n", filenameA);
ERR("Cannot open assembly %s, status=%i\n", filenameA, status);
domain_restore(prev_domain);
goto cleanup;
}

2
dlls/mscoree/metahost.c
View file

@ -93,7 +93,6 @@ MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type);
MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name);
MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count);
static void (CDECL *mono_config_parse)(const char *filename);
MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name);
MonoDomain* (CDECL *mono_domain_get)(void);
MonoDomain* (CDECL *mono_domain_get_by_id)(int id);
BOOL (CDECL *mono_domain_set)(MonoDomain *domain,BOOL force);
@ -199,7 +198,6 @@ static HRESULT load_mono(LPCWSTR mono_path)
LOAD_MONO_FUNCTION(mono_class_from_mono_type);
LOAD_MONO_FUNCTION(mono_class_from_name);
LOAD_MONO_FUNCTION(mono_class_get_method_from_name);
LOAD_MONO_FUNCTION(mono_domain_assembly_open);
LOAD_MONO_FUNCTION(mono_domain_get);
LOAD_MONO_FUNCTION(mono_domain_get_by_id);
LOAD_MONO_FUNCTION(mono_domain_set);

1
dlls/mscoree/mscoree_private.h
View file

@ -157,7 +157,6 @@ extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC
extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN;
extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN;
extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN;
extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name) DECLSPEC_HIDDEN;
extern MonoDomain* (CDECL *mono_domain_get)(void) DECLSPEC_HIDDEN;
extern MonoDomain* (CDECL *mono_domain_get_by_id)(int id) DECLSPEC_HIDDEN;
extern BOOL (CDECL *mono_domain_set)(MonoDomain *domain, BOOL force) DECLSPEC_HIDDEN;