Changeset 668 for trunk/src/winmm/os2timer.cpp

Timestamp:

Aug 24, 1999, 11:21:11 PM (26 years ago)

Author:

phaller

Message:

Fix: added SetWin32TIB wrappers to callback functions

File:

• trunk/src/winmm/os2timer.cpp (modified) (4 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.6 1999-08-24 16:12:04 phaller Exp $ */
+/* $Id: os2timer.cpp,v 1.7 1999-08-24 21:21:11 phaller Exp $ */
 
 /*
@@ -22 +22 @@
 #include "win32type.h"
 #include "wintimer.h"
+#include <wprocess.h>
 #include "os2timer.h"
 #include "misc.h"
@@ -163 +164 @@
 void OS2Timer::TimerHandler()
 {
- ULONG   Count = 0;
- APIRET  rc = 0;       /* Return code  */
-
-#ifdef DEBUG
-    WriteLog("TimerHandler thread created\n");
-#endif
-    rc = DosSetPriority (PRTYS_THREAD,        /* Change a single thread */
-                         PRTYC_TIMECRITICAL,  /* Time critical class    */
-                         0L,                  /* Increase by 15         */
-                         0L);                 /* Assume current thread  */
-
-    rc = DosCreateEventSem(NULL, &TimerSem, DC_SEM_SHARED, 0);
-
-    if(rc != 0)
-        _endthread();
-
-#ifdef DEBUG
-    WriteLog("Semaphore created\n");
-#endif
-    TimerStatus = Stopped;
-
-    while(!fFatal) {
-        DosWaitEventSem(TimerSem, SEM_INDEFINITE_WAIT);
-        DosResetEventSem(TimerSem, &Count);
-        if(!fFatal) {
-#ifdef DEBUG
-////        WriteLog("T");
-#endif
+  ULONG   Count = 0;
+  APIRET  rc = 0;       /* Return code  */
+  USHORT  selTIB;
+
+  dprintf(("WINMM: TimerHandler thread created\n"));
+
+  rc = DosSetPriority (PRTYS_THREAD,        /* Change a single thread */
+                       PRTYC_TIMECRITICAL,  /* Time critical class    */
+                       0L,                  /* Increase by 15         */
+                       0L);                 /* Assume current thread  */
+
+  rc = DosCreateEventSem(NULL, &TimerSem, DC_SEM_SHARED, 0);
+
+  if(rc != 0)
+      _endthread();
+
+  dprintf(("WINMM: OS2Timer:Semaphore created\n"));
+
+  TimerStatus = Stopped;
+
+  while(!fFatal)
+  {
+    DosWaitEventSem(TimerSem, SEM_INDEFINITE_WAIT);
+    DosResetEventSem(TimerSem, &Count);
+    if(!fFatal)
+    {
         // @@@PH: we're calling the client with PRTYC_TIMECRITICAL !!!
         //        It'd be much nicer to call with original priority!
@@ -196 +195 @@
         //        time event is scheduled (DosSuspendThread()) ? It's
         //        much like raising a signal (SIGALARM)
+
+        selTIB = SetWin32TIB();
         clientCallback((UINT)this, 0, userData, 0, 0);
-    }
-    }
-    DosCloseEventSem(TimerSem);
+        SetFS(selTIB);
+    }
+  }
+  DosCloseEventSem(TimerSem);
 }
 //******************************************************************************