ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve GetProcAddrOrThrow/LoadOrThrow error messages

This commit is contained in:
Morilli 2025-01-24 10:56:50 +01:00
parent 83098604fa
commit cc45a6ec2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Common/OSTailoredCode.cs
View File

@ -216,7 +216,7 @@ namespace BizHawk.Common
public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName) public IntPtr GetProcAddrOrThrow(IntPtr hModule, string procName)
{ {
var ret = GetProcAddrOrZero(hModule, 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); public IntPtr LoadOrZero(string dllToLoad) => LoadLibraryW(dllToLoad);
@ -224,7 +224,7 @@ namespace BizHawk.Common
public IntPtr LoadOrThrow(string dllToLoad) public IntPtr LoadOrThrow(string dllToLoad)
{ {
var ret = LoadOrZero(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() public unsafe string GetErrorMessage()