Remove debug.txt support

Author: Rosalie241

ModApi.UpdateManager/DllsUpdater.cs

@@ -8,9 +8,6 @@
 using System.Reflection;
 using System.Security.AccessControl;
 using System.Security.Principal;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace ModApi.UpdateManager
 {

Spore ModAPI Easy Installer/EasyInstaller.cs

@@ -473,12 +473,12 @@ private static ResultType ExtractSporemodZip(string inputFile, ModConfiguration
                     {
                         mod.AddFile(entry.Name, GetGameFromFileType(type));
                         string configOutPath = Path.Combine(modPath, entry.Name);
-                        DebugShowMessageBox(configOutPath, "configOutPath");
+
                         entry.ExtractToFile(configOutPath, true);
                         if (outputPath != null)
                         {
                             string fileOutPath = Path.Combine(outputPath, entry.Name);
-                            DebugShowMessageBox(fileOutPath, "fileOutPath");
+
                             File.Copy(configOutPath, fileOutPath);
                         }
                     }
@@ -898,12 +898,5 @@ static void ShowExitMessageBox()
             thread.Start();
             thread.Join();
         }
-
-        private static bool ErrorTesting = File.Exists(Path.Combine(Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString(), "debug.txt"));
-        static void DebugShowMessageBox(string text, string caption)
-        {
-            if (ErrorTesting)
-                MessageBox.Show(text, caption);
-        }
     }
 }

Spore ModAPI Easy Installer/XmlInstallerWindow.xaml.cs

@@ -31,19 +31,7 @@ public partial class XmlInstallerWindow : DecoratableWindow
     {
         public static string GameSporeString = "Spore";
         public static string GameGaString = "GalacticAdventures";
-        //public bool cancelled = false;
-        /*bool _cancelled = false;
-        public bool cancelled
-        {
-            get => _cancelled;
-            set
-            {
-                _cancelled = value;
-                if (!_cancelled)
-                    InstallCancelled?.Invoke(this, null);
-            }
-        }*/
-        public static bool ERROR_TESTING = File.Exists(Path.Combine(Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString(), "debug.txt"));
+
         public static List<XmlInstallerWindow> installerWindows = new List<XmlInstallerWindow>();
         string ModSettingsStoragePath = string.Empty;
         string ModConfigPath = string.Empty;
@@ -68,7 +56,6 @@ public bool cancelled
         Version ModInfoVersion = null;// new Version(1, 0, 0, 0);
         int _installerState = 0; //0 = waiting, 1 = installing
         int _installerMode = 0; //0 = show components list, 1 = don't show components list
-        bool _isModUnique = true;
         bool _isModMatched = false;
         bool _dontUseLegacyPackagePlacement = false;
         public static string GaDataPath = SporePath.MoveToData(SporePath.Game.GalacticAdventures, SporePath.GetRealParent(PathDialogs.ProcessGalacticAdventures()));
@@ -80,8 +67,6 @@ public XmlInstallerWindow(string modName, bool configure)
             InitializeComponent();
             //LauncherSettings.Load();
             installerWindows.Add(this);
-            if (ERROR_TESTING)
-                MessageBox.Show("Core Spore Data: " + SporeDataPath + "\nGA Data: " + GaDataPath, "Data paths");
 
             if ((LauncherSettings.ForcedCoreSporeDataPath == null) && (!Directory.Exists(SporeDataPath)))
                 PathDialogs.ProcessSpore();
@@ -235,10 +220,8 @@ private void PrepareInstaller()
                     {
                         if (mod.Unique == ModUnique)
                         {
-                            _isModUnique = false;
                             if (mod.Name == ModName)
                             {
-                                //MessageBox.Show(mod.Name + "\n\n" + ModName, "mod.Name and ModName");
                                 _isModMatched = true;
                                 break;
                             }
@@ -1026,9 +1009,6 @@ await Task.Run(() =>
                             else if (p.ComponentGames[i] == GameSporeString)
                                 targetPath = Path.Combine(SporeDataPath, p.ComponentFileNames[i]);
 
-                            if (ERROR_TESTING)
-                                MessageBox.Show(targetPath, "UNINSTALLING");
-
                             if (File.Exists(targetPath))
                                 File.Delete(targetPath);
                         }
@@ -1178,7 +1158,6 @@ private void HandleModFile(ComponentInfo p, int index, bool copy)
                 targetFolderPath = SporeDataPath; //Path.Combine(SporeDataPath, p.ComponentFileNames[index]);
             else
             {
-                ShowMessageBox(p.ComponentGames[index] + "\n\n" + p.ComponentFileNames[index]);
                 isDll = true;
                 if (_dontUseLegacyPackagePlacement)
                 {
@@ -1187,8 +1166,6 @@ private void HandleModFile(ComponentInfo p, int index, bool copy)
                         Directory.CreateDirectory(dllFolderPath);
                     string outputPath = Path.Combine(dllFolderPath, p.ComponentFileNames[index]);
 
-                    ShowMessageBox(outputPath);
-
                     if (File.Exists(outputPath))
                         File.Delete(outputPath);
 
@@ -1208,7 +1185,6 @@ private void HandleModFile(ComponentInfo p, int index, bool copy)
                             Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString()
                             , p.ComponentFileNames[index]);
 
-                        ShowMessageBox(outputPath);
 
                         if (File.Exists(outputPath))
                         {
@@ -1224,8 +1200,6 @@ private void HandleModFile(ComponentInfo p, int index, bool copy)
                             Directory.GetParent(System.Reflection.Assembly.GetEntryAssembly().Location).ToString()
                             , p.ComponentFileNames[index].Replace(".dll", "-disk.dll"));
 
-                        ShowMessageBox(outputPath);
-
                         if (File.Exists(outputPath))
                         {
                             File.Delete(outputPath);
@@ -1275,8 +1249,6 @@ private void HandleModFile(ComponentInfo p, int index, bool copy)
             {
                 targetPath = Path.Combine(targetFolderPath, p.ComponentFileNames[index]);
 
-                ShowMessageBox("targetPath: " + targetPath);
-
                 if (File.Exists(targetPath))
                     File.Delete(targetPath);
 
@@ -1486,11 +1458,7 @@ private void SplashBorder_PreviewMouseLeftButtonDown(object sender, MouseButtonE
         {
             DragMove();
         }
-        public static void ShowMessageBox(string text)
-        {
-            if (ERROR_TESTING)
-                MessageBox.Show(text, "Debug Info");
-        }
+
         private void FinishButton_Click(object sender, RoutedEventArgs e)
         {
             Close();

Spore ModAPI Launcher/Injector.cs

@@ -73,14 +73,12 @@ public static IntPtr InjectDLL(PROCESS_INFORMATION pi, string dllPath)
             bytes[dllPath.Length] = 0;
 
             UIntPtr numBytesWritten;
-            Program.ERROR_TESTING_MSG("Beginning WriteProcessMemory");
             bool writeProcessMemoryOutput = WriteProcessMemory(hProc, objPtr, bytes, (uint)bytes.Length, out numBytesWritten);
             if (!writeProcessMemoryOutput || numBytesWritten.ToUInt32() != bytes.Length)
             {
                 /*throw new InjectException("Write process memory failed.");*/
                 Program.ThrowWin32Exception("Write process memory failed.");
             }
-            Program.ERROR_TESTING_MSG("WriteProcessMemory output: " + writeProcessMemoryOutput.ToString());
 
             // Create a remote thread that begins at the LoadLibrary function and is passed as memory pointer
             IntPtr hRemoteThread = CreateRemoteThread(hProc, IntPtr.Zero, 0, retLib, objPtr, 0, out var lpThreadId);
@@ -167,13 +165,11 @@ public static void SetInjectionData(PROCESS_INFORMATION pi, IntPtr hDLLInjectorH
             }
 
 
-            Program.ERROR_TESTING_MSG("Beginning WriteProcessMemory");
             bool writeProcessMemoryOutput = WriteProcessMemory(hProc, objPtr, bytes, (uint)bytes.Length, out var numBytesWritten);
             if (!writeProcessMemoryOutput || numBytesWritten.ToUInt32() != bytes.Length)
             {
                 Program.ThrowWin32Exception("Write process memory failed.");
             }
-            Program.ERROR_TESTING_MSG("WriteProcessMemory output: " + writeProcessMemoryOutput.ToString());
 
             // Create a remote thread that begins at the LoadLibrary function and is passed as memory pointer
             IntPtr hRemoteThread = CreateRemoteThread(hProc, IntPtr.Zero, 0, SetInjectDataPtr, objPtr, 0, out var lpThreadId);

Spore ModAPI Launcher/Program.cs

@@ -21,7 +21,6 @@ namespace SporeModAPI_Launcher
     class Program
     {
         public static IntPtr processHandle = IntPtr.Zero;
-        private static readonly bool ERROR_TESTING = File.Exists(Path.Combine(Directory.GetParent(Assembly.GetEntryAssembly().Location).ToString(), "debug.txt"));
 
         private const string ModAPIFixDownloadURL = "http://davoonline.com/sporemodder/emd4600/SporeApp_ModAPIFix.zip";
         private const string ModApiHelpThreadURL = "https://launcherkit.sporecommunity.com/support";
@@ -61,14 +60,6 @@ static void Main()
             }
         }
 
-        public static void ERROR_TESTING_MSG(string message)
-        {
-            if (ERROR_TESTING)
-            {
-                MessageBox.Show(message, "Error testing");
-            }
-        }
-
         void Execute()
         {
             try
@@ -84,24 +75,19 @@ void Execute()
                 if (LauncherSettings.ForcedSporebinEP1Path == null)
                 {
                     this.ProcessSporebinPath();
-                    ERROR_TESTING_MSG("1. SporebinEP1 path: " + this.SporebinPath);
                 }
                 else
                 {
                     SporebinPath = LauncherSettings.ForcedSporebinEP1Path;
-                    ERROR_TESTING_MSG("1. SporebinEP1 path is overridden");
                 }
 
                 // use the default path for now (we might have to use a different one for Origin)
                 if (LauncherSettings.ForcedGalacticAdventuresSporeAppPath == null)
                 {
                     this.ExecutablePath = this.SporebinPath + "SporeApp.exe";
 
-                    ERROR_TESTING_MSG("2.0. Executable type: " + this.ExecutablePath);
-
                     this.ProcessExecutableType();
 
-                    ERROR_TESTING_MSG("2. Executable type: " + this._executableType);
 
                     if (this._executableType == GameVersionType.None)
                     {
@@ -111,7 +97,6 @@ void Execute()
                 }
                 else
                 {
-                    ERROR_TESTING_MSG("2. Executable type is overridden.");
                     this._executableType = LauncherSettings.GameVersion;
                 }
 
@@ -136,8 +121,6 @@ void Execute()
                     }
                 }
 
-                ERROR_TESTING_MSG("3. Real executable path: " + this.ExecutablePath);
-
                 // we must also check if the steam_api.dll doesn't exist (it's required for Origin users)
                 if (GameVersion.RequiresModAPIFix(this._executableType) && !File.Exists(this.SporebinPath + "steam_api.dll"))
                 {
@@ -149,7 +132,6 @@ void Execute()
 
                 if (SporePath.SporeIsInstalledOnSteam())
                 {
-                    ERROR_TESTING_MSG("3.5: Applying steam fix");
                     string steamAppIdPath = Path.Combine(this.SporebinPath, "steam_appid.txt");
                     //we have to use Spore GAs appid now, due to steam DRM :(
                     if (!File.Exists(steamAppIdPath) || File.ReadAllText(steamAppIdPath) != "24720")
@@ -166,9 +148,6 @@ void Execute()
                 }
 
                 string dllEnding = GameVersion.VersionNames[(int)this._executableType];
-
-                ERROR_TESTING_MSG("4. DLL suffix: " + dllEnding);
-
                 if (dllEnding == null)
                 {
                     MessageBox.Show(Strings.VersionNotDetected, CommonStrings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -244,14 +223,11 @@ List<string> GetDLLsToInject(string dllEnding, List<string> dllExceptions)
             foreach (var file in baseFolder.EnumerateFiles("*" + dllEnding + ".dll")
                 .Where(x => x.Name != MODAPI_DLL && !dllExceptions.Contains(x.Name)))
             {
-                ERROR_TESTING_MSG("5.* Preparing " + file.Name);
                 // the ModAPI dll should already be loaded
                 if (file.Name != MODAPI_DLL)
                 {
                     dlls.Add(file.FullName);
                 }
-                else
-                    ERROR_TESTING_MSG("5.* " + file.Name + " was already injected!");
             }
 
 
@@ -318,8 +294,6 @@ void CreateSporeProcess()
             else
                 currentSporebinPath = this.SporebinPath;
 
-            ERROR_TESTING_MSG("currentSporebinPath: " + currentSporebinPath + "\nExecutablePath: " + ExecutablePath);
-
             if (!NativeMethods.CreateProcess(null, "\"" + this.ExecutablePath + "\" " + sb,
                     IntPtr.Zero, IntPtr.Zero, false, ProcessCreationFlags.CREATE_SUSPENDED, IntPtr.Zero, currentSporebinPath, ref this.StartupInfo, out this.ProcessInfo))
             {
@@ -357,7 +331,6 @@ string ProcessSporebinPath()
         GameVersionType ProcessExecutableType()
         {
             GameVersionType executableType = GameVersion.DetectVersion(this.ExecutablePath);
-            ERROR_TESTING_MSG("2.1. File length: " + new System.IO.FileInfo(this.ExecutablePath).Length);
 
             // for debugging purposes
             //executableType = GameVersionType.None;