From fdb124b02fdb2ef2621e9ae8033eba29c96ca25d Mon Sep 17 00:00:00 2001 From: Pursuit Date: Mon, 25 May 2020 21:38:13 +0200 Subject: [PATCH] First changes for 0.4.1 --- AsiSupport/ASI/AsiThread.cs | 2 ++ AsiSupport/App.meta | 2 +- AsiSupport/AsiSupport.csproj | 16 +++++++++++----- AsiSupport/Config.cs | 2 +- AsiSupport/Properties/AssemblyInfo.cs | 4 ++-- AsiSupport/SHVDN.cs | 2 -- AsiSupport/Support.cs | 16 ++++++---------- Changelog.txt | 5 +++++ ReadMe.txt | 2 +- 9 files changed, 29 insertions(+), 22 deletions(-) diff --git a/AsiSupport/ASI/AsiThread.cs b/AsiSupport/ASI/AsiThread.cs index 0b1b821..5d53ac2 100644 --- a/AsiSupport/ASI/AsiThread.cs +++ b/AsiSupport/ASI/AsiThread.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.ExceptionServices; using System.Text; using System.Threading; using System.Threading.Tasks; @@ -36,6 +37,7 @@ public void Start() else Log.Error("Unable to start AsiThread \"" + this.Name + "\": no function specified."); } + [HandleProcessCorruptedStateExceptions] private void RunFiber() { Log.Info("Starting new GameFiber: \"" + this.Name + '"'); diff --git a/AsiSupport/App.meta b/AsiSupport/App.meta index 4c0694c..71d3bd8 100644 --- a/AsiSupport/App.meta +++ b/AsiSupport/App.meta @@ -1,3 +1,3 @@ #AsiSupport application metadata -DevStage=BETA \ No newline at end of file +VersionType=BETA \ No newline at end of file diff --git a/AsiSupport/AsiSupport.csproj b/AsiSupport/AsiSupport.csproj index f622431..474be00 100644 --- a/AsiSupport/AsiSupport.csproj +++ b/AsiSupport/AsiSupport.csproj @@ -9,8 +9,9 @@ Properties AsiSupport AsiSupport - v4.6 + v4.7.2 512 + true @@ -34,11 +35,16 @@ true - - ..\..\..\..\Libraries\PursuitLib\Windows\bin\Release\PursuitLib.dll + + False + ..\..\..\..\Libraries\PursuitLib\PursuitLib\bin\Release\PursuitLib.dll - - ..\..\..\..\Libraries\PursuitLib\RPH\bin\Release\PursuitLib.RPH.dll + + False + ..\..\..\..\Libraries\PursuitLib\PursuitLib.RPH\bin\Release\PursuitLib.RPH.dll + + + ..\..\..\..\Libraries\PursuitLib\PursuitLib.Windows\bin\Release\PursuitLib.Windows.dll ..\..\..\..\Libraries\RagePluginHook\RagePluginHookSDK.dll diff --git a/AsiSupport/Config.cs b/AsiSupport/Config.cs index d85f69f..7405f51 100644 --- a/AsiSupport/Config.cs +++ b/AsiSupport/Config.cs @@ -10,7 +10,7 @@ public class Config : ConfigFile public bool IgnoreUnknownNatives { get; set; } = true; - public bool EnableSHVDNSupport { get; set; } = true; + public bool EnableSHVDNSupport { get; set; } = false; public Config() : base(Support.Instance.ConfigFile, true) {} } diff --git a/AsiSupport/Properties/AssemblyInfo.cs b/AsiSupport/Properties/AssemblyInfo.cs index 886afb9..b1b4b7c 100644 --- a/AsiSupport/Properties/AssemblyInfo.cs +++ b/AsiSupport/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.4.0")] -[assembly: AssemblyFileVersion("0.4.0")] +[assembly: AssemblyVersion("0.4.1")] +[assembly: AssemblyFileVersion("0.4.1")] diff --git a/AsiSupport/SHVDN.cs b/AsiSupport/SHVDN.cs index a83f09b..bce443d 100644 --- a/AsiSupport/SHVDN.cs +++ b/AsiSupport/SHVDN.cs @@ -34,8 +34,6 @@ public static void Init() foreach(string filename in Directory.EnumerateFiles(Support.Instance.WorkingDirectory, "ScriptHookVDotNet-univ*.dll")) { - Log.Info("File: " + filename); - Assembly assembly; try diff --git a/AsiSupport/Support.cs b/AsiSupport/Support.cs index 6287114..93cdbd5 100644 --- a/AsiSupport/Support.cs +++ b/AsiSupport/Support.cs @@ -1,17 +1,13 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using AsiSupport.ASI; +using AsiSupport.ASI; using AsiSupport.Managers; using PursuitLib; using PursuitLib.Extensions; using PursuitLib.IO; using PursuitLib.RPH; using Rage; +using System; +using System.IO; +using System.Text; namespace AsiSupport { @@ -38,10 +34,10 @@ public Support() protected override void Tick() { if(!Game.IsLoading && !this.initialized) //Do not load plugins while the game is loading, it will cause a crash - this.Initialize(); + this.InitSupport(); } - private void Initialize() + private void InitSupport() { Game.FadeScreenOut(0); GameFiber.Wait(1000); diff --git a/Changelog.txt b/Changelog.txt index 0debf50..c0f06dd 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,8 @@ +__0.4.1__ +* SHVDN support is now disabled by default (because of its instability) +* The versions manifest has been updated (up to version 1.0.1868.1) +* Process corrupted state exceptions (ie: AccessViolations) are now properly handled. + __0.4.0__ * The maximum number of native arguments has been increased from 25 to 32 * All argument buffers are now pre-allocated: this should improve the plugin's overall performance diff --git a/ReadMe.txt b/ReadMe.txt index f40b609..5d4950e 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -38,7 +38,7 @@ IV) Credits V) License ASI Support for RAGE Plugin Hook - Copyright © 2018 Pursuit + Copyright © 2019 Pursuit This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by