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

Timestamp:

Nov 26, 2006, 1:36:45 PM (19 years ago)

Author:

cinc

Message:

Implemented wpRequestObjectMutex() and wpReleaseObjectMutex(). These are implemented using the OS/2 api.

File:

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

trunk/desktop/class_c/wpobject.c

@@ -39 +39 @@
  */
 #define INCL_DOS
+#define INCL_DOSERRORS
+#define INCL_DOSSEMAPHORES
 #include <os2.h>
 
@@ -45 +47 @@
 
 #include <string.h>
+#include "desktoptypes.h"
 #include "wpobject.ih"
 
-#include "desktoptypes.h"
 
 NOM_Scope gpointer NOMLINK impl_WPObject_wpAllocMem(WPObject* nomSelf, const CORBA_unsigned_long cbBytes,
@@ -96 +98 @@
 NOM_Scope void NOMLINK impl_WPObject_nomInit(WPObject* nomSelf, CORBA_Environment *ev)
 {
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
 
   /* orbit-idl-c-stubs.c, VoyagerWriteProtoForParentCall line 84 */
@@ -104 +106 @@
             __FUNCTION__, nomSelf , nomSelf->mtab->nomClassName);
 
+  /* Initialize important data before letting subclasses do their stuff */
+  //_gObjectMutex=g_mutex_new();
+  if(NO_ERROR!=DosCreateMutexSem(NULL, &_gObjectMutex, 0, FALSE))
+    {
+      g_error("Can't create a mutex for WPObject!");
+    }
+
   _wpInitData(nomSelf, ev);
 }
@@ -109 +118 @@
 NOM_Scope void NOMLINK impl_WPObject_nomUninit(WPObject* nomSelf, CORBA_Environment *ev)
 {
-/* WPObjectData* nomThis=WPObjectGetData(nomSelf); */
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
 
   _wpUnInitData(nomSelf, ev);
 
+  //g_mutex_free(_gObjectMutex);
+  DosCloseMutexSem(_gObjectMutex);
   WPObject_nomUninit_parent(nomSelf,  ev);
 }
@@ -170 +181 @@
   return NULLHANDLE;
 }
+
+NOM_Scope CORBA_unsigned_long NOMLINK impl_WPObject_wpRequestObjectMutexSem(WPObject* nomSelf,
+                                                                            const CORBA_unsigned_long ulReserved, CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+
+  return DosRequestMutexSem(_gObjectMutex, -1L);
+}
+
+NOM_Scope CORBA_unsigned_long NOMLINK impl_WPObject_wpReleaseObjectMutexSem(WPObject* nomSelf, CORBA_Environment *ev)
+{
+  WPObjectData* nomThis=WPObjectGetData(nomSelf);
+  return DosReleaseMutexSem(_gObjectMutex);
+}