Prepare for System.Threading.Lock

Author: YoshiRulz

src/BizHawk.BizInvoke/CallingConventionAdapter.cs

@@ -233,7 +233,7 @@ static MsHostSysVGuest()
 			}
 
 			private readonly MemoryBlock _memory;
-			private readonly object _sync = new();
+			private readonly Lock _sync = new();
 			private readonly WeakReference?[] _refs;
 
 			public MsHostSysVGuest()

src/BizHawk.Bizware.Input/KeyMouseInput/RawKeyMouseInput.cs

@@ -25,7 +25,7 @@ internal sealed class RawKeyMouseInput : IKeyMouseInput
 		private List<KeyEvent> _keyEvents = [ ];
 		private (int X, int Y) _mouseDelta;
 		private (int X, int Y) _lastMouseAbsPos;
-		private readonly object _lockObj = new();
+		private readonly Lock _lockObj = new();
 		private bool _disposed;
 
 		private IntPtr RawInputBuffer;

src/BizHawk.Bizware.Input/KeyMouseInput/X11KeyMouseInput.cs

@@ -16,7 +16,7 @@ internal sealed class X11KeyMouseInput : IKeyMouseInput
 	{
 		private IntPtr Display;
 		private readonly bool[] LastKeyState = new bool[256];
-		private readonly object LockObj = new();
+		private readonly Lock LockObj = new();
 		private readonly DistinctKey[] KeyEnumMap = new DistinctKey[256];
 		private readonly bool _supportsXInput2;
 		private readonly int _xi2Opcode;

src/BizHawk.Client.Common/lua/LuaLibraryBase.cs

@@ -31,7 +31,7 @@ protected LuaLibraryBase(ILuaLibraries luaLibsImpl, ApiContainer apiContainer, A
 		protected static LuaFile CurrentFile { get; private set; }
 
 		private static Thread _currentHostThread;
-		private static readonly object ThreadMutex = new();
+		private static readonly Lock ThreadMutex = new();
 
 		public abstract string Name { get; }
 

src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.Http.cs

@@ -36,7 +36,7 @@ public partial class RCheevos
 		/// </summary>
 		public abstract class RCheevoHttpRequest : IDisposable
 		{
-			private readonly object _syncObject = new();
+			private readonly Lock _syncObject = new();
 			private readonly ManualResetEventSlim _completionEvent = new();
 			private bool _isDisposed;
 

src/BizHawk.Emulation.Cores/Libretro/Libretro.cs

@@ -30,7 +30,7 @@ static LibretroHost()
 
 		private class BridgeGuard(IntPtr parentHandler) : IMonitor
 		{
-			private static readonly object _sync = new();
+			private static readonly Lock _sync = new();
 			private static IntPtr _activeHandler;
 			private static int _refCount;
 

src/BizHawk.Emulation.DiscSystem/DiscoHawkLogic/DiscoHawkLogic.cs

@@ -365,7 +365,7 @@ public static void RunWithArgs(string[] args, Action<string> showComparisonResul
 				po.CancellationToken = cts.Token;
 				po.MaxDegreeOfParallelism = 1;
 				if(po.MaxDegreeOfParallelism < 0) po.MaxDegreeOfParallelism = 1;
-				object olock = new object();
+				Lock olock = new();
 				int ctr=0;
 				bool blocked = false;
 				try

src/MainSlnCommon.props

@@ -47,6 +47,7 @@
 		<CompilerVisibleProperty Include="MSBuildProjectName" />
 		<InternalsVisibleTo Include="$(MSBuildProjectName.Replace('BizHawk.', 'BizHawk.Tests.'))" />
 		<Using Include="System" />
+		<Using Include="System.Object" Alias="Lock" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
 		<Compile Remove="$(MSBuildProjectDirectory)/debug/**/*" />