GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error when loading project on non-ASCII path

Browse Source 
#1439
This commit is contained in:
Wojtek Figat
2023-09-25 16:34:01 +02:00
parent 96b6313acb
commit c374127de1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Engine/NativeInterop.Unmanaged.cs
View File

@@ -853,7 +853,7 @@ namespace FlaxEngine.Interop
} }
try try
{ {
string assemblyPath = Marshal.PtrToStringAnsi(assemblyPathPtr); string assemblyPath = Marshal.PtrToStringUni(assemblyPathPtr);
Assembly assembly; Assembly assembly;
#if FLAX_EDITOR #if FLAX_EDITOR

3
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -703,11 +703,10 @@ bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePa
{ {
// TODO: Use new hostfxr delegate load_assembly_bytes? (.NET 8+) // TODO: Use new hostfxr delegate load_assembly_bytes? (.NET 8+)
// Open .Net assembly // Open .Net assembly
const StringAnsi assemblyPathAnsi = assemblyPath.ToStringAnsi();
const char* name = nullptr; const char* name = nullptr;
const char* fullname = nullptr; const char* fullname = nullptr;
static void* LoadAssemblyImagePtr = GetStaticMethodPointer(TEXT("LoadAssemblyImage")); static void* LoadAssemblyImagePtr = GetStaticMethodPointer(TEXT("LoadAssemblyImage"));
_handle = CallStaticMethod<void*, const char*, const char**, const char**>(LoadAssemblyImagePtr, assemblyPathAnsi.Get(), &name, &fullname); _handle = CallStaticMethod<void*, const Char*, const char**, const char**>(LoadAssemblyImagePtr, assemblyPath.Get(), &name, &fullname);
MCore::GC::FreeMemory((void*)name); MCore::GC::FreeMemory((void*)name);
MCore::GC::FreeMemory((void*)fullname); MCore::GC::FreeMemory((void*)fullname);
if (_handle == nullptr) if (_handle == nullptr)