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

In Debug config, don't use `Assembly.Load(byte[])` for ext. tools 

apparently messes with the debugger IDK
This commit is contained in:
James Groom 2023-10-27 08:21:11 +10:00 committed by GitHub
parent 940c392fa3
commit 14c00d0ca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -35,7 +35,11 @@ namespace BizHawk.Client.EmuHawk
_asmChecksum = asmChecksum; _asmChecksum = asmChecksum;
_entryPointTypeName = entryPointTypeName; _entryPointTypeName = entryPointTypeName;
_extToolMan = extToolMan; _extToolMan = extToolMan;
#if DEBUG
_skipExtToolWarning = true;
#else
_skipExtToolWarning = _extToolMan._config.TrustedExtTools.TryGetValue(asmFilename, out var s) && s == _asmChecksum; _skipExtToolWarning = _extToolMan._config.TrustedExtTools.TryGetValue(asmFilename, out var s) && s == _asmChecksum;
#endif
AsmFilename = asmFilename; AsmFilename = asmFilename;
} }
@ -47,7 +51,9 @@ namespace BizHawk.Client.EmuHawk
/*skipExtToolWarning:*/ _skipExtToolWarning); /*skipExtToolWarning:*/ _skipExtToolWarning);
if (!success || _skipExtToolWarning) return; if (!success || _skipExtToolWarning) return;
_skipExtToolWarning = true; _skipExtToolWarning = true;
#if !DEBUG
_extToolMan._config.TrustedExtTools[AsmFilename] = _asmChecksum; _extToolMan._config.TrustedExtTools[AsmFilename] = _asmChecksum;
#endif
} }
} }
@ -119,8 +125,12 @@ namespace BizHawk.Client.EmuHawk
try try
{ {
if (!OSTailoredCode.IsUnixHost) MotWHack.RemoveMOTW(fileName); if (!OSTailoredCode.IsUnixHost) MotWHack.RemoveMOTW(fileName);
#if DEBUG
var externalToolFile = Assembly.LoadFrom(fileName);
#else
var asmBytes = File.ReadAllBytes(fileName); var asmBytes = File.ReadAllBytes(fileName);
var externalToolFile = Assembly.Load(asmBytes); var externalToolFile = Assembly.Load(asmBytes);
#endif
var entryPoint = externalToolFile.GetTypes() var entryPoint = externalToolFile.GetTypes()
.SingleOrDefault(t => typeof(IExternalToolForm).IsAssignableFrom(t) && t.GetCustomAttributes().OfType<ExternalToolAttribute>().Any()); .SingleOrDefault(t => typeof(IExternalToolForm).IsAssignableFrom(t) && t.GetCustomAttributes().OfType<ExternalToolAttribute>().Any());
if (entryPoint == null) throw new ExternalToolAttribute.MissingException(); if (entryPoint == null) throw new ExternalToolAttribute.MissingException();
@ -145,7 +155,11 @@ namespace BizHawk.Client.EmuHawk
item.Text = toolAttribute.Name; item.Text = toolAttribute.Name;
MenuItemInfo menuItemInfo = new( MenuItemInfo menuItemInfo = new(
this, this,
#if DEBUG
asmChecksum: string.Empty,
#else
asmChecksum: SHA1Checksum.ComputePrefixedHex(asmBytes), asmChecksum: SHA1Checksum.ComputePrefixedHex(asmBytes),
#endif
asmFilename: fileName, asmFilename: fileName,
entryPointTypeName: entryPoint.FullName); entryPointTypeName: entryPoint.FullName);
item.Tag = menuItemInfo; item.Tag = menuItemInfo;