1 files changed, 53 insertions, 3 deletions

diff --git a/src/zencore/process.cpp b/src/zencore/process.cpp
index f657869dc..080607f13 100644
--- a/src/zencore/process.cpp
+++ b/src/zencore/process.cpp
@@ -11,6 +11,7 @@
 #include <zencore/timer.h>
 #include <zencore/trace.h>
 
+#include <map>
 #include <thread>
 
 ZEN_THIRD_PARTY_INCLUDES_START
@@ -20,8 +21,8 @@ ZEN_THIRD_PARTY_INCLUDES_START
 
 #	include <Psapi.h>
 #	include <shellapi.h>
-#	include <Shlobj.h>
-#	include <TlHelp32.h>
+#	include <shlobj.h>
+#	include <tlhelp32.h>
 #else
 #	include <fcntl.h>
 #	include <pthread.h>
@@ -487,13 +488,57 @@ CreateProcNormal(const std::filesystem::path& Executable, std::string_view Comma
 	STARTUPINFO			StartupInfo{.cb = sizeof(STARTUPINFO)};
 
 	bool				  InheritHandles	= false;
-	void*				  Environment		= nullptr;
 	LPSECURITY_ATTRIBUTES ProcessAttributes = nullptr;
 	LPSECURITY_ATTRIBUTES ThreadAttributes	= nullptr;
 
+	// Build environment block when custom environment variables are specified
+	ExtendableWideStringBuilder<512> EnvironmentBlock;
+	void*							 Environment = nullptr;
+	if (!Options.Environment.empty())
+	{
+		// Capture current environment into a map
+		std::map<std::wstring, std::wstring> EnvMap;
+		wchar_t*							 EnvStrings = GetEnvironmentStringsW();
+		if (EnvStrings)
+		{
+			for (const wchar_t* Ptr = EnvStrings; *Ptr; Ptr += wcslen(Ptr) + 1)
+			{
+				std::wstring_view Entry(Ptr);
+				size_t			  EqPos = Entry.find(L'=');
+				if (EqPos != std::wstring_view::npos && EqPos > 0)
+				{
+					EnvMap[std::wstring(Entry.substr(0, EqPos))] = std::wstring(Entry.substr(EqPos + 1));
+				}
+			}
+			FreeEnvironmentStringsW(EnvStrings);
+		}
+
+		// Apply overrides
+		for (const auto& [Key, Value] : Options.Environment)
+		{
+			EnvMap[Utf8ToWide(Key)] = Utf8ToWide(Value);
+		}
+
+		// Build double-null-terminated environment block
+		for (const auto& [Key, Value] : EnvMap)
+		{
+			EnvironmentBlock << Key;
+			EnvironmentBlock.Append(L'=');
+			EnvironmentBlock << Value;
+			EnvironmentBlock.Append(L'\0');
+		}
+		EnvironmentBlock.Append(L'\0');
+
+		Environment = EnvironmentBlock.Data();
+	}
+
 	const bool AssignToJob = Options.AssignToJob && Options.AssignToJob->IsValid();
 
 	DWORD CreationFlags = 0;
+	if (Environment)
+	{
+		CreationFlags |= CREATE_UNICODE_ENVIRONMENT;
+	}
 	if (Options.Flags & CreateProcOptions::Flag_NewConsole)
 	{
 		CreationFlags |= CREATE_NEW_CONSOLE;
@@ -790,6 +835,11 @@ CreateProc(const std::filesystem::path& Executable, std::string_view CommandLine
 			}
 		}
 
+		for (const auto& [Key, Value] : Options.Environment)
+		{
+			setenv(Key.c_str(), Value.c_str(), 1);
+		}
+
 		if (execv(Executable.c_str(), ArgV.data()) < 0)
 		{
 			ThrowLastError("Failed to exec() a new process image");