Changeset 286

Timestamp:

Apr 1, 2007, 10:44:04 AM (18 years ago)

Author:

cinc

Message:

Fixed DLL registering with the GC. See ticket #7.

File:

• trunk/nom/src/nomgc.c (modified) (7 diffs)

trunk/nom/src/nomgc.c ¶

@@ -146 +146 @@
 #endif
 
-/*
-  Find a library record in the buffer filled by DosQuerySysState().
+/**
+  Find a library record in the buffer filled by DosQuerySysState(). This function
+  searches in the list of all known libs, not in the process libs list.
  */
 static qsLrec_t* qsFindModuleRec(const qsPtrRec_t * hRegisterDLL,  USHORT hMod){
@@ -157 +158 @@
     {
       a++;
-      /* printf("%d Checking: %x -> %04X (%s)\n", a, pModRec, pModRec->hmte, pModRec->pName); */
+      /* g_message("%d Checking: %x -> %04X (%s)", a, pModRec, pModRec->hmte, pModRec->pName); */
 
       if (NULLHANDLE==pModRec->pObjInfo   && pModRec->ctObj > 0)
@@ -178 +179 @@
 }
 
+/**
+   Get the info about the current DLLs from OS/2. Go over all found
+   DLLs and insert them in a list. For all found DLLs go over the imports
+   of them and add them to the list etc. Duplicates are ignored.
+ */
 #define BUFSIZE 1024*1024
 NOMEXTERN HREGDLL NOMLINK nomBeginRegisterDLLWithGC(void)
@@ -213 +219 @@
     pRegDLL->pMainAnchor=(qsPtrRec_t*) buf;
 
+    /* Pointer to process information */
     p=pRegDLL->pMainAnchor->pProcRec;
 
     while(p && p->RecType == 1)
       {
-
-        if (p->cLib) {
+        qsLrec_t * pModRec; /* Info about a DLL */
+
+        /* Get record for executable */
+        pModRec=qsFindModuleRec(pRegDLL->pMainAnchor,  p->hMte);
+        if(pModRec){
+          //if(pModRec->pName)
+          //g_message("exe) %s", pModRec->pName);
+          qsAddDLLToList(pRegDLL, pModRec);
+        }
+
+        if (p->cLib) { /* Number of lib imports */
           int i;
 
           for (i=0; i<p->cLib; i++){
-            qsLrec_t * pModRec;
-
             pModRec=qsFindModuleRec(pRegDLL->pMainAnchor,  p->pLibRec[i]);
 
             if(pModRec){
-              //  if(pModRec->pName)
-              //g_message("%s", pModRec->pName);
+              //if(pModRec->pName)
+              //g_message("a) %s", pModRec->pName);
               qsAddDLLToList(pRegDLL, pModRec);
             }
@@ -262 +276 @@
                 if(pModImp){
                   //if(pModImp->pName)
-                  //  g_message("%s", pModImp->pName);
+                  //g_message("b) %s", pModImp->pName);
                   qsAddDLLToList(pRegDLL, pModImp);
                 }
@@ -293 +307 @@
   GSList* lTemp;
 
-  //g_message("Trying to register DLL %s\n", chrDLLName);
+  //g_message("Trying to register DLL %s", chrDLLName);
   lTemp=hRegisterDLL->dllList;
   while(lTemp)
@@ -301 +315 @@
       pModRec=(qsLrec_t*)lTemp->data;
       if(pModRec){
-        //g_message("DLL name: %s\n", pModRec->pName);
+        //  g_message("DLL name: %s", pModRec->pName);
         if(pModRec->pName && (NULLHANDLE!=strstr( pModRec->pName, chrDLLName)))
           {