Changeset 284

Timestamp:

Mar 31, 2007, 6:15:56 PM (18 years ago)

Author:

cinc

Message:

Use new IDL compiler

Location:

trunk/nom

Files:

• Makefile (modified) (1 diff)
• include/nomgc.h (modified) (1 diff)
• src/nomgc.c (modified) (4 diffs)
• src/nomtkinit.c (modified) (1 diff)

trunk/nom/Makefile

@@ -75 +75 @@
         @echo "[33;1;mLinking "$@"...[0;m"
         cmd.exe /C create_vobjtk_def $(OBJDIR)/nobjtk.def
-        $(CC) $(GCCLDFLAGS)  -o $@ $(OBJECTS) $(LIBS) $(ADDLIBS) $(GCLIB) $(OBJDIR)/nobjtk.def
+        $(CC) $(GCCLDFLAGS) -Zmap -o $@ $(OBJECTS) $(LIBS) $(ADDLIBS) $(GCLIB) $(OBJDIR)/nobjtk.def
         emximp -o $(OBJDIR)/$(basename $(notdir $@)).a $(OBJDIR)/nobjtk.def
         @echo "[32;1;mDone linking "$@"...[0;m"

trunk/nom/include/nomgc.h

@@ -43 +43 @@
 
 /* Garbage collector */
+void _System nomInitGarbageCollection(void* pMemPtr); //The parameter will go away
 NOMEXTERN HREGDLL NOMLINK nomBeginRegisterDLLWithGC(void);
 NOMEXTERN void NOMLINK nomEndRegisterDLLWithGC(const HREGDLL hRegisterDLL );

trunk/nom/src/nomgc.c

@@ -112 +112 @@
   if(DosQueryModFromEIP( &hModule, &ulObj, CCHMAXPATH, thePath, &ulOffset, (ULONG)test)!=0) {
     hModule=0;
-    return NULLHANDLE; /* Error */
+    return ; /* Error */
   }
 
@@ -227 +227 @@
 
             if(pModRec){
-              //if(pModRec->pName)
+              //  if(pModRec->pName)
               //g_message("%s", pModRec->pName);
               qsAddDLLToList(pRegDLL, pModRec);
@@ -240 +240 @@
        the list we touch every DLL and check every import. Import cycles are no problem, because
        later duplicates are ignored. */
+    //g_message("\n\n");
     lTemp=pRegDLL->dllList;
     while(lTemp)
@@ -259 +260 @@
                 
                 pModImp=qsFindModuleRec(pRegDLL->pMainAnchor,  pImpHmte[iImps]);
-                if(pModImp)
+                if(pModImp){
+                  //if(pModImp->pName)
+                  //  g_message("%s", pModImp->pName);
                   qsAddDLLToList(pRegDLL, pModImp);
+                }
               }/* for()*/
           }/* if() */
         lTemp=g_slist_next(lTemp);
       };/* while() */
-    //qsPrintDLLList();
+    //  qsPrintDLLList();
     hReg=pRegDLL;
   }

trunk/nom/src/nomtkinit.c

@@ -161 +161 @@
 #endif
   NOMClassMgrObject=NOMClassMgrNew();
+
   if(!NOMClassMgrObject)
     g_error("Can't create the NOMClassMgr class object!\n");