https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4e4f9fc7706a772b581f…
commit b4e4f9fc7706a772b581f075d8f8d611010a450b
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Nov 9 21:52:30 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Nov 9 21:52:30 2019 +0100
[MCIQTZ32] Sync with Wine Staging 4.18. CORE-16441
---
dll/win32/mciqtz32/CMakeLists.txt | 1 +
dll/win32/mciqtz32/mciqtz.c | 11 +++++------
media/doc/README.WINE | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt
index 88e92f6c4df..d47f5089ecc 100644
--- a/dll/win32/mciqtz32/CMakeLists.txt
+++ b/dll/win32/mciqtz32/CMakeLists.txt
@@ -11,4 +11,5 @@ add_library(mciqtz32 MODULE ${SOURCE} mciavi_res.rc)
set_module_type(mciqtz32 win32dll)
target_link_libraries(mciqtz32 wine strmiids)
add_importlibs(mciqtz32 winmm ole32 user32 gdi32 msvcrt kernel32 ntdll)
+add_dependencies(mciqtz32 dxsdk)
add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/mciqtz32/mciqtz.c b/dll/win32/mciqtz32/mciqtz.c
index 1aec32635b2..ec4a8b531a0 100644
--- a/dll/win32/mciqtz32/mciqtz.c
+++ b/dll/win32/mciqtz32/mciqtz.c
@@ -422,20 +422,19 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags,
LPMCI_PLAY_PARMS lpParms
wma->mci_flags = dwFlags;
IMediaSeeking_GetTimeFormat(wma->seek, &format);
if (dwFlags & MCI_FROM) {
+ wma->seek_start = lpParms->dwFrom;
if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME))
- wma->seek_start = lpParms->dwFrom * 10000;
- else
- wma->seek_start = lpParms->dwFrom;
+ wma->seek_start *= 10000;
+
start_flags = AM_SEEKING_AbsolutePositioning;
} else {
wma->seek_start = 0;
start_flags = AM_SEEKING_NoPositioning;
}
if (dwFlags & MCI_TO) {
+ wma->seek_stop = lpParms->dwTo;
if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME))
- wma->seek_stop = lpParms->dwTo * 10000;
- else
- wma->seek_stop = lpParms->dwTo;
+ wma->seek_stop *= 10000;
} else {
wma->seek_stop = 0;
IMediaSeeking_GetDuration(wma->seek, &wma->seek_stop);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 7e54bded41d..4b8dfb11244 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -93,7 +93,7 @@ dll/win32/lz32 # Synced to WineStaging-3.3
dll/win32/mapi32 # Synced to WineStaging-4.18
dll/win32/mciavi32 # Synced to WineStaging-4.18
dll/win32/mcicda # Synced to WineStaging-3.3
-dll/win32/mciqtz32 # Synced to WineStaging-3.3
+dll/win32/mciqtz32 # Synced to WineStaging-4.18
dll/win32/mciseq # Synced to WineStaging-3.3
dll/win32/mciwave # Synced to WineStaging-4.0
dll/win32/mgmtapi # Synced to WineStaging-3.3