January 2021 - Wine-Commits

Brendan Shanks : loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 307f5d00f17d71fe0030acb6ba9f28c3c9d76615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=307f5d00f17d71fe0030acb6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jan 28 14:52:46 2021 -0800 loader: On Mac, reserve an area starting at 4GB to force Rosetta's allocations higher. On Apple Silicon, Rosetta allocates memory starting at 0x100000000 (the 4GB line) before the preloader runs. The .NET 3.5 installer and DirectX Jun2010 redistributable both contain non-relocatable EXEs with that base address, which fail to run. The workaround is to create an empty linker section at that address, which is mapped by the kernel before Rosetta runs and forces Rosetta's allocations higher in memory. The linker section runs from 0x100000000-0x114000000. Rosetta's allocations are ~132MB, and should end below 0x120000000. This is not an exact science: a non-relocatable EXE with base address between 0x114000000-0x120000000 will fail to run. If one is discovered, the section size will need to be changed. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- loader/preloader_mac.c | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4cb23101f4c..42596bbb9c8 100755 --- a/configure +++ b/configure @@ -8727,7 +8727,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main+:} false; then : diff --git a/configure.ac b/configure.ac index 0f8b9f6c080..a9003523700 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,7 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d86675538bb..fc07b7da0ed 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -54,6 +54,17 @@ #include "wine/asm.h" #include "main.h" +/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) + * before the preloader runs, which prevents any nonrelocatable EXEs with that + * base address from running. + * + * This empty linker section forces Rosetta's allocations (currently ~132 MB) + * to start at 0x114000000, and they should end below 0x120000000. + */ +#if defined(__x86_64__) +__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +#endif + #ifndef LC_MAIN #define LC_MAIN 0x80000028 struct entry_point_command @@ -79,6 +90,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ { (void *)0x7ffd00000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -395,6 +407,10 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; + static const char reserved_segname[] = "WINE_4GB_RESERVE"; + + if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) + continue; if (end > seg_start && start <= seg_end) {

1 0

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

Jan. 29, 2021

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

Zebediah Figura : kernel32: Implement SetProcessDEPPolicy().
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

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

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in activate_mode().
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 1dc7015cdbcc863a57c89cc81b94440c10686da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dc7015cdbcc863a57c89cc8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:15 2021 -0600 winegstreamer: Avoid using Wine debug functions in activate_mode(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7178bb4dfc..5747cce1dd2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1422,7 +1422,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) struct parser *This = gst_pad_get_element_private(pad); if (!activate) { - TRACE("Deactivating\n"); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; @@ -1432,7 +1431,6 @@ static gboolean activate_push(GstPad *pad, gboolean activate) } else if (!This->push_thread) { int ret; - TRACE("Activating\n"); if ((ret = pthread_create(&This->push_thread, NULL, push_data, This))) { GST_ERROR("Failed to create push thread: %s", strerror(errno)); @@ -1447,7 +1445,7 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g { struct parser *filter = gst_pad_get_element_private(pad); - TRACE("%s source pad for filter %p in %s mode.\n", + GST_DEBUG("%s source pad for filter %p in %s mode.", activate ? "Activating" : "Deactivating", filter, gst_pad_mode_get_name(mode)); switch (mode) {

1 0

Zebediah Figura : winegstreamer: Do not flush the upstream source pin in activate_push().
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 5482400a4edb57985be313a68ea9b6406f26ae4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5482400a4edb57985be313a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 18:40:13 2021 -0600 winegstreamer: Do not flush the upstream source pin in activate_push(). We don't do this in pull mode (and in general never have; avidemux and wavparse are two examples of GStreamer elements that don't flush the upstream pad when deactivating). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a4d49c75a1b..b2a20934837 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1424,12 +1424,10 @@ static gboolean activate_push(GstPad *pad, gboolean activate) EnterCriticalSection(&This->filter.filter_cs); if (!activate) { TRACE("Deactivating\n"); - IAsyncReader_BeginFlush(This->reader); if (This->push_thread) { pthread_join(This->push_thread, NULL); This->push_thread = 0; } - IAsyncReader_EndFlush(This->reader); if (This->filter.state == State_Stopped) This->nextofs = This->start; } else if (!This->push_thread) {

1 0

Zebediah Figura : kernel32: Implement GetSystemDEPPolicy().
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

Module: wine Branch: master Commit: 246e2356e5a178ca7e56d350cbc5cdaecc8538ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=246e2356e5a178ca7e56d350… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 28 22:08:21 2021 -0600 kernel32: Implement GetSystemDEPPolicy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92582ae31de..227d49ea37e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -34,6 +34,7 @@ #include "wincon.h" #include "kernel_private.h" #include "psapi.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/server.h" #include "wine/asm.h" @@ -41,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); +static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; + typedef struct { LPSTR lpEnvAddress; @@ -553,8 +556,7 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) */ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) { - FIXME("stub\n"); - return OptIn; + return user_shared_data->NXSupportPolicy; } /**********************************************************************

1 0

Alexandre Julliard : ntdll: Implement DbgUiConnectToDbg().
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

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 Jan. 29, 2021

Jan. 29, 2021

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 : mfmediaengine: Set "ended" state when session presentation ends.
by Alexandre Julliard Jan. 29, 2021

Jan. 29, 2021

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 Jan. 29, 2021

Jan. 29, 2021

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