Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mono: Runtime main args and assembly search fixes #17619

Merged
merged 1 commit into from
Mar 18, 2018
Merged

Mono: Runtime main args and assembly search fixes #17619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions modules/mono/mono_gd/gd_mono.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,31 @@ void gdmono_MonoPrintCallback(const char *string, mono_bool is_stdout) {

GDMono *GDMono::singleton = NULL;

namespace {

void setup_runtime_main_args() {
CharString execpath = OS::get_singleton()->get_executable_path().utf8();

List<String> cmdline_args = OS::get_singleton()->get_cmdline_args();

List<CharString> cmdline_args_utf8;
Vector<char *> main_args;
main_args.resize(cmdline_args.size() + 1);

main_args[0] = execpath.ptrw();

int i = 1;
for (List<String>::Element *E = cmdline_args.front(); E; E = E->next()) {
CharString &stored = cmdline_args_utf8.push_back(E->get().utf8())->get();
main_args[i] = stored.ptrw();
i++;
}

mono_runtime_set_main_args(main_args.size(), main_args.ptrw());
}

#ifdef DEBUG_ENABLED

static bool _wait_for_debugger_msecs(uint32_t p_msecs) {

do {
Expand All @@ -96,9 +120,7 @@ static bool _wait_for_debugger_msecs(uint32_t p_msecs) {

return mono_is_debugger_attached();
}
#endif

#ifdef DEBUG_ENABLED
void gdmono_debug_init() {

mono_debug_init(MONO_DEBUG_FORMAT_MONO);
Expand All @@ -125,8 +147,11 @@ void gdmono_debug_init() {
};
mono_jit_parse_options(2, (char **)options);
}

#endif

} // namespace

void GDMono::initialize() {

ERR_FAIL_NULL(Engine::get_singleton());
Expand Down Expand Up @@ -179,6 +204,8 @@ void GDMono::initialize() {

GDMonoUtils::set_main_thread(GDMonoUtils::get_current_thread());

setup_runtime_main_args(); // Required for System.Environment.GetCommandLineArgs

runtime_initialized = true;

OS::get_singleton()->print("Mono: Runtime initialized\n");
Expand Down
26 changes: 13 additions & 13 deletions modules/mono/mono_gd/gd_mono_assembly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,22 @@ MonoAssembly *GDMonoAssembly::_search_hook(MonoAssemblyName *aname, void *user_d
path = search_dir.plus_file(name);
if (FileAccess::exists(path)) {
res = _load_assembly_from(name.get_basename(), path, refonly);
break;
if (res != NULL)
break;
}
} else {
path = search_dir.plus_file(name + ".dll");
if (FileAccess::exists(path)) {
res = _load_assembly_from(name, path, refonly);
break;
if (res != NULL)
break;
}

path = search_dir.plus_file(name + ".exe");
if (FileAccess::exists(path)) {
res = _load_assembly_from(name, path, refonly);
break;
if (res != NULL)
break;
}
}
}
Expand Down Expand Up @@ -151,19 +154,15 @@ MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **asse
path = search_dir.plus_file(name);
if (FileAccess::exists(path)) {
res = _load_assembly_from(name.get_basename(), path, refonly);
break;
if (res != NULL)
break;
}
} else {
path = search_dir.plus_file(name + ".dll");
if (FileAccess::exists(path)) {
res = _load_assembly_from(name, path, refonly);
break;
}

path = search_dir.plus_file(name + ".exe");
if (FileAccess::exists(path)) {
res = _load_assembly_from(name, path, refonly);
break;
if (res != NULL)
break;
}
}
}
Expand Down Expand Up @@ -212,14 +211,15 @@ Error GDMonoAssembly::load(bool p_refonly) {

String image_filename(path);

MonoImageOpenStatus status;
MonoImageOpenStatus status = MONO_IMAGE_OK;

image = mono_image_open_from_data_with_name(
(char *)&data[0], data.size(),
true, &status, refonly,
image_filename.utf8().get_data());

ERR_FAIL_COND_V(status != MONO_IMAGE_OK || image == NULL, ERR_FILE_CANT_OPEN);
ERR_FAIL_COND_V(status != MONO_IMAGE_OK, ERR_FILE_CANT_OPEN);
ERR_FAIL_NULL_V(image, ERR_FILE_CANT_OPEN);

#ifdef DEBUG_ENABLED
String pdb_path(path + ".pdb");
Expand Down