Fix #4, reformat some stuff

Author: FromDarkHell

BL3DX11Injection/BL3DX11Injection.vcxproj

@@ -75,7 +75,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>d3d11</TargetName>
-    <OutDir>K:\Borderlands3\OakGame\Binaries\Win64</OutDir>
+    <OutDir>K:\Borderlands3\OakGame\Binaries\Win64\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -186,9 +186,6 @@
     <Library Include="HookLib.lib" />
     <Library Include="Zydis.lib" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="d3d11.def" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>

BL3DX11Injection/BL3DX11Injection.vcxproj.filters

@@ -53,9 +53,4 @@
       <Filter>Header Files\Libraries</Filter>
     </Library>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="d3d11.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
 </Project>

BL3DX11Injection/INIReader.h

@@ -12,6 +12,7 @@ home page for more info:
 https://github.com/benhoyt/inih
 
 */
+#pragma warning(disable: 26495)
 
 #ifndef __INI_H__
 #define __INI_H__

BL3DX11Injection/PluginLoadHook.cpp

@@ -134,16 +134,21 @@ void InitializePluginHooks(HMODULE gameModule) {
     pluginsPath = pPath;
     iniPath = pluginsPath + L"pluginLoader.ini";
 
-    PVOID Target = GetProcAddress(GetModuleHandle(L"kernel32.dll"), "ExitProcess");
-    
-    if (SetHook(Target, ExitProcessHook, reinterpret_cast<PVOID*>(&OriginalExitProcess))) 
+    auto kernelDll = GetModuleHandle(L"kernel32.dll");
+    if (kernelDll == NULL) { // Honestly this is pretty much pointless but doing it like this removes an error & saves on some processing
+        LogString(L"Unable to locate kernel module...\n");
+        return;
+    }
+
+    PVOID Target = GetProcAddress(kernelDll, "ExitProcess");
+    if (Target != NULL && SetHook(Target, ExitProcessHook, reinterpret_cast<PVOID*>(&OriginalExitProcess))) 
         LogString(L"Initialized ExitProcess(...) hook\n");
     else 
         LogString(L"Unable to initialize ExitProcess(...) hook\n");
 
-    PVOID loadLibraryHook = GetProcAddress(GetModuleHandle(L"kernel32.dll"), "LoadLibraryW");
-    if (SetHook(loadLibraryHook, LoadLibraryWHook, reinterpret_cast<PVOID*>(&OriginalLoadLibrary)))
+    PVOID loadLibraryHook = GetProcAddress(kernelDll, "LoadLibraryW");
+    if (loadLibraryHook != NULL && SetHook(loadLibraryHook, LoadLibraryWHook, reinterpret_cast<PVOID*>(&OriginalLoadLibrary)))
         LogString(L"Initialized LoadLibraryW(...) hook...\n");
     else  
-        LogString(L"Unable to initialize LoadLibraryW(...) hook");
+        LogString(L"Unable to initialize LoadLibraryW(...) hook\n");
 }

BL3DX11Injection/d3d11.def

@@ -4,6 +4,9 @@
 #include "dllmain.h"
 #include "PluginLoadHook.h"
 
+#pragma warning(disable: 6031)
+
+
 static HINSTANCE hL;
 static HMODULE gameModule;
 
@@ -51,15 +54,28 @@ int executionThread() {
 
     SetConsoleTitle(L"Borderlands 3 Plugin Loader");
 
-    HANDLE hStdout = CreateFile(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
-        NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    HANDLE hStdin = CreateFile(L"CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
-        NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
+    // All of this is necessary so that way we can properly use the output of the console
+    freopen("CONIN$", "r", stdin); 
+    freopen("CONOUT$", "w", stderr);
+    freopen("CONOUT$", "w", stdout);
+    HANDLE hStdout = CreateFile(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    HANDLE hStdin = CreateFile(L"CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    
+    // Make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog point to console as well
+    std::ios::sync_with_stdio(true);
+    SetStdHandle(STD_INPUT_HANDLE, hStdin);
     SetStdHandle(STD_OUTPUT_HANDLE, hStdout); // Set our STD handles
     SetStdHandle(STD_ERROR_HANDLE, hStdout); // stderr is going back to STDOUT
-    SetStdHandle(STD_INPUT_HANDLE, hStdin);
 
+    // Clear the error states for all of the C++ stream objects.
+    // Attempting to access the streams before they're valid causes them to enter an error state.
+    std::wcout.clear();
+    std::cout.clear();
+    std::wcerr.clear();
+    std::cerr.clear();
+    std::wcin.clear();
+    std::cin.clear();
+    
     LogString(L"Console allocated...\n");
     LogString(L"==== Debug ====\n");