…..

Author: Lord-Kamina

game/platform.cc

@@ -113,23 +113,33 @@ int Platform::defaultBackEnd() {
 }
 
 #if (BOOST_OS_WINDOWS)
+std::unique_ptr<FILE, decltype(&fclose)> Platform::stdErrStream{nullptr, fclose};
+std::unique_ptr<HANDLE, decltype(&CloseHandle)> Platform::stdOutHandle{nullptr, CloseHandle};
 int Platform::stderr_fd;
 
 void Platform::initWindowsConsole() {
-	if (AttachConsole(ATTACH_PARENT_PROCESS) == 0 || fileno(stdout) == -2 || fileno(stderr) == -2) {
+	if (int res = AttachConsole(ATTACH_PARENT_PROCESS) == 0 && (fileno(stdout) == -2 || fileno(stderr) == -2)) {
 		auto ptr = stdErrStream.get();
 		freopen_s(&ptr, "NUL", "w", stderr);
 	}
 	else {
-		freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
 		freopen_s((FILE**)stderr, "CONOUT$", "w", stderr);
-		std::ios::sync_with_stdio(true);
-		std::setvbuf(stdout, nullptr, _IONBF, 0);
-		std::setvbuf(stderr, nullptr, _IONBF, 0);
-		std::cout.clear();
-		std::cerr.clear();
-		std::wcout.clear();
-		std::wcerr.clear();
+		freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
+		HANDLE hStdout = CreateFile(
+			"CONOUT$", GENERIC_READ | GENERIC_WRITE,
+			FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL
+		);
+		if (hStdout == INVALID_HANDLE_VALUE) {
+			std::fprintf(stderr, "Unable to get a handle to the stdout console. Error=%u", GetLastError());
+		}
+		else {
+			stdOutHandle.reset(&hStdout);
+			SetStdHandle(STD_OUTPUT_HANDLE, *stdOutHandle);
+			std::setvbuf(stdout, nullptr, _IONBF, 0);
+			std::cout.clear();
+			std::wcout.clear();
+		}
 	}
 	stderr_fd = fileno(stderr);
 }

game/platform.hh

@@ -2,13 +2,27 @@
 
 #include <array>
 #include <cstdint>
+#include <fstream>
 #include <iostream>
 #include <memory>
 
 #include <boost/predef/os.h>
 #include <SDL_events.h>
 
-#if (BOOST_OS_WINDOWS) 
+#if defined(_MSC_VER)
+#define NOMINMAX
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+#define _AMD64_
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(__i386__) || defined(_M_IX86)
+#define _X86_
+#elif defined(__arm__) || defined(_M_ARM) || defined(_M_ARMT)
+#define _ARM_
+#endif
+#endif
+
+#if (BOOST_OS_WINDOWS)
+#include <handleapi.h>
+
 #include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,8 +47,13 @@ struct Platform {
 
 #if (BOOST_OS_WINDOWS)
 	static int stderr_fd;
+// 	static int stdout_file;
   private:
-	std::unique_ptr<FILE, decltype(&fclose)> stdErrStream{nullptr, fclose};
+// 	static std::ofstream conOutStream;
+	static std::unique_ptr<FILE, decltype(&fclose)> stdErrStream;
+	static std::unique_ptr<HANDLE, decltype(&CloseHandle)> stdOutHandle;
+// 	static std::unique_ptr<FILE, decltype(&fclose)> stdOutFd;
+// 	static std::unique_ptr<FILE, decltype(&fclose)> oldStdOutFd;
 #else
 	static constexpr int stderr_fd = STDERR_FILENO;
 #endif