Update SRLTracer

marcussacana · May 23, 2019 · 4ce4433 · 4ce4433
1 parent 906eaaf
commit 4ce4433
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 13 deletions.
diff --git a/Help/Debug Utility.rar b/Help/Debug Utility.rar
diff --git a/SRL/Hook/FileHook.cs b/SRL/Hook/FileHook.cs
@@ -7,6 +7,9 @@ static partial class StringReloader
     {
         static void InstallCreateFileHooks()
         {
+            if (Managed)
+                return;
+
             dGetFileAttrA = new GetFileAttributesADelegate(GetFileAttributes);
             dGetFileAttrW = new GetFileAttributesWDelegate(GetFileAttributes);
             dGetFileAttrExA = new GetFileAttributesExADelegate(GetFileAttributesEx);

diff --git a/SRL/Hook/IntroInjector.cs b/SRL/Hook/IntroInjector.cs
@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 
 namespace SRL {
+
     static partial class StringReloader {
 
 #if !DEBUG
@@ -25,7 +26,7 @@ static partial class StringReloader {
         static UnmanagedHook MoveWindowHook;
 
         static void InstallIntroInjector() {
-            if (ShowWindowHook != null)
+            if (ShowWindowHook != null || Managed)
                 return;
 #if !DEBUG
             CreateWindowExADel = new CreateWindowExADelegate(hCreateWindowEx);

diff --git a/SRL/Hook/TextHook.cs b/SRL/Hook/TextHook.cs
@@ -51,6 +51,9 @@ static partial class StringReloader {
         static UnmanagedHook hMultiByteToWideChar;
 
         static void InstallGlyphHooks() {
+            if (Managed)
+                return;
+
             dOutlineA = new GetGlyphOutlineDelegate(hGetGlyphOutlineA);
             dOutlineW = new GetGlyphOutlineDelegate(hGetGlyphOutlineW);
 
@@ -61,7 +64,11 @@ static void InstallGlyphHooks() {
             OutlineW.Install();
         }
 
-        static void InstallTextOutHooks() {
+        static void InstallTextOutHooks()
+        {
+            if (Managed)
+                return;
+
             dTextOutA = new TextOutADelegate(hTextOut);
             dTextOutW = new TextOutWDelegate(hTextOut);
 
@@ -72,7 +79,11 @@ static void InstallTextOutHooks() {
             hTextOutW.Install();
         }
 
-        static void InstallExtTextOutHooks() {
+        static void InstallExtTextOutHooks()
+        {
+            if (Managed)
+                return;
+
             dExtTextOutA = new ExtTextOutADelegate(hExtTextOut);
             dExtTextOutW = new ExtTextOutWDelegate(hExtTextOut);
 
@@ -83,7 +94,11 @@ static void InstallExtTextOutHooks() {
             hExtTextOutW.Install();
         }
 
-        static void InstallCreateFontHooks() {
+        static void InstallCreateFontHooks()
+        {
+            if (Managed)
+                return;
+
             dCreateFontA = new CreateFontADelegate(hCreateFont);
             dCreateFontW = new CreateFontWDelegate(hCreateFont);
 
@@ -94,7 +109,11 @@ static void InstallCreateFontHooks() {
             hCreatFontW.Install();
         }
 
-        static void InstallCreateFontIndirectHooks() {
+        static void InstallCreateFontIndirectHooks()
+        {
+            if (Managed)
+                return;
+
             dCreateFontIndirectA = new CreateFontIndirectADelegate(hCreateFontIndirectA);
             dCreateFontIndirectW = new CreateFontIndirectWDelegate(hCreateFontIndirectW);
 
@@ -108,6 +127,8 @@ static void InstallCreateFontIndirectHooks() {
 
 #if DEBUG
         static void InstallSendMessageHooks() {
+            if (Managed)
+                return;
             dSendMessageA = new SendMessageADelegate(SendMessageAHook);
             dSendMessageW = new SendMessageWDelegate(SendMessageWHook);
 
@@ -119,6 +140,8 @@ static void InstallSendMessageHooks() {
         }
 
         static void InstallCreateWindowHooks() {
+            if (Managed)
+                return;
             dCreateWindowA = new CreateWindowADelegate(CreateWindow);
             dCreateWindowW = new CreateWindowWDelegate(CreateWindow);
 
@@ -130,6 +153,8 @@ static void InstallCreateWindowHooks() {
         }
 
         static void InstallCreateWindowExHooks() {
+            if (Managed)
+                return;
             dCreateWindowExA = new CreateWindowExADelegate(CreateWindowEx);
             dCreateWindowExW = new CreateWindowExWDelegate(CreateWindowEx);
 
@@ -141,7 +166,11 @@ static void InstallCreateWindowExHooks() {
         }
 #endif
 
-        static void InstallSetWindowTextHooks() {
+        static void InstallSetWindowTextHooks()
+        {
+            if (Managed)
+                return;
+
             dSetWindowTextA = new SetWindowTextADelegate(SetWindowTextHook);
             dSetWindowTextW = new SetWindowTextWDelegate(SetWindowTextHook);
 
@@ -152,7 +181,11 @@ static void InstallSetWindowTextHooks() {
             hSetWindowTextW.Install();
         }
 
-        static void InstallMultiByteToWideChar() {
+        static void InstallMultiByteToWideChar()
+        {
+            if (Managed)
+                return;
+
             dMultiByteToWideChar = new MultiByteToWideCharDelegate(MultiByteToWideCharHook);
 
             hMultiByteToWideChar = AutoHookCreator("kernel32.dll", "MultiByteToWideChar", dMultiByteToWideChar);

diff --git a/SRL/Properties/AssemblyInfo.cs b/SRL/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("VNX+")]
 [assembly: AssemblyProduct("SRL - By Marcussacana")]
-[assembly: AssemblyCopyright("Copyright © VNX+ 2017-2018")]
+[assembly: AssemblyCopyright("Copyright © VNX+ 2017-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // É possível especificar todos os valores ou usar como padrão os Números de Build e da Revisão
 // usando o '*' como mostrado abaixo:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0")]
+[assembly: AssemblyVersion("4.1.0.0")]
+[assembly: AssemblyFileVersion("4.1.0.0")]
diff --git a/SRL/Reloader.cs b/SRL/Reloader.cs
@@ -343,6 +343,7 @@ internal static void Init() {
                     else
                     {
                         NoDatabase = true;
+                        StrRld = new Dictionary<string, string>();
                         Warning("Can't Compile Strings because the SRL don't found any LST.");
                     }
                 }

diff --git a/SRL/Variables.cs b/SRL/Variables.cs
@@ -232,12 +232,19 @@ static Dictionary<string, string> StrRld {
             }
         }
 
+        static bool? DbgFlg = null;
         static bool _FrcDbg = false;
         static bool Debugging {
             get {
                 if (_FrcDbg)
                     return true;
-                return File.Exists(BaseDir + "DEBUG");
+
+                if (DbgFlg.HasValue)
+                    return DbgFlg.Value;
+
+                DbgFlg = File.Exists(BaseDir + "DEBUG");
+
+                return DbgFlg.Value;
             }
             set {
                 _FrcDbg = value;

diff --git a/SRLTracer/Form1.cs b/SRLTracer/Form1.cs
@@ -1,4 +1,5 @@
-using SacanaWrapper;
+//#define DEBUG
+using SacanaWrapper;
 using System;
 using System.Windows.Forms;
 

diff --git a/SRLUnity/Main.cs b/SRLUnity/Main.cs
@@ -37,7 +37,7 @@ public static string GameDirectory {
 
         public static string Process(string Text) {
             Initialize();
-
+            
             IntPtr Ptr = Marshal.StringToHGlobalAuto(Text);
             IntPtr New = Function(Ptr);
             Text = Marshal.PtrToStringAuto(New);
-Original file line number
+Diff line change
@@ Expand Up / @@ -343,6 +343,7 @@ internal static void Init() { @@
                         else
                         {
                             NoDatabase = true;
+                            StrRld = new Dictionary<string, string>();
                             Warning("Can't Compile Strings because the SRL don't found any LST.");
                         }
                     }
@@ Expand Down @@