From 878082322c1b78e5f267179e0dff73f11b5ecb90 Mon Sep 17 00:00:00 2001
From: "alexey.min" <alexey.min@gmail.com>
Date: Sat, 4 Feb 2012 11:48:16 +0000
Subject: [PATCH] d3d9 proxy loader hides console after success

---
 d3d9_proxy_loader/DllMain.cpp        | 13 +++++++++----
 d3d9_proxy_loader/PostBuildEvent.cmd |  7 +++++++
 d3d9_proxy_loader/d3d9_proxy.h       |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 d3d9_proxy_loader/PostBuildEvent.cmd

diff --git a/d3d9_proxy_loader/DllMain.cpp b/d3d9_proxy_loader/DllMain.cpp
index 2e99d86..cc41675 100644
--- a/d3d9_proxy_loader/DllMain.cpp
+++ b/d3d9_proxy_loader/DllMain.cpp
@@ -93,22 +93,26 @@ void D3D9Proxy_Uninitialize()
 }
 
 
-void D3D9Proxy_LoadL2Detect()
+bool D3D9Proxy_LoadL2Detect()
 {
 	if( gl_hL2Detect != NULL )
-		return;
+		return true; // already loaded
 
 	gl_hL2Detect = LoadLibraryW( L"L2Detect_d.dll" );
-	if( gl_hL2Detect == NULL )
+	if( gl_hL2Detect == NULL ) // first try failed
 	{
 		gl_hL2Detect = LoadLibraryW( L"L2Detect.dll" );
 		if( gl_hL2Detect == NULL )
+		{
 			log_error( LOG_ERROR, "Failed to load radar DLL!  Tried to find L2Detect_d / L2Detect dlls.\n" );
+			return false;
+		}
 		else
 			log_error( LOG_OK, "Loaded L2Detect.dll at 0x%08X\n", gl_hL2Detect );
 	}
 	else
 		log_error( LOG_OK, "Loaded L2Detect_d.dll (debug version) at 0x%08X\n", gl_hL2Detect );
+	return true;
 }
 
 
@@ -149,7 +153,8 @@ IDirect3D9* WINAPI Direct3DCreate9( UINT SDKVersion )
 		::ExitProcess(0); // exit the hard way
 	}
 
-	D3D9Proxy_LoadL2Detect();
+	if( D3D9Proxy_LoadL2Detect() )
+		ErrorLogger_EnableLoggingToConsole( false );
 
 	// Request pointer from Original Dll. 
 	IDirect3D9 *pIDirect3D9_orig = D3DCreate9_fn( SDKVersion );
diff --git a/d3d9_proxy_loader/PostBuildEvent.cmd b/d3d9_proxy_loader/PostBuildEvent.cmd
new file mode 100644
index 0000000..94e0d4c
--- /dev/null
+++ b/d3d9_proxy_loader/PostBuildEvent.cmd
@@ -0,0 +1,7 @@
+set out=..\..\out\dist_L2Detect
+
+echo Copy d3d9.dll %2\%1.dll - %2\%out%
+copy /y %2\%1.dll %2\%out%
+
+echo Copy d3d9.pdb %2\%1.pdb - %2\%out%
+rem copy /y %2\%1.pdb %2\%out%
diff --git a/d3d9_proxy_loader/d3d9_proxy.h b/d3d9_proxy_loader/d3d9_proxy.h
index 60bd1de..ca60346 100644
--- a/d3d9_proxy_loader/d3d9_proxy.h
+++ b/d3d9_proxy_loader/d3d9_proxy.h
@@ -5,4 +5,4 @@ extern HINSTANCE           gl_hOriginalDll;
 
 void D3D9Proxy_Initialize();
 void D3D9Proxy_Uninitialize();
-void D3D9Proxy_LoadL2Detect();
\ No newline at end of file
+bool D3D9Proxy_LoadL2Detect();
\ No newline at end of file