Jörg Höhle : winmm: MCI notification is controlled by keyword only.

[Alexandre Julliard]

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

Author: Jörg Höhle 
Date:   Tue Oct 13 08:00:03 2009 +0200

winmm: MCI notification is controlled by keyword only.

---

dlls/winmm/mci.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 216fb2a..32204a0 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -1433,12 +1433,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
    goto errCleanUp;
     }

-    /* set up call back */
-    if (hwndCallback != 0) {
-	dwFlags |= MCI_NOTIFY;
-	data[0] = (DWORD)hwndCallback;
-    }
-
     /* set return information */
     switch (retType = MCI_GetReturnType(lpCmd)) {
     case 0:		offset = 1;	break;
@@ -1454,6 +1448,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet,
     if ((dwRet = MCI_ParseOptArgs(data, offset, lpCmd, args, &dwFlags)))
    goto errCleanUp;

+    /* set up call back */
+    if (dwFlags & MCI_NOTIFY) {
+	data[0] = (DWORD)hwndCallback;
+    }
+
     /* FIXME: the command should get it's own notification window set up and
      * ask for device closing while processing the notification mechanism
      */