Skip to content

Improve error handling and document unsafe requirements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve error handling and document unsafe requirements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions Launcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Linq;
using Velopack;

// 'partial' is required because LibraryImport generates partial methods.
// Removing this modifier will result in build errors.
public static partial class Launcher
{
// --- Win32 API P/Invoke definitions ---
Expand Down Expand Up @@ -36,12 +39,12 @@ public static partial class Launcher
[STAThread]
static int Main(string[] args)
{
// 1. Initialize Velopack
VelopackApp.Build().Run();

IntPtr hUnityPlayer = IntPtr.Zero;
try
{
// 1. Initialize Velopack
VelopackApp.Build().Run();

// 2. Load UnityPlayer.dll
string unityPlayerPath = Path.Combine(AppContext.BaseDirectory, "UnityPlayer.dll");
hUnityPlayer = LoadLibraryW(unityPlayerPath);
Expand All @@ -62,7 +65,11 @@ static int Main(string[] args)

// 5. Prepare arguments for UnityMain
IntPtr hInstance = GetModuleHandleW(null); // Get instance handle of the executable
string commandLine = string.Join(" ", args); // Command line arguments
if (hInstance == IntPtr.Zero)
{
throw new Win32Exception(Marshal.GetLastWin32Error(), "Failed to get module handle.");
}
string commandLine = string.Join(" ", args.Select(a => "\"" + a.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"")); // Command line arguments

// 6. Call UnityMain
int exitCode = unityMain(hInstance, IntPtr.Zero, commandLine, SW_SHOWDEFAULT);
Expand All @@ -85,7 +92,12 @@ static int Main(string[] args)
// 7. Ensure loaded library is freed
if (hUnityPlayer != IntPtr.Zero)
{
FreeLibrary(hUnityPlayer);
bool freed = FreeLibrary(hUnityPlayer);
if (!freed)
{
int error = Marshal.GetLastWin32Error();
ShowError($"Failed to free UnityPlayer.dll: {new Win32Exception(error).Message}");
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Launcher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ApplicationManifest>Launcher.manifest</ApplicationManifest>
<!-- Target platform architecture -->
<PlatformTarget>x64</PlatformTarget>
<!-- Allow unsafe code blocks if needed -->
<!-- Required: LibraryImport-generated code uses unsafe pointers -->
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<!-- Versioning -->
Expand Down