Merge pull request #35 from danielga/update-signatures-and-fix-longstanding-issues

Update signatures and fix some longstanding issues

Author: danielga

azure-pipelines.yml

@@ -6,12 +6,7 @@ variables:
   GARRYSMOD_COMMON_REPOSITORY: https://github.com/danielga/garrysmod_common.git
   PROJECT_GENERATOR_VERSION: 2
   REPOSITORY_DIR: $(System.DefaultWorkingDirectory)
-  TARGET_ARCHITECTURE: x86
-  TARGET_ARCHITECTURE_64: x86_64
   DISABLE_X86_64_BUILD: true
-  SOURCE_SDK: $(System.DefaultWorkingDirectory)/dependencies/sourcesdk-minimal
-  SOURCE_SDK_BRANCH: master
-  SOURCE_SDK_REPOSITORY: https://github.com/danielga/sourcesdk-minimal.git
 trigger:
   tags:
     include:
@@ -26,13 +21,10 @@ jobs:
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.ps1
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.ps1
-    TARGET_OS: win32
-    TARGET_OS_64: win64
     COMPILER_PLATFORM: vs2019
     PROJECT_OS: windows
-    PREMAKE5_EXECUTABLE: premake5.exe
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/windows/premake-core/premake5.exe
-    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-windows.zip
+    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-windows.zip
   steps:
   - powershell: 'Invoke-Expression ((New-Object System.Net.WebClient).DownloadString("$env:BOOTSTRAP_URL"))'
     displayName: Bootstrap
@@ -55,24 +47,25 @@ jobs:
   displayName: Linux
   pool:
     name: Azure Pipelines
-    vmImage: ubuntu-18.04
+    vmImage: ubuntu-16.04
   timeoutInMinutes: 10
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
-    TARGET_OS: linux
-    TARGET_OS_64: linux64
     COMPILER_PLATFORM: gmake
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/linux/premake-core/premake5
     PROJECT_OS: linux
-    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-linux.tar.gz
-    CC: gcc-8
-    CXX: g++-8
+    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-linux.tar.gz
+    CC: gcc-9
+    CXX: g++-9
+    AR: gcc-ar-9
+    NM: gcc-nm-9
+    RANLIB: gcc-ranlib-9
   steps:
   - bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
     displayName: Bootstrap
   - bash: |
-      sudo apt-get update && sudo apt-get install -y g++-8-multilib
+      sudo apt-get update && sudo apt-get install -y g++-9-multilib
       $BUILD_SCRIPT
     displayName: Build
   - task: CopyFiles@2
@@ -92,22 +85,23 @@ jobs:
   displayName: macOS
   pool:
     name: Azure Pipelines
-    vmImage: macOS-10.13
+    vmImage: macOS-10.15
   timeoutInMinutes: 10
   variables:
     BOOTSTRAP_URL: https://raw.githubusercontent.com/danielga/garrysmod_common/master/build/bootstrap.sh
     BUILD_SCRIPT: $(System.DefaultWorkingDirectory)/dependencies/garrysmod_common/build/build.sh
-    TARGET_OS: osx
-    TARGET_OS_64: osx64
     COMPILER_PLATFORM: gmake
     PREMAKE5: $(System.DefaultWorkingDirectory)/dependencies/macosx/premake-core/premake5
     PROJECT_OS: macosx
-    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-macosx.tar.gz
+    PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha15/premake-5.0.0-alpha15-macosx.tar.gz
+    MACOSX_SDK_URL: https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.7.sdk.tar.xz
+    MACOSX_SDK_DIRECTORY: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
+    SDKROOT: $(System.DefaultWorkingDirectory)/dependencies/macosx/MacOSX10.7.sdk
   steps:
   - bash: 'curl -s -L "$BOOTSTRAP_URL" | bash'
     displayName: Bootstrap
   - bash: |
-      sudo xcode-select -s "/Applications/Xcode_9.4.1.app/Contents/Developer"
+      sudo xcode-select -s "/Applications/Xcode_11.4.1.app/Contents/Developer"
       $BUILD_SCRIPT
     displayName: Build
   - task: CopyFiles@2

license.txt

@@ -2,7 +2,7 @@ gm_sourcenet
 A module for Garry's Mod that provides interfaces to many systems
 of VALVe's engine.
 -----------------------------------------------------------------------
-Copyright (c) 2015-2019, Daniel Almeida
+Copyright (c) 2015-2020, Daniel Almeida
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

premake5.lua

@@ -6,36 +6,25 @@ newoption({
 
 local gmcommon = assert(_OPTIONS.gmcommon or os.getenv("GARRYSMOD_COMMON"),
 	"you didn't provide a path to your garrysmod_common (https://github.com/danielga/garrysmod_common) directory")
-include(path.join(gmcommon, "generator.v2.lua"))
+include(gmcommon .. "/generator.v2.lua")
 
 CreateWorkspace({name = "sourcenet", abi_compatible = true})
 	CreateProject({serverside = true})
 		IncludeLuaShared()
+		IncludeHelpersExtended()
 		IncludeSDKCommon()
 		IncludeSDKTier0()
 		IncludeSDKTier1()
+		IncludeSDKLZMA()
 		IncludeScanning()
 		IncludeDetouring()
 		files({"source/server/*.cpp", "source/server/*.hpp"})
-		links("LZMA")
 
 	CreateProject({serverside = false})
 		IncludeLuaShared()
+		IncludeHelpersExtended()
 		IncludeSDKCommon()
 		IncludeSDKTier0()
 		IncludeSDKTier1()
 		IncludeScanning()
 		IncludeDetouring()
-
-	project("LZMA")
-		language("C")
-		kind("StaticLib")
-		defines("_7ZIP_ST")
-		files({
-			"source/lzma/*.h",
-			"source/lzma/*.c"
-		})
-		vpaths({
-			["Header files"] = "source/lzma/*.h",
-			["Source files"] = "source/lzma/*.c"
-		})

readme.md

@@ -5,16 +5,16 @@ A module for Garry's Mod that provides interfaces to many systems of VALVe's eng
 
 ## Compiling
 
-The only supported compilation platform for this project on Windows is **Visual Studio 2017** on **release** mode.  
+The only supported compilation platforms for this project on Windows are **Visual Studio 2015**, **Visual Studio 2017** and **Visual Studio 2019** on **release** mode.  
 On Linux, everything should work fine as is, on **release** mode.  
-For Mac OSX, any **Xcode (using the GCC compiler)** version *MIGHT* work as long as the **Mac OSX 10.7 SDK** is used, on **release** mode.  
+For Mac OSX, any **Xcode version (using the GCC compiler)** *MIGHT* work as long as the **Mac OSX 10.7 SDK** is used, on **release** mode.  
 These restrictions are not random; they exist because of ABI compatibility reasons.  
-If stuff starts erroring or fails to work, be sure to check the correct line endings (\n and such) are present in the files for each OS.  
+If stuff starts erroring or fails to work, be sure to check the correct line endings (`\n` and such) are present in the files for each OS.
 
 ## Requirements
 
-This project requires [garrysmod\_common][2], a framework to facilitate the creation of compilations files (Visual Studio, make, XCode, etc). Simply set the environment variable '**GARRYSMOD\_COMMON**' or the premake option '**gmcommon**' to the path of your local copy of [garrysmod\_common][2].  
-We also use [SourceSDK2013][3], so set the environment variable '**SOURCE\_SDK**' or the premake option '**sourcesdk**' to the path of your local copy of [SourceSDK2013][3]. The previous links to [SourceSDK2013][3] point to my own fork of VALVe's repo and for good reason: Garry's Mod has lots of backwards incompatible changes to interfaces and it's much smaller, being perfect for automated build systems like Travis-CI.  
+This project requires [garrysmod_common][2], a framework to facilitate the creation of compilations files (Visual Studio, make, XCode, etc). Simply set the environment variable `GARRYSMOD_COMMON` or the premake option `--gmcommon=path` to the path of your local copy of [garrysmod_common][2].  
+We also use [SourceSDK2013][3]. The previous links to [SourceSDK2013][3] point to my own fork of VALVe's repo and for good reason: Garry's Mod has lots of backwards incompatible changes to interfaces and it's much smaller, being perfect for automated build systems like Azure Pipelines (which is used for this project).
 
   [1]: https://github.com/AlexSwift/GMod13-Modules/tree/master/gm_sourcenet3
   [2]: https://github.com/danielga/garrysmod_common

source/gameeventmanager.cpp

@@ -5,6 +5,7 @@
 #include "sn_bf_write.hpp"
 
 #include <GarrysMod/Lua/AutoReference.h>
+
 #include <igameevents.h>
 
 namespace GameEventManager

source/hooks.cpp

@@ -6,13 +6,15 @@
 #include "sn_bf_write.hpp"
 #include "net.hpp"
 
-#include <inetmsghandler.h>
-#include <cdll_int.h>
-#include <scanning/symbolfinder.hpp>
 #include <GarrysMod/Lua/Helpers.hpp>
-#include <detouring/classproxy.hpp>
+#include <GarrysMod/FunctionPointers.hpp>
 #include <Platform.hpp>
 
+#include <detouring/classproxy.hpp>
+
+#include <inetmsghandler.h>
+#include <cdll_int.h>
+
 namespace Hooks
 {
 
@@ -64,17 +66,6 @@ namespace Hooks
 	class CNetChanProxy : public Detouring::ClassProxy<CNetChan, CNetChanProxy>
 	{
 	private:
-
-#if defined SYSTEM_WINDOWS
-
-		typedef bool( __thiscall *ProcessMessages_t )( CNetChan *netchan, bf_read &buf );
-
-#else
-
-		typedef bool( *ProcessMessages_t )( CNetChan *netchan, bf_read &buf );
-
-#endif
-
 		typedef CNetChan TargetClass;
 		typedef CNetChanProxy SubstituteClass;
 
@@ -83,25 +74,12 @@ namespace Hooks
 			return NetChannel::Get( LUA, index );
 		}
 
-		static const char ProcessMessages_sig[];
-		static const size_t ProcessMessages_siglen;
-
-		static ProcessMessages_t ProcessMessages_original;
+		static FunctionPointers::CNetChan_ProcessMessages_t ProcessMessages_original;
 
 	public:
 		static void Initialize( GarrysMod::Lua::ILuaBase *LUA )
 		{
-			{
-				SymbolFinder symfinder;
-
-				ProcessMessages_original =
-					reinterpret_cast<ProcessMessages_t>( symfinder.Resolve(
-						global::engine_loader.GetModuleLoader( ).GetModule( ),
-						ProcessMessages_sig,
-						ProcessMessages_siglen
-					) );
-			}
-
+			ProcessMessages_original = FunctionPointers::CNetChan_ProcessMessages( );
 			if( ProcessMessages_original == nullptr )
 				LUA->ThrowError( "failed to locate CNetChan::ProcessMessages" );
 		}
@@ -210,15 +188,19 @@ namespace Hooks
 		{
 			CNetChan *netchan = This( );
 
-			static uint8_t data[100000] = { 0 };
 			if( !buf.IsOverflowed( ) )
 			{
-				memcpy( data, buf.GetBasePointer( ), buf.GetNumBytesRead( ) );
+				static uint8_t data[100000] = { 0 };
 
-				int32_t bitsread = buf.GetNumBitsRead( );
+				const int32_t bytesread = buf.GetNumBytesRead( );
+				if( bytesread > 0 )
+					std::memcpy( data, buf.GetBasePointer( ), bytesread );
+
+				const int32_t bitsread = buf.GetNumBitsRead( );
 				bf_write write( data, sizeof( data ) );
 				write.SeekToBit( bitsread );
 
+				bool handled = false;
 				HOOK_INIT( "PreProcessMessages" );
 				HOOK_PUSH( NetChannel::Push( LUA, netchan ) );
 				HOOK_PUSH( bf_read **reader = sn_bf_read::Push( LUA, &buf ) );
@@ -232,21 +214,30 @@ namespace Hooks
 					) );
 				}
 
-				HOOK_CALL( 0 );
+				if( HOOK_CALL( 1 ) )
+				{
+					if( LUA->IsType( -1, GarrysMod::Lua::Type::BOOL ) )
+						handled = LUA->GetBool( -1 );
+
+					LUA->Pop( 1 );
+				}
 
 				*reader = nullptr;
 				*writer = nullptr;
 				HOOK_END( );
 
-				buf.StartReading(
-					write.GetBasePointer( ),
-					write.GetNumBytesWritten( ),
-					bitsread,
-					write.GetNumBitsWritten( )
-				);
+				if( handled )
+					buf.StartReading(
+						write.GetBasePointer( ),
+						write.GetNumBytesWritten( ),
+						bitsread,
+						write.GetNumBitsWritten( )
+					);
+				else
+					buf.Seek( bitsread );
 			}
 
-			return Call<bool, bf_read &>( ProcessMessages_original, buf );
+			return Call<bool, CNetChan, bf_read &>( ProcessMessages_original, buf );
 		}
 
 		bool HookShutdown( CNetChan *netchan )
@@ -262,28 +253,7 @@ namespace Hooks
 
 	CNetChanProxy CNetChanProxy::Singleton;
 
-#if defined SYSTEM_WINDOWS
-
-	const char CNetChanProxy::ProcessMessages_sig[] = "\x55\x8B\xEC\x83\xEC\x2C\xF7\x05";
-	const size_t CNetChanProxy::ProcessMessages_siglen =
-		sizeof( CNetChanProxy::ProcessMessages_sig ) - 1;
-
-#elif ( defined SYSTEM_LINUX && defined SOURCENET_SERVER ) || defined SYSTEM_MACOSX
-
-	const char CNetChanProxy::ProcessMessages_sig[] =
-		"@_ZN8CNetChan15ProcessMessagesER7bf_read";
-	const size_t CNetChanProxy::ProcessMessages_siglen = 0;
-
-#elif defined SYSTEM_LINUX && defined SOURCENET_CLIENT
-
-	const char CNetChanProxy::ProcessMessages_sig[] =
-		"\x55\x89\xE5\x57\x56\x53\x83\xEC\x6C\x8B\x3D\x2A\x2A\x2A\x2A\x8B";
-	const size_t CNetChanProxy::ProcessMessages_siglen =
-		sizeof( CNetChanProxy::ProcessMessages_sig ) - 1;
-
-#endif
-
-	CNetChanProxy::ProcessMessages_t CNetChanProxy::ProcessMessages_original = nullptr;
+	FunctionPointers::CNetChan_ProcessMessages_t CNetChanProxy::ProcessMessages_original = nullptr;
 
 	class INetChannelHandlerProxy : public Detouring::ClassProxy<INetChannelHandler, INetChannelHandlerProxy>
 	{