Change how the VersionInfo object is created from version.rc such that non-release builds are possible and get labelled as such

2 files changed, 29 insertions, 0 deletions

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