Changeset 668

Timestamp:

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

Author:

phaller

Message:

Fix: added SetWin32TIB wrappers to callback functions

Location:

trunk/src/winmm

Files:

• dwaveout.cpp (modified) (6 diffs)
• dwaveout.h (modified) (2 diffs)
• midi.cpp (modified) (4 diffs)
• os2timer.cpp (modified) (4 diffs)

trunk/src/winmm/dwaveout.cpp ¶

@@ -1 @@
-/* $Id: dwaveout.cpp,v 1.5 1999-08-19 18:46:04 phaller Exp $ */
+/* $Id: dwaveout.cpp,v 1.6 1999-08-24 21:21:11 phaller Exp $ */
 
 /*
@@ -16 +16 @@
  ****************************************************************************/
 
+
+
 #define  INCL_BASE
 #define  INCL_OS2MM
@@ -22 +24 @@
 #include <stdlib.h>
 #include <string.h>
-
 #define  OS2_ONLY
 #include "win32type.h"
+#include <wprocess.h>
 
 #include "misc.h"
@@ -48 +50 @@
    Init(pwfx);
 
-   callback         = (LPDRVCALLBACK)nCallback;
+   mthdCallback         = (LPDRVCALLBACK)nCallback;
    this->dwInstance = dwInstance;
 
@@ -62 +64 @@
 
    WinPostMsg(hwndCallback, WOM_OPEN, 0, 0);
+}
+/******************************************************************************/
+/******************************************************************************/
+void DartWaveOut::callback(HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2)
+{
+  USHORT selTIB = SetWin32TIB();
+  mthdCallback(h,uMessage,dwUser,dw1,dw2);
+  SetFS(selTIB);
 }
 /******************************************************************************/
@@ -77 +87 @@
    wavehdr       = NULL;
    curhdr        = NULL;
-   callback      = NULL;
+   mthdCallback  = NULL;
    hwndCallback  = 0;
    dwInstance    = 0;

trunk/src/winmm/dwaveout.h ¶

@@ -1 @@
-/* $Id: dwaveout.h,v 1.3 1999-06-10 16:24:33 phaller Exp $ */
+/* $Id: dwaveout.h,v 1.4 1999-08-24 21:21:11 phaller Exp $ */
 
 /*
@@ -71 +71 @@
     int curFillPos, curPlayPos; //fillpos == pos in os2 mix buffer, bufpos == pos in win buffer
 
- LPDRVCALLBACK callback;
+  // callback interface
+  LPDRVCALLBACK mthdCallback;
+  void          callback(HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
+
          HWND hwndCallback;
         DWORD dwInstance;

trunk/src/winmm/midi.cpp ¶

@@ -1 @@
-/* $Id: midi.cpp,v 1.4 1999-08-19 18:46:04 phaller Exp $ */
+/* $Id: midi.cpp,v 1.5 1999-08-24 21:21:11 phaller Exp $ */
 
 /*
@@ -26 +26 @@
 #include "midi.hpp"
 #include <winos2def.h>
-
+#include <wprocess.h>
 
 ODINDEBUGCHANNEL(WINMM-MIDI)
@@ -884 +884 @@
 void Midi::callback( UINT msg, DWORD p1, DWORD p2)
 {
+  USHORT selTIB;
+
+  dprintf(("WINMM: callback %x %lx %lx\n", msg, p1, p2 ));
+
    if ( iCallbackFunction )
    {
-      dprintf(("WINMM: callback %x %lx %lx\n", msg, p1, p2 ));
-      iCallbackFunction( (ULONG)this, msg, iCallbackInstance, p1, p2 );
+     selTIB = SetWin32TIB();
+     iCallbackFunction( (ULONG)this, msg, iCallbackInstance, p1, p2 );
+     SetFS(selTIB);
    }
    else
@@ -969 +974 @@
    // Disable the link
    iHwdInstance->removeLink( iAppInstance );
-
    callback( MIM_CLOSE, 0, 0 );
    return MMSYSERR_NOERROR;

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);
 }
 //******************************************************************************