[[libsystem]] Ensure programs call MCSInitialize() & MCSFinalize()

peter-b · peter-b · commit 6d4d14a70fe2 · 2015-01-22T11:23:24.000Z
diff --git a/engine/src/dsklnxmain.cpp b/engine/src/dsklnxmain.cpp
@@ -57,7 +57,8 @@ int main(int argc, char *argv[], char *envp[])
 	MCsysencoding = strclone(nl_langinfo(CODESET));
 	
 	extern bool MCModulesInitialize();
-	if (!MCInitialize() || !MCModulesInitialize() || !MCScriptInitialize())
+	if (!MCInitialize() || !MCSInitialize() ||
+	    !MCModulesInitialize() || !MCScriptInitialize())
 		exit(-1);
     
 	// Convert the argv array to StringRefs
diff --git a/engine/src/dskosxmain.mm b/engine/src/dskosxmain.mm
@@ -64,7 +64,7 @@ int main(int argc, char *argv[], char *envp[])
 	// MW-2011-08-18: [[ Bug ]] Make sure we initialize Cocoa on startup.
 	NSApplicationLoad();
 	
-	if (!MCInitialize() || !MCScriptInitialize())
+	if (!MCInitialize() || !MCSInitialize() || !MCScriptInitialize())
 		exit(-1);
 	
 	// On OSX, argv and envp are encoded as UTF8
diff --git a/engine/src/dskw32main.cpp b/engine/src/dskw32main.cpp
@@ -206,7 +206,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	}
 
     extern bool MCModulesInitialize();
-	if (!MCInitialize() || !MCModulesInitialize() || !MCScriptInitialize())
+    if (!MCInitialize() || !MCSInitialize() ||
+        !MCModulesInitialize() || !MCScriptInitialize())
 		exit(-1);
 	
     // Ensure the command line variable gets set
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -1981,7 +1981,8 @@ int main(int argc, char *argv[], char *envp[])
 	CGDisplayRegisterReconfigurationCallback(display_reconfiguration_callback, nil);
     
     extern bool MCModulesInitialize();
-	if (!MCInitialize() || !MCModulesInitialize() || !MCScriptInitialize())
+	if (!MCInitialize() || !MCSInitialize() ||
+	    !MCModulesInitialize() || !MCScriptInitialize())
 		exit(-1);
     
 	// On OSX, argv and envp are encoded as UTF8
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -1794,6 +1794,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doKeyboardHidde
 JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doCreate(JNIEnv *env, jobject object, jobject activity, jobject container, jobject view)
 {
     MCInitialize();
+    MCSInitialize();
     MCModulesInitialize();
     MCScriptInitialize();
     
diff --git a/engine/src/mbliphoneapp.mm b/engine/src/mbliphoneapp.mm
@@ -2013,7 +2013,8 @@ MC_DLLEXPORT int main(int argc, char *argv[], char *envp[])
 	}
 #endif
 	
-    if (!MCInitialize() || !MCModulesInitialize() || !MCScriptInitialize())
+    if (!MCInitialize() || !MCSInitialize() ||
+        !MCModulesInitialize() || !MCScriptInitialize())
         return -1;
     
 	int t_exit_code;
diff --git a/engine/src/srvmain.cpp b/engine/src/srvmain.cpp
@@ -610,7 +610,8 @@ extern void MCModulesFinalize();
 
 int main(int argc, char *argv[], char *envp[])
 {
-	if (!MCInitialize() || !MCModulesInitialize() || !MCScriptInitialize())
+	if (!MCInitialize() || !MCSInitialize() ||
+	    !MCModulesInitialize() || !MCScriptInitialize())
 		exit(-1);
     
 // THIS IS MAC SPECIFIC AT THE MOMENT BUT SHOULD WORK ON LINUX
diff --git a/engine/src/sysdefs.h b/engine/src/sysdefs.h
@@ -123,6 +123,13 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include <foundation-objc.h>
 #endif
 
+//////////////////////////////////////////////////////////////////////
+//
+//  FOUNDATION SYSTEM LIBRARY
+//
+
+#include <foundation-system.h>
+
 //////////////////////////////////////////////////////////////////////
 //
 //  LEGACY INCLUDES AND DEFINES
diff --git a/toolchain/lc-compile/src/test.cpp b/toolchain/lc-compile/src/test.cpp
@@ -16,6 +16,7 @@
 
 #include "foundation.h"
 #include "foundation-auto.h"
+#include "foundation-system.h"
 #include "script.h"
 
 extern "C" void MCStringExecPutStringAfter(void);
@@ -66,6 +67,7 @@ int main(int argc, char *argv[])
     }
     
     MCInitialize();
+    MCSInitialize();
     MCScriptInitialize();
     
     // Skip command arg.

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`extern bool MCModulesInitialize();`
`209`		`- if (!MCInitialize() \|\| !MCModulesInitialize() \|\| !MCScriptInitialize())`
	`209`	`+ if (!MCInitialize() \|\| !MCSInitialize() \|\|`
	`210`	`+ !MCModulesInitialize() \|\| !MCScriptInitialize())`
`210`	`211`	`exit(-1);`
`211`	`212`
`212`	`213`	`// Ensure the command line variable gets set`
Original file line number	Diff line number	Diff line change
`@@ -1794,6 +1794,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doKeyboardHidde`
`1794`	`1794`	`JNIEXPORT void JNICALL Java_com_runrev_android_Engine_doCreate(JNIEnv *env, jobject object, jobject activity, jobject container, jobject view)`
`1795`	`1795`	`{`
`1796`	`1796`	`MCInitialize();`
	`1797`	`+ MCSInitialize();`
`1797`	`1798`	`MCModulesInitialize();`
`1798`	`1799`	`MCScriptInitialize();`
`1799`	`1800`
Original file line number	Diff line number	Diff line change
`@@ -2013,7 +2013,8 @@ MC_DLLEXPORT int main(int argc, char argv[], char envp[])`
`2013`	`2013`	`}`
`2014`	`2014`	`#endif`
`2015`	`2015`
`2016`		`- if (!MCInitialize() \|\| !MCModulesInitialize() \|\| !MCScriptInitialize())`
	`2016`	`+ if (!MCInitialize() \|\| !MCSInitialize() \|\|`
	`2017`	`+ !MCModulesInitialize() \|\| !MCScriptInitialize())`
`2017`	`2018`	`return -1;`
`2018`	`2019`
`2019`	`2020`	`int t_exit_code;`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,8 @@ extern void MCModulesFinalize();`
`610`	`610`
`611`	`611`	`int main(int argc, char argv[], char envp[])`
`612`	`612`	`{`
`613`		`- if (!MCInitialize() \|\| !MCModulesInitialize() \|\| !MCScriptInitialize())`
	`613`	`+ if (!MCInitialize() \|\| !MCSInitialize() \|\|`
	`614`	`+ !MCModulesInitialize() \|\| !MCScriptInitialize())`
`614`	`615`	`exit(-1);`
`615`	`616`
`616`	`617`	`// THIS IS MAC SPECIFIC AT THE MOMENT BUT SHOULD WORK ON LINUX`