Skip to content

Support unicode paths for Mono #836

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

Draft
slxdy wants to merge 1 commit into
base: alpha-development
Choose a base branch
from
+16 −2
Draft

Support unicode paths for Mono #836

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
4 changes: 2 additions & 2 deletions MelonLoader.Bootstrap/RuntimeHandlers/Mono/MonoHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ private static unsafe void InitializeManaged()
foreach (var dll in Directory.EnumerateFiles(overridesDir, "*.dll"))
{
MelonDebug.Log("Loading assembly: " + dll);
if (Mono.DomainAssemblyOpen(Domain, dll) == 0)
if (Mono.TryLoadAssemblyUnicode(Domain, dll) == 0)
MelonDebug.Log("Assembly failed to load!");
}
}
}
}

MelonDebug.Log("Loading ML assembly");
var assembly = Mono.DomainAssemblyOpen(Domain, mlPath);
var assembly = Mono.TryLoadAssemblyUnicode(Domain, mlPath);
if (assembly == 0)
{
Core.Logger.Error($"Failed to load the Mono MelonLoader assembly");
Expand Down
14 changes: 14 additions & 0 deletions MelonLoader.Bootstrap/RuntimeHandlers/Mono/MonoLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,20 @@ internal class MonoLib
};
}

public nint TryLoadAssemblyUnicode(nint domain, string path)
{
if (!File.Exists(path))
return 0;

var dir = Path.GetDirectoryName(path)!;
var prevCwd = Directory.GetCurrentDirectory();

Directory.SetCurrentDirectory(dir);
var asm = DomainAssemblyOpen(domain, Path.GetFileName(path));
Directory.SetCurrentDirectory(prevCwd);
return asm;
}

private static string? FindMonoPath(string searchDir)
{
foreach (var folder in folderNames)
Expand Down