Changeset 105 for trunk/desktop/class_c/wpobject.c

Timestamp:

Nov 25, 2006, 8:56:42 PM (19 years ago)

Author:

cinc

Message:

Implemented wpAllocMem() and wpFreeMem

File:

• trunk/desktop/class_c/wpobject.c (modified) (2 diffs)

trunk/desktop/class_c/wpobject.c

@@ -47 +47 @@
 #include "wpobject.ih"
 
+#include "desktoptypes.h"
+
 NOM_Scope gpointer NOMLINK impl_WPObject_wpAllocMem(WPObject* nomSelf, const CORBA_unsigned_long cbBytes,
                                                     CORBA_unsigned_long* prc, CORBA_Environment *ev)
 {
+
 /* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
-  gpointer nomRetval;
+  gpointer ptrMem=NULLHANDLE;
+  PUSEITEM pui;
 
-  return nomRetval;
+  /* Add mem for the inuse list structures */
+  ptrMem=NOMMalloc(cbBytes+sizeof(USEITEM)+sizeof(MEMORYITEM));
+
+  if(!ptrMem) {
+    if(prc)
+      *prc=(gulong)NOMERROR_NOT_ENOUGH_MEMORY;
+    return NULLHANDLE;
+  }
+
+  /* Fill the structures */
+  pui=(PUSEITEM)ptrMem;
+  pui->type=(ULONG)USAGE_MEMORY;
+  pui++;
+  ((MEMORYITEM*)pui)->cbBuffer=cbBytes;
+  
+#warning !!!!! Memory is not in inuse list !!!!!
+  /* Add memory to in use list */
+  //_wpAddToObjUseList(somSelf, (PUSEITEM)pMem);
+  
+  return ptrMem+sizeof(USEITEM)+sizeof(MEMORYITEM);    
 }
 
@@ -61 +84 @@
   CORBA_boolean nomRetval;
 
-  return nomRetval;
+  if(!pByte)
+    return FALSE;
+
+  /* remove from inuse list */
+#warning !!!!! Memory not removed from inuse list !!!!!
+  //_wpDeleteFromObjUseList(somSelf, (PUSEITEM)(pByte-sizeof(USEITEM)-sizeof(MEMORYITEM)) );
+
+  NOMFree(pByte-sizeof(USEITEM)-sizeof(MEMORYITEM));
+  return TRUE; /* free can't fail */;
 }