Author: akhaldi Date: Sat Sep 21 12:59:22 2013 New Revision: 60270
URL: http://svn.reactos.org/svn/reactos?rev=60270&view=rev Log: [MCIQTZ32] * Sync with Wine 1.7.1. CORE-7469
Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/version.rc trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -6,13 +6,10 @@
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)
Modified: trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciavi_r... ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -577,3 +577,5 @@ MCI_ON_S, "on" MCI_OFF_S, "off" END + +#include "version.rc"
Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.c... ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -244,13 +244,13 @@
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 @@ 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);
Modified: trunk/reactos/dll/win32/mciqtz32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/version.... ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/version.rc [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -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>
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=6... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -99,7 +99,7 @@ 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