Move Detour EventLogger Initialize (#55)

* Update version * Log initialize * Move initialize earlier for detours
SoupBuild · Aug 4, 2020 · 5def8e0 · 5def8e0
1 parent ad5aaa3
commit 5def8e0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/Source/Build/Execute/SystemAccessTracker.h b/Source/Build/Execute/SystemAccessTracker.h
@@ -510,22 +510,27 @@ namespace Soup::Build
 		// ProcessThreadsApi
 		void OnCreateProcessA(std::string_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnCreateProcessW(std::wstring_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnCreateProcessAsUserA(std::string_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnCreateProcessAsUserW(std::wstring_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnExitProcess(uint32_t exitCode) override final
 		{
+			Log::Diag("SystemAccessTracker::OnExitProcess - " + std::to_string(exitCode));
 		}
 
 		// UndocumentedApi
@@ -673,10 +678,12 @@ namespace Soup::Build
 
 		void OnCreateProcessWithLogonW(std::wstring_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnCreateProcessWithTokenW(std::wstring_view applicationName, bool result) override final
 		{
+			OnCreateProcess(applicationName);
 		}
 
 		void OnCreateSymbolicLinkA(std::string_view symlinkFileName, std::string_view targetFileName, uint32_t flags, bool result) override final
@@ -1018,6 +1025,17 @@ namespace Soup::Build
 		}
 
 	private:
+		void OnCreateProcess(std::wstring_view applicationName)
+		{
+			std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
+			OnCreateProcess(converter.to_bytes(applicationName.data()));
+		}
+
+		void OnCreateProcess(std::string_view applicationName)
+		{
+			Log::Diag("SystemAccessTracker::OnCreateProcess - " + std::string(applicationName));
+		}
+
 		void TouchFileRead(std::wstring_view fileName, bool exists)
 		{
 			std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;

diff --git a/Source/Client/CLI/Commands/VersionCommand.h b/Source/Client/CLI/Commands/VersionCommand.h
@@ -31,7 +31,7 @@ namespace Soup::Client
 
 			// TODO var version = Assembly.GetExecutingAssembly().GetName().Version;
 			// Log::Message($"{version.Major}.{version.Minor}.{version.Build}");
-			Log::HighPriority("0.8.2");
+			Log::HighPriority("0.8.3");
 		}
 
 	private:

diff --git a/Source/Client/CLI/Recipe.toml b/Source/Client/CLI/Recipe.toml
@@ -1,5 +1,5 @@
 Name = "Soup"
-Version = "0.8.2"
+Version = "0.8.3"
 Type = "Executable"
 
 # Ensure the core build extensions are runtime dependencies

diff --git a/Source/Monitor/Detours/EventLogger.h b/Source/Monitor/Detours/EventLogger.h
@@ -177,7 +177,10 @@ class EventLogger
 	static void UnsafeWriteMessage(const Monitor::DetourMessage& message)
 	{
 		if (s_pipeHandle == INVALID_HANDLE_VALUE)
-			return; // TODO: A static dll init may do bad things before the main entry initialize
+		{
+			printf("DETOURS-ERROR: Handle not ready!! %u\n", (uint32_t)message.Type);
+			exit(-1234);
+		}
 
 		// Write the message
 		DWORD countBytesToWrite = message.ContentSize +

diff --git a/Source/Monitor/Detours/Functions/UndocumentedApiOverrides.h b/Source/Monitor/Detours/Functions/UndocumentedApiOverrides.h
@@ -5,8 +5,6 @@ namespace Functions::UndocumentedApi::Overrides
 {
 	int WINAPI EntryPoint(void)
 	{
-		EventLogger::Initialize();
-
 		return Cache::EntryPoint();
 	}
 

diff --git a/Source/Monitor/Detours/Module.cpp b/Source/Monitor/Detours/Module.cpp
@@ -518,6 +518,9 @@ bool ProcessAttach(HMODULE hDll)
 
 	try
 	{
+		// Initialize the event pipe
+		EventLogger::Initialize();
+
 		// Find hidden functions.
 		Functions::UndocumentedApi::Cache::PrivCopyFileExA =
 			(BOOL (WINAPI *)(LPCSTR, LPCSTR, LPPROGRESS_ROUTINE, LPVOID, LPBOOL, DWORD))