Jörg Höhle : mciqtz32: Fix open/close omissions.

[Alexandre Julliard]

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

Author: Jörg Höhle 
Date:   Mon Nov 23 09:28:00 2009 +0100

mciqtz32: Fix open/close omissions.

---

dlls/mciqtz32/mciqtz.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c
index 8371227..354a9f5 100644
--- a/dlls/mciqtz32/mciqtz.c
+++ b/dlls/mciqtz32/mciqtz.c
@@ -105,6 +105,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID)
         /* finish all outstanding things */
         MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL);

+        mciSetDriverData(dwDevID, 0);
         HeapFree(GetProcessHeap(), 0, wma);
         return 1;
     }
@@ -166,7 +167,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags,
         goto err;
     }

-    if (!((dwFlags & MCI_OPEN_ELEMENT) && (dwFlags & MCI_OPEN_ELEMENT))) {
+    if (!(dwFlags & MCI_OPEN_ELEMENT) || (dwFlags & MCI_OPEN_ELEMENT_ID)) {
         TRACE("Wrong dwFlags %x\n", dwFlags);
         goto err;
     }