Changeset 2242 for trunk/src/winmm/dwaveout.h

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/dwaveout.h (modified) (3 diffs)

trunk/src/winmm/dwaveout.h

@@ -1 @@
-/* $Id: dwaveout.h,v 1.5 1999-10-22 18:09:16 sandervl Exp $ */
+/* $Id: dwaveout.h,v 1.6 1999-12-29 08:33:56 phaller Exp $ */
 
 /*
@@ -32 +32 @@
 {
 public:
-              DartWaveOut(LPWAVEFORMATEX pwfx, ULONG nCallback, ULONG dwInstance);
+              DartWaveOut(LPWAVEFORMATEX pwfx, ULONG nCallback, ULONG dwInstance, USHORT usSel);
               DartWaveOut(LPWAVEFORMATEX pwfx, HWND hwndCallback);
               DartWaveOut(LPWAVEFORMATEX pwfx);
@@ -72 +72 @@
     int curFillPos, curPlayPos; //fillpos == pos in os2 mix buffer, bufpos == pos in win buffer
 
-  // callback interface
-  LPDRVCALLBACK mthdCallback;
-  void          callback(HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
+    // callback interface
+    LPDRVCALLBACK mthdCallback; // pointer to win32 routine for the callback
+    USHORT        selCallback;  // the win32 tib selector for the callback (saved at waveOutOpen)
+    void          callback(HDRVR h, UINT uMessage, DWORD dwUser, DWORD dw1, DWORD dw2);
+    HWND          hwndCallback;
+    DWORD         dwInstance;
 
-         HWND hwndCallback;
-        DWORD dwInstance;
-    WAVEHDR  *wavehdr, *curhdr;
+    WAVEHDR  *wavehdr,
+             *curhdr;
 
-     BOOL fMixerSetup;
+    BOOL fMixerSetup;
 
-      VMutex *wmutex;
+    VMutex *wmutex;
                               // Linked list management
               DartWaveOut*    next;                   // Next Timer