Jörg Höhle : mciwave: Use the current device ID for notification.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b82f615cd4edabfbc63b74e501e4df225d13e524
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b82f615cd4edabfbc63b74e501...

Author: Jörg Höhle 
Date:   Thu Nov  5 20:21:07 2009 +0100

mciwave: Use the current device ID for notification.

---

dlls/mciwave/mciwave.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c
index 6879a57..6d9b39e 100644
--- a/dlls/mciwave/mciwave.c
+++ b/dlls/mciwave/mciwave.c
@@ -211,6 +211,9 @@ static WINE_MCIWAVE *WAVE_mciGetOpenDev(MCIDEVICEID wDevID)
  */
 static void WAVE_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIWAVE* wmw, UINT wStatus)
 {
+    /* We simply save one parameter by not passing the wDevID local
+     * to the command.  They are the same (via mciGetDriverData).
+     */
     MCIDEVICEID wDevID = wmw->wNotifyDeviceID;
     HANDLE old = InterlockedExchangePointer(&wmw->hCallback, NULL);
     if (old) mciDriverNotify(old, wDevID, MCI_NOTIFY_SUPERSEDED);
@@ -535,7 +538,8 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P
     WAVE_mciDefaultFmt(wmw);

TRACE("wDevID=%04X (lpParams->wDeviceID=%08X)\n", wDevID, lpOpenParms->wDeviceID);
-    wmw->wNotifyDeviceID = lpOpenParms->wDeviceID;
+    /* Logs show the native winmm calls us with 0 still in lpOpenParms.wDeviceID */
+    wmw->wNotifyDeviceID = wDevID;

if (dwFlags & MCI_OPEN_ELEMENT) {
    if (dwFlags & MCI_OPEN_ELEMENT_ID) {
@@ -805,7 +809,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt,
     wmw->dwStatus = MCI_MODE_PLAY;

if (!(dwFlags & MCI_WAIT)) {
-	return MCI_SendCommandAsync(wmw->wNotifyDeviceID, WAVE_mciPlay, dwFlags,
+	return MCI_SendCommandAsync(wDevID, WAVE_mciPlay, dwFlags,
    			    (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS));
     }

@@ -1009,7 +1013,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt
     wmw->dwStatus = MCI_MODE_RECORD;

if (!(dwFlags & MCI_WAIT)) {
-	return MCI_SendCommandAsync(wmw->wNotifyDeviceID, WAVE_mciRecord, dwFlags,
+	return MCI_SendCommandAsync(wDevID, WAVE_mciRecord, dwFlags,
    			    (DWORD_PTR)lpParms, sizeof(MCI_RECORD_PARMS));
     }