Changeset 2242 for trunk/src/winmm/waveout.cpp

Timestamp:

Dec 29, 1999, 9:36:10 AM (26 years ago)

Author:

phaller

Message:

Fix: memory leak in Dart thread callback functions

File:

• trunk/src/winmm/waveout.cpp (modified) (3 diffs)

trunk/src/winmm/waveout.cpp

@@ -1 @@
-/* $Id: waveout.cpp,v 1.7 1999-12-20 22:22:07 sandervl Exp $ */
+/* $Id: waveout.cpp,v 1.8 1999-12-29 08:33:56 phaller Exp $ */
 #undef DEBUG
 /*
@@ -34 +34 @@
 /******************************************************************************/
 /******************************************************************************/
-ODINFUNCTION6(MMRESULT, waveOutOpen,
-              LPHWAVEOUT, phwo,
-              UINT, uDeviceID,
-              const LPWAVEFORMATEX, pwfx,
-              DWORD, dwCallback,
-              DWORD, dwInstance,
-              DWORD, fdwOpen)
+
+//@@@PH 1999/12/28 this function needs the win32 tib FS selector for callback purposes
+//                 therefore, one cannot use ODINFUNCTION macro wrappers! The xxxFS
+//                 macro passes in USHORT selFS as first parameter.
+ODINFUNCTION6FS(MMRESULT, waveOutOpen,
+                LPHWAVEOUT, phwo,
+                UINT, uDeviceID,
+                const LPWAVEFORMATEX, pwfx,
+                DWORD, dwCallback,
+                DWORD, dwInstance,
+                DWORD, fdwOpen)
 {
   MMRESULT rc;
@@ -62 +66 @@
   }
   else
-  if(fdwOpen == CALLBACK_FUNCTION) {
-        *phwo = (HWAVEOUT)new DartWaveOut(pwfx, dwCallback, dwInstance);
+  if(fdwOpen == CALLBACK_FUNCTION)
+  {
+    //@@@PH 1999/12/28 save valid FS: to win32 TIB
+        *phwo = (HWAVEOUT)new DartWaveOut(pwfx, dwCallback, dwInstance, selFS);
   }
   else  *phwo = (HWAVEOUT)new DartWaveOut(pwfx);