January 2021 - Wine-commits

Zebediah Figura : kernel32: Implement SetProcessDEPPolicy().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: b62921245238412709d4e9f8a3548d37864d0d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b62921245238412709d4e9f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:22 2021 -0600 kernel32: Implement SetProcessDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 227d49ea37e..085fff1454e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -562,11 +562,19 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) /********************************************************************** * SetProcessDEPPolicy (KERNEL32.@) */ -BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) +BOOL WINAPI SetProcessDEPPolicy( DWORD flags ) { - FIXME("(%d): stub\n", newDEP); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + ULONG dep_flags = 0; + + TRACE("%#x\n", flags); + + if (flags & PROCESS_DEP_ENABLE) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT; + if (flags & PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) + dep_flags |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; + + return set_ntstatus( NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &dep_flags, sizeof(dep_flags) ) ); } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Implement DbgUiGet/SetThreadDebugObject().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: f7c48da359a7b83e6a0ef35fdea89fcc613a48b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c48da359a7b83e6a0ef35f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:17:45 2021 +0100 ntdll: Implement DbgUiGet/SetThreadDebugObject(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2f1d4904111..285b719f2d5 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -38,10 +38,10 @@ @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess -# @ stub DbgUiGetThreadDebugObject +@ stdcall DbgUiGetThreadDebugObject() @ stdcall DbgUiIssueRemoteBreakin(long) @ stdcall DbgUiRemoteBreakin(ptr) -# @ stub DbgUiSetThreadDebugObject +@ stdcall DbgUiSetThreadDebugObject(long) # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 4cf83753a79..d8280277418 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -118,6 +118,22 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, &create_info, attr ); } +/*********************************************************************** + * DbgUiGetThreadDebugObject (NTDLL.@) + */ +HANDLE WINAPI DbgUiGetThreadDebugObject(void) +{ + return NtCurrentTeb()->DbgSsReserved[1]; +} + +/*********************************************************************** + * DbgUiSetThreadDebugObject (NTDLL.@) + */ +void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) +{ + NtCurrentTeb()->DbgSsReserved[1] = handle; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 6de71e0e206..ac63567dad3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,8 +3020,10 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*); +NTSYSAPI void WINAPI DbgUiSetThreadDebugObject(HANDLE); NTSYSAPI void WINAPI DbgUserBreakPoint(void); NTSYSAPI NTSTATUS WINAPI LdrAccessResource(HMODULE,const IMAGE_RESOURCE_DATA_ENTRY*,void**,PULONG); NTSYSAPI NTSTATUS WINAPI LdrAddDllDirectory(const UNICODE_STRING*,void**);

1 0

Alexandre Julliard : ntdll: Implement DbgUiConnectToDbg().
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: a24e330b203a6b37987633ba03fc3b2e1c3a004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24e330b203a6b37987633ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 11:20:38 2021 +0100 ntdll: Implement DbgUiConnectToDbg(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/process.c | 16 ++++++++++++++++ include/winternl.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 285b719f2d5..740030f2066 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -34,7 +34,7 @@ @ stub DbgPrompt # @ stub DbgQueryDebugFilterState # @ stub DbgSetDebugFilterState -@ stub DbgUiConnectToDbg +@ stdcall DbgUiConnectToDbg() @ stub DbgUiContinue @ stub DbgUiConvertStateChangeStructure # @ stub DbgUiDebugActiveProcess diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index d8280277418..c52f00d123e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -134,6 +134,22 @@ void WINAPI DbgUiSetThreadDebugObject( HANDLE handle ) NtCurrentTeb()->DbgSsReserved[1] = handle; } +/*********************************************************************** + * DbgUiConnectToDbg (NTDLL.@) + */ +NTSTATUS WINAPI DbgUiConnectToDbg(void) +{ + HANDLE handle; + NTSTATUS status; + OBJECT_ATTRIBUTES attr = { sizeof(attr) }; + + if (DbgUiGetThreadDebugObject()) return STATUS_SUCCESS; /* already connected */ + + status = NtCreateDebugObject( &handle, DEBUG_ALL_ACCESS, &attr, 0 ); + if (!status) DbgUiSetThreadDebugObject( handle ); + return status; +} + /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index ac63567dad3..fc4792a194a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3020,6 +3020,7 @@ typedef struct _PS_CREATE_INFO NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); +NTSYSAPI NTSTATUS WINAPI DbgUiConnectToDbg(void); NTSYSAPI HANDLE WINAPI DbgUiGetThreadDebugObject(void); NTSYSAPI NTSTATUS WINAPI DbgUiIssueRemoteBreakin(HANDLE); NTSYSAPI void WINAPI DbgUiRemoteBreakin(void*);

1 0

Alexandre Julliard : ntdll: Support the NtCreateDebugObject() flags.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 964772bc8ea04fb445843b13f4d1f2e297002d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=964772bc8ea04fb445843b13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:26:17 2021 +0100 ntdll: Support the NtCreateDebugObject() flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/process.c | 2 +- dlls/ntdll/unix/sync.c | 3 ++ include/wine/server_protocol.h | 4 ++- include/winternl.h | 2 ++ server/debugger.c | 21 ++++++------ server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + 9 files changed, 98 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964772bc8ea04fb44584…

1 0

Nikolay Sivov : mf/tests: Use interface check helper more.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: be3bab5efbcef1470468b982f342d401af8047c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be3bab5efbcef1470468b982… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:56 2021 +0300 mf/tests: Use interface check helper more. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8272064466f..34090d0a9d4 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1154,7 +1154,6 @@ static void test_session_events(IMFMediaSession *session) static void test_media_session(void) { IMFRateControl *rate_control, *rate_control2; - IMFLocalMFTRegistration *local_reg; MFCLOCK_PROPERTIES clock_props; IMFRateSupport *rate_support; IMFAttributes *attributes; @@ -1163,7 +1162,6 @@ static void test_media_session(void) IMFShutdown *shutdown; PROPVARIANT propvar; DWORD status, caps; - IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; @@ -1176,23 +1174,19 @@ static void test_media_session(void) hr = MFCreateMediaSession(NULL, &session); ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFAttributes, (void **)&unk); - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + check_interface(session, &IID_IMFGetService, TRUE); + check_interface(session, &IID_IMFAttributes, FALSE); - hr = IMFMediaSession_QueryInterface(session, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support); ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); + hr = MFGetService((IUnknown *)session, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, (void **)&rate_control); ok(hr == S_OK, "Failed to get rate control interface, hr %#x.\n", hr); - hr = IMFGetService_GetService(gs, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, - (void **)&local_reg); + hr = MFGetService((IUnknown *)session, &MF_LOCAL_MFT_REGISTRATION_SERVICE, &IID_IMFLocalMFTRegistration, (void **)&unk); ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Vista */, "Failed to get registration service, hr %#x.\n", hr); if (SUCCEEDED(hr)) - IMFLocalMFTRegistration_Release(local_reg); + IUnknown_Release(unk); hr = IMFRateSupport_QueryInterface(rate_support, &IID_IMFMediaSession, (void **)&unk); ok(hr == S_OK, "Failed to get session interface, hr %#x.\n", hr); @@ -1220,6 +1214,8 @@ static void test_media_session(void) hr = IMFMediaSession_GetClock(session, &clock); ok(hr == S_OK, "Failed to get clock, hr %#x.\n", hr); + check_interface(clock, &IID_IMFPresentationClock, TRUE); + hr = IMFClock_QueryInterface(clock, &IID_IMFRateControl, (void **)&rate_control2); ok(hr == S_OK, "Failed to get rate control, hr %#x.\n", hr); @@ -1241,8 +1237,6 @@ todo_wine IMFRateControl_Release(rate_control); IMFRateSupport_Release(rate_support); - IMFGetService_Release(gs); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session);

1 0

Nikolay Sivov : mfmediaengine: Use presentation clock interface from the session.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 39d177b88b77c63f476a995a655d471dd5852a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d177b88b77c63f476a995a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:57 2021 +0300 mfmediaengine: Use presentation clock interface from the session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 6f6811ff9ea..2bf7cf45da1 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -126,7 +126,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; - IMFClock *clock; + IMFPresentationClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -982,7 +982,7 @@ static void free_media_engine(struct media_engine *engine) if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); if (engine->clock) - IMFClock_Release(engine->clock); + IMFPresentationClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -1208,16 +1208,14 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { struct media_engine *engine = impl_from_IMFMediaEngine(iface); - LONGLONG clocktime; double ret = 0.0; - MFTIME systime; + MFTIME clocktime; TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { - /* Assume 100ns clock. */ ret = (double)clocktime / 10000000.0; } LeaveCriticalSection(&engine->cs); @@ -1854,6 +1852,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct { DXGI_FORMAT output_format; UINT64 playback_hwnd; + IMFClock *clock; HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; @@ -1877,7 +1876,12 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; - if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &clock))) + return hr; + + hr = IMFClock_QueryInterface(clock, &IID_IMFPresentationClock, (void **)&engine->clock); + IMFClock_Release(clock); + if (FAILED(hr)) return hr; if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL)))

1 0

Nikolay Sivov : mfmediaengine: Use existing helper to update engine state flags.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 85a62b3657fa473c2e012e882e891df3256755e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a62b3657fa473c2e012e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:58 2021 +0300 mfmediaengine: Use existing helper to update engine state flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 2bf7cf45da1..f9872f43a3b 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -822,10 +822,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return E_UNEXPECTED; } - if (sd_video) - engine->flags |= FLAGS_ENGINE_HAS_VIDEO; - if (sd_audio) - engine->flags |= FLAGS_ENGINE_HAS_AUDIO; + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); /* Assume live source if duration was not provided. */ if (SUCCEEDED(IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, &duration))) @@ -1421,13 +1419,13 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - engine->flags &= ~FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; IMFMediaSession_Start(engine->session, &GUID_NULL, &var); - engine->flags |= FLAGS_ENGINE_WAITING; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, TRUE); } IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_WAITING, 0, 0); @@ -1447,8 +1445,8 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - engine->flags &= ~FLAGS_ENGINE_WAITING; - engine->flags |= FLAGS_ENGINE_PAUSED; + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PAUSE, 0, 0); @@ -1623,7 +1621,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) hr = MF_E_SHUTDOWN; else { - engine->flags |= FLAGS_ENGINE_SHUT_DOWN; + media_engine_set_flag(engine, FLAGS_ENGINE_SHUT_DOWN, TRUE); IMFMediaSession_Shutdown(engine->session); } LeaveCriticalSection(&engine->cs); @@ -1794,7 +1792,7 @@ static HRESULT WINAPI media_engine_grabber_callback_OnProcessSample(IMFSampleGra if (!(engine->flags & FLAGS_ENGINE_FIRST_FRAME)) { IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_FIRSTFRAMEREADY, 0, 0); - engine->flags |= FLAGS_ENGINE_FIRST_FRAME; + media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, TRUE); } engine->video_frame.pts = sample_time;

1 0

Nikolay Sivov : mfmediaengine: Set "ended" state when session presentation ends.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 67815c2f6236b65656eb8500cbd11d4b4c9eedff URL: https://source.winehq.org/git/wine.git/?a=commit;h=67815c2f6236b65656eb8500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:09:59 2021 +0300 mfmediaengine: Set "ended" state when session presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index f9872f43a3b..42aa8a6e92a 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -96,6 +96,7 @@ enum media_engine_flags FLAGS_ENGINE_HAS_AUDIO = 0x800, FLAGS_ENGINE_HAS_VIDEO = 0x1000, FLAGS_ENGINE_FIRST_FRAME = 0x2000, + FLAGS_ENGINE_IS_ENDED = 0x4000, }; struct video_frame @@ -634,6 +635,7 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface EnterCriticalSection(&engine->cs); media_engine_set_flag(engine, FLAGS_ENGINE_FIRST_FRAME, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_IS_ENDED, TRUE); engine->video_frame.pts = MINLONGLONG; LeaveCriticalSection(&engine->cs); @@ -1347,9 +1349,16 @@ static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTi static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_IS_ENDED); + LeaveCriticalSection(&engine->cs); + + return value; } static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) @@ -1419,7 +1428,7 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_WAITING)) { - media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED | FLAGS_ENGINE_IS_ENDED, FALSE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_PLAY, 0, 0); var.vt = VT_EMPTY; @@ -1445,7 +1454,7 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) if (!(engine->flags & FLAGS_ENGINE_PAUSED)) { - media_engine_set_flag(engine, FLAGS_ENGINE_WAITING, FALSE); + media_engine_set_flag(engine, FLAGS_ENGINE_WAITING | FLAGS_ENGINE_IS_ENDED, FALSE); media_engine_set_flag(engine, FLAGS_ENGINE_PAUSED, TRUE); IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_TIMEUPDATE, 0, 0);

1 0

Nikolay Sivov : mfmediaengine: Force returned playback position after presentation ends.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 35569903876e4893d3430d734442cba759d63f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35569903876e4893d3430d73… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:00 2021 +0300 mfmediaengine: Force returned playback position after presentation ends. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 42aa8a6e92a..8c3b4f41229 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1214,7 +1214,11 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) TRACE("%p.\n", iface); EnterCriticalSection(&engine->cs); - if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) + if (engine->flags & FLAGS_ENGINE_IS_ENDED) + { + ret = engine->duration; + } + else if (SUCCEEDED(IMFPresentationClock_GetTime(engine->clock, &clocktime))) { ret = (double)clocktime / 10000000.0; }

1 0

Nikolay Sivov : mfmediaengine: Use consistent format for traces.
by Alexandre Julliard 29 Jan '21

29 Jan '21

Module: wine Branch: master Commit: 21ae610d14f0d508c1b20c8af8516e118e00f4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ae610d14f0d508c1b20c8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 29 15:10:01 2021 +0300 mfmediaengine: Use consistent format for traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 8c3b4f41229..65f207bd4b5 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -952,7 +952,7 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) @@ -972,7 +972,7 @@ static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); return refcount; } @@ -999,7 +999,7 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) struct media_engine *engine = impl_from_IMFMediaEngine(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); - TRACE("(%p) ref=%u.\n", iface, refcount); + TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) free_media_engine(engine); @@ -1978,7 +1978,7 @@ static IMFMediaEngineClassFactory media_engine_factory = { &media_engine_factory static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - TRACE("(%s, %p).\n", debugstr_guid(riid), obj); + TRACE("%s, %p.\n", debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2005,7 +2005,7 @@ static ULONG WINAPI classfactory_Release(IClassFactory *iface) static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - TRACE("(%p, %s, %p).\n", outer, debugstr_guid(riid), obj); + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), obj); *obj = NULL; @@ -2034,7 +2034,7 @@ static IClassFactory classfactory = { &class_factory_vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) { - TRACE("(%s, %s, %p).\n", debugstr_guid(clsid), debugstr_guid(riid), obj); + TRACE("%s, %s, %p.\n", debugstr_guid(clsid), debugstr_guid(riid), obj); if (IsEqualGUID(clsid, &CLSID_MFMediaEngineClassFactory)) return IClassFactory_QueryInterface(&classfactory, riid, obj);

1 0