Merge branch 'expose-version' of https://github.com/ASpoonPlaysGames/…

…NorthstarLauncher into expose-version

.editorconfig

@@ -9,3 +9,4 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = tab
+indent_size = 4

.github/workflows/add-to-project.yml

@@ -0,0 +1,17 @@
+name: add-to-project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+        with:
+          project-url: "https://github.com/orgs/R2Northstar/projects/3"
+          github-token: "${{ secrets.PROJECT_BOARD_TOKEN }}"
+

.github/workflows/ci.yml

@@ -3,6 +3,7 @@ on: [push, pull_request]
 
 env:
   BUILD_PROFILE: Release
+  NORTHSTAR_VERSION: 0.0.0.${{github.run_number}}
 
 jobs:
   build:
@@ -16,6 +17,13 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
       - name: Configure cmake
         run: cmake -G "Ninja" -DCMAKE_BUILD_TYPE:STRING="${{ env.BUILD_PROFILE }}"
+      - name: Setup resource file version
+        shell: bash
+        run: |
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
+          FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
       - name: Build
         run: cmake --build .
       - name: Extract Short Commit Hash

.github/workflows/release.yml

@@ -26,6 +26,7 @@ jobs:
         shell: bash
         run: |
           sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
           sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
       - name: Build

BUILD.md

@@ -3,6 +3,7 @@ The following steps will allow you to compile your own NorthstarLauncher executa
 
 *This guide assumes you have already installed Northstar as shown in [this page](https://r2northstar.gitbook.io/r2northstar-wiki/installing-northstar/basic-setup)*
 
+## Windows
 ### Steps
 1. **Install Git** from [this link](https://git-scm.com)
 2. **Clone** the [R2Northstar/NorthstarLauncher](https://github.com/R2Northstar/NorthstarLauncher) repo with submodules using this command `git clone --recurse-submodules https://github.com/R2Northstar/NorthstarLauncher.git`
@@ -39,3 +40,12 @@ Developers who can work a command line may be interested in using [Visual Studio
 - Run `cmake . -G "Ninja"` to generate build files.
 
 - Run `cmake --build .` to build the project.
+
+## Linux
+### Steps
+1. Clone the GitHub repo
+2. Use `cd` to navigate to the cloned repo's directory
+3. Then, run the following commands in order:
+* `docker build --rm -t northstar-build-fedora .`
+* `docker run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build northstar-build-fedora cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME=Windows -G "Ninja"`
+* `docker run --rm -it -e CC=cl -e CXX=cl --mount type=bind,source="$(pwd)",destination=/build northstar-build-fedora cmake --build .`

Dockerfile

@@ -0,0 +1,26 @@
+FROM registry.fedoraproject.org/fedora-toolbox:38
+RUN dnf update -y && \
+    dnf install -y \
+    	git \
+    	wine \
+	wine-mono \
+	python3 \
+	msitools \
+	python3-simplejson \
+	python3-six \
+	cmake \
+	ninja-build \
+	make \
+	samba \
+	libunwind && \
+    dnf clean all && \
+    mkdir /opt/msvc/ /build
+
+RUN git config --global --add safe.directory /build
+RUN git clone https://github.com/mstorsjo/msvc-wine && \
+    ./msvc-wine/vsdownload.py --accept-license --dest /opt/msvc/ && \
+    ./msvc-wine/install.sh /opt/msvc/ && \
+    rm -rf ~/.wine ./msvc-wine/ && \
+    git config --global --add safe.directory '/build'
+ENV PATH="/opt/msvc/bin/x64:${PATH}"
+WORKDIR /build/

NorthstarDLL/CMakeLists.txt

@@ -4,6 +4,7 @@ find_package(minhook REQUIRED)
 find_package(libcurl REQUIRED)
 
 add_library(NorthstarDLL SHARED
+            "resources.rc"
             "client/audio.cpp"
             "client/audio.h"
             "client/chatcommand.cpp"
@@ -90,6 +91,7 @@ add_library(NorthstarDLL SHARED
             "scripts/client/scriptbrowserhooks.cpp"
             "scripts/client/scriptmainmenupromos.cpp"
             "scripts/client/scriptmodmenu.cpp"
+            "scripts/client/scriptoriginauth.cpp"
             "scripts/client/scriptserverbrowser.cpp"
             "scripts/client/scriptservertoclientstringcommand.cpp"
             "scripts/server/miscserverfixes.cpp"

NorthstarDLL/client/audio.cpp

@@ -16,6 +16,7 @@ extern "C"
 	extern void* __fastcall Audio_GetParentEvent();
 }
 
+ConVar* Cvar_mileslog_enable;
 ConVar* Cvar_ns_print_played_sounds;
 
 CustomAudioManager g_CustomAudioManager;
@@ -494,9 +495,17 @@ AUTOHOOK(MilesLog, client.dll + 0x57DAD0,
 void, __fastcall, (int level, const char* string))
 // clang-format on
 {
+	if (!Cvar_mileslog_enable->GetBool())
+		return;
+
 	spdlog::info("[MSS] {} - {}", level, string);
 }
 
+ON_DLL_LOAD_RELIESON("engine.dll", MilesLogFuncHooks, ConVar, (CModule module))
+{
+	Cvar_mileslog_enable = new ConVar("mileslog_enable", "0", FCVAR_NONE, "Enables/disables whether the mileslog func should be logged");
+}
+
 ON_DLL_LOAD_CLIENT_RELIESON("client.dll", AudioHooks, ConVar, (CModule module))
 {
 	AUTOHOOK_DISPATCH()

NorthstarDLL/client/rejectconnectionfixes.cpp

@@ -25,7 +25,7 @@ void,, (bool a1, const char* fmt, ...))
 		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "disconnect", R2::cmd_source_t::kCommandSrcCode);
 	}
 
-	return COM_ExplainDisconnection(a1, buf);
+	return COM_ExplainDisconnection(a1, "%s", buf);
 }
 
 ON_DLL_LOAD_CLIENT("engine.dll", RejectConnectionFixes, (CModule module))

NorthstarDLL/core/convar/concommand.h

@@ -83,8 +83,7 @@ typedef void (*FnCommandCallback_t)(const CCommand& command);
 //-----------------------------------------------------------------------------
 // Returns 0 to COMMAND_COMPLETION_MAXITEMS worth of completion strings
 //-----------------------------------------------------------------------------
-typedef int (*__fastcall FnCommandCompletionCallback)(
-	const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
+typedef int (*FnCommandCompletionCallback)(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
 
 // From r5reloaded
 class ConCommandBase

NorthstarDLL/core/hooks.h

@@ -219,7 +219,7 @@ class __autohook
 	type callingConvention CONCAT2(__autohookfunc, name) args;                                                                             \
 	namespace                                                                                                                              \
 	{                                                                                                                                      \
-		type(*callingConvention name) args;                                                                                                \
+		type(*name) args;                                                                                                                  \
 		__autohook CONCAT2(__autohook, __LINE__)(                                                                                          \
 			&__FILEAUTOHOOK, __STR(name), __STR(addrString), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name));                       \
 	}                                                                                                                                      \
@@ -230,7 +230,7 @@ class __autohook
 	type callingConvention CONCAT2(__autohookfunc, name) args;                                                                             \
 	namespace                                                                                                                              \
 	{                                                                                                                                      \
-		type(*callingConvention name) args;                                                                                                \
+		type(*name) args;                                                                                                                  \
 		__autohook                                                                                                                         \
 			CONCAT2(__autohook, __LINE__)(&__FILEAUTOHOOK, __STR(name), addr, (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name));      \
 	}                                                                                                                                      \
@@ -241,7 +241,7 @@ class __autohook
 	type callingConvention CONCAT2(__autohookfunc, name) args;                                                                             \
 	namespace                                                                                                                              \
 	{                                                                                                                                      \
-		type(*callingConvention name) args;                                                                                                \
+		type(*name) args;                                                                                                                  \
 		__autohook CONCAT2(__autohook, __LINE__)(                                                                                          \
 			&__FILEAUTOHOOK, __STR(name), __STR(moduleName), __STR(procName), (LPVOID*)&name, (LPVOID)CONCAT2(__autohookfunc, name));      \
 	}                                                                                                                                      \
@@ -267,7 +267,7 @@ class ManualHook
 #define HOOK(varName, originalFunc, type, callingConvention, args)                                                                         \
 	namespace                                                                                                                              \
 	{                                                                                                                                      \
-		type(*callingConvention originalFunc) args;                                                                                        \
+		type(*originalFunc) args;                                                                                                          \
 	}                                                                                                                                      \
 	type callingConvention CONCAT2(__manualhookfunc, varName) args;                                                                        \
 	ManualHook varName = ManualHook(__STR(varName), (LPVOID*)&originalFunc, (LPVOID)CONCAT2(__manualhookfunc, varName));                   \
@@ -316,7 +316,7 @@ class __autovar
 
 // FUNCTION_AT(engine.dll + 0xDEADBEEF, void, __fastcall, SomeFunc, (void* a1))
 #define FUNCTION_AT(addrString, type, callingConvention, name, args)                                                                       \
-	type(*callingConvention name) args;                                                                                                    \
+	type(*name) args;                                                                                                                      \
 	namespace                                                                                                                              \
 	{                                                                                                                                      \
 		__autovar CONCAT2(__autovar, __LINE__)(&__FILEAUTOHOOK, __STR(addrString), (void**)&name);                                         \

NorthstarDLL/core/tier0.cpp

@@ -3,7 +3,7 @@
 // use the Tier0 namespace for tier0 funcs
 namespace Tier0
 {
-	IMemAlloc* g_pMemAllocSingleton;
+	IMemAlloc* g_pMemAllocSingleton = nullptr;
 
 	ErrorType Error;
 	CommandLineType CommandLine;

NorthstarDLL/dllmain.cpp

@@ -5,6 +5,7 @@
 #include "config/profile.h"
 #include "plugins/plugin_abi.h"
 #include "plugins/plugins.h"
+#include "plugins/pluginbackend.h"
 #include "util/version.h"
 #include "squirrel/squirrel.h"
 #include "shared/gamepresence.h"
@@ -49,7 +50,9 @@ bool InitialiseNorthstar()
 	InitialiseVersion();
 	CreateLogFiles();
 
-	InitialiseCrashHandler();
+	g_pCrashHandler = new CCrashHandler();
+	bool bAllFatal = strstr(GetCommandLineA(), "-crash_handle_all") != NULL;
+	g_pCrashHandler->SetAllFatal(bAllFatal);
 
 	// Write launcher version to log
 	StartupLog();
@@ -60,6 +63,7 @@ bool InitialiseNorthstar()
 
 	g_pGameStatePresence = new GameStatePresence();
 	g_pPluginManager = new PluginManager();
+	g_pPluginCommunicationhandler = new PluginCommunicationHandler();
 	g_pPluginManager->LoadPlugins();
 
 	InitialiseSquirrelManagers();