Skip to content

Change Mod initialization to not break when loading a HEW-built pat… #1

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

Open
Shamtam wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change Mod initialization to not break when loading a HEW-built pat… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9957df
Change `Mod` initialization to not break when loading a HEW-built pat…
Shamtam Nov 30, 2020
260bb85
Fix console redirection for CLI operation. Remove built executable
Shamtam Mar 14, 2021
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
Binary file removed SharpTune.exe
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions SharpTune/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
using System.Text;
using EcuMapTools;
using SharpTuneCore;
using System.Runtime.InteropServices;

namespace SharpTune
{
public static class Program
{
// defines for commandline output
[DllImport("kernel32.dll")]
static extern bool AttachConsole(int dwProcessId);
private const int ATTACH_PARENT_PROCESS = -1;

private static SharpTuner sharpTuner;
/// <summary>
/// Entry point. Runs the utility with or without exception handling, depending on whether a debugger is attached.
Expand All @@ -45,6 +51,9 @@ public static int Main(string[] args)
{
try
{
// redirect console output to parent process;
// must be before any calls to Console.WriteLine()
AttachConsole(ATTACH_PARENT_PROCESS);
result = Run(args);
}
catch (Exception exception)
Expand Down
4 changes: 2 additions & 2 deletions SharpTune/RomMod/Mod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ public Mod(string modPath, string build)
FilePath = modPath;
isResource = false;
reader = new SRecordReader(modPath);
TryReadPatches();
TryReversePatches();
//TryReadPatches();
//TryReversePatches();
}

public bool TryDefinition(AvailableDevices ad, string defPath)
Expand Down
2 changes: 1 addition & 1 deletion SharpTune/RomMod/ModDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public bool TryReadDefString(Blob metadata, out string metaString, ref int offse
}

char[] splitter = { '\0' };
string tempstring = System.Text.Encoding.ASCII.GetString(tempbytelist.ToArray());
string tempstring = System.Text.Encoding.UTF8.GetString(tempbytelist.ToArray());
metaString = tempstring.Split(splitter)[0];
return true;
}
Expand Down
3 changes: 3 additions & 0 deletions SharpTune/RomMod/RomMod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,9 @@ public static bool TryHewBuild(AvailableDevices ad, string patchPath, string rom
return false;
}
}

// use baseline'd patch to create new mod
mod = new Mod(mod.ModIdent + ".patch");
File.Copy(romPath, "oem.bin", true);
Trace.WriteLine("Attempting to test patches");
if (!mod.TryCheckApplyMod(romPath, romPath, true, false)) //&& !mod.TryCheckApplyMod(romPath, romPath, false, false)) ;
Expand Down