From 6c8112a6c368dd36d21fd94689e9682bc3b012a5 Mon Sep 17 00:00:00 2001
From: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Date: Wed, 27 Apr 2022 22:56:13 +0200
Subject: Hardcode version number (#152)
* Hardcode version number
This way, we don't get the wrong version number when launching
Titanfall2.exe via `-northstar`
The hardcoded value should be overwritten by CI on release
Fixes #129
* Set Northstar version in separate header file
* Make `northstar_version` array a constant
* Fix formatting
---
.../NorthstarDedicatedTest.vcxproj | 1 +
.../NorthstarDedicatedTest.vcxproj.filters | 3 +
NorthstarDedicatedTest/ns_version.h | 7 +++
NorthstarDedicatedTest/version.cpp | 67 +++++-----------------
4 files changed, 25 insertions(+), 53 deletions(-)
create mode 100644 NorthstarDedicatedTest/ns_version.h
(limited to 'NorthstarDedicatedTest')
diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj
index 13f907e1..ea9ccbb3 100644
--- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj
+++ b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj
@@ -118,6 +118,7 @@
+
diff --git a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters
index e9c52d1d..da8f064e 100644
--- a/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters
+++ b/NorthstarDedicatedTest/NorthstarDedicatedTest.vcxproj.filters
@@ -1509,6 +1509,9 @@
Header Files\Client
+
+ Header Files
+
diff --git a/NorthstarDedicatedTest/ns_version.h b/NorthstarDedicatedTest/ns_version.h
new file mode 100644
index 00000000..d30594fb
--- /dev/null
+++ b/NorthstarDedicatedTest/ns_version.h
@@ -0,0 +1,7 @@
+#pragma once
+#ifndef NORTHSTAR_VERSION
+// Turning off clang-format here so it doesn't mess with style as it needs to be this way for regex-ing with CI
+// clang-format off
+#define NORTHSTAR_VERSION 0,0,0,1
+// clang-format on
+#endif
diff --git a/NorthstarDedicatedTest/version.cpp b/NorthstarDedicatedTest/version.cpp
index a0bcee20..3755e4c4 100644
--- a/NorthstarDedicatedTest/version.cpp
+++ b/NorthstarDedicatedTest/version.cpp
@@ -1,65 +1,26 @@
#include "version.h"
#include "pch.h"
+#include "ns_version.h"
char version[16];
char NSUserAgent[32];
void InitialiseVersion()
{
- HRSRC hResInfo;
- DWORD dwSize;
- HGLOBAL hResData;
- LPVOID pRes, pResCopy;
- UINT uLen = 0;
- VS_FIXEDFILEINFO* lpFfi = NULL;
- HINSTANCE hInst = ::GetModuleHandle(NULL);
+ constexpr int northstar_version[4] {NORTHSTAR_VERSION};
- hResInfo = FindResourceW(hInst, MAKEINTRESOURCE(1), RT_VERSION);
- if (hResInfo != NULL)
+ // We actually use the rightmost integer do determine whether or not we're a debug/dev build
+ // If it is set to 1, we are a dev build
+ // On github CI, we set this 1 to a 0 automatically as we replace the 0,0,0,1 with the real version number
+ if (northstar_version[3] == 1)
{
- dwSize = SizeofResource(hInst, hResInfo);
- hResData = LoadResource(hInst, hResInfo);
- if (hResData != NULL)
- {
- pRes = LockResource(hResData);
- pResCopy = LocalAlloc(LMEM_FIXED, dwSize);
- if (pResCopy != 0)
- {
- CopyMemory(pResCopy, pRes, dwSize);
- VerQueryValueW(pResCopy, L"\\", (LPVOID*)&lpFfi, &uLen);
-
- DWORD dwFileVersionMS = lpFfi->dwFileVersionMS;
- DWORD dwFileVersionLS = lpFfi->dwFileVersionLS;
-
- DWORD dwLeftMost = HIWORD(dwFileVersionMS);
- DWORD dwSecondLeft = LOWORD(dwFileVersionMS);
- DWORD dwSecondRight = HIWORD(dwFileVersionLS);
- DWORD dwRightMost = LOWORD(dwFileVersionLS);
-
- // We actually use the rightmost integer do determine whether or not we're a debug/dev build
- // If it is set to 1 (as in resources.rc), we are a dev build
- // On github CI, we set this 1 to a 0 automatically as we replace the 0.0.0.1 with the real version number
- if (dwRightMost == 1)
- {
- sprintf(version, "%d.%d.%d.%d+dev", dwLeftMost, dwSecondLeft, dwSecondRight, dwRightMost);
- sprintf(NSUserAgent, "R2Northstar/%d.%d.%d+dev", dwLeftMost, dwSecondLeft, dwSecondRight);
- }
- else
- {
- sprintf(version, "%d.%d.%d.%d", dwLeftMost, dwSecondLeft, dwSecondRight, dwRightMost);
- sprintf(NSUserAgent, "R2Northstar/%d.%d.%d", dwLeftMost, dwSecondLeft, dwSecondRight);
- }
- UnlockResource(hResData);
- FreeResource(hResData);
- LocalFree(pResCopy);
- return;
- }
- UnlockResource(hResData);
- FreeResource(hResData);
- LocalFree(pResCopy);
- }
+ sprintf(version, "%d.%d.%d.%d+dev", northstar_version[0], northstar_version[1], northstar_version[2], northstar_version[3]);
+ sprintf(NSUserAgent, "R2Northstar/%d.%d.%d+dev", northstar_version[0], northstar_version[1], northstar_version[2]);
+ }
+ else
+ {
+ sprintf(version, "%d.%d.%d.%d", northstar_version[0], northstar_version[1], northstar_version[2], northstar_version[3]);
+ sprintf(NSUserAgent, "R2Northstar/%d.%d.%d", northstar_version[0], northstar_version[1], northstar_version[2]);
}
- // Could not locate version info for whatever reason
- spdlog::error("Failed to load version info:\n{}", std::system_category().message(GetLastError()));
- sprintf(NSUserAgent, "R2Northstar/0.0.0");
+ return;
}
--
cgit v1.2.3