Changeset 326 for trunk/nom/src/nomgc.c

Timestamp:

Apr 9, 2008, 10:22:08 PM (17 years ago)

Author:

cinc

Message:

Portability patches for Windows, Linux, Darwin by Bird.

File:

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

trunk/nom/src/nomgc.c

@@ -37 +37 @@
  */
 
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_DOSMEMMGR
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# define INCL_DOSERRORS
+# define INCL_DOSMEMMGR
+# include <os2.h>
+#endif /* __OS2__ */
 
 #include <stdio.h>
@@ -83 +85 @@
   memory functions as the GLIB default allocation function.
  */
+#ifdef __OS2__
 void _System  nomInitGarbageCollection(void* pMemInExe)
+#else
+void nomInitGarbageCollection(void* pMemInExe)
+#endif
 {
  GMemVTable vtbl={0};
@@ -98 +104 @@
 
  /* Cretea tree holding the already registered DLLs */
+#ifdef _MSC_VER 
  treeRegisteredDLL=g_tree_new((GCompareFunc)stricmp);
+#else 
+ treeRegisteredDLL=g_tree_new((GCompareFunc)strcasecmp);
+#endif
 
  bUseGC=TRUE;
@@ -104 +114 @@
 
 
+#ifdef __OS2__
 void test()
 {
@@ -110 +121 @@
   HMODULE hModule;
 
-  if(DosQueryModFromEIP( &hModule, &ulObj, CCHMAXPATH, thePath, &ulOffset, (ULONG)test)!=0) {
+  if(DosQueryModFromEIP( &hModule, &ulObj, CCHMAXPATH, thePath, &ulOffset, (gulong)test)!=0) {
     hModule=0;
     return ; /* Error */
@@ -116 +127 @@
 
 }
+#endif /* __OS2__ */
 
 NOMEXTERN void NOMLINK  nomRegisterDataAreaForGC(char* pStart, char* pEnd)
@@ -122 +134 @@
 }
 
+#ifdef __OS2__
+
 static void qsAddDLLToList(HREGDLL hReg, qsLrec_t* rec)
 {
-  if(NULLHANDLE==g_slist_find(hReg->dllList, rec))
+  if(NULL==g_slist_find(hReg->dllList, rec))
     hReg->dllList=g_slist_append(hReg->dllList, rec);
 }
@@ -160 +174 @@
       /* g_message("%d Checking: %x -> %04X (%s)", a, pModRec, pModRec->hmte, pModRec->pName); */
 
-      if (NULLHANDLE==pModRec->pObjInfo   && pModRec->ctObj > 0)
+      if (NULL==pModRec->pObjInfo   && pModRec->ctObj > 0)
         {
           pModRec->pObjInfo = (qsLObjrec_t*)((char*)pModRec
@@ -179 +193 @@
 }
 
+
 /**
    Get the info about the current DLLs from OS/2. Go over all found
@@ -187 +202 @@
 NOMEXTERN HREGDLL NOMLINK nomBeginRegisterDLLWithGC(void)
 {
-  ULONG rc;
-  HREGDLL hReg=NULLHANDLE;
+  gulong rc;
+  HREGDLL hReg=NULL;
   PTIB     ptib;
   PPIB     ppib;
   char *  buf;
-  HREGDLL  pRegDLL=NULLHANDLE;
+  HREGDLL  pRegDLL=NULL;
 
   rc = DosGetInfoBlocks(&ptib, &ppib);
   if (rc!=NO_ERROR)
-    return NULLHANDLE;
+    return NULL;
 
   buf = malloc(BUFSIZE);
   if(!buf)
-    return NULLHANDLE;
+    return NULL;
 
   pRegDLL =(HREGDLL) malloc(sizeof(REGDLL));
   if(!pRegDLL){
     free(buf);
-    return NULLHANDLE;
+    return NULL;
   }
-  pRegDLL->dllList=NULLHANDLE;
+  pRegDLL->dllList=NULL;
 
   memset(buf,0,BUFSIZE);
@@ -303 +318 @@
 #define OBJWRITE        0x0002L
 #define OBJINVALID      0x0080L
-NOMEXTERN BOOL NOMLINK nomRegisterDLLByName(const HREGDLL hRegisterDLL, const char* chrDLLName)
+NOMEXTERN gboolean NOMLINK nomRegisterDLLByName(const HREGDLL hRegisterDLL, const char* chrDLLName)
 {
   GSList* lTemp;
@@ -316 +331 @@
       if(pModRec){
         //  g_message("DLL name: %s", pModRec->pName);
-        if(pModRec->pName && (NULLHANDLE!=strstr( pModRec->pName, chrDLLName)))
+        if(pModRec->pName && (NULL!=strstr( pModRec->pName, chrDLLName)))
           {
             qsLObjrec_t  *pObjInfo;
             //g_message("    --> Found DLL %s", pModRec->pName);
             pObjInfo=pModRec->pObjInfo;
-            if(NULLHANDLE!=pObjInfo)
+            if(NULL!=pObjInfo)
               {
                 int iObj;
@@ -344 +359 @@
 }
 
-
-NOMEXTERN BOOL NOMLINK nomQueryUsingNameIsDLLRegistered(const gchar *chrName)
-{
-  if(NULLHANDLE!=g_tree_lookup(treeRegisteredDLL, chrName))
+//#elif defined(_WIN32)
+#else /* PORTME */
+
+NOMEXTERN HREGDLL NOMLINK nomBeginRegisterDLLWithGC(void)
+{
+    HREGDLL pRegDLL;
+
+    pRegDLL =(HREGDLL) malloc(sizeof(REGDLL));
+    if(pRegDLL)
+      pRegDLL->dllList=NULL;
+    return pRegDLL;
+}
+
+NOMEXTERN void NOMLINK nomEndRegisterDLLWithGC(const HREGDLL hRegisterDLL )
+{
+}
+
+NOMEXTERN gboolean NOMLINK nomRegisterDLLByName(const HREGDLL hRegisterDLL, const char* chrDLLName)
+{
     return TRUE;
+}
+
+#endif
+
+NOMEXTERN gboolean NOMLINK nomQueryUsingNameIsDLLRegistered(const gchar *chrName)
+{
+  if(NULL!=g_tree_lookup(treeRegisteredDLL, chrName))
+    return TRUE;
 
   return FALSE;