From 8f905e1d498f0c264529737f4b8f7a47c0de59ee Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 15 May 2018 23:43:35 +0100
Subject: Change how the VersionInfo object is created from version.rc such
 that non-release builds are possible and get labelled as such

---
 src/selfupdater.cpp | 44 ++++++++++++++++++++++++++++++++++++++++----
 src/shared/util.cpp | 28 ++++++++++++++++++++++++++++
 src/shared/util.h   |  1 +
 src/version.rc      |  5 ++++-
 4 files changed, 73 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index d671bafc..8027e804 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -104,10 +104,46 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface)
 
   VS_FIXEDFILEINFO version = GetFileVersion(ToWString(QApplication::applicationFilePath()));
 
-  m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16,
-                            version.dwFileVersionMS & 0xFFFF,
-                            version.dwFileVersionLS >> 16,
-                            version.dwFileVersionLS & 0xFFFF);
+  if (version.dwFileFlags | VS_FF_PRERELEASE)
+  {
+    // Pre-release builds need annotating
+    QString versionString = QString::fromStdWString(GetFileVersionString(ToWString(QApplication::applicationFilePath())));
+
+    // The pre-release flag can be set without the string specifying what type of pre-release
+    bool noLetters = true;
+    for (QChar character : versionString)
+    {
+      if (character.isLetter())
+      {
+        noLetters = false;
+        break;
+      }
+    }
+
+    if (noLetters)
+    {
+      // Default to pre-alpha when release type is unspecified
+      m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16,
+                                version.dwFileVersionMS & 0xFFFF,
+                                version.dwFileVersionLS >> 16,
+                                version.dwFileVersionLS & 0xFFFF,
+                                VersionInfo::RELEASE_PREALPHA);
+    }
+    else
+    {
+      // Trust the string to make sense
+      m_MOVersion = VersionInfo(versionString);
+      qDebug() << "<: " << (m_MOVersion < VersionInfo(2, 1, 4)) << ", >: " << (m_MOVersion > VersionInfo(2, 1, 4));
+    }
+  }
+  else
+  {
+    // Non-pre-release builds just need their version numbers reading
+    m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16,
+                              version.dwFileVersionMS & 0xFFFF,
+                              version.dwFileVersionLS >> 16,
+                              version.dwFileVersionLS & 0xFFFF);
+  }
 }
 
 
diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 5491a9e6..008c5050 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -174,5 +174,33 @@ VS_FIXEDFILEINFO GetFileVersion(const std::wstring &fileName)
   }
 }
 
+std::wstring GetFileVersionString(const std::wstring &fileName)
+{
+  DWORD handle = 0UL;
+  DWORD size = ::GetFileVersionInfoSizeW(fileName.c_str(), &handle);
+  if (size == 0) {
+    throw windows_error("failed to determine file version info size");
+  }
+
+  boost::scoped_array<char> buffer(new char[size]);
+  try {
+    handle = 0UL;
+    if (!::GetFileVersionInfoW(fileName.c_str(), handle, size, buffer.get())) {
+      throw windows_error("failed to determine file version info");
+    }
+
+    LPVOID strBuffer = nullptr;
+    UINT strLength = 0;
+    if (!::VerQueryValue(buffer.get(), L"\\StringFileInfo\\040904B0\\ProductVersion", &strBuffer, &strLength)) {
+      throw windows_error("failed to determine file version");
+    }
+
+    return std::wstring((LPCTSTR)strBuffer);
+  }
+  catch (...) {
+    throw;
+  }
+}
+
 
 } // namespace MOShared
diff --git a/src/shared/util.h b/src/shared/util.h
index 1e498059..75c382a7 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -45,6 +45,7 @@ std::wstring ToLower(const std::wstring &text);
 bool CaseInsensitiveEqual(const std::wstring &lhs, const std::wstring &rhs);
 
 VS_FIXEDFILEINFO GetFileVersion(const std::wstring &fileName);
+std::wstring GetFileVersionString(const std::wstring &fileName);
 
 } // namespace MOShared
 
diff --git a/src/version.rc b/src/version.rc
index 700e2488..39565d70 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -1,7 +1,10 @@
 #include "Winver.h"
 
+// If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
+// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
+// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
 #define VER_FILEVERSION     2,1,4
-#define VER_FILEVERSION_STR "2.1.4-dev\0"
+#define VER_FILEVERSION_STR "2.1.4\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-- 
cgit v1.3.1


From 9c1806cc74a1600f1c28610532d9a06434adf30d Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+github@gmail.com>
Date: Tue, 15 May 2018 23:45:15 +0100
Subject: Remove sneaky test qDebug instance.

---
 src/selfupdater.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index 8027e804..a57b7962 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -133,7 +133,6 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface)
     {
       // Trust the string to make sense
       m_MOVersion = VersionInfo(versionString);
-      qDebug() << "<: " << (m_MOVersion < VersionInfo(2, 1, 4)) << ", >: " << (m_MOVersion > VersionInfo(2, 1, 4));
     }
   }
   else
-- 
cgit v1.3.1