From 4baefd87465f68006a63a25ea61056180fb5c669 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 16 May 2020 12:50:33 +1000 Subject: [PATCH] Replace GetProcAddrOrNull with GetProcAddrOrZero both in ILinkedLibManager and its inheritors, and in IImportResolver and its inheritors; see aa8fe56ef --- src/BizHawk.BizInvoke/BizExvoker.cs | 4 ++-- src/BizHawk.Common/IImportResolver.cs | 22 ++++++++++------- src/BizHawk.Common/OSTailoredCode.cs | 24 ++++++++----------- .../N64/NativeApi/mupen64plusVideoApi.cs | 4 ++-- .../Waterbox/PeRunner.cs | 6 ++--- .../Waterbox/PeWrapper.cs | 4 ++-- .../API_MednaDisc.cs | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/BizHawk.BizInvoke/BizExvoker.cs b/src/BizHawk.BizInvoke/BizExvoker.cs index 23bbc08533..7cdcf74711 100644 --- a/src/BizHawk.BizInvoke/BizExvoker.cs +++ b/src/BizHawk.BizInvoke/BizExvoker.cs @@ -95,9 +95,9 @@ namespace BizHawk.BizInvoke } } - public IntPtr? GetProcAddrOrNull(string entryPoint) => EntryPoints.TryGetValue(entryPoint, out var ret) ? ret : (IntPtr?) null; + public IntPtr GetProcAddrOrZero(string entryPoint) => EntryPoints.TryGetValue(entryPoint, out var ret) ? ret : IntPtr.Zero; - public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"could not find {entryPoint} in exports"); + public IntPtr GetProcAddrOrThrow(string entryPoint) => EntryPoints.TryGetValue(entryPoint, out var ret) ? ret : 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 365f21bd21..4862ccbd2b 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 GetProcAddrOrZero(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 GetProcAddrOrZero(string entryPoint) => OSTailoredCode.LinkedLibManager.GetProcAddrOrZero(_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 GetProcAddrOrZero(string procName) => OSTailoredCode.LinkedLibManager.GetProcAddrOrZero(HModule, procName); public IntPtr GetProcAddrOrThrow(string procName) => OSTailoredCode.LinkedLibManager.GetProcAddrOrThrow(HModule, procName); @@ -106,16 +106,20 @@ namespace BizHawk.Common _resolvers = resolvers.ToList(); } - public IntPtr? GetProcAddrOrNull(string entryPoint) + public IntPtr GetProcAddrOrZero(string entryPoint) { - for (var i = _resolvers.Count - 1; i != -1; i--) + for (var i = _resolvers.Count - 1; i != 0; i--) { - var ret = _resolvers[i].GetProcAddrOrNull(entryPoint); - if (ret != null) return ret.Value; + var ret = _resolvers[i].GetProcAddrOrZero(entryPoint); + if (ret != IntPtr.Zero) return ret; } - return null; + return _resolvers[0].GetProcAddrOrZero(entryPoint); // if it's Zero/NULL, return it anyway - the search failed } - public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"{entryPoint} was not found in any of the aggregated resolvers"); + public IntPtr GetProcAddrOrThrow(string entryPoint) + { + var ret = GetProcAddrOrZero(entryPoint); + return ret != IntPtr.Zero ? ret : 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 5afd9a8117..ba81131144 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 GetProcAddrOrZero(IntPtr hModule, string procName); /// could not find symbol IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName); @@ -61,17 +61,13 @@ namespace BizHawk.Common public int FreeByPtr(IntPtr hModule) => dlclose(hModule); - public IntPtr? GetProcAddrOrNull(IntPtr hModule, string procName) - { - var p = dlsym(hModule, procName); - return p == IntPtr.Zero ? (IntPtr?) null : p; - } + public IntPtr GetProcAddrOrZero(IntPtr hModule, string procName) => dlsym(hModule, procName); public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) { _ = dlerror(); // the Internet said to do this - var p = GetProcAddrOrNull(hModule, procName); - if (p != null) return p.Value; + var p = GetProcAddrOrZero(hModule, procName); + if (p != IntPtr.Zero) return p; var errCharPtr = dlerror(); throw new InvalidOperationException($"error in {nameof(dlsym)}{(errCharPtr == IntPtr.Zero ? string.Empty : $": {Marshal.PtrToStringAnsi(errCharPtr)}")}"); } @@ -104,13 +100,13 @@ namespace BizHawk.Common public int FreeByPtr(IntPtr hModule) => FreeLibrary(hModule) ? 0 : 1; - public IntPtr? GetProcAddrOrNull(IntPtr hModule, string procName) - { - var p = GetProcAddress(hModule, procName); - return p == IntPtr.Zero ? (IntPtr?) null : p; - } + public IntPtr GetProcAddrOrZero(IntPtr hModule, string procName) => GetProcAddress(hModule, procName); - public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) => GetProcAddrOrNull(hModule, procName) ?? throw new InvalidOperationException($"got null pointer from {nameof(GetProcAddress)}, error code: {GetLastError()}"); + public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) + { + var ret = GetProcAddrOrZero(hModule, procName); + return ret != IntPtr.Zero ? ret : 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 e174dd40da..af51702105 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/NativeApi/mupen64plusVideoApi.cs @@ -60,8 +60,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi videoplugin); GFXReadScreen2 = mupen64plusApi.GetTypedDelegate(GfxDll, "ReadScreen2"); GFXReadScreen2Res = mupen64plusApi.GetTypedDelegate(GfxDll, "ReadScreen2"); - var funcPtr = OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(GfxDll, "GetScreenTextureID"); - if (funcPtr != null) GFXGetScreenTextureID = (GetScreenTextureID) Marshal.GetDelegateForFunctionPointer(funcPtr.Value, typeof(GetScreenTextureID)); + var funcPtr = OSTailoredCode.LinkedLibManager.GetProcAddrOrZero(GfxDll, "GetScreenTextureID"); + if (funcPtr != IntPtr.Zero) GFXGetScreenTextureID = (GetScreenTextureID) Marshal.GetDelegateForFunctionPointer(funcPtr, 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 542d92bf66..d377963c8f 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/PeRunner.cs @@ -107,8 +107,8 @@ namespace BizHawk.Emulation.Cores.Waterbox var imports = _parent._exports[moduleName]; var pointers = entries.Select(e => { - var ptr = imports.GetProcAddrOrNull(e); - if (ptr != null) return ptr.Value; + var ptr = imports.GetProcAddrOrZero(e); + if (ptr != IntPtr.Zero) return ptr; var s = $"Trapped on unimplemented function {moduleName}:{e}"; Action del = () => { @@ -1104,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 GetProcAddrOrZero(string entryPoint) => _modules[0].GetProcAddrOrZero(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 362efb7ce6..c9afe2146e 100644 --- a/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs +++ b/src/BizHawk.Emulation.Cores/Waterbox/PeWrapper.cs @@ -304,9 +304,9 @@ namespace BizHawk.Emulation.Cores.Waterbox } } - public IntPtr? GetProcAddrOrNull(string entryPoint) => ExportsByName.TryGetValue(entryPoint, out var ret) ? ret : (IntPtr?) null; + public IntPtr GetProcAddrOrZero(string entryPoint) => ExportsByName.TryGetValue(entryPoint, out var ret) ? ret : IntPtr.Zero; - public IntPtr GetProcAddrOrThrow(string entryPoint) => GetProcAddrOrNull(entryPoint) ?? throw new InvalidOperationException($"could not find {entryPoint} in exports"); + public IntPtr GetProcAddrOrThrow(string entryPoint) => ExportsByName.TryGetValue(entryPoint, out var ret) ? ret : throw new InvalidOperationException($"could not find {entryPoint} in exports"); public void ConnectImports(string moduleName, IImportResolver module) { diff --git a/src/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs b/src/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs index 8d8747f92d..cb48e37903 100644 --- a/src/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs +++ b/src/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs @@ -95,7 +95,7 @@ namespace BizHawk.Emulation.DiscSystem { var lib = OSTailoredCode.LinkedLibManager.LoadOrNull("mednadisc.dll"); _IsLibraryAvailable = lib != null - && OSTailoredCode.LinkedLibManager.GetProcAddrOrNull(lib.Value, "mednadisc_LoadCD") != null; + && OSTailoredCode.LinkedLibManager.GetProcAddrOrZero(lib.Value, "mednadisc_LoadCD") != IntPtr.Zero; if (lib != null) OSTailoredCode.LinkedLibManager.FreeByPtr(lib.Value); }