Update NSIS logging plugin

3 files changed, 142 insertions, 2 deletions

diff --git a/windows/nsis-plugins/src/log/log.cpp b/windows/nsis-plugins/src/log/log.cpp
index af0b972179..d9ab10f4ea 100644
--- a/windows/nsis-plugins/src/log/log.cpp
+++ b/windows/nsis-plugins/src/log/log.cpp
@@ -2,12 +2,16 @@
 #include "logger.h"
 #include <libcommon/string.h>
 #include <libcommon/filesystem.h>
+#include <libcommon/registry/registry.h>
+#include <libcommon/filesystem.h>
+#include <libcommon/error.h>
 #include <windows.h>
 #include <nsis/pluginapi.h>
 #include <string>
 #include <vector>
 #include <memory>
 #include <sstream>
+#include <iomanip>
 #include <experimental/filesystem>
 
 Logger *g_logger = nullptr;
@@ -77,6 +81,90 @@ std::vector<std::wstring> BlockToRows(const std::wstring &textBlock)
 	return common::string::Tokenize(textBlock, L"\r\n");
 }
 
+std::wstring GetWindowsProductName()
+{
+	auto regkey = common::registry::Registry::OpenKey(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+		false, common::registry::RegistryView::Force64);
+
+	return regkey->readString(L"ProductName");
+}
+
+std::wstring GetWindowsVersion()
+{
+	common::fs::ScopedNativeFileSystem nativeFileSystem;
+
+	const auto systemDir = common::fs::GetKnownFolderPath(FOLDERID_System, 0, nullptr);
+	const auto systemModule = std::experimental::filesystem::path(systemDir).append(L"ntoskrnl.exe");
+
+	DWORD dummy;
+
+	const auto versionSize = GetFileVersionInfoSizeW(systemModule.c_str(), &dummy);
+	THROW_GLE_IF(0, versionSize, "GetFileVersionInfoSizeW");
+
+	std::vector<uint8_t> buf(versionSize);
+
+	auto status = GetFileVersionInfoW(systemModule.c_str(), 0, static_cast<DWORD>(buf.size()), &buf[0]);
+	THROW_GLE_IF(FALSE, status, "GetFileVersionInfoW");
+
+	//
+	// Get the translation table.
+	// This is required to build the path to the value we're actually after.
+	//
+
+	struct LANGANDCODEPAGE
+	{
+		WORD wLanguage;
+		WORD wCodePage;
+	}
+	*translations = nullptr;
+
+	UINT translationsSize = 0;
+
+	status = VerQueryValueW(&buf[0], L"\\VarFileInfo\\Translation", reinterpret_cast<LPVOID *>(&translations), &translationsSize);
+	THROW_GLE_IF(FALSE, status, "VerQueryValueW");
+
+	if (translationsSize < sizeof(LANGANDCODEPAGE))
+	{
+		throw std::runtime_error("Invalid VERSION_INFO translation table");
+	}
+
+	//
+	// Use primary translation.
+	//
+
+	std::wstringstream ss;
+
+	ss << L"\\StringFileInfo\\"
+		<< std::setw(4) << std::setfill(L'0') << std::hex
+		<< translations[0].wLanguage
+		<< std::setw(4) << std::setfill(L'0') << std::hex
+		<< translations[0].wCodePage
+		<< L"\\ProductVersion";
+
+	const auto productVersionName = ss.str();
+
+	void *productVersion = nullptr;
+	UINT productVersionSize = 0;
+
+	status = VerQueryValueW(&buf[0], productVersionName.c_str(), &productVersion, &productVersionSize);
+	THROW_GLE_IF(FALSE, status, "VerQueryValueW");
+
+	// Size returned is the length in characters.
+	std::wstring version(reinterpret_cast<const wchar_t *>(productVersion), productVersionSize);
+
+	// Chop off trailing terminators.
+	while ((false == version.empty()) && (*version.rbegin() == L'\0'))
+	{
+		version.resize(version.size() - 1);
+	}
+
+	if (version.empty())
+	{
+		throw std::runtime_error("Invalid version information");
+	}
+
+	return version;
+}
 } // anonymous namespace
 
 //
@@ -203,6 +291,57 @@ void __declspec(dllexport) NSISCALL LogWithDetails
 }
 
 //
+// LogWindowsVersion
+//
+// Writes a message containing the Windows version and build, to the log file.
+//
+void __declspec(dllexport) NSISCALL LogWindowsVersion
+(
+	HWND hwndParent,
+	int string_size,
+	LPTSTR variables,
+	stack_t **stacktop,
+	extra_parameters *extra,
+	...
+)
+{
+	EXDLL_INIT();
+
+	if (nullptr == g_logger)
+	{
+		return;
+	}
+
+	try
+	{
+		const auto productName = GetWindowsProductName();
+		const auto version = GetWindowsVersion();
+
+		std::wstringstream ss;
+
+		ss	<< L"Windows version: "
+			<< productName
+			<< L", "
+			<< version;
+
+		g_logger->log(ss.str());
+	}
+	catch (std::exception &err)
+	{
+		const std::vector<std::wstring> details =
+		{
+			common::string::ToWide(err.what())
+		};
+
+		g_logger->log(L"Windows version: Failed to determine version", details);
+	}
+	catch (...)
+	{
+		g_logger->log(L"Windows version: Failed to determine version");
+	}
+}
+
+//
 // PluginLog
 //
 // Writes a message to the log file.
diff --git a/windows/nsis-plugins/src/log/log.def b/windows/nsis-plugins/src/log/log.def
index 581efdab9d..11cffd21e3 100644
--- a/windows/nsis-plugins/src/log/log.def
+++ b/windows/nsis-plugins/src/log/log.def
@@ -5,6 +5,7 @@ EXPORTS
 Initialize
 Log
 LogWithDetails
+LogWindowsVersion
 
 PluginLog
 PluginLogWithDetails
diff --git a/windows/nsis-plugins/src/log/log.vcxproj b/windows/nsis-plugins/src/log/log.vcxproj
index a8506699d8..31c45bd46e 100644
--- a/windows/nsis-plugins/src/log/log.vcxproj
+++ b/windows/nsis-plugins/src/log/log.vcxproj
@@ -70,7 +70,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/windows/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mincore.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>log.def</ModuleDefinitionFile>
     </Link>
@@ -96,7 +96,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <AdditionalLibraryDirectories>$(ProjectDir)../../../../dist-assets/binaries/windows/nsis/;$(SolutionDir)bin\$(Platform)-$(Configuration)\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mincore.lib;libcommon.lib;pluginapi-x86-unicode.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libc.lib</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>log.def</ModuleDefinitionFile>
     </Link>