Use a different mechanism for passing the user main to al_run_main.

SiegeLordEx · SiegeLord · commit 0beabc3b461e · 2024-10-30T22:45:50.000-07:00
This one doesn't crash on MacOS when using bundles. Fixes #56
diff --git a/allegro5/system.d b/allegro5/system.d
@@ -13,6 +13,8 @@ extern (C) void rt_moduleTlsDtor();
 
 int al_run_allegro(scope int delegate() user_main)
 {
+	__gshared int delegate() user_main_inner;
+	user_main_inner = user_main;
 	extern(C) static int main_runner(int argc, char** argv)
 	{
 		version(OSX)
@@ -21,7 +23,7 @@ int al_run_allegro(scope int delegate() user_main)
 			rt_moduleTlsCtor();
 		}
 
-		auto main_ret = (*cast(int delegate()*)argv[0])();
+		auto main_ret = user_main_inner();
 
 		version(OSX)
 		{
@@ -32,8 +34,7 @@ int al_run_allegro(scope int delegate() user_main)
 		return main_ret;
 	}
 
-	char* fake_arg = cast(char*)&user_main;
-	return al_run_main(0, &fake_arg, &main_runner);
+	return al_run_main(0, null, &main_runner);
 }
 
 nothrow @nogc extern (C)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ extern (C) void rt_moduleTlsDtor();`
`13`	`13`
`14`	`14`	`int al_run_allegro(scope int delegate() user_main)`
`15`	`15`	`{`
	`16`	`+ __gshared int delegate() user_main_inner;`
	`17`	`+ user_main_inner = user_main;`
`16`	`18`	`extern(C) static int main_runner(int argc, char** argv)`
`17`	`19`	`{`
`18`	`20`	`version(OSX)`
`@@ -21,7 +23,7 @@ int al_run_allegro(scope int delegate() user_main)`
`21`	`23`	`rt_moduleTlsCtor();`
`22`	`24`	`}`
`23`	`25`
`24`		`- auto main_ret = (cast(int delegate())argv[0])();`
	`26`	`+ auto main_ret = user_main_inner();`
`25`	`27`
`26`	`28`	`version(OSX)`
`27`	`29`	`{`
`@@ -32,8 +34,7 @@ int al_run_allegro(scope int delegate() user_main)`
`32`	`34`	`return main_ret;`
`33`	`35`	`}`
`34`	`36`
`35`		`- char* fake_arg = cast(char*)&user_main;`
`36`		`- return al_run_main(0, &fake_arg, &main_runner);`
	`37`	`+ return al_run_main(0, null, &main_runner);`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`nothrow @nogc extern (C)`