From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 21 Sep 2013 12:59:22 +0000 (+0000)
Subject: [MCIQTZ32]
X-Git-Tag: ReactOS-0.3.16~1275
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f9369af8304addd42da000a9da87d852419935a5

[MCIQTZ32]
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60270
---

diff --git a/reactos/dll/win32/mciqtz32/CMakeLists.txt b/reactos/dll/win32/mciqtz32/CMakeLists.txt
index d5257fb3405..ad0628f4feb 100644
--- a/reactos/dll/win32/mciqtz32/CMakeLists.txt
+++ b/reactos/dll/win32/mciqtz32/CMakeLists.txt
@@ -6,13 +6,10 @@ spec2def(mciqtz32.dll mciqtz32.spec)
 
 list(APPEND SOURCE
     mciqtz.c
-    mciavi_res.rc
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def)
 
-add_library(mciqtz32 SHARED ${SOURCE})
+add_library(mciqtz32 SHARED ${SOURCE} mciavi_res.rc)
 set_module_type(mciqtz32 win32dll)
 target_link_libraries(mciqtz32 wine strmiids)
-add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll)
-add_dependencies(mciqtz32 dxsdk)
+add_importlibs(mciqtz32 winmm ole32 user32 gdi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mciqtz32/mciavi_res.rc b/reactos/dll/win32/mciqtz32/mciavi_res.rc
index 8290f14b581..8db52cf9922 100644
--- a/reactos/dll/win32/mciqtz32/mciavi_res.rc
+++ b/reactos/dll/win32/mciqtz32/mciavi_res.rc
@@ -577,3 +577,5 @@ BEGIN
 MCI_ON_S,			"on"
 MCI_OFF_S,			"off"
 END
+
+#include "version.rc"
diff --git a/reactos/dll/win32/mciqtz32/mciqtz.c b/reactos/dll/win32/mciqtz32/mciqtz.c
index fec6b77b633..7dcdf9c8113 100644
--- a/reactos/dll/win32/mciqtz32/mciqtz.c
+++ b/reactos/dll/win32/mciqtz32/mciqtz.c
@@ -244,13 +244,13 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags,
 
 err:
     if (wma->vidbasic)
-        IUnknown_Release(wma->vidbasic);
+        IBasicVideo_Release(wma->vidbasic);
     wma->vidbasic = NULL;
     if (wma->seek)
-        IUnknown_Release(wma->seek);
+        IMediaSeeking_Release(wma->seek);
     wma->seek = NULL;
     if (wma->vidwin)
-        IUnknown_Release(wma->vidwin);
+        IVideoWindow_Release(wma->vidwin);
     wma->vidwin = NULL;
     if (wma->pgraph)
         IGraphBuilder_Release(wma->pgraph);
@@ -285,9 +285,9 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP
     MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL);
 
     if (wma->opened) {
-        IUnknown_Release(wma->vidwin);
-        IUnknown_Release(wma->vidbasic);
-        IUnknown_Release(wma->seek);
+        IVideoWindow_Release(wma->vidwin);
+        IBasicVideo_Release(wma->vidbasic);
+        IMediaSeeking_Release(wma->seek);
         IMediaEvent_Release(wma->mevent);
         IGraphBuilder_Release(wma->pgraph);
         IMediaControl_Release(wma->pmctrl);
diff --git a/reactos/dll/win32/mciqtz32/version.rc b/reactos/dll/win32/mciqtz32/version.rc
index 94c6078bd27..a0de28b0f60 100644
--- a/reactos/dll/win32/mciqtz32/version.rc
+++ b/reactos/dll/win32/mciqtz32/version.rc
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILEDESCRIPTION_STR "Wine DirectShow MCI Driver"
 #define WINE_FILENAME_STR "mciqtz32.dll"
 #define WINE_FILEVERSION 6,5,1,900
 #define WINE_FILEVERSION_STR "6.5.1.900"
 #define WINE_PRODUCTVERSION 6,5,1,900
 #define WINE_PRODUCTVERSION_STR "6.5"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include "wine/wine_common_ver.rc"
+#include <wine/wine_common_ver.rc>
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 49ccd770419..075c5a1b6a0 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -99,7 +99,7 @@ reactos/dll/win32/lz32            # Synced to Wine-1.5.19
 reactos/dll/win32/mapi32          # Synced to Wine-1.7.1
 reactos/dll/win32/mciavi32        # Synced to Wine-1.7.1
 reactos/dll/win32/mcicda          # Synced to Wine-1.5.19
-reactos/dll/win32/mciqtz32        # Synced to Wine-1.5.4
+reactos/dll/win32/mciqtz32        # Synced to Wine-1.7.1
 reactos/dll/win32/mciseq          # Synced to Wine-1.5.4
 reactos/dll/win32/mciwave         # Synced to Wine-1.5.19
 reactos/dll/win32/mlang           # Synced to Wine-1.5.4