ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make discohawk main even more like multiclient main

This commit is contained in:
zeromus 2013-08-19 03:04:31 +00:00
parent add0691c5d
commit 3aa6108cb9
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DiscoHawk/DiscoHawk.cs
View File

@ -41,6 +41,7 @@ namespace BizHawk
SubMain(args); SubMain(args);
} }
//NoInlining should keep this code from getting jammed into Main() which would create dependencies on types which havent been setup by the resolver yet... or something like that
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true)]
public static extern bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, ChangeWindowMessageFilterExAction action, ref CHANGEFILTERSTRUCT changeInfo); public static extern bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, ChangeWindowMessageFilterExAction action, ref CHANGEFILTERSTRUCT changeInfo);
static void SubMain(string[] args) static void SubMain(string[] args)
@ -69,16 +70,21 @@ namespace BizHawk
static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
{ {
//load missing assemblies by trying to find them in the dll directory lock (AppDomain.CurrentDomain)
string dllname = new AssemblyName(args.Name).Name + ".dll"; {
string directory = System.IO.Path.Combine(GetExeDirectoryAbsolute(), "dll"); var asms = AppDomain.CurrentDomain.GetAssemblies();
string fname = Path.Combine(directory, dllname); foreach (var asm in asms)
if (!File.Exists(fname)) return null; if (asm.FullName == args.Name)
return asm;
ApplyMOTW(fname); //load missing assemblies by trying to find them in the dll directory
string dllname = new AssemblyName(args.Name).Name + ".dll";
//it is important that we use LoadFile here and not load from a byte array; otherwise mixed (managed/unamanged) assemblies can't load string directory = Path.Combine(GetExeDirectoryAbsolute(), "dll");
return Assembly.LoadFile(fname); string fname = Path.Combine(directory, dllname);
if (!File.Exists(fname)) return null;
//it is important that we use LoadFile here and not load from a byte array; otherwise mixed (managed/unamanged) assemblies can't load
return Assembly.LoadFile(fname);
}
} }
//declared here instead of a more usual place to avoid dependencies on the more usual place //declared here instead of a more usual place to avoid dependencies on the more usual place