wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Jacek Caban : ntdll: Support device paths in LdrGetDllPath.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 1a05b7da6335772af50636a31be6d4f9f58ade16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a05b7da6335772af50636a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 25 14:15:36 2020 +0100 ntdll: Support device paths in LdrGetDllPath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48698 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 18 ++++++++++++++++++ dlls/ntdll/loader.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7342a865af..0e45ad44ff 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2635,6 +2635,24 @@ static void test_LdrGetDllPath(void) ret = pLdrGetDllPath( fooW, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); ok( ret == STATUS_INVALID_PARAMETER, "LdrGetDllPath failed %x\n", ret ); + lstrcpyW( buffer, L"\\\\?\\" ); + lstrcatW( buffer, dlldir ); + p = buffer + lstrlenW(buffer); + *p++ = '\\'; + lstrcpyW( p, fooW ); + ret = pLdrGetDllPath( buffer, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !memcmp( path, L"\\\\?\\", 4 * sizeof(WCHAR) ) && path_equal( path + 4, dlldir ), + "got %s expected \\\\?\\%s\n", wine_dbgstr_w(path), wine_dbgstr_w(dlldir)); + pRtlReleasePath( path ); + + ret = pLdrGetDllPath( L"\\\\?\\c:\\test.dll", LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR, &path, &unknown_ptr ); + ok( !ret, "LdrGetDllPath failed %x\n", ret ); + ok( !unknown_ptr, "unknown ptr %p\n", unknown_ptr ); + ok( !lstrcmpW( path, L"\\\\?\\c:" ), "got %s expected \\\\?\\c:\n", wine_dbgstr_w(path)); + pRtlReleasePath( path ); + lstrcpyW( buffer, dlldir ); p = buffer + lstrlenW(buffer); *p++ = '\\'; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 85eb297680..1b641f1b9d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2204,7 +2204,7 @@ static NTSTATUS get_dll_load_path_search_flags( LPCWSTR module, DWORD flags, WCH if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) { DWORD type = RtlDetermineDosPathNameType_U( module ); - if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) + if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH && type != DEVICE_PATH) return STATUS_INVALID_PARAMETER; mod_end = get_module_path_end( module ); len += (mod_end - module) + 1;

1 0

Nikolay Sivov : mf: Fix string array access for registration data helpers.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: d0f4487c61f6393021bef6ea9d6c33aed38824b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0f4487c61f6393021bef6ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:24 2020 +0300 mf: Fix string array access for registration data helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 8e42837b46..ac80c51016 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1090,7 +1090,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *count, BOOL unique, const WCHAR *str) +static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *capacity, BOOL unique, const WCHAR *str) { WCHAR *ptrW; int len, i; @@ -1104,17 +1104,17 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun } } - if (!vector->calpwstr.cElems || *count > vector->calpwstr.cElems - 1) + if (!*capacity || *capacity - 1 < vector->calpwstr.cElems) { unsigned int new_count; WCHAR **ptr; - new_count = *count ? *count * 2 : 10; + new_count = *capacity ? *capacity * 2 : 10; ptr = CoTaskMemRealloc(vector->calpwstr.pElems, new_count * sizeof(*vector->calpwstr.pElems)); if (!ptr) return E_OUTOFMEMORY; vector->calpwstr.pElems = ptr; - *count = new_count; + *capacity = new_count; } len = lstrlenW(str); @@ -1129,12 +1129,14 @@ static HRESULT prop_string_vector_append(PROPVARIANT *vector, unsigned int *coun static int __cdecl qsort_string_compare(const void *a, const void *b) { - return lstrcmpW(a, b); + const WCHAR *left = *(const WCHAR **)a, *right = *(const WCHAR **)b; + return lstrcmpW(left, right); } static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int maxlen, PROPVARIANT *dst) { static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + unsigned int capacity = 0, count, size; HRESULT hr = S_OK; int i, index; WCHAR *buffW; @@ -1148,8 +1150,6 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned for (i = 0; i < ARRAY_SIZE(hkey_roots); ++i) { - unsigned int count; - DWORD size; HKEY hkey; if (RegOpenKeyW(hkey_roots[i], path, &hkey)) @@ -1162,7 +1162,8 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned { if (filter && !wcschr(buffW, filter)) continue; - if (FAILED(hr = prop_string_vector_append(dst, &count, i > 0, buffW))) + + if (FAILED(hr = prop_string_vector_append(dst, &capacity, i > 0, buffW))) break; size = maxlen; }

1 0

Nikolay Sivov : mf: Add a helper to trace timestamp arguments.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: e121a552930739c46fb64bb9a6822ba7c4c26099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e121a552930739c46fb64bb9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:23 2020 +0300 mf: Add a helper to trace timestamp arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 2 +- dlls/mf/mf_private.h | 21 +++++++++++++++++++++ dlls/mf/samplegrabber.c | 10 +++++----- dlls/mf/session.c | 6 ++++-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 20b587e413..8e42837b46 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1894,7 +1894,7 @@ static HRESULT WINAPI sample_copier_transform_GetOutputStatus(IMFTransform *ifac static HRESULT WINAPI sample_copier_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) { - TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(lower), wine_dbgstr_longlong(upper)); + TRACE("%p, %s, %s.\n", iface, debugstr_time(lower), debugstr_time(upper)); return E_NOTIMPL; } diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index f68c7d8d4c..dd8f49e1bc 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -19,6 +19,7 @@ #include "mfidl.h" #include "wine/heap.h" +#include "wine/debug.h" static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { @@ -55,3 +56,23 @@ struct activate_funcs }; HRESULT create_activation_object(void *context, const struct activate_funcs *funcs, IMFActivate **ret) DECLSPEC_HIDDEN; + +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index ea0d596f7e..205298501d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1151,7 +1151,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStart(IMFClockStateSink * { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(systime), wine_dbgstr_longlong(offset)); + TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); sample_grabber_set_state(grabber, SINK_STATE_RUNNING); @@ -1162,7 +1162,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockStop(IMFClockStateSink *i { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, debugstr_time(systime)); sample_grabber_set_state(grabber, SINK_STATE_STOPPED); @@ -1173,7 +1173,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockPause(IMFClockStateSink * { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, debugstr_time(systime)); return IMFSampleGrabberSinkCallback_OnClockPause(sample_grabber_get_callback(grabber), systime); } @@ -1182,7 +1182,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockRestart(IMFClockStateSink { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(systime)); + TRACE("%p, %s.\n", iface, debugstr_time(systime)); sample_grabber_set_state(grabber, SINK_STATE_RUNNING); @@ -1193,7 +1193,7 @@ static HRESULT WINAPI sample_grabber_clock_sink_OnClockSetRate(IMFClockStateSink { struct sample_grabber *grabber = impl_from_IMFClockStateSink(iface); - TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(systime), rate); + TRACE("%p, %s, %f.\n", iface, debugstr_time(systime), rate); return IMFSampleGrabberSinkCallback_OnClockSetRate(sample_grabber_get_callback(grabber), systime, rate); } diff --git a/dlls/mf/session.c b/dlls/mf/session.c index db1e5e4fe5..50f011dc52 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -31,6 +31,8 @@ #include "wine/heap.h" #include "wine/list.h" +#include "mf_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); enum session_command @@ -3547,7 +3549,7 @@ static HRESULT WINAPI present_clock_Start(IMFPresentationClock *iface, LONGLONG struct clock_state_change_param param = {{0}}; HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(start_offset)); + TRACE("%p, %s.\n", iface, debugstr_time(start_offset)); EnterCriticalSection(&clock->cs); clock->start_offset = param.u.offset = start_offset; @@ -3772,7 +3774,7 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, struct clock_timer *clock_timer; HRESULT hr; - TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, wine_dbgstr_longlong(time), callback, state, cancel_key); + TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key); if (!(clock_timer = heap_alloc_zero(sizeof(*clock_timer)))) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : mfplat: Remove trace from MFGetSystemTime().
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 914bb084e56b9aa5c00ea5a6cca39bd398620945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=914bb084e56b9aa5c00ea5a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:22 2020 +0300 mfplat: Remove trace from MFGetSystemTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 66bdc505f0..8d9dffe075 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1002,8 +1002,6 @@ MFTIME WINAPI MFGetSystemTime(void) { MFTIME mf; - TRACE("()\n"); - GetSystemTimeAsFileTime( (FILETIME*)&mf ); return mf;

1 0

Nikolay Sivov : mfplat: Add a helper to trace timestamp arguments.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 9ea8edc0b95b6c9e53b9f68aa02ae929908e501e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea8edc0b95b6c9e53b9f68a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 15:01:21 2020 +0300 mfplat: Add a helper to trace timestamp arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- dlls/mfplat/main.c | 10 +++++----- dlls/mfplat/mfplat_private.h | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index ea89bcb1f5..4bbb36b683 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -663,7 +663,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO HRESULT hr; GUID major; - TRACE("%p, %s, %u, %u, %p.\n", media_type, wine_dbgstr_longlong(duration), min_length, alignment, buffer); + TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer); if (!media_type) return E_INVALIDARG; @@ -1075,7 +1075,7 @@ static HRESULT WINAPI sample_SetSampleTime(IMFSample *iface, LONGLONG timestamp) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(timestamp)); + TRACE("%p, %s.\n", iface, debugstr_time(timestamp)); EnterCriticalSection(&sample->attributes.cs); sample->timestamp = timestamp; @@ -1106,7 +1106,7 @@ static HRESULT WINAPI sample_SetSampleDuration(IMFSample *iface, LONGLONG durati { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(duration)); + TRACE("%p, %s.\n", iface, debugstr_time(duration)); EnterCriticalSection(&sample->attributes.cs); sample->duration = duration; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 3368ab0969..66bdc505f0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8015,7 +8015,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s, %s.\n", iface, wine_dbgstr_longlong(system_time), wine_dbgstr_longlong(start_offset)); + TRACE("%p, %s, %s.\n", iface, debugstr_time(system_time), debugstr_time(start_offset)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) @@ -8033,7 +8033,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) @@ -8048,7 +8048,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) @@ -8066,7 +8066,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); HRESULT hr; - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(system_time)); + TRACE("%p, %s.\n", iface, debugstr_time(system_time)); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) @@ -8084,7 +8084,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockSetRate(IMFClockStateSink * struct system_time_source *source = impl_from_IMFClockStateSink(iface); double intpart; - TRACE("%p, %s, %f.\n", iface, wine_dbgstr_longlong(system_time), rate); + TRACE("%p, %s, %f.\n", iface, debugstr_time(system_time), rate); if (rate == 0.0f) return MF_E_UNSUPPORTED_RATE; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index ad4958465a..0f1c5479e6 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -182,3 +182,23 @@ static inline const char *debugstr_fourcc(DWORD format) return wine_dbgstr_an((char *)&format, 4); } + +static inline const char *debugstr_time(LONGLONG time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +}

1 0

Nikolay Sivov : mfreadwrite: Autodetect ftyp(isom) as .mp4.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 3ac77317b8026646321e54d6451ecc8ec3116142 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ac77317b8026646321e54d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 14:40:02 2020 +0300 mfreadwrite: Autodetect ftyp(isom) as .mp4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 029a6ce410..aa7f6855f4 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -1888,26 +1888,26 @@ failed: static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { - static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; - static const UINT8 wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; - static const UINT8 wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; + static const unsigned char asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; + static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; + static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint { - const UINT8 *magic; - UINT32 magic_len; + const unsigned char *magic; const WCHAR *url; - const UINT8 *mask; + const unsigned char *mask; } url_hints[] = { - { asfmagic, sizeof(asfmagic), L".asf" }, - { wavmagic, sizeof(wavmagic), L".wav", wavmask }, + { asfmagic, L".asf" }, + { wavmagic, L".wav", wavmask }, + { isommagic, L".mp4", mp4mask }, }; - UINT8 buffer[4 * sizeof(unsigned int)]; + unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; + unsigned int i, j, length = 0, caps = 0; IMFAttributes *attributes; - UINT32 length = 0; - unsigned int i, j; - DWORD caps = 0; QWORD position; HRESULT hr; @@ -1941,23 +1941,26 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) for (i = 0; i < ARRAY_SIZE(url_hints); ++i) { + memcpy(pattern, buffer, sizeof(buffer)); if (url_hints[i].mask) { unsigned int *mask = (unsigned int *)url_hints[i].mask; - unsigned int *data = (unsigned int *)buffer; + unsigned int *data = (unsigned int *)pattern; for (j = 0; j < sizeof(buffer) / sizeof(unsigned int); ++j) data[j] &= mask[j]; } - if (!memcmp(buffer, url_hints[i].magic, min(url_hints[i].magic_len, length))) + if (!memcmp(pattern, url_hints[i].magic, sizeof(pattern))) { *url = url_hints[i].url; break; } } - if (!*url) + if (*url) + TRACE("Stream type guessed as %s from %s.\n", debugstr_w(*url), debugstr_an((char *)buffer, length)); + else WARN("Unrecognized content type %s.\n", debugstr_an((char *)buffer, length)); return S_OK;

1 0

Nikolay Sivov : mfreadwrite: Implement reader flushing.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 954ed2364867133e39a4f42c452dc94c145c8e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=954ed2364867133e39a4f42c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 14:40:01 2020 +0300 mfreadwrite: Implement reader flushing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 70 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 1291948fb1..029a6ce410 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -922,6 +922,59 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, return hr; } +static void source_reader_release_responses(struct media_stream *stream) +{ + struct stream_response *ptr, *next; + + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->responses, struct stream_response, entry) + { + list_remove(&ptr->entry); + source_reader_release_response(ptr); + } +} + +static void source_reader_flush_stream(struct source_reader *reader, DWORD stream_index) +{ + struct media_stream *stream = &reader->streams[stream_index]; + + EnterCriticalSection(&stream->cs); + + source_reader_release_responses(stream); + if (stream->decoder) + IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + stream->requests = 0; + + LeaveCriticalSection(&stream->cs); +} + +static HRESULT source_reader_flush(struct source_reader *reader, unsigned int index) +{ + unsigned int stream_index; + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + stream_index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + stream_index = reader->first_audio_stream_index; + break; + case MF_SOURCE_READER_ALL_STREAMS: + for (stream_index = 0; stream_index < reader->stream_count; ++stream_index) + { + source_reader_flush_stream(reader, stream_index); + } + + break; + default: + stream_index = index; + } + + source_reader_flush_stream(reader, stream_index); + + return S_OK; +} + static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); @@ -990,7 +1043,9 @@ static HRESULT WINAPI source_reader_async_commands_callback_Invoke(IMFAsyncCallb break; case SOURCE_READER_ASYNC_FLUSH: - FIXME("Async flushing is not implemented.\n"); + source_reader_flush(reader, command->stream_index); + + IMFSourceReaderCallback_OnFlush(reader->async_callback, command->stream_index); break; default: ; @@ -1063,7 +1118,6 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { struct media_stream *stream = &reader->streams[i]; - struct stream_response *ptr, *next; if (stream->stream) IMFMediaStream_Release(stream->stream); @@ -1073,11 +1127,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) IMFTransform_Release(stream->decoder); DeleteCriticalSection(&stream->cs); - LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->responses, struct stream_response, entry) - { - list_remove(&ptr->entry); - source_reader_release_response(ptr); - } + source_reader_release_responses(stream); } heap_free(reader->streams); DeleteCriticalSection(&reader->cs); @@ -1570,7 +1620,7 @@ static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) struct source_reader_async_command *command; HRESULT hr; - FIXME("%p, %#x.\n", iface, index); + TRACE("%p, %#x.\n", iface, index); if (reader->async_callback) { @@ -1584,9 +1634,7 @@ static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) IUnknown_Release(&command->IUnknown_iface); } else - { - hr = E_NOTIMPL; - } + hr = source_reader_flush(reader, index); return hr; }

1 0

Nikolay Sivov : mfreadwrite: Implement async reader mode.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 799880144060d8f543d1cc347c3ac74367a4707c URL: https://source.winehq.org/git/wine.git/?a=commit;h=799880144060d8f543d1cc34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 14:40:00 2020 +0300 mfreadwrite: Implement async reader mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 617 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 448 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=799880144060d8f543d1…

1 0

Nikolay Sivov : mfreadwrite: Request one sample at a time from the stream.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 767744513e7d4c40f76a0ad0e2e40fc933081919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=767744513e7d4c40f76a0ad0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 14:39:59 2020 +0300 mfreadwrite: Request one sample at a time from the stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index ee4d826519..af9bea34ac 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -94,6 +94,11 @@ enum media_source_state SOURCE_STATE_STARTED, }; +enum media_stream_flags +{ + STREAM_FLAG_SAMPLE_REQUESTED = 0x1, +}; + struct media_stream { IMFMediaStream *stream; @@ -107,6 +112,7 @@ struct media_stream enum media_stream_state state; BOOL selected; BOOL presented; + DWORD flags; }; struct source_reader @@ -507,6 +513,7 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, { EnterCriticalSection(&reader->streams[i].cs); + reader->streams[i].flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; hr = source_reader_process_sample(&reader->streams[i], sample); LeaveCriticalSection(&reader->streams[i].cs); @@ -1235,10 +1242,12 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind { while (list_empty(&stream->responses) && stream->state != STREAM_STATE_EOS) { - if (stream->stream) + if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) { if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) WARN("Sample request failed, hr %#x.\n", hr); + else + stream->flags |= STREAM_FLAG_SAMPLE_REQUESTED; } SleepConditionVariableCS(&stream->sample_event, &stream->cs, INFINITE); }

1 0

Nikolay Sivov : mfreadwrite: Handle MEStreamTick event in source reader.
by Alexandre Julliard 25 Mar '20

25 Mar '20

Module: wine Branch: master Commit: 63e0b3a71a4c5a78c2196708b67ebdb1306b0caf URL: https://source.winehq.org/git/wine.git/?a=commit;h=63e0b3a71a4c5a78c2196708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 25 14:39:58 2020 +0300 mfreadwrite: Handle MEStreamTick event in source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 3faa6c6ee0..ee4d826519 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -528,12 +528,17 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, } static HRESULT source_reader_media_stream_state_handler(struct source_reader *reader, IMFMediaStream *stream, - MediaEventType event) + IMFMediaEvent *event) { + MediaEventType event_type; + LONGLONG timestamp; + PROPVARIANT value; unsigned int i; HRESULT hr; DWORD id; + IMFMediaEvent_GetType(event, &event_type); + if (FAILED(hr = media_stream_get_id(stream, &id))) { WARN("Unidentified stream %p, hr %#x.\n", stream, hr); @@ -548,7 +553,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re { EnterCriticalSection(&stream->cs); - switch (event) + switch (event_type) { case MEEndOfStream: stream->state = STREAM_STATE_EOS; @@ -565,6 +570,16 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re case MEStreamStarted: stream->state = STREAM_STATE_READY; break; + case MEStreamTick: + value.vt = VT_EMPTY; + hr = SUCCEEDED(IMFMediaEvent_GetValue(event, &value)) && value.vt == VT_I8 ? S_OK : E_UNEXPECTED; + timestamp = SUCCEEDED(hr) ? value.u.hVal.QuadPart : 0; + PropVariantClear(&value); + + source_reader_queue_response(stream, hr, stream->index, MF_SOURCE_READERF_STREAMTICK, timestamp, NULL); + + WakeAllConditionVariable(&stream->sample_event); + break; default: ; } @@ -606,8 +621,9 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba break; case MEStreamSeeked: case MEStreamStarted: + case MEStreamTick: case MEEndOfStream: - hr = source_reader_media_stream_state_handler(reader, stream, event_type); + hr = source_reader_media_stream_state_handler(reader, stream, event); break; default: ; @@ -664,6 +680,13 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) return refcount; } +static void source_reader_release_response(struct stream_response *response) +{ + if (response->sample) + IMFSample_Release(response->sample); + heap_free(response); +} + static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); @@ -697,10 +720,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->responses, struct stream_response, entry) { - if (ptr->sample) - IMFSample_Release(ptr->sample); list_remove(&ptr->entry); - heap_free(ptr); + source_reader_release_response(ptr); } } heap_free(reader->streams); @@ -1231,6 +1252,8 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind *sample = response->sample; if (*sample) IMFSample_AddRef(*sample); + hr = response->status; + source_reader_release_response(response); } else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020