From f93181b0bf13f582460a2ef1505b3729bb81e1e7 Mon Sep 17 00:00:00 2001 From: Jamie Reece Wilson Date: Sun, 6 Oct 2024 00:35:57 +0100 Subject: [PATCH] [*] Amend again: 7046ccec117c95bc4535751642934a23a1617c09 --- Source/IO/FS/Resources.cpp | 2 +- Source/Process/AuProcess.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/IO/FS/Resources.cpp b/Source/IO/FS/Resources.cpp index aca94374..258dd038 100644 --- a/Source/IO/FS/Resources.cpp +++ b/Source/IO/FS/Resources.cpp @@ -138,7 +138,7 @@ namespace Aurora::IO::FS AuString tempPath; if (Process::GetWorkingDirectory(tempPath)) { - tempPath += "/" + fileName; + tempPath += "/" + AuString(fileName); if (FileExists(tempPath)) { path = tempPath; diff --git a/Source/Process/AuProcess.cpp b/Source/Process/AuProcess.cpp index b6575d1e..7e1a291e 100644 --- a/Source/Process/AuProcess.cpp +++ b/Source/Process/AuProcess.cpp @@ -317,11 +317,11 @@ namespace Aurora::Process static void *LoadModule(const AuROString &name, const AuROString &path) { - void *pFound {}; + void **pFound {}; if (AuTryFind(gModuleHandles, path, pFound)) { - return pFound; + return *pFound; } #if defined(AURORA_IS_MODERNNT_DERIVED) @@ -651,11 +651,11 @@ namespace Aurora::Process { AU_LOCK_GLOBAL_GUARD(gSpinLock); - void *pFound {}; + void **pFound {}; if (AuTryFind(gModuleHandles, request.mod, pFound)) { - return pFound; + return *pFound; } // TODO: need safe string container @@ -780,7 +780,7 @@ namespace Aurora::Process { AU_LOCK_GLOBAL_GUARD(gSpinLock); - void *pFound {}; + void **pFound {}; if (!AuTryFind(gModuleHandles, name, pFound)) { @@ -788,7 +788,7 @@ namespace Aurora::Process return {}; } - return pFound; + return *pFound; } AUKN_SYM AuMach GetProcAddress(const AuROString &mod, const AuRONString &symbol)