April 2020 - Wine-Devel - list.winehq.org

[PATCH resend 2/3] comctl32/tests/imagelist: Add more tests for ILD_PRESERVEALPHA.
by Ziqing Hui April 14, 2020

April 14, 2020

The added code is to prove that ILD_PRESERVEALPHA won't take effect if ILS_ALPHA or ILS_SATURATE is set. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH resend 1/3] comctl32/tests/imagelist: Check alpha channel in ImageList_DrawIndirect tests.
by Ziqing Hui April 14, 2020

April 14, 2020

version6 comctl32 support alpha blend. So it would be good for us to check alpha channel in the tests. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 70 ++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 32 deletions(-)

1 0

[PATCH resend v2 1/3] ntdll: Handle unaligned condition variables when using futexes.
by Zebediah Figura April 14, 2020

April 14, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48389 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/sync.c | 76 ++++++++++++++---------- dlls/ntdll/sync.c | 117 +++++++++++++++++++++++++++++++------ 2 files changed, 144 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 6426d7cc6fb..8cdb7f10887 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2241,10 +2241,18 @@ static void test_condvars_consumer_producer(void) /* Sample test for some sequence of events happening, sequenced using "condvar_seq" */ static DWORD condvar_seq = 0; -static CONDITION_VARIABLE condvar_base = CONDITION_VARIABLE_INIT; +static CONDITION_VARIABLE aligned_cv; static CRITICAL_SECTION condvar_crit; static SRWLOCK condvar_srwlock; +#include "pshpack1.h" +static struct +{ + char c; + CONDITION_VARIABLE cv; +} unaligned_cv; +#include "poppack.h" + /* Sequence of wake/sleep to check boundary conditions: * 0: init * 1: producer emits a WakeConditionVariable without consumer waiting. @@ -2264,28 +2272,31 @@ static SRWLOCK condvar_srwlock; * 12: producer (shared) wakes up consumer (shared) * 13: end */ -static DWORD WINAPI condvar_base_producer(LPVOID x) { +static DWORD WINAPI condvar_base_producer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; + while (condvar_seq < 1) Sleep(1); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); condvar_seq = 2; while (condvar_seq < 3) Sleep(1); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); condvar_seq = 4; while (condvar_seq < 5) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 6) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeAllConditionVariable (&condvar_base); + pWakeAllConditionVariable(cv); LeaveCriticalSection (&condvar_crit); while (condvar_seq < 8) Sleep(1); EnterCriticalSection (&condvar_crit); - pWakeConditionVariable (&condvar_base); + pWakeConditionVariable(cv); Sleep(50); LeaveCriticalSection (&condvar_crit); @@ -2295,36 +2306,38 @@ static DWORD WINAPI condvar_base_producer(LPVOID x) { while (condvar_seq < 9) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 10) Sleep(1); pAcquireSRWLockExclusive(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockExclusive(&condvar_srwlock); while (condvar_seq < 11) Sleep(1); pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); while (condvar_seq < 12) Sleep(1); Sleep(50); /* ensure that consumer waits for cond variable */ pAcquireSRWLockShared(&condvar_srwlock); - pWakeConditionVariable(&condvar_base); + pWakeConditionVariable(cv); pReleaseSRWLockShared(&condvar_srwlock); return 0; } -static DWORD WINAPI condvar_base_consumer(LPVOID x) { +static DWORD WINAPI condvar_base_consumer(void *arg) +{ + CONDITION_VARIABLE *cv = arg; BOOL ret; while (condvar_seq < 2) Sleep(1); /* wake was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); @@ -2334,33 +2347,33 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { /* wake all was emitted, but we were not sleeping */ EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 5; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wake\n"); EnterCriticalSection (&condvar_crit); condvar_seq = 6; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 200); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 200); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should return TRUE on good wakeall\n"); condvar_seq = 7; EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on out of band wake\n"); ok (GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableCS should return ERROR_TIMEOUT on out of band wake, not %d\n", GetLastError()); EnterCriticalSection (&condvar_crit); condvar_seq = 8; - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 20); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 20); LeaveCriticalSection (&condvar_crit); ok (ret, "SleepConditionVariableCS should still return TRUE on crit unlock delay\n"); @@ -2374,25 +2387,25 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 9; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 10; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockExclusive(&condvar_srwlock); condvar_seq = 11; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); pAcquireSRWLockShared(&condvar_srwlock); condvar_seq = 12; - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 200, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok (ret, "pSleepConditionVariableSRW should return TRUE on good wake\n"); @@ -2400,12 +2413,12 @@ static DWORD WINAPI condvar_base_consumer(LPVOID x) { return 0; } -static void test_condvars_base(void) { +static void test_condvars_base(RTL_CONDITION_VARIABLE *cv) +{ HANDLE hp, hc; DWORD dummy; BOOL ret; - if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ win_skip("no condition variable support.\n"); @@ -2418,7 +2431,7 @@ static void test_condvars_base(void) { pInitializeSRWLock(&condvar_srwlock); EnterCriticalSection (&condvar_crit); - ret = pSleepConditionVariableCS(&condvar_base, &condvar_crit, 10); + ret = pSleepConditionVariableCS(cv, &condvar_crit, 10); LeaveCriticalSection (&condvar_crit); ok (!ret, "SleepConditionVariableCS should return FALSE on untriggered condvar\n"); @@ -2427,23 +2440,23 @@ static void test_condvars_base(void) { if (pInitializeSRWLock) { pAcquireSRWLockExclusive(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, 0); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, 0); pReleaseSRWLockExclusive(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); pAcquireSRWLockShared(&condvar_srwlock); - ret = pSleepConditionVariableSRW(&condvar_base, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); + ret = pSleepConditionVariableSRW(cv, &condvar_srwlock, 10, CONDITION_VARIABLE_LOCKMODE_SHARED); pReleaseSRWLockShared(&condvar_srwlock); ok(!ret, "SleepConditionVariableSRW should return FALSE on untriggered condvar\n"); ok(GetLastError() == ERROR_TIMEOUT, "SleepConditionVariableSRW should return ERROR_TIMEOUT on untriggered condvar, not %d\n", GetLastError()); } - - hp = CreateThread(NULL, 0, condvar_base_producer, NULL, 0, &dummy); - hc = CreateThread(NULL, 0, condvar_base_consumer, NULL, 0, &dummy); + condvar_seq = 0; + hp = CreateThread(NULL, 0, condvar_base_producer, cv, 0, &dummy); + hc = CreateThread(NULL, 0, condvar_base_consumer, cv, 0, &dummy); condvar_seq = 1; /* go */ @@ -3252,7 +3265,8 @@ START_TEST(sync) test_WaitForSingleObject(); test_WaitForMultipleObjects(); test_initonce(); - test_condvars_base(); + test_condvars_base(&aligned_cv); + test_condvars_base(&unaligned_cv.cv); test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 62a60362768..d7319405889 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -115,6 +115,16 @@ static inline int use_futexes(void) return supported; } +static int *get_futex(void **ptr) +{ + if (sizeof(void *) == 8) + return (int *)((((ULONG_PTR)ptr) + 3) & ~3); + else if (!(((ULONG_PTR)ptr) & 3)) + return (int *)ptr; + else + return NULL; +} + static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2227,35 +2237,98 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) } #ifdef __linux__ -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +static NTSTATUS fast_wait_cv( int *futex, int val, const LARGE_INTEGER *timeout ) { struct timespec timespec; int ret; - if (!use_futexes()) - return STATUS_NOT_IMPLEMENTED; - if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) { timespec_from_timeout( &timespec, timeout ); - ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + ret = futex_wait( futex, val, &timespec ); } else - ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + ret = futex_wait( futex, val, NULL ); if (ret == -1 && errno == ETIMEDOUT) return STATUS_TIMEOUT; return STATUS_WAIT_0; } +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + RtlLeaveCriticalSection( cs ); + status = fast_wait_cv( futex, val, timeout ); + RtlEnterCriticalSection( cs ); + return status; +} + +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + NTSTATUS status; + int val, *futex; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + val = *futex; + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlReleaseSRWLockShared( lock ); + else + RtlReleaseSRWLockExclusive( lock ); + + status = fast_wait_cv( futex, val, timeout ); + + if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) + RtlAcquireSRWLockShared( lock ); + else + RtlAcquireSRWLockExclusive( lock ); + return status; +} + static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { + int *futex; + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - futex_wake( (int *)&variable->Ptr, count ); + if (!(futex = get_futex( &variable->Ptr ))) + return STATUS_NOT_IMPLEMENTED; + + interlocked_xchg_add( futex, 1 ); + futex_wake( futex, count ); return STATUS_SUCCESS; } #else +static NTSTATUS fast_sleep_srw_cv( RTL_CONDITION_VARIABLE *variable, + RTL_SRWLOCK *lock, const LARGE_INTEGER *timeout, ULONG flags ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, + RTL_CRITICAL_SECTION *cs, const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) { return STATUS_NOT_IMPLEMENTED; @@ -2300,9 +2373,11 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressSingle( variable ); + } } /*********************************************************************** @@ -2312,9 +2387,11 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) */ void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { - interlocked_xchg_add( (int *)&variable->Ptr, 1 ); if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + { + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); RtlWakeAddressAll( variable ); + } } /*********************************************************************** @@ -2336,15 +2413,15 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R const LARGE_INTEGER *timeout ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; - - RtlLeaveCriticalSection( crit ); + int val; - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_sleep_cs_cv( variable, crit, timeout )) != STATUS_NOT_IMPLEMENTED) + return status; + val = *(int *)&variable->Ptr; + RtlLeaveCriticalSection( crit ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); - return status; } @@ -2371,15 +2448,19 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, const LARGE_INTEGER *timeout, ULONG flags ) { NTSTATUS status; - int val = *(int *)&variable->Ptr; + int val; + + if ((status = fast_sleep_srw_cv( variable, lock, timeout, flags )) != STATUS_NOT_IMPLEMENTED) + return status; + + val = *(int *)&variable->Ptr; if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlReleaseSRWLockShared( lock ); else RtlReleaseSRWLockExclusive( lock ); - if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); -- 2.26.0

2 5

[PATCH 2/2] mshtml v2: non-HTML resources accessed through the res:// protocol have resource type 2110
by Damjan Jovanovic April 13, 2020

April 13, 2020

Try 2 adds tests. On https://docs.microsoft.com/en-us/previous-versions//aa767740(v=vs.85) they only mention resource types RT_HTML and the completely undocumented RT_FILE, so by a process of elimination, the 2110 magic number is probably RT_FILE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 5 ++++ dlls/mshtml/tests/image.gif | Bin 0 -> 1144 bytes dlls/mshtml/tests/protocol.c | 55 +++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/rsrc.rc | 12 ++++++++ 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 dlls/mshtml/tests/image.gif

2 1

[PATCH 1/2] mshtml/tests: fix a HRESULT comparison in ProtocolSink_ReportResult()
by Damjan Jovanovic April 13, 2020

April 13, 2020

ProtocolSink_ReportResult() only checks expect_hrResult is non-zero, instead of comparing it against hres like the same code snippet in test_protocol_fail(). Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/4] mf: Implement sink prerolling.
by Nikolay Sivov April 13, 2020

April 13, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 118 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 93 insertions(+), 25 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5b9f720815..bc4cac6ef0 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -76,6 +76,7 @@ enum session_state { SESSION_STATE_STOPPED = 0, SESSION_STATE_STARTING_SOURCES, + SESSION_STATE_PREROLLING_SINKS, SESSION_STATE_STARTING_SINKS, SESSION_STATE_STARTED, SESSION_STATE_PAUSING_SINKS, @@ -93,6 +94,7 @@ enum object_state OBJ_STATE_STOPPED = 0, OBJ_STATE_STARTED, OBJ_STATE_PAUSED, + OBJ_STATE_PREROLLED, OBJ_STATE_INVALID, }; @@ -108,6 +110,7 @@ struct media_sink { struct list entry; IMFMediaSink *sink; + IMFMediaSinkPreroll *preroll; IMFMediaEventGenerator *event_generator; BOOL finalized; }; @@ -168,6 +171,7 @@ enum presentation_flags SESSION_FLAG_SOURCES_SUBSCRIBED = 0x1, SESSION_FLAG_PRESENTATION_CLOCK_SET = 0x2, SESSION_FLAG_FINALIZE_SINKS = 0x4, + SESSION_FLAG_NEEDS_PREROLL = 0x8, }; struct media_session @@ -722,6 +726,8 @@ static void session_clear_presentation(struct media_session *session) if (sink->sink) IMFMediaSink_Release(sink->sink); + if (sink->preroll) + IMFMediaSinkPreroll_Release(sink->preroll); if (sink->event_generator) IMFMediaEventGenerator_Release(sink->event_generator); heap_free(sink); @@ -982,6 +988,7 @@ static DWORD session_get_object_rate_caps(IUnknown *object) static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) { struct media_sink *media_sink; + DWORD flags; LIST_FOR_EACH_ENTRY(media_sink, &session->presentation.sinks, struct media_sink, entry) { @@ -997,6 +1004,12 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); + if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL) + { + if (SUCCEEDED(IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaSinkPreroll, (void **)&media_sink->preroll))) + session->presentation.flags |= SESSION_FLAG_NEEDS_PREROLL; + } + list_add_tail(&session->presentation.sinks, &media_sink->entry); return S_OK; @@ -1915,6 +1928,8 @@ static enum object_state session_get_object_state_for_event(MediaEventType event case MEStreamStopped: case MEStreamSinkStopped: return OBJ_STATE_STOPPED; + case MEStreamSinkPrerolled: + return OBJ_STATE_PREROLLED; default: return OBJ_STATE_INVALID; } @@ -1931,11 +1946,10 @@ static void session_set_consumed_clock(IUnknown *object, IMFPresentationClock *c } } -static HRESULT session_start_clock(struct media_session *session) +static void session_set_presentation_clock(struct media_session *session) { IMFPresentationTimeSource *time_source = NULL; struct media_source *source; - LONGLONG start_offset = 0; struct media_sink *sink; struct topo_node *node; HRESULT hr; @@ -2007,6 +2021,12 @@ static HRESULT session_start_clock(struct media_session *session) session->presentation.flags |= SESSION_FLAG_PRESENTATION_CLOCK_SET; } +} + +static HRESULT session_start_clock(struct media_session *session) +{ + LONGLONG start_offset = 0; + HRESULT hr; if (IsEqualGUID(&session->presentation.time_format, &GUID_NULL)) { @@ -2026,14 +2046,36 @@ static HRESULT session_start_clock(struct media_session *session) return hr; } +static BOOL session_set_node_object_state(struct media_session *session, IUnknown *object, + MF_TOPOLOGY_TYPE node_type, enum object_state state) +{ + struct topo_node *node; + BOOL changed = FALSE; + + LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) + { + if (node->type == node_type && object == node->object.object) + { + changed = node->state != state; + node->state = state; + break; + } + } + + return changed; +} static void session_set_source_object_state(struct media_session *session, IUnknown *object, MediaEventType event_type) { + IMFStreamSink *stream_sink; struct media_source *src; + struct media_sink *sink; enum object_state state; struct topo_node *node; + unsigned int i, count; BOOL changed = FALSE; + HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; @@ -2058,15 +2100,7 @@ static void session_set_source_object_state(struct media_session *session, IUnkn case MEStreamPaused: case MEStreamStopped: - LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) - { - if (node->type == MF_TOPOLOGY_SOURCESTREAM_NODE && object == node->object.object) - { - changed = node->state != state; - node->state = state; - break; - } - } + changed = session_set_node_object_state(session, object, MF_TOPOLOGY_SOURCESTREAM_NODE, state); default: ; } @@ -2081,7 +2115,44 @@ static void session_set_source_object_state(struct media_session *session, IUnkn break; session_set_topo_status(session, S_OK, MF_TOPOSTATUS_STARTED_SOURCE); - if (SUCCEEDED(session_start_clock(session))) + + session_set_presentation_clock(session); + + if (session->presentation.flags & SESSION_FLAG_NEEDS_PREROLL) + { + MFTIME preroll_time = 0; + + if (session->presentation.start_position.vt == VT_I8) + preroll_time = session->presentation.start_position.hVal.QuadPart; + + /* Mark stream sinks without prerolling support as PREROLLED to keep state test logic generic. */ + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + if (sink->preroll) + { + /* FIXME: abort and enter error state on failure. */ + if (FAILED(hr = IMFMediaSinkPreroll_NotifyPreroll(sink->preroll, preroll_time))) + WARN("Preroll notification failed, hr %#x.\n", hr); + } + else + { + if (SUCCEEDED(IMFMediaSink_GetStreamSinkCount(sink->sink, &count))) + { + for (i = 0; i < count; ++i) + { + if (SUCCEEDED(IMFMediaSink_GetStreamSinkByIndex(sink->sink, i, &stream_sink))) + { + session_set_node_object_state(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE, + OBJ_STATE_PREROLLED); + IMFStreamSink_Release(stream_sink); + } + } + } + } + } + session->state = SESSION_STATE_PREROLLING_SINKS; + } + else if (SUCCEEDED(session_start_clock(session))) session->state = SESSION_STATE_STARTING_SINKS; break; @@ -2137,31 +2208,27 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre MediaEventType event_type) { struct media_source *source; - struct topo_node *node; enum object_state state; - BOOL changed = FALSE; IMFMediaEvent *event; DWORD caps, flags; + BOOL changed; HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; - LIST_FOR_EACH_ENTRY(node, &session->presentation.nodes, struct topo_node, entry) - { - if (node->type == MF_TOPOLOGY_OUTPUT_NODE && stream == node->object.sink_stream) - { - changed = node->state != state; - node->state = state; - break; - } - } - - if (!changed) + if (!(changed = session_set_node_object_state(session, (IUnknown *)stream, MF_TOPOLOGY_OUTPUT_NODE, state))) return; switch (session->state) { + case SESSION_STATE_PREROLLING_SINKS: + if (!session_is_output_nodes_state(session, OBJ_STATE_PREROLLED)) + break; + + if (SUCCEEDED(session_start_clock(session))) + session->state = SESSION_STATE_STARTING_SINKS; + break; case SESSION_STATE_STARTING_SINKS: if (!session_is_output_nodes_state(session, OBJ_STATE_STARTED)) break; @@ -2630,6 +2697,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM case MEStreamSinkStarted: case MEStreamSinkPaused: case MEStreamSinkStopped: + case MEStreamSinkPrerolled: EnterCriticalSection(&session->cs); session_set_sink_stream_state(session, (IMFStreamSink *)event_source, event_type); -- 2.25.1

1 3

[PATCH 1/5] wined3d: Remove WINED3D_RS_EDGEANTIALIAS.
by Chip Davis April 13, 2020

April 13, 2020

Handle this render state similarly to D3DRS_ZFUNC, by mapping it in the client DLLs. As far as I can tell, save for the fact that it's only supposed to apply to lines forming a convex outline, it's roughly equivalent to D3DRS_ANTIALIASEDLINEENABLE. We definitely handled it the same way. Curiously, even though we supported the render state, we didn't set the corresponding capability bit. Do that now. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d8/device.c | 13 +++++++++++-- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/device.c | 10 ++++++++-- dlls/wined3d/state.c | 13 +++++-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 -- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a67f817785..07f6dccbcbf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -422,6 +422,9 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + if (caps->LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->RasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; + caps->LineCaps &= ~WINED3DLINECAPS_ANTIALIAS; caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER @@ -446,9 +449,15 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) { - if (state == D3DRS_ZBIAS) + switch (state) + { + case D3DRS_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRS_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba9011..4ebf51d040c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1340,6 +1340,8 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) if (caps->dpcLineCaps.dwRasterCaps & WINED3DPRASTERCAPS_DEPTHBIAS) caps->dpcLineCaps.dwRasterCaps = (caps->dpcLineCaps.dwRasterCaps | D3DPRASTERCAPS_ZBIAS) & ~WINED3DPRASTERCAPS_DEPTHBIAS; + if (wined3d_caps.LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->dpcLineCaps.dwRasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; caps->dpcLineCaps.dwZCmpCaps &= ( D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e09100dfdc7..47856a05fb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -74,9 +74,15 @@ static inline WORD d3d_fpu_setup(void) static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) { - if (state == D3DRENDERSTATE_ZBIAS) + switch (state) + { + case D3DRENDERSTATE_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRENDERSTATE_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d375122781b..1cb9f222eab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,12 +1798,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta } } -static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void line_antialias(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_rasterizer_state *r = state->rasterizer_state; - - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) + if (r && r->desc.line_antialias) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4427,7 +4424,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4445,7 +4442,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4602,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, @@ -5504,6 +5500,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 8, 8}, { 17, 22}, { 27, 27}, + { 40, 40}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48d133485b8..7e97c84c19e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1665,7 +1665,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_FOGEND] = tmpfloat.d; tmpfloat.f = 1.0f; rs[WINED3D_RS_FOGDENSITY] = tmpfloat.d; - rs[WINED3D_RS_EDGEANTIALIAS] = FALSE; rs[WINED3D_RS_RANGEFOGENABLE] = FALSE; rs[WINED3D_RS_STENCILENABLE] = FALSE; rs[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 335d502ab0b..004c33f8ea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4919,7 +4919,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_FOGEND); D3DSTATE_TO_STR(WINED3D_RS_FOGDENSITY); D3DSTATE_TO_STR(WINED3D_RS_STIPPLEENABLE); - D3DSTATE_TO_STR(WINED3D_RS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3D_RS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3D_RS_MIPMAPLODBIAS); D3DSTATE_TO_STR(WINED3D_RS_RANGEFOGENABLE); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3b41896e4..d3eb8100cd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -310,7 +310,6 @@ enum wined3d_render_state WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, WINED3D_RS_STIPPLEENABLE = 39, - WINED3D_RS_EDGEANTIALIAS = 40, WINED3D_RS_COLORKEYENABLE = 41, WINED3D_RS_MIPMAPLODBIAS = 46, WINED3D_RS_RANGEFOGENABLE = 48, @@ -1209,7 +1208,6 @@ enum wined3d_shader_type #define WINED3DPRASTERCAPS_STIPPLE 0x00000200 #define WINED3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 #define WINED3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 -#define WINED3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 #define WINED3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 #define WINED3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 #define WINED3DPRASTERCAPS_FOGRANGE 0x00010000 -- 2.24.0

3 9

[PATCH 2/2] opengl32: add stub wglSwapMultipleBuffers
by Vijay Kiran Kamuju April 13, 2020

April 13, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] opengl32: update spec file
by Vijay Kiran Kamuju April 13, 2020

April 13, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] adsldp/tests: Add one more skip() to catch ERROR_DS_SERVER_DOWN.
by Dmitry Timoshkov April 13, 2020

April 13, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/ldap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e76bd2e0b6..9d0def609b 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -350,6 +350,11 @@ static void test_DirectorySearch(void) ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com/rootDSE", &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); -- 2.25.2

2 1