From 48b926e5b47cf2380db412b6c08e8c7aeec1138a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 16 Apr 2014 09:53:07 +0200
Subject: [PATCH] - check +logfile explicitly at the start of execution. Due to
 the custom CVAR rewrite it would get called so late that it'd miss half of
 the log. - added version check for Windows 8. I also would have liked to add
 8.1 but due to some incredibly stupid changes in the version API it's no
 longer possible to reliably retrieve the correct Windows version for later
 builds.

---
 src/c_cmds.cpp         | 26 ++++++++++++++++----------
 src/c_dispatch.h       |  2 ++
 src/d_main.cpp         |  7 +++++++
 src/win32/i_system.cpp | 12 ++++++++++++
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index cdf615ef49..0e7adb8ef3 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -441,27 +441,33 @@ CCMD (exec)
 	}
 }
 
+void execLogfile(const char *fn)
+{
+	if ((Logfile = fopen(fn, "w")))
+	{
+		const char *timestr = myasctime();
+		Printf("Log started: %s\n", timestr);
+	}
+	else
+	{
+		Printf("Could not start log\n");
+	}
+}
+
 CCMD (logfile)
 {
-	const char *timestr = myasctime ();
 
 	if (Logfile)
 	{
-		Printf ("Log stopped: %s\n", timestr);
+		const char *timestr = myasctime();
+		Printf("Log stopped: %s\n", timestr);
 		fclose (Logfile);
 		Logfile = NULL;
 	}
 
 	if (argv.argc() >= 2)
 	{
-		if ( (Logfile = fopen (argv[1], "w")) )
-		{
-			Printf ("Log started: %s\n", timestr);
-		}
-		else
-		{
-			Printf ("Could not start log\n");
-		}
+		execLogfile(argv[1]);
 	}
 }
 
diff --git a/src/c_dispatch.h b/src/c_dispatch.h
index 96dc50644e..f4518608df 100644
--- a/src/c_dispatch.h
+++ b/src/c_dispatch.h
@@ -168,4 +168,6 @@ extern unsigned int MakeKey (const char *s);
 extern unsigned int MakeKey (const char *s, size_t len);
 extern unsigned int SuperFastHash (const char *data, size_t len);
 
+void execLogfile(const char *fn);
+
 #endif //__C_DISPATCH_H__
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 6c938ef53f..695e7e517a 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2223,6 +2223,13 @@ void D_DoomMain (void)
 	FString *args;
 	int argcount;
 
+	// +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here.
+	FString logfile = Args->TakeValue("+logfile");
+	if (logfile != NULL)
+	{
+		execLogfile(logfile);
+	}
+
 	D_DoomInit();
 	PClass::StaticInit ();
 	atterm(FinalGC);
diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp
index a82cb65f9c..4690c253d6 100644
--- a/src/win32/i_system.cpp
+++ b/src/win32/i_system.cpp
@@ -581,6 +581,18 @@ void I_DetectOS(void)
 					osname = "Server 2008 R2";
 				}
 			}
+			else if (info.dwMinorVersion == 2)	
+			{
+				// Microsoft broke this API for 8.1 so without jumping through hoops it won't be possible anymore to detect never versions aside from the build number, especially for older compilers.
+				if (info.wProductType == VER_NT_WORKSTATION)
+				{
+					osname = "8 (or higher)";
+				}
+				else
+				{
+					osname = "Server 2012 (or higher)";
+				}
+			}
 		}
 		break;