Changeset 219 for trunk/nom/src/nomtkinit.c

Timestamp:

Feb 3, 2007, 6:59:37 PM (19 years ago)

Author:

cinc

Message:

Added doxygen tags. Some minor changes to NOMClass.

File:

• trunk/nom/src/nomtkinit.c (modified) (6 diffs)

trunk/nom/src/nomtkinit.c

@@ -16 +16 @@
 * The Initial Developer of the Original Code is
 * netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
-* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* Portions created by the Initial Developer are Copyright (C) 2005-2007
 * the Initial Developer. All Rights Reserved.
 *
@@ -100 +100 @@
 
 
+NOMEXTERN PNOM_ENV NOMLINK nomTkInit(void)
+{
+  PVOID memPtr;
+
+  if(pGlobalNomEnv)
+    return pGlobalNomEnv; /* Already done */
+
+  nomPrintf("Entering %s...\n", __FUNCTION__);
+
+  memPtr=g_malloc(sizeof(NOM_ENV)); /* g_malloc() can't fail... */
+
+  nomPrintf("%s: Got root memory: %x\n", __FUNCTION__, memPtr);
+
+  /* Now init the structure */
+  /* GC memory is zeroed... */
+  ((PNOM_ENV)memPtr)->cbSize=sizeof(NOM_ENV);
+  pGlobalNomEnv=(PNOM_ENV)memPtr;
+
+  return (PNOM_ENV)memPtr;
+}
+
 
 /*
@@ -117 +138 @@
 #endif
 
+
 #ifdef DEBUG_NOMENVNEW
   nomPrintf("Entering %s to initialize NOM runtime.\n\n", __FUNCTION__);
   nomPrintf("**** Building NOMObject class...\n");
 #endif
+  nomTkInit();
+
   nomCls=NOMObjectNewClass(NOMObject_MajorVersion, NOMObject_MinorVersion);
 
@@ -142 +166 @@
 
   /* Now register the classes we already have */
-  //  _nomRegisterClass(NOMClassMgrObject,   pGlobalNomEnv->defaultMetaClass->mtab, NULLHANDLE); //NOMClass
   _nomClassReady(pGlobalNomEnv->defaultMetaClass, NULLHANDLE); //NOMClass
-  //_nomRegisterClass(NOMClassMgrObject,   NOMClassMgrObject->mtab, NULLHANDLE); //NOMClassMgr
   _nomClassReady(  _NOMClassMgr, NULLHANDLE); //NOMClassMgr
   ncPriv=(NOMClassPriv*)pGlobalNomEnv->nomObjectMetaClass->mtab->nomClsInfo;
@@ -150 +172 @@
   /* Do not register the NOMObject metaclass here. It's already registered because it's 
      NOMClass in fact. */
-  //_nomRegisterClass(NOMClassMgrObject, pGlobalNomEnv->nomObjectMetaClass->mtab, NULLHANDLE); //NOMObject
   _nomClassReady(_NOMObject, NULLHANDLE); //NOMObject
 
@@ -180 +201 @@
 
 
-NOMEXTERN PNOM_ENV NOMLINK nomTkInit(void)
-{
-  PVOID memPtr;
-  //PVOID memPool;
-
-  nomPrintf("Entering %s...\n", __FUNCTION__);
-
-  memPtr=g_malloc(sizeof(NOM_ENV)); /* g_malloc() can't fail... */
-
-  nomPrintf("%s: Got root memory: %x\n", __FUNCTION__, memPtr);
-
-  /* Now init the structure */
-  /* GC memory is zeroed... */
-  ((PNOM_ENV)memPtr)->cbSize=sizeof(NOM_ENV);
-  pGlobalNomEnv=(PNOM_ENV)memPtr;
-
-#if 0
-  if(NO_ERROR!=DosCreateMutexSem(NULL, &((PNOM_ENV)memPtr)->hmtx, DC_SEM_SHARED, FALSE))
-    {
-      g_free(memPtr);
-      return NULL;
-    }
-#endif
-
-  return (PNOM_ENV)memPtr;
-}
-
-
-
-
-
-
-
-
-
-
-
+NOMEXTERN void NOMLINK nomTkUnInit(gpointer pReserved)
+{
+  /* Nothing yet...*/
+}
+
+NOMEXTERN void NOMLINK nomEnvironmentEnd (void)
+{
+  nomTkUnInit(NULL);
+}
+
+
+
+
+
+
+
+
+
+