Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MCIQTZ32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60270
This commit is contained in:
Amine Khaldi 2013-09-21 12:59:22 +00:00
parent e0a205d44a
commit f9369af830
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/mciqtz32/CMakeLists.txt
View file

@ -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)

2
reactos/dll/win32/mciqtz32/mciavi_res.rc
View file

@ -577,3 +577,5 @@ BEGIN
MCI_ON_S, "on"
MCI_OFF_S, "off"
END
#include "version.rc"

12
reactos/dll/win32/mciqtz32/mciqtz.c
View file

@ -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);

4
reactos/dll/win32/mciqtz32/version.rc
View file

@ -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>

2
reactos/media/doc/README.WINE
View file

@ -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