From cc45a6ec2da0dc47f6bd4094dadca31c48a2d1a2 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:56:50 +0100 Subject: [PATCH] improve GetProcAddrOrThrow/LoadOrThrow error messages --- src/BizHawk.Common/OSTailoredCode.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Common/OSTailoredCode.cs b/src/BizHawk.Common/OSTailoredCode.cs index 3449f7d8b4..54b2f12596 100644 --- a/src/BizHawk.Common/OSTailoredCode.cs +++ b/src/BizHawk.Common/OSTailoredCode.cs @@ -216,7 +216,7 @@ namespace BizHawk.Common 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)}, {GetErrorMessage()}"); + return ret != IntPtr.Zero ? ret : throw new InvalidOperationException($"got null pointer from {nameof(GetProcAddress)} trying to find symbol {procName}, {GetErrorMessage()}"); } public IntPtr LoadOrZero(string dllToLoad) => LoadLibraryW(dllToLoad); @@ -224,7 +224,7 @@ namespace BizHawk.Common public IntPtr LoadOrThrow(string dllToLoad) { var ret = LoadOrZero(dllToLoad); - return ret != IntPtr.Zero ? ret : throw new InvalidOperationException($"got null pointer from {nameof(LoadLibraryW)} while trying to load {dllToLoad}, {GetErrorMessage()}"); + return ret != IntPtr.Zero ? ret : throw new InvalidOperationException($"got null pointer from {nameof(LoadLibraryW)} trying to load {dllToLoad}, {GetErrorMessage()}"); } public unsafe string GetErrorMessage()