From 3e51bbe5c24f00a7e72a84276ce9da80c95792fe Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 16 May 2020 12:35:04 +1000 Subject: [PATCH] Revert "Fix up Nullable brain damage" This reverts commit aa8fe56ef9f1147c57c6731bf990471a1f4fff5c. --- src/BizHawk.BizInvoke/BizExvoker.cs | 14 ++----------- src/BizHawk.Common/IImportResolver.cs | 21 +++++++------------ src/BizHawk.Common/OSTailoredCode.cs | 21 +++++++------------ .../N64/NativeApi/mupen64plusVideoApi.cs | 3 +-- .../Waterbox/PeRunner.cs | 5 ++--- .../Waterbox/PeWrapper.cs | 14 ++----------- 6 files changed, 21 insertions(+), 57 deletions(-) diff --git a/src/BizHawk.BizInvoke/BizExvoker.cs b/src/BizHawk.BizInvoke/BizExvoker.cs index 48025b1e93..23bbc08533 100644 --- a/src/BizHawk.BizInvoke/BizExvoker.cs +++ b/src/BizHawk.BizInvoke/BizExvoker.cs @@ -95,19 +95,9 @@ namespace BizHawk.BizInvoke } } - public IntPtr GetProcAddrOrNull(string entryPoint) - { - EntryPoints.TryGetValue(entryPoint, out var ret); - return ret; - } + public IntPtr? GetProcAddrOrNull(string entryPoint) => EntryPoints.TryGetValue(entryPoint, out var ret) ? ret : (IntPtr?) null; - public IntPtr GetProcAddrOrThrow(string entryPoint) - { - var ret = GetProcAddrOrNull(entryPoint); - if (ret == IntPtr.Zero) - throw new InvalidOperationException($"could not find {entryPoint} in exports"); - return ret; - } + public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"could not find {entryPoint} in exports"); } static readonly Dictionary Impls = new Dictionary(); diff --git a/src/BizHawk.Common/IImportResolver.cs b/src/BizHawk.Common/IImportResolver.cs index 8c781deb50..365f21bd21 100644 --- a/src/BizHawk.Common/IImportResolver.cs +++ b/src/BizHawk.Common/IImportResolver.cs @@ -10,7 +10,7 @@ namespace BizHawk.Common /// public interface IImportResolver { - IntPtr GetProcAddrOrNull(string entryPoint); + IntPtr? GetProcAddrOrNull(string entryPoint); /// could not find symbol IntPtr GetProcAddrOrThrow(string entryPoint); @@ -32,7 +32,7 @@ namespace BizHawk.Common _p = OSTailoredCode.LinkedLibManager.LoadOrThrow(OSTailoredCode.IsUnixHost ? ResolveFilePath(dllName) : dllName); } - public IntPtr GetProcAddrOrNull(string entryPoint) => OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(_p, entryPoint); + public IntPtr? GetProcAddrOrNull(string entryPoint) => OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(_p, entryPoint); public IntPtr GetProcAddrOrThrow(string entryPoint) => OSTailoredCode.LinkedLibManager.GetProcAddrOrThrow(_p, entryPoint); @@ -84,7 +84,7 @@ namespace BizHawk.Common Environment.SetEnvironmentVariable("PATH", envpath, EnvironmentVariableTarget.Process); } - public IntPtr GetProcAddrOrNull(string procName) => OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(HModule, procName); + public IntPtr? GetProcAddrOrNull(string procName) => OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(HModule, procName); public IntPtr GetProcAddrOrThrow(string procName) => OSTailoredCode.LinkedLibManager.GetProcAddrOrThrow(HModule, procName); @@ -106,23 +106,16 @@ namespace BizHawk.Common _resolvers = resolvers.ToList(); } - public IntPtr GetProcAddrOrNull(string entryPoint) + public IntPtr? GetProcAddrOrNull(string entryPoint) { for (var i = _resolvers.Count - 1; i != -1; i--) { var ret = _resolvers[i].GetProcAddrOrNull(entryPoint); - if (ret != IntPtr.Zero) - return ret; + if (ret != null) return ret.Value; } - return IntPtr.Zero; + return null; } - public IntPtr GetProcAddrOrThrow(string entryPoint) - { - var ret = GetProcAddrOrNull(entryPoint); - if (ret == IntPtr.Zero) - throw new InvalidOperationException($"{entryPoint} was not found in any of the aggregated resolvers"); - return ret; - } + public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"{entryPoint} was not found in any of the aggregated resolvers"); } } diff --git a/src/BizHawk.Common/OSTailoredCode.cs b/src/BizHawk.Common/OSTailoredCode.cs index b0c524bf31..5afd9a8117 100644 --- a/src/BizHawk.Common/OSTailoredCode.cs +++ b/src/BizHawk.Common/OSTailoredCode.cs @@ -34,7 +34,7 @@ namespace BizHawk.Common { int FreeByPtr(IntPtr hModule); - IntPtr GetProcAddrOrNull(IntPtr hModule, string procName); + IntPtr? GetProcAddrOrNull(IntPtr hModule, string procName); /// could not find symbol IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName); @@ -61,18 +61,17 @@ namespace BizHawk.Common public int FreeByPtr(IntPtr hModule) => dlclose(hModule); - public IntPtr GetProcAddrOrNull(IntPtr hModule, string procName) + public IntPtr? GetProcAddrOrNull(IntPtr hModule, string procName) { var p = dlsym(hModule, procName); - return p; + return p == IntPtr.Zero ? (IntPtr?) null : p; } public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) { _ = dlerror(); // the Internet said to do this var p = GetProcAddrOrNull(hModule, procName); - if (p != IntPtr.Zero) - return p; + if (p != null) return p.Value; var errCharPtr = dlerror(); throw new InvalidOperationException($"error in {nameof(dlsym)}{(errCharPtr == IntPtr.Zero ? string.Empty : $": {Marshal.PtrToStringAnsi(errCharPtr)}")}"); } @@ -105,19 +104,13 @@ namespace BizHawk.Common public int FreeByPtr(IntPtr hModule) => FreeLibrary(hModule) ? 0 : 1; - public IntPtr GetProcAddrOrNull(IntPtr hModule, string procName) + public IntPtr? GetProcAddrOrNull(IntPtr hModule, string procName) { var p = GetProcAddress(hModule, procName); - return p; + return p == IntPtr.Zero ? (IntPtr?) null : p; } - public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) - { - var ret = GetProcAddrOrNull(hModule, procName); - if (ret == IntPtr.Zero) - throw new InvalidOperationException($"got null pointer from {nameof(GetProcAddress)}, error code: {GetLastError()}"); - return ret; - } + public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) => GetProcAddrOrNull(hModule, procName) ?? throw new InvalidOperationException($"got null pointer from {nameof(GetProcAddress)}, error code: {GetLastError()}"); public IntPtr? LoadOrNull(string dllToLoad) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs index 5873cc013f..e174dd40da 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs @@ -61,8 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi GFXReadScreen2 = mupen64plusApi.GetTypedDelegate(GfxDll, "ReadScreen2"); GFXReadScreen2Res = mupen64plusApi.GetTypedDelegate(GfxDll, "ReadScreen2"); var funcPtr = OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(GfxDll, "GetScreenTextureID"); - if (funcPtr != IntPtr.Zero) - GFXGetScreenTextureID = (GetScreenTextureID) Marshal.GetDelegateForFunctionPointer(funcPtr, typeof(GetScreenTextureID)); + if (funcPtr != null) GFXGetScreenTextureID = (GetScreenTextureID) Marshal.GetDelegateForFunctionPointer(funcPtr.Value, typeof(GetScreenTextureID)); } public void GetScreenDimensions(ref int width, ref int height) diff --git a/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs b/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs index 489f625017..542d92bf66 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs @@ -108,8 +108,7 @@ namespace BizHawk.Emulation.Cores.Waterbox var pointers = entries.Select(e => { var ptr = imports.GetProcAddrOrNull(e); - if (ptr != IntPtr.Zero) - return ptr; + if (ptr != null) return ptr.Value; var s = $"Trapped on unimplemented function {moduleName}:{e}"; Action del = () => { @@ -1105,7 +1104,7 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - public IntPtr GetProcAddrOrNull(string entryPoint) => _modules[0].GetProcAddrOrNull(entryPoint); // _modules[0] is always the main module + public IntPtr? GetProcAddrOrNull(string entryPoint) => _modules[0].GetProcAddrOrNull(entryPoint); // _modules[0] is always the main module public IntPtr GetProcAddrOrThrow(string entryPoint) => _modules[0].GetProcAddrOrThrow(entryPoint); diff --git a/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs b/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs index 5f71efb034..362efb7ce6 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs @@ -304,19 +304,9 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - public IntPtr GetProcAddrOrNull(string entryPoint) - { - ExportsByName.TryGetValue(entryPoint, out var ret); - return ret; - } + public IntPtr? GetProcAddrOrNull(string entryPoint) => ExportsByName.TryGetValue(entryPoint, out var ret) ? ret : (IntPtr?) null; - public IntPtr GetProcAddrOrThrow(string entryPoint) - { - var ret = GetProcAddrOrNull(entryPoint); - if (ret == IntPtr.Zero) - throw new InvalidOperationException($"could not find {entryPoint} in exports"); - return ret; - } + public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"could not find {entryPoint} in exports"); public void ConnectImports(string moduleName, IImportResolver module) {