do WhackMOTW after redirecting the dll directories fully, so that the shared RemoveMOTW that I moved to a common assembly can be found (wild guess)
This commit is contained in:
parent
daceefdd6a
commit
6b298f07f2
|
@ -20,13 +20,13 @@ namespace BizHawk.Client.DBMan
|
||||||
string dllDir = System.IO.Path.Combine(GetExeDirectoryAbsolute(), "dll");
|
string dllDir = System.IO.Path.Combine(GetExeDirectoryAbsolute(), "dll");
|
||||||
SetDllDirectory(dllDir);
|
SetDllDirectory(dllDir);
|
||||||
|
|
||||||
|
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
||||||
|
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||||
|
|
||||||
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
||||||
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
||||||
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
||||||
WhackAllMOTW(dllDir);
|
WhackAllMOTW(dllDir);
|
||||||
|
|
||||||
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,13 +29,13 @@ namespace BizHawk.Client.DiscoHawk
|
||||||
string dllDir = System.IO.Path.Combine(GetExeDirectoryAbsolute(), "dll");
|
string dllDir = System.IO.Path.Combine(GetExeDirectoryAbsolute(), "dll");
|
||||||
SetDllDirectory(dllDir);
|
SetDllDirectory(dllDir);
|
||||||
|
|
||||||
|
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
||||||
|
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||||
|
|
||||||
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
||||||
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
||||||
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
||||||
WhackAllMOTW(dllDir);
|
WhackAllMOTW(dllDir);
|
||||||
|
|
||||||
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,9 @@ namespace BizHawk.Client.EmuHawk
|
||||||
// this will look in subdirectory "dll" to load pinvoked stuff
|
// this will look in subdirectory "dll" to load pinvoked stuff
|
||||||
string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
|
string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
|
||||||
SetDllDirectory(dllDir);
|
SetDllDirectory(dllDir);
|
||||||
|
|
||||||
|
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
||||||
|
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||||
|
|
||||||
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
||||||
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
||||||
|
@ -67,9 +70,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
//We need to do it here too... otherwise people get exceptions when externaltools we distribute try to startup
|
//We need to do it here too... otherwise people get exceptions when externaltools we distribute try to startup
|
||||||
|
|
||||||
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,13 +24,13 @@ namespace BizHawk.Client.MultiHawk
|
||||||
string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
|
string dllDir = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "dll");
|
||||||
SetDllDirectory(dllDir);
|
SetDllDirectory(dllDir);
|
||||||
|
|
||||||
|
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
||||||
|
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
||||||
|
|
||||||
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
//but before we even try doing that, whack the MOTW from everything in that directory (thats a dll)
|
||||||
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
//otherwise, some people will have crashes at boot-up due to .net security disliking MOTW.
|
||||||
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
//some people are getting MOTW through a combination of browser used to download bizhawk, and program used to dearchive it
|
||||||
WhackAllMOTW(dllDir);
|
WhackAllMOTW(dllDir);
|
||||||
|
|
||||||
//in case assembly resolution fails, such as if we moved them into the dll subdiretory, this event handler can reroute to them
|
|
||||||
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue