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

round 2: superior jabo dll handling through shared code, and fix major bug in previous version which made dlls fail to get located sometimes

This commit is contained in:
zeromus 2014-08-03 05:09:28 +00:00
parent eb087b460a
commit 532cd76af0
4 changed files with 110 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.cs
View File

@ -19,14 +19,8 @@ namespace BizHawk.Client.EmuHawk
private N64Settings s;
private N64SyncSettings ss;
private enum JaboStatus
{
NotReady,
ReadyToPatch,
Ready,
WrongVersion21,
WrongVersion16
};
private N64JaboManager.JaboStatus currentJaboStatus = N64JaboManager.JaboStatus.NotReady;
string[] validResolutions = {
"320 x 240",
@ -59,7 +53,6 @@ namespace BizHawk.Client.EmuHawk
"1380 x 768"
};
private JaboStatus currentJaboStatus = JaboStatus.NotReady;
private string previousPluginSelection = string.Empty;
private bool programmaticallyChangingPluginComboBox = false;
@ -387,40 +380,9 @@ namespace BizHawk.Client.EmuHawk
N64plugintabcontrol.TabPages.Remove(JaboTab);
}
if (File.Exists("dll\\Jabo_Direct3D8_patched.dll"))
{
byte[] hash = MD5.Create().ComputeHash(File.ReadAllBytes("dll\\Jabo_Direct3D8_patched.dll"));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "F4D6E624489CD88C68A5850426D4D70E")
{
// jabo is ready to go
currentJaboStatus = JaboStatus.Ready;
}
}
else if (File.Exists("dll\\Jabo_Direct3D8.dll"))
{
byte[] hash = MD5.Create().ComputeHash(File.ReadAllBytes("dll\\Jabo_Direct3D8.dll"));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "4F353AA71E7455B81205D8EC0AA339E1")
{
// jabo will be patched when a rom is loaded. user is ready to go
currentJaboStatus = JaboStatus.ReadyToPatch;
}
else if (hash_string == "4A4173928ED33735157A8D8CD14D4C9C")
{
// wrong jabo installed (2.0)
currentJaboStatus = JaboStatus.WrongVersion21;
}
else if (hash_string == "FF57F60C58EDE6364B980EDCB311873B")
{
// wrong jabo installed (1.6)
currentJaboStatus = JaboStatus.WrongVersion16;
}
else
{
// this is not the right file
}
}
N64JaboManager manager = new N64JaboManager();
manager.Scan();
currentJaboStatus = manager.Status;
s = GetSettings();
ss = GetSyncSettings();
@ -971,7 +933,7 @@ namespace BizHawk.Client.EmuHawk
if (PluginComboBox.Text == "Jabo 1.6.1")
{
if (currentJaboStatus == JaboStatus.Ready || currentJaboStatus == JaboStatus.ReadyToPatch)
if (currentJaboStatus == N64JaboManager.JaboStatus.Ready || currentJaboStatus == N64JaboManager.JaboStatus.ReadyToPatch)
{
jaboStatusLabel.Text = "You are ready to use Jabo.";
jaboStatusDetailLabel.Text = "";
@ -983,15 +945,15 @@ namespace BizHawk.Client.EmuHawk
else
{
jaboStatusDetailLabel.Text = "To use Jabo please copy Jabo_Direct3D8.dll from a Project64 v1.6.1 installation into Bizhawk's dll directory.";
if (currentJaboStatus == JaboStatus.NotReady)
if (currentJaboStatus == N64JaboManager.JaboStatus.NotReady)
{
jaboStatusLabel.Text = "You are NOT ready to use Jabo.";
}
else if (currentJaboStatus == JaboStatus.WrongVersion16)
else if (currentJaboStatus == N64JaboManager.JaboStatus.WrongVersion16)
{
jaboStatusLabel.Text = "You are NOT ready to use Jabo. Bizhawk requires Jabo Direct3D8 v1.6.1, but found v1.6 instead.";
}
else if (currentJaboStatus == JaboStatus.WrongVersion21)
else if (currentJaboStatus == N64JaboManager.JaboStatus.WrongVersion21)
{
jaboStatusLabel.Text = "You are NOT ready to use Jabo. Bizhawk requires Jabo Direct3D8 v1.6.1, but found v2.0 instead.";
}

1
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -240,6 +240,7 @@
<Compile Include="Consoles\Nintendo\GBA\LibMeteor.cs" />
<Compile Include="Consoles\Nintendo\GBA\Meteor.cs" />
<Compile Include="Consoles\Nintendo\N64\N64Input.cs" />
<Compile Include="Consoles\Nintendo\N64\N64JaboManager.cs" />
<Compile Include="Consoles\Nintendo\N64\N64Settings.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Controller.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Glide.cs" />

94
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64JaboManager.cs Normal file
View File

@ -0,0 +1,94 @@
using System;
using System.IO;
using System.Security.Cryptography;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public class N64JaboManager
{
string dllDir, rawPath, patchedPath;
public N64JaboManager()
{
//THIS IS HORRIBLE! PATH MUST BE PASSED IN SOME OTHER WAY
dllDir = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location), "dll");
rawPath = Path.Combine(dllDir, "Jabo_Direct3D8.dll");
patchedPath = Path.Combine(dllDir, "Jabo_Direct3D8_patched.dll");
}
public JaboStatus Status { get; private set; }
public enum JaboStatus
{
NotReady,
ReadyToPatch,
Ready,
WrongVersion21,
WrongVersion16
};
public void Scan()
{
//check whether the file is patched and intact
if (File.Exists(patchedPath))
{
using (var md5 = MD5.Create())
{
byte[] hash = md5.ComputeHash(File.ReadAllBytes(patchedPath));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "F4D6E624489CD88C68A5850426D4D70E")
{
Status = JaboStatus.Ready;
}
}
}
else if (File.Exists(rawPath))
{
using (var md5 = MD5.Create())
{
byte[] hash = md5.ComputeHash(File.ReadAllBytes(rawPath));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "4F353AA71E7455B81205D8EC0AA339E1")
{
// jabo will be patched when a rom is loaded. user is ready to go
Status = JaboStatus.ReadyToPatch;
}
if (hash_string == "4A4173928ED33735157A8D8CD14D4C9C")
{
// wrong jabo installed (2.0)
Status = JaboStatus.WrongVersion21;
}
else if (hash_string == "FF57F60C58EDE6364B980EDCB311873B")
{
// wrong jabo installed (1.6)
Status = JaboStatus.WrongVersion16;
}
}
}
}
public void Patch()
{
byte[] jaboDLL = File.ReadAllBytes(rawPath);
//this converts PE sections to have some different security flags (read+write instead of just read, maybe? I can't remember the details)
//without it, NX protection would trip. Why are these flags set oddly? The dll packer, I think.
jaboDLL[583] = 0xA0;
jaboDLL[623] = 0xA0;
jaboDLL[663] = 0xA0;
jaboDLL[703] = 0xA0;
jaboDLL[743] = 0xA0;
jaboDLL[783] = 0xA0;
jaboDLL[823] = 0xA0;
jaboDLL[863] = 0xA0;
File.WriteAllBytes(patchedPath, jaboDLL);
//re-scan, in case the file didnt get written for some weird reason
Scan();
}
}
}

45
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeAPI/mupen64plusVideoApi.cs
View File

@ -42,7 +42,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
private delegate Int32 GetScreenTextureID();
GetScreenTextureID GFXGetScreenTextureID;
public mupen64plusVideoApi(mupen64plusApi core, VideoPluginSettings settings)
{
string videoplugin;
@ -62,45 +61,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
case PluginType.Jabo:
videoplugin = "mupen64plus-video-jabo.dll";
//THIS IS HORRIBLE! PATH MUST BE PASSED IN SOME OTHER WAY
string dllDir = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "dll");
string rawPath = Path.Combine(dllDir, "Jabo_Direct3D8.dll");
string patchedPath = Path.Combine(dllDir, "Jabo_Direct3D8_patched.dll");
N64JaboManager manager = new N64JaboManager();
manager.Scan();
if (manager.Status == N64JaboManager.JaboStatus.ReadyToPatch)
manager.Patch();
if(manager.Status != N64JaboManager.JaboStatus.Ready)
throw new FileNotFoundException(string.Format("Error: Jabo dll was not found. please copy Jabo_Direct3D8.dll from a Project64 v1.6.1 installation into Bizhawk's dll directory."));
if (File.Exists(patchedPath))
{
byte[] hash = MD5.Create().ComputeHash(File.ReadAllBytes(patchedPath));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "F4D6E624489CD88C68A5850426D4D70E")
{
jaboReady = true;
}
}
if (!jaboReady && File.Exists(rawPath))
{
byte[] hash = MD5.Create().ComputeHash(File.ReadAllBytes(rawPath));
string hash_string = BitConverter.ToString(hash).Replace("-", "");
if (hash_string == "4F353AA71E7455B81205D8EC0AA339E1")
{
byte[] jaboDLL = File.ReadAllBytes(rawPath);
jaboDLL[583] = 0xA0;
jaboDLL[623] = 0xA0;
jaboDLL[663] = 0xA0;
jaboDLL[703] = 0xA0;
jaboDLL[743] = 0xA0;
jaboDLL[783] = 0xA0;
jaboDLL[823] = 0xA0;
jaboDLL[863] = 0xA0;
File.WriteAllBytes(patchedPath, jaboDLL);
jaboReady = true;
}
}
if (!jaboReady)
{
throw new InvalidOperationException(string.Format("Error: Jabo dll was not found. please copy Jabo_Direct3D8.dll from a Project64 v1.6.1 installation into Bizhawk's dll directory."));
}
break;
}