From 4ae3cafbbd0bf7bdf4a52080cd357e6582cf3e7e Mon Sep 17 00:00:00 2001
From: kb1000 <kaeptmblaubaer1000@gmail.com>
Date: Fri, 10 Jan 2025 01:37:04 +0100
Subject: [PATCH] Add launcher command line parameter to run legacy binaries
 from bin_legacy

---
 Star Ruler 2.exe                              | Bin 26624 -> 45568 bytes
 StarRuler2.sh                                 |  28 +++--
 source/loader/SR2Loader/HybridCRT.props       |  38 +++++++
 source/loader/SR2Loader/SR2Loader.vcxproj     |  39 ++++---
 .../SR2Loader/SR2Loader.vcxproj.filters       |   1 +
 source/loader/main.c                          | 101 ++++++++++++------
 source/msvc/Star Ruler 2/Star Ruler 2.sln     |   6 +-
 7 files changed, 154 insertions(+), 59 deletions(-)
 create mode 100644 source/loader/SR2Loader/HybridCRT.props

diff --git a/Star Ruler 2.exe b/Star Ruler 2.exe
index 3d6eba2b9b6625acd954445946321f58d0442799..7e3bc44e98b2191235254783479c04756f6712c0 100644
GIT binary patch
delta 19975
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

delta 1327
zcmbtTT}TvB6h1RrX_jugj!A#c$_NG`n`5D9G_guo*kZK}HH9#DH-&X~*&R!^VvQ);
zhK082CFr52ii9M3FnS0{$O<Bfpq@goho~S+$R5h+oSE5*UOT&Y&Ue0he&)_Ocl;ec
zKF3{Z<>qp`z3I-T+z+AGn9MJ(Vdaj)v{xows3+={@06PwCP@puL#Cdn`)TrB!-GQ<
z3%2;%0fOfXA@QR3Xr5byYAE4Lw*rq$o^>F0fL_H_ue*-05Elxs@8@LUy&IsFOa=da
zs67Dda&FhEaS@<N|H9W5B2aSf&CYr?G^V15%;AG_^7>kS+pf1%O2kEZSL6Ci6b!A8
z2M5#v%t}0F2l8L5pXaMKD~S4WnOmrBQ84OW?m(QoTu_;2nSQB=WmL)0&CYz9M;AjV
z!s-u1giL!=HubD*3bH9a+%h{_%+Aj6+KaNO0{L6`+_bup>~M35x+dH#kAD3qkd3?H
zmPeLvxY?yH%hN1-N{VOwL)x>Y+l2j@0NSi_>2{iFD;TR5Gh;T~+<0<ynPpo~(-90I
zQ3l}CX62VmdtwOvrZvN|!bL<#G3~n{L<wixB!9d7lx5l^#<J@vj<|R`Rz^-?+G{#t
z6Foe$ZBlI!=0_|V!p;hG#*<Vq%_sQ{;d3eF_DMa4@D8Cbdrg{0XL-6q>vMEy$;u9G
z;m8d3?YTEqjT<NzY<<PnH*7s*Ys(AZ@jrGAB=v=s-P>tDKV$0=7h?bCL|k^W^LwTG
zmp!gDjN|Vg+2;-TXkut`%qfyaqNa<8okmbUOd}%gBu)_l#)wN;V{;$v%HOthJQh($
zf@sql(3@C(QYw`S9z6z-hF5NYatau;63~R#l5G`fKnM;zs+rW{Wa4U(Q&8J}jl|I>
zI{t^-MVxs<h_mOKf)>e6Bol*Dz_SA}EF$SYoF_eIQO>yroWUw^Hf{qaw*^Y#R#EaN
zxsSy_1n41c%S*%_G3VZt{@-rSbNfQ7H#Rad5Dof<qoHodfHx9Lh8Pl&5Ofx>&_H}|
zBoZ5hhdlcF6S2WiGD$4Jd;KP>s`yZFA{kE%N7ZmQ96H$EB{$RuBN4o+HC!>ZcLU(p
mw{Pwhy)-Z(DF9PF`NII*x@z?%&rG9zTEE-sy0;i`^!);U=`<z)

diff --git a/StarRuler2.sh b/StarRuler2.sh
index a94968bc..56bf980e 100755
--- a/StarRuler2.sh
+++ b/StarRuler2.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -eo pipefail
+
 #Figure out where the script is located
 if [[ -L "$0" ]]; then
 	script_loc="$(readlink "$0")"
@@ -7,15 +9,25 @@ else
 fi
 cd "$(dirname "$script_loc")"
 
+bin_folder="bin"
+args=()
+for arg in "$@"; do
+    if [ "$arg" = "--legacy" ]; then
+        bin_folder="bin_legacy"
+    else
+        args+=("$arg")
+    fi
+done
+
 #Execute the right binary for this architecture
-if [ `uname` == "Darwin" ]; then
-    chmod +x ./bin/osx64/StarRuler2.bin
-    DYLD_LIBRARY_PATH="./bin/osx64/:$DYLD_LIBRARY_PATH" exec ./bin/osx64/StarRuler2.bin $@
-elif [ `uname -m` = "x86_64" ]; then
-    chmod +x ./bin/lin64/StarRuler2.bin
-    LD_LIBRARY_PATH="./bin/lin64/:$LD_LIBRARY_PATH" exec ./bin/lin64/StarRuler2.bin $@
+if [ "$(uname)" = "Darwin" ]; then
+    chmod +x ./$bin_folder/osx64/StarRuler2.bin
+    DYLD_LIBRARY_PATH="./$bin_folder/osx64/:$DYLD_LIBRARY_PATH" exec ./$bin_folder/osx64/StarRuler2.bin "${args[@]}"
+elif [ "$(uname -m)" = "x86_64" ]; then
+    chmod +x ./$bin_folder/lin64/StarRuler2.bin
+    LD_LIBRARY_PATH="./$bin_folder/lin64/:$LD_LIBRARY_PATH" exec ./$bin_folder/lin64/StarRuler2.bin "${args[@]}"
 else
-    chmod +x ./bin/lin32/StarRuler2.bin
-    LD_LIBRARY_PATH="./bin/lin32/:$LD_LIBRARY_PATH" exec ./bin/lin32/StarRuler2.bin $@
+    chmod +x ./$bin_folder/lin32/StarRuler2.bin
+    LD_LIBRARY_PATH="./$bin_folder/lin32/:$LD_LIBRARY_PATH" exec ./$bin_folder/lin32/StarRuler2.bin "${args[@]}"
 fi;
 # vim: set ff=unix:
diff --git a/source/loader/SR2Loader/HybridCRT.props b/source/loader/SR2Loader/HybridCRT.props
new file mode 100644
index 00000000..3b898d1a
--- /dev/null
+++ b/source/loader/SR2Loader/HybridCRT.props
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Condition="'$(HybridCrtConfiguration)'==''">
+    <HybridCrtConfiguration>$(Configuration)</HybridCrtConfiguration>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Debug'">
+    <ClCompile>
+      <!-- We use MultiThreadedDebug, rather than MultiThreadedDebugDLL, to avoid DLL dependencies on VCRUNTIME140d.dll and MSVCP140d.dll. -->
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrtd.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrtd.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(HybridCrtConfiguration)'=='Release'">
+    <ClCompile>
+      <!-- We use MultiThreaded, rather than MultiThreadedDLL, to avoid DLL dependencies on VCRUNTIME140.dll and MSVCP140.dll. -->
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <!-- Link statically against the runtime and STL, but link dynamically against the CRT by ignoring the static CRT
+           lib and instead linking against the Universal CRT DLL import library. This "hybrid" linking mechanism is
+           supported according to the CRT maintainer. Dynamic linking against the CRT makes the binaries a bit smaller
+           than they would otherwise be if the CRT, runtime, and STL were all statically linked in. -->
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries);libucrt.lib</IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>%(AdditionalOptions) /defaultlib:ucrt.lib</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/source/loader/SR2Loader/SR2Loader.vcxproj b/source/loader/SR2Loader/SR2Loader.vcxproj
index 983de293..7b34a13b 100644
--- a/source/loader/SR2Loader/SR2Loader.vcxproj
+++ b/source/loader/SR2Loader/SR2Loader.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -11,15 +11,17 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{93B31A9C-7169-47CA-80DB-CF3BB398291E}</ProjectGuid>
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v143</PlatformToolset>
-    <ProjectGuid>{93B31A9C-7169-47CA-80DB-CF3BB398291E}</ProjectGuid>
-    <RootNamespace>SR2Loader</RootNamespace>
+    <CharacterSet>Unicode</CharacterSet>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -28,6 +30,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="$(MSBuildThisFileDirectory)\HybridCRT.props" Label="HybridCRT" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -37,14 +42,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)\..\..\..\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>Star Ruler 2</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -53,23 +59,19 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MinSpace</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <Optimization>MinSpace</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
-      <ExceptionHandling>false</ExceptionHandling>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <CompileAsManaged>false</CompileAsManaged>
-      <DebugInformationFormat>None</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Windows</SubSystem>
-      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -84,6 +86,9 @@
   <ItemGroup>
     <ClInclude Include="resource.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="HybridCRT.props" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/source/loader/SR2Loader/SR2Loader.vcxproj.filters b/source/loader/SR2Loader/SR2Loader.vcxproj.filters
index 07f91028..fa0eacc7 100644
--- a/source/loader/SR2Loader/SR2Loader.vcxproj.filters
+++ b/source/loader/SR2Loader/SR2Loader.vcxproj.filters
@@ -16,6 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\sr2.ico" />
+    <None Include="HybridCRT.props" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
diff --git a/source/loader/main.c b/source/loader/main.c
index a6f9263e..c25c1350 100644
--- a/source/loader/main.c
+++ b/source/loader/main.c
@@ -1,43 +1,80 @@
-#include <Windows.h>
-
-static inline __forceinline __declspec(allocator) wchar_t* wstrdup(const wchar_t *_String) {
-	size_t i = 0;
-	while (_String[i] != 0)
-		i++;
-	wchar_t* ret = (wchar_t *)HeapAlloc(GetProcessHeap(), 0, sizeof(wchar_t) * (i + 1));
-	wsprintfW(ret, L"%s", _String);
-	return ret;
-}
+#include <windows.h>
+#include <stdint.h>
+#include <string.h>
 
-DWORD __stdcall mainCRTStartup(LPVOID p) {
-	//Create command, passing all of our arguments
-	LPWSTR cmdline = GetCommandLineW();
-	wchar_t search = ' ';
-	if (cmdline[0] == '"') {
-		search = '"';
-		cmdline++;
-	}
-	while (cmdline[0] != 0) {
-		cmdline++;
-		if (cmdline[0] == search) {
-			cmdline++;
-			break;
+int wmain(int argc, wchar_t* argv[]) {
+
+	STARTUPINFOW startup = {};
+	startup.cb = sizeof(startup);
+
+	PROCESS_INFORMATION process = {};
+
+	wchar_t* path = L"bin\\win64\\Star Ruler 2.exe";
+
+	size_t size = 0;
+	for (int i = 0; i < argc; i++) {
+		if (wcscmp(argv[i], L"--legacy") == 0) {
+			path = L"bin_legacy\\win64\\Star Ruler 2.exe";
+		}
+		else {
+			// worst-case estimate of expected escaped argument size, two output characters for every input character
+			// (to handle quotes and backslashes), one separator space and a leading and trailing quote
+			// first argument has no space, use it for the null terminator
+			size += wcslen(argv[i]) * 2 + 3;
 		}
 	}
-	while (cmdline[0] == ' ') {
-		cmdline++;
-	}
 
-	STARTUPINFOW startup;
-		SecureZeroMemory(&startup, sizeof(startup));
-		startup.cb = sizeof(startup);
+	//Create command, passing all of our arguments
+
+	wchar_t* cmdline = malloc(size * sizeof(wchar_t));
+	wchar_t* cur = cmdline;
 
-	PROCESS_INFORMATION process;
-		SecureZeroMemory(&process, sizeof(process));
+	for (int i = 0; i < argc; i++) {
+		if (wcscmp(argv[i], L"--legacy") == 0) {
+			continue;
+		}
+
+		for (wchar_t* arg = argv[i]; *arg != L'\0'; arg++) {
+			if (i != 0) {
+				*cur++ = L' ';
+			}
+			*cur++ = L'"';
+			switch (*arg) {
+			case L'"':
+				*cur++ = L'\\';
+				*cur++ = L'"';
+				arg++;
+				break;
+			case L'\\':
+				int backslashes = 0;
+				do {
+					backslashes++;
+				} while (arg[backslashes] == L'\\');
+				if (arg[backslashes] != 0 && arg[backslashes] != L'"') {
+					for (int j = 0; j < backslashes; j++) {
+						*cur++ = L'\\';
+					}
+				}
+				else {
+					for (int j = 0; j < backslashes; j++) {
+						*cur++ = L'\\';
+						*cur++ = L'\\';
+					}
+				}
+				arg += backslashes;
+				break;
+			default:
+				*cur++ = *arg++;
+			}
+			*cur++ = L'"';
+		}
+	}
+	*cur = L'\0';
 
-	if(CreateProcessW(L"bin\\win64\\Star Ruler 2.exe", wstrdup(cmdline), NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &startup, &process) != FALSE) {
+	if (CreateProcessW(path, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &startup, &process) != FALSE) {
 		CloseHandle(process.hProcess);
 		CloseHandle(process.hThread);
 	}
+	free(cmdline);
 	return 0;
 }
diff --git a/source/msvc/Star Ruler 2/Star Ruler 2.sln b/source/msvc/Star Ruler 2/Star Ruler 2.sln
index b2ece365..e9b77e27 100644
--- a/source/msvc/Star Ruler 2/Star Ruler 2.sln	
+++ b/source/msvc/Star Ruler 2/Star Ruler 2.sln	
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32407.337
+# Visual Studio Version 17
+VisualStudioVersion = 17.12.35527.113
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Star Ruler 2", "Star Ruler 2.vcxproj", "{50CA85BE-6640-4824-8CB6-9D65F77518F6}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -89,7 +89,9 @@ Global
 		{A1E1942C-36D2-4824-9ECB-B4727543E958}.Non-Steam Release|x64.ActiveCfg = Release|x64
 		{A1E1942C-36D2-4824-9ECB-B4727543E958}.Non-Steam Release|x64.Build.0 = Release|x64
 		{93B31A9C-7169-47CA-80DB-CF3BB398291E}.Debug|x64.ActiveCfg = Debug|x64
+		{93B31A9C-7169-47CA-80DB-CF3BB398291E}.Debug|x64.Build.0 = Debug|x64
 		{93B31A9C-7169-47CA-80DB-CF3BB398291E}.Non-Steam Release|x64.ActiveCfg = Release|x64
+		{93B31A9C-7169-47CA-80DB-CF3BB398291E}.Non-Steam Release|x64.Build.0 = Release|x64
 		{ABEA2C04-40F0-4D98-9191-A026E1D0DF07}.Debug|x64.ActiveCfg = Debug|x64
 		{ABEA2C04-40F0-4D98-9191-A026E1D0DF07}.Debug|x64.Build.0 = Debug|x64
 		{ABEA2C04-40F0-4D98-9191-A026E1D0DF07}.Non-Steam Release|x64.ActiveCfg = Release|x64