Changeset 133

Timestamp:

Dec 3, 2006, 9:37:54 AM (19 years ago)

Author:

cinc

Message:

Added initialization call for garbage collector.

Location:

trunk/emx-wrapper

Files:

• makefile.emx (modified) (2 diffs)
• voyager-desktop.c (modified) (4 diffs)

trunk/emx-wrapper/makefile.emx

@@ -10 +10 @@
 GCCLDFLAGS      =       -Zmt
 
-OBJDIR  =       .
+OBJDIR          =       ./../../../o
 CDIR    =       .
+
+GCLIB           =       -l$(OBJDIR)/gc
 
 OBJECTS         =       voyager-desktop.o
@@ -19 +21 @@
 
 voyager-desktop.exe:    voyager-desktop.c
-        $(CC)  -o $@ voyager-desktop.c $(LIBS) $(GCCFLAGS)
+        $(CC)  -o $@ voyager-desktop.c $(LIBS) $(GCLIB) $(GCCFLAGS)
 
 

trunk/emx-wrapper/voyager-desktop.c

@@ -48 +48 @@
   HMODULE hModule;
   HMODULE hModuleGTK;
+  HMODULE hModuleGC;
   PFN proc;
 
+  /*
+    Initialize the garbage collector.
+   */
+  if((rc=DosLoadModule(uchrError, sizeof(uchrError),"vdesktop.dll", &hModuleGC))!=NO_ERROR)
+    {
+      printf("DosLoadmodule for vdesktop.dll failed with rc=0x%x because of module %s.\n", (int)rc, uchrError);
+      return 1;
+    };
+  fprintf(stderr, "DLL handle for Vdesktop.dll is: 0x%x\n", (int)hModuleGC);
+  if((rc = DosQueryProcAddr(hModuleGC,                  /* Handle to module           */
+                            0L,                         /* No ProcName specified      */
+                            "initGarbageCollection",    /* ProcName (not specified)   */
+                            &proc))!=NO_ERROR)          /* Address returned           0 */
+    {
+       fprintf(stderr, "DosQueryProcAddr for initGarbageCollection() failed with rc=0x%x\n",(int) rc);
+      return 1;
+    }
+  fprintf(stderr, "   Proc address for initGarbageCollection() is: 0x%x\n", (int)proc);
+  proc();
+
+  /*
+    Init GTK
+   */
   if((rc=DosLoadModule(uchrError, sizeof(uchrError),"gtk2.dll", &hModuleGTK))!=NO_ERROR)
     {
@@ -56 +80 @@
     };
   fprintf(stderr, "DLL handle for gtk2.dll is: 0x%x\n", (int) hModuleGTK);
-  if((rc = DosQueryProcAddr(hModuleGTK,         /* Handle to module           */
-                        0L,                  /* No ProcName specified      */
-                        "gtk_init"    ,                 /* ProcName (not specified)   */
-                            &proc))!=NO_ERROR)         /* Address returned           0 */
+  if((rc = DosQueryProcAddr(hModuleGTK,                /* Handle to module           */
+                            0L,                        /* No ProcName specified      */
+                            "gtk_init",                /* ProcName (not specified)   */
+                            &proc))!=NO_ERROR)         /* Address returned         0 */
     {
        fprintf(stderr, "DosQueryProcAddr for gtk_init() failed with rc=0x%x\n",(int) rc);
-       DosFreeModule(hModule);
+       DosFreeModule(hModuleGC);
       return 1;
     }
@@ -78 +102 @@
     };
   fprintf(stderr, "DLL handle for Vdesktop.dll is: 0x%x\n", (int)hModule);
-  if((rc = DosQueryProcAddr(hModule,         /* Handle to module           */
-                        0L,                  /* No ProcName specified      */
-                        "main_loop"    ,                 /* ProcName (not specified)   */
-                            &proc))!=NO_ERROR)         /* Address returned           0 */
+  if((rc = DosQueryProcAddr(hModule,                /* Handle to module           */
+                            0L,                     /* No ProcName specified      */
+                            "main_loop"    ,        /* ProcName (not specified)   */
+                            &proc))!=NO_ERROR)      /* Address returned           0 */
     {
        fprintf(stderr, "DosQueryProcAddr for main_loop() failed with rc=0x%x\n",(int) rc);
-       DosFreeModule(hModule);
+       DosFreeModule(hModuleGTK);
+       DosFreeModule(hModuleGC);
       return 1;
     }
@@ -97 +122 @@
   DosFreeModule(hModuleGTK);
 
+  DosFreeModule(hModuleGC);
+
   return 0; 
 }