Skip to content

Disposes all streams #4

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
Tustin wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Disposes all streams #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae0953b
Disposes all streams
Tustin Mar 6, 2017
9a4fca4
fixed gt/ge/lt/le parsing (improper operators)
Tustin Apr 24, 2017
9f59ffa
should be tabs again
Tustin Apr 24, 2017
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
8 changes: 4 additions & 4 deletions GTA V Script Decompiler/Function.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,16 +1217,16 @@ public void decodeinstruction()
Stack.Op_CmpNE();
goto HandleJump;
case Instruction.JumpLe:
Stack.Op_CmpGT();
Stack.Op_CmpGE();
goto HandleJump;
case Instruction.JumpLt:
Stack.Op_CmpGE();
Stack.Op_CmpGT();
goto HandleJump;
case Instruction.JumpGe:
Stack.Op_CmpLT();
Stack.Op_CmpLE();
goto HandleJump;
case Instruction.JumpGt:
Stack.Op_CmpLE();
Stack.Op_CmpLT();
goto HandleJump;
case Instruction.Call:
FunctionName tempf = GetFunctionNameFromOffset(Instructions[Offset].GetOperandsAsInt);
Expand Down
245 changes: 132 additions & 113 deletions GTA V Script Decompiler/Native Param Info.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.IO;
using System.Windows.Forms;

namespace Decompiler
Expand All @@ -16,24 +16,26 @@ public NativeParamInfo()

public void savefile()
{
Stream natfile =
using (Stream natfile =
File.Create(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
"nativeinfo.dat"));
IO.Writer writer = new IO.Writer(natfile);
foreach (KeyValuePair<uint, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
"nativeinfo.dat")))
{
writer.Write(native.Key);
writer.Write(Types.indexof(native.Value.Item1));
writer.Write((byte) native.Value.Item2.Length);
for (int i = 0; i < native.Value.Item2.Length; i++)
using (IO.Writer writer = new IO.Writer(natfile))
{
writer.Write(Types.indexof(native.Value.Item2[i]));
foreach (KeyValuePair<uint, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
{
writer.Write(native.Key);
writer.Write(Types.indexof(native.Value.Item1));
writer.Write((byte)native.Value.Item2.Length);
for (int i = 0; i < native.Value.Item2.Length; i++)
{
writer.Write(Types.indexof(native.Value.Item2[i]));
}
}
}
}
writer.Close();
}


public void updatenative(uint hash, Stack.DataType returns, params Stack.DataType[] param)
{
lock (Program.ThreadLock)
Expand Down Expand Up @@ -103,21 +105,24 @@ public void loadfile()
"nativeinfo.dat");
if (!File.Exists(file))
return;
Stream natfile = File.OpenRead(file);
IO.Reader reader = new IO.Reader(natfile, true);
while (natfile.Position < natfile.Length)
using (Stream natfile = File.OpenRead(file))
{
uint native = reader.ReadUInt32();
Stack.DataType returntype = Types.getatindex(reader.ReadByte());
byte count = reader.ReadByte();
Stack.DataType[] param = new Stack.DataType[count];
for (byte i = 0; i < count; i++)
using (IO.Reader reader = new IO.Reader(natfile, true))
{
param[i] = Types.getatindex(reader.ReadByte());
while (natfile.Position < natfile.Length)
{
uint native = reader.ReadUInt32();
Stack.DataType returntype = Types.getatindex(reader.ReadByte());
byte count = reader.ReadByte();
Stack.DataType[] param = new Stack.DataType[count];
for (byte i = 0; i < count; i++)
{
param[i] = Types.getatindex(reader.ReadByte());
}
Natives.Add(native, new Tuple<Stack.DataType, Stack.DataType[]>(returntype, param));
}
}
Natives.Add(native, new Tuple<Stack.DataType, Stack.DataType[]>(returntype, param));
}

}

public string getnativeinfo(uint hash)
Expand All @@ -139,44 +144,48 @@ public string getnativeinfo(uint hash)

public void exportnativeinfo()
{
Stream natfile =
using (Stream natfile =
File.Create(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
"natives.h"));
StreamWriter sw = new StreamWriter(natfile);
sw.WriteLine("/*************************************************************");
sw.WriteLine("****************** GTA V Native Header file ******************");
sw.WriteLine("*************************************************************/\n");
sw.WriteLine("#ifndef NATIVE_HEADER\n#define NATIVE_HEADER");
sw.WriteLine("typedef unsigned int uint;");
sw.WriteLine("typedef uint bool;");
sw.WriteLine("typedef uint var;");
sw.WriteLine("");
List<Tuple<string, string>> natives = new List<Tuple<string, string>>();

foreach (KeyValuePair<uint, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
"natives.h")))
{
string type = Types.gettype(native.Value.Item1).returntype;
string line = Program.nativefile.nativefromhash(native.Key) + "(";

int max = native.Value.Item2.Length;
if (max == 0)
{
natives.Add(new Tuple<string, string>(line + ");\n", type));
continue;
}
for (int i = 0; i < max; i++)
using (StreamWriter sw = new StreamWriter(natfile))
{
line += Types.gettype(native.Value.Item2[i]).vardec + i + ", ";
sw.WriteLine("/*************************************************************");
sw.WriteLine("****************** GTA V Native Header file ******************");
sw.WriteLine("*************************************************************/\n");
sw.WriteLine("#ifndef NATIVE_HEADER\n#define NATIVE_HEADER");
sw.WriteLine("typedef unsigned int uint;");
sw.WriteLine("typedef uint bool;");
sw.WriteLine("typedef uint var;");
sw.WriteLine("");
List<Tuple<string, string>> natives = new List<Tuple<string, string>>();

foreach (KeyValuePair<uint, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
{
string type = Types.gettype(native.Value.Item1).returntype;
string line = Program.nativefile.nativefromhash(native.Key) + "(";

int max = native.Value.Item2.Length;
if (max == 0)
{
natives.Add(new Tuple<string, string>(line + ");\n", type));
continue;
}
for (int i = 0; i < max; i++)
{
line += Types.gettype(native.Value.Item2[i]).vardec + i + ", ";
}
natives.Add(new Tuple<string, string>(line.Remove(line.Length - 2) + ");\n", type));
}
natives.Sort();
foreach (Tuple<string, string> native in natives)
{
sw.Write("extern " + native.Item2 + native.Item1);
}
sw.WriteLine("#endif");
}
natives.Add(new Tuple<string, string>(line.Remove(line.Length - 2) + ");\n", type));
}
natives.Sort();
foreach (Tuple<string, string> native in natives)
{
sw.Write("extern " + native.Item2 + native.Item1);
}
sw.WriteLine("#endif");
sw.Close();

}

public string TypeToString(Stack.DataType type)
Expand Down Expand Up @@ -220,24 +229,28 @@ public void savefile()
try
{
string loc = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
Stream natfile = File.Create(Path.Combine(loc, "x64nativeinfonew.dat"));
IO.Writer writer = new IO.Writer(natfile);
foreach (KeyValuePair<ulong, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
using (Stream natfile = File.Create(Path.Combine(loc, "x64nativeinfonew.dat")))
{
writer.Write(native.Key);
writer.Write(Types.indexof(native.Value.Item1));
writer.Write((byte) native.Value.Item2.Length);
for (int i = 0; i < native.Value.Item2.Length; i++)
using (IO.Writer writer = new IO.Writer(natfile))
{
writer.Write(Types.indexof(native.Value.Item2[i]));
foreach (KeyValuePair<ulong, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
{
writer.Write(native.Key);
writer.Write(Types.indexof(native.Value.Item1));
writer.Write((byte)native.Value.Item2.Length);
for (int i = 0; i < native.Value.Item2.Length; i++)
{
writer.Write(Types.indexof(native.Value.Item2[i]));
}
}
if (File.Exists(Path.Combine(loc, "x64nativeinfo.dat")))
{
File.Delete("x64nativeinfo.dat");
}
File.Move(Path.Combine(loc, "x64nativeinfonew.dat"), Path.Combine(loc, "x64nativeinfo.dat"));
}
}
writer.Close();
if (File.Exists(Path.Combine(loc, "x64nativeinfo.dat")))
{
File.Delete("x64nativeinfo.dat");
}
File.Move(Path.Combine(loc, "x64nativeinfonew.dat"), Path.Combine(loc, "x64nativeinfo.dat"));

}
catch (Exception Exception)
{
Expand Down Expand Up @@ -337,21 +350,24 @@ public void loadfile()
"x64nativeinfo.dat");
if (!File.Exists(file))
return;
Stream natfile = File.OpenRead(file);
IO.Reader reader = new IO.Reader(natfile, false);
while (natfile.Position < natfile.Length)
using (Stream natfile = File.OpenRead(file))
{
ulong native = reader.ReadUInt64();
Stack.DataType returntype = Types.getatindex(reader.ReadByte());
byte count = reader.ReadByte();
Stack.DataType[] param = new Stack.DataType[count];
for (byte i = 0; i < count; i++)
using (IO.Reader reader = new IO.Reader(natfile, false))
{
param[i] = Types.getatindex(reader.ReadByte());
while (natfile.Position < natfile.Length)
{
ulong native = reader.ReadUInt64();
Stack.DataType returntype = Types.getatindex(reader.ReadByte());
byte count = reader.ReadByte();
Stack.DataType[] param = new Stack.DataType[count];
for (byte i = 0; i < count; i++)
{
param[i] = Types.getatindex(reader.ReadByte());
}
Natives.Add(native, new Tuple<Stack.DataType, Stack.DataType[]>(returntype, param));
}
}
Natives.Add(native, new Tuple<Stack.DataType, Stack.DataType[]>(returntype, param));
}

}

public string getnativeinfo(ulong hash)
Expand All @@ -373,43 +389,46 @@ public string getnativeinfo(ulong hash)

public void exportnativeinfo()
{
Stream natfile =
using (Stream natfile =
File.Create(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
"natives.h"));
StreamWriter sw = new StreamWriter(natfile);
sw.WriteLine("/*************************************************************");
sw.WriteLine("****************** GTA V Native Header file ******************");
sw.WriteLine("*************************************************************/\n");
sw.WriteLine("#define TRUE 1\n#define FALSE 0\n#define true 1\n#define false 0\n");
sw.WriteLine("typedef unsigned int uint;");
sw.WriteLine("typedef uint bool;");
sw.WriteLine("typedef uint var;");
sw.WriteLine("");
List<Tuple<string, string>> natives = new List<Tuple<string, string>>();

foreach (KeyValuePair<ulong, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
"natives.h")))
{
string type = Types.gettype(native.Value.Item1).returntype;
string line = Program.x64nativefile.nativefromhash(native.Key) + "(";

int max = native.Value.Item2.Length;
if (max == 0)
using (StreamWriter sw = new StreamWriter(natfile))
{
natives.Add(new Tuple<string, string>(line + ");\n", type));
continue;
}
for (int i = 0; i < max; i++)
{
line += Types.gettype(native.Value.Item2[i]).vardec + i + ", ";
sw.WriteLine("/*************************************************************");
sw.WriteLine("****************** GTA V Native Header file ******************");
sw.WriteLine("*************************************************************/\n");
sw.WriteLine("#define TRUE 1\n#define FALSE 0\n#define true 1\n#define false 0\n");
sw.WriteLine("typedef unsigned int uint;");
sw.WriteLine("typedef uint bool;");
sw.WriteLine("typedef uint var;");
sw.WriteLine("");
List<Tuple<string, string>> natives = new List<Tuple<string, string>>();

foreach (KeyValuePair<ulong, Tuple<Stack.DataType, Stack.DataType[]>> native in Natives)
{
string type = Types.gettype(native.Value.Item1).returntype;
string line = Program.x64nativefile.nativefromhash(native.Key) + "(";

int max = native.Value.Item2.Length;
if (max == 0)
{
natives.Add(new Tuple<string, string>(line + ");\n", type));
continue;
}
for (int i = 0; i < max; i++)
{
line += Types.gettype(native.Value.Item2[i]).vardec + i + ", ";
}
natives.Add(new Tuple<string, string>(line.Remove(line.Length - 2) + ");\n", type));
}
natives.Sort();
foreach (Tuple<string, string> native in natives)
{
sw.Write("extern " + native.Item2 + native.Item1);
}
}
natives.Add(new Tuple<string, string>(line.Remove(line.Length - 2) + ");\n", type));
}
natives.Sort();
foreach (Tuple<string, string> native in natives)
{
sw.Write("extern " + native.Item2 + native.Item1);
}
sw.Close();
}

public string TypeToString(Stack.DataType type)
Expand Down