2007-11-10 Alp Toker <alp@atoker.com>

[mono.git] / samples / embed / teste.c

diff --git a/samples/embed/teste.c b/samples/embed/teste.c
index d67720a145f7194cf2d2049bc4642f340ed485a1..258d8aa5fa8d0dd5becdaff2842d4fe27fc9094b 100644 (file)
--- a/samples/embed/teste.c
+++ b/samples/embed/teste.c
@@ -1,5 +1,6 @@
 #include <mono/jit/jit.h>
 #include <mono/metadata/environment.h>
+#include <stdlib.h>
 
 /*
  * Very simple mono embedding example.
@@ -15,21 +16,11 @@ gimme () {
        return mono_string_new (mono_domain_get (), "All your monos are belong to us!");
 }
 
-typedef struct
+static void main_function (MonoDomain *domain, const char *file, int argc, char** argv)
 {
-       MonoDomain *domain;
-       const char *file;
-       int argc;
-       char **argv;
-} MainThreadArgs;
-
-static void main_thread_handler (gpointer user_data)
-{
-       MainThreadArgs *main_args=(MainThreadArgs *)user_data;
        MonoAssembly *assembly;
 
-       assembly = mono_domain_assembly_open (main_args->domain,
-                                             main_args->file);
+       assembly = mono_domain_assembly_open (domain, file);
        if (!assembly)
                exit (2);
        /*
@@ -37,8 +28,7 @@ static void main_thread_handler (gpointer user_data)
         * The return value needs to be looked up from
         * System.Environment.ExitCode.
         */
-       mono_jit_exec (main_args->domain, assembly, main_args->argc,
-                      main_args->argv);
+       mono_jit_exec (domain, assembly, argc, argv);
 }
 
 
@@ -47,13 +37,19 @@ main(int argc, char* argv[]) {
        MonoDomain *domain;
        const char *file;
        int retval;
-       MainThreadArgs main_args;
        
        if (argc < 2){
-               fprintf (stderr, "Please provide an assembly to load");
+               fprintf (stderr, "Please provide an assembly to load\n");
                return 1;
        }
        file = argv [1];
+
+       /*
+        * Load the default Mono configuration file, this is needed
+        * if you are planning on using the dllmaps defined on the
+        * system configuration
+        */
+       mono_config_parse (NULL);
        /*
         * mono_jit_init() creates a domain: each assembly is
         * loaded and run in a MonoDomain.
@@ -65,15 +61,9 @@ main(int argc, char* argv[]) {
         */
        mono_add_internal_call ("MonoEmbed::gimme", gimme);
 
-       main_args.domain=domain;
-       main_args.file=file;
-       main_args.argc=argc-1;
-       main_args.argv=argv+1;
-       
-       mono_runtime_exec_managed_code (domain, main_thread_handler,
-                                       &main_args);
+       main_function (domain, file, argc - 1, argv + 1);
        
-       retval=mono_environment_exitcode_get ();
+       retval = mono_environment_exitcode_get ();
        
        mono_jit_cleanup (domain);
        return retval;