November 2020 - Wine-commits

Alexandre Julliard : mscms: Move liblcms support to a new Unix library.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: daf9f128507980bb87506be43ebad36941af6218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf9f128507980bb87506be4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:46:37 2020 +0100 mscms: Move liblcms support to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 1 + dlls/mscms/handle.c | 9 +- dlls/mscms/icc.c | 4 - dlls/mscms/liblcms.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mscms/mscms_main.c | 17 +--- dlls/mscms/mscms_priv.h | 22 +++-- dlls/mscms/profile.c | 88 +++++-------------- dlls/mscms/transform.c | 221 ++++------------------------------------------ 8 files changed, 287 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=daf9f128507980bb8750…

1 0

Alexandre Julliard : mscms: Build with msvcrt.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 11fb2a59181c42478075a9576cf37450c277c625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fb2a59181c42478075a957… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:47:53 2020 +0100 mscms: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 2 ++ dlls/mscms/handle.c | 4 +--- dlls/mscms/icc.c | 2 -- dlls/mscms/mscms_main.c | 6 +----- dlls/mscms/profile.c | 39 +++++++++++++-------------------------- dlls/mscms/stub.c | 4 +--- dlls/mscms/transform.c | 4 +--- 7 files changed, 19 insertions(+), 42 deletions(-) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 495f9af98d5..4c976247ebf 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -4,6 +4,8 @@ IMPORTS = shlwapi advapi32 EXTRAINCL = $(LCMS2_CFLAGS) EXTRALIBS = $(LCMS2_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ handle.c \ icc.c \ diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index ee59ad3b5bd..4e532a6fca3 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 2033374d30c..2765888709c 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 2ea0255c4a1..516dd82540c 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -18,11 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "wine/port.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -31,6 +26,7 @@ #include "winuser.h" #include "winternl.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0e5af035d87..bc7f200006b 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -18,10 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" -#include "wine/unicode.h" - #include <stdarg.h> #include "windef.h" @@ -32,6 +28,7 @@ #include "winreg.h" #include "shlwapi.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" @@ -104,12 +101,6 @@ BOOL WINAPI AssociateColorProfileWithDeviceA( PCSTR machine, PCSTR profile, PCST static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) { - static const WCHAR fmtW[] = {'%','c','%','c','%','c','%','c',0}; - static const WCHAR icmW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','C','M',0}; PROFILEHEADER header; PROFILE profile; HPROFILE handle; @@ -132,11 +123,13 @@ static BOOL set_profile_device_key( PCWSTR file, const BYTE *value, DWORD size ) SetLastError( ERROR_INVALID_PROFILE ); return FALSE; } - RegCreateKeyExW( HKEY_LOCAL_MACHINE, icmW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\ICM", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &icm_key, NULL ); basename( file, basenameW ); - sprintfW( classW, fmtW, (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, - (header.phClass >> 8) & 0xff, header.phClass & 0xff ); + swprintf( classW, ARRAY_SIZE(classW), L"%c%c%c%c", + (header.phClass >> 24) & 0xff, (header.phClass >> 16) & 0xff, + (header.phClass >> 8) & 0xff, header.phClass & 0xff ); RegCreateKeyExW( icm_key, classW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &class_key, NULL ); if (value) RegSetValueExW( class_key, basenameW, 0, REG_BINARY, value, size ); @@ -287,8 +280,6 @@ BOOL WINAPI GetColorDirectoryA( PCSTR machine, PSTR buffer, PDWORD size ) BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) { WCHAR colordir[MAX_PATH]; - static const WCHAR colorsubdir[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r',0}; DWORD len; TRACE( "( %p, %p )\n", buffer, size ); @@ -296,7 +287,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); - lstrcatW( colordir, colorsubdir ); + lstrcatW( colordir, L"\\spool\\drivers\\color" ); len = lstrlenW( colordir ) * sizeof(WCHAR); @@ -573,9 +564,6 @@ BOOL WINAPI GetStandardColorSpaceProfileA( PCSTR machine, DWORD id, PSTR profile */ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profile, PDWORD size ) { - static const WCHAR rgbprofilefile[] = - { '\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; WCHAR rgbprofile[MAX_PATH]; DWORD len = sizeof(rgbprofile); @@ -605,7 +593,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi { case LCS_sRGB: case LCS_WINDOWS_COLOR_SPACE: /* FIXME */ - lstrcatW( rgbprofile, rgbprofilefile ); + lstrcatW( rgbprofile, L"\\srgb color space profile.icm" ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); if (*size < len) @@ -917,7 +905,6 @@ exit: BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, PDWORD size, PDWORD number ) { - static const WCHAR spec[] = {'\\','*','i','c','m',0}; BOOL match, ret = FALSE; WCHAR colordir[MAX_PATH], glob[MAX_PATH], **profiles = NULL; DWORD i, len = sizeof(colordir), count = 0, totalsize = 0; @@ -932,14 +919,14 @@ BOOL WINAPI EnumColorProfilesW( PCWSTR machine, PENUMTYPEW record, PBYTE buffer, record->dwVersion != ENUM_TYPE_VERSION) return FALSE; ret = GetColorDirectoryW( machine, colordir, &len ); - if (!ret || len + sizeof(spec) > MAX_PATH) + if (!ret || len + ARRAY_SIZE(L"\\*icm") > MAX_PATH) { WARN( "Can't retrieve color directory\n" ); return FALSE; } lstrcpyW( glob, colordir ); - lstrcatW( glob, spec ); + lstrcatW( glob, L"\\*icm" ); find = FindFirstFileW( glob, &data ); if (find == INVALID_HANDLE_VALUE) return FALSE; @@ -1085,7 +1072,7 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) lstrcatW( dest, base ); /* Is source equal to destination? */ - if (!lstrcmpW( profile, dest )) return TRUE; + if (!wcscmp( profile, dest )) return TRUE; return CopyFileW( profile, dest, TRUE ); } @@ -1385,11 +1372,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) { - size += (strlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); + size += (lstrlenW( profile->pProfileData ) + 2) * sizeof(WCHAR); if (!(path = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; GetColorDirectoryW( NULL, path, &size ); PathAddBackslashW( path ); - strcatW( path, profile->pProfileData ); + lstrcatW( path, profile->pProfileData ); } else return NULL; handle = CreateFileW( path, flags, sharing, NULL, creation, 0, NULL ); diff --git a/dlls/mscms/stub.c b/dlls/mscms/stub.c index 4cd6863f219..28c08e20868 100644 --- a/dlls/mscms/stub.c +++ b/dlls/mscms/stub.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -28,6 +25,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h" diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 29d977e58f6..fc005062e38 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/debug.h" - #include <stdarg.h> #include "windef.h" @@ -29,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "icm.h" +#include "wine/debug.h" #include "mscms_priv.h"

1 0

Nikolay Sivov : evr/presenter: Create sample allocator on object creation.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 603b00fe55139115c6ba4c302bae0d0c6f3150e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603b00fe55139115c6ba4c30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:18 2020 +0300 evr/presenter: Create sample allocator on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 335e5df2459..2102882e084 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -70,6 +70,7 @@ struct video_presenter IMediaEventSink *event_sink; IDirect3DDeviceManager9 *device_manager; + IMFVideoSampleAllocator *allocator; struct streaming_thread thread; IMFMediaType *media_type; UINT reset_token; @@ -175,12 +176,13 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) IMFMediaType_Release(presenter->media_type); presenter->media_type = NULL; - /* FIXME: release samples pool */ + IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { unsigned int flags; + HRESULT hr; if (!media_type) { @@ -193,12 +195,15 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, video_presenter_reset_media_type(presenter); - /* FIXME: allocate samples pool */ - - presenter->media_type = media_type; - IMFMediaType_AddRef(presenter->media_type); + if (SUCCEEDED(hr = IMFVideoSampleAllocator_InitializeSampleAllocator(presenter->allocator, 3, media_type))) + { + presenter->media_type = media_type; + IMFMediaType_AddRef(presenter->media_type); + } + else + WARN("Failed to initialize sample allocator, hr %#x.\n", hr); - return S_OK; + return hr; } static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) @@ -220,7 +225,9 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = video_presenter_set_media_type(presenter, media_type); - hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); if (SUCCEEDED(hr)) @@ -388,9 +395,12 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_end_streaming(presenter); video_presenter_clear_container(presenter); + video_presenter_reset_media_type(presenter); DeleteCriticalSection(&presenter->cs); if (presenter->device_manager) IDirect3DDeviceManager9_Release(presenter->device_manager); + if (presenter->allocator) + IMFVideoSampleAllocator_Release(presenter->allocator); heap_free(presenter); } @@ -1179,6 +1189,11 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#x.\n", hr); + if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + { + hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); + } + return hr; }

1 0

Nikolay Sivov : evr/presenter: Add a helpe for input processing.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: e4ec280ec7d56875d2097c8094608dbf7bdcb697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ec280ec7d56875d2097c80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:19 2020 +0300 evr/presenter: Add a helpe for input processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 2102882e084..8be3dd91aa7 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -40,6 +40,11 @@ enum presenter_state PRESENTER_STATE_PAUSED, }; +enum presenter_flags +{ + PRESENTER_MIXER_HAS_INPUT = 0x1, +}; + enum streaming_thread_message { EVRM_STOP = WM_USER, @@ -82,6 +87,7 @@ struct video_presenter SIZE native_ratio; unsigned int ar_mode; unsigned int state; + unsigned int flags; CRITICAL_SECTION cs; }; @@ -311,6 +317,50 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) return S_OK; } +static HRESULT video_presenter_process_input(struct video_presenter *presenter) +{ + MFT_OUTPUT_DATA_BUFFER buffer; + HRESULT hr = S_OK; + IMFSample *sample; + DWORD status; + + if (!presenter->media_type) + return S_OK; + + while (hr == S_OK) + { + if (!(presenter->flags & PRESENTER_MIXER_HAS_INPUT)) + break; + + if (FAILED(hr = IMFVideoSampleAllocator_AllocateSample(presenter->allocator, &sample))) + { + WARN("Failed to allocate a sample, hr %#x.\n", hr); + break; + } + + memset(&buffer, 0, sizeof(buffer)); + buffer.pSample = sample; + + if (FAILED(hr = IMFTransform_ProcessOutput(presenter->mixer, 0, 1, &buffer, &status))) + { + /* FIXME: failure path probably needs to handle some errors specifically */ + presenter->flags &= ~PRESENTER_MIXER_HAS_INPUT; + IMFSample_Release(sample); + break; + } + else + { + if (buffer.pEvents) + IMFCollection_Release(buffer.pEvents); + + /* FIXME: for now drop output sample back to the pool */ + IMFSample_Release(sample); + } + } + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -511,6 +561,10 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M case MFVP_MESSAGE_ENDSTREAMING: hr = video_presenter_end_streaming(presenter); break; + case MFVP_MESSAGE_PROCESSINPUTNOTIFY: + presenter->flags |= PRESENTER_MIXER_HAS_INPUT; + hr = video_presenter_process_input(presenter); + break; default: FIXME("Unsupported message %u.\n", message); hr = E_NOTIMPL;

1 0

Nikolay Sivov : evr/presenter: Notify renderer host about mixer latency.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 38d75c4294399dc7465c7c5f86c6c578962e1cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d75c4294399dc7465c7c5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:20 2020 +0300 evr/presenter: Notify renderer host about mixer latency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8be3dd91aa7..5bffa9af228 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -131,6 +131,13 @@ static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPosition return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); } +static void video_presenter_notify_renderer(struct video_presenter *presenter, + LONG event, LONG_PTR param1, LONG_PTR param2) +{ + if (presenter->event_sink) + IMediaEventSink_Notify(presenter->event_sink, event, param1, param2); +} + static unsigned int get_gcd(unsigned int a, unsigned int b) { unsigned int m; @@ -329,6 +336,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) while (hr == S_OK) { + LONGLONG mixing_started, mixing_finished; + MFTIME systime; + if (!(presenter->flags & PRESENTER_MIXER_HAS_INPUT)) break; @@ -341,6 +351,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) memset(&buffer, 0, sizeof(buffer)); buffer.pSample = sample; + if (presenter->clock) + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_started, &systime); + if (FAILED(hr = IMFTransform_ProcessOutput(presenter->mixer, 0, 1, &buffer, &status))) { /* FIXME: failure path probably needs to handle some errors specifically */ @@ -350,6 +363,15 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) } else { + if (presenter->clock) + { + LONGLONG latency; + + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_finished, &systime); + latency = mixing_finished - mixing_started; + video_presenter_notify_renderer(presenter, EC_PROCESSING_LATENCY, (LONG_PTR)&latency, 0); + } + if (buffer.pEvents) IMFCollection_Release(buffer.pEvents);

1 0

Nikolay Sivov : evr/presenter: Add sample allocator notification callback.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 03a10db21494906b88997b980457a970b56f83c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a10db21494906b88997b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:21 2020 +0300 evr/presenter: Add sample allocator notification callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5bffa9af228..9bf4cda3725 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct video_presenter IMFRateSupport IMFRateSupport_iface; IMFGetService IMFGetService_iface; IMFVideoPositionMapper IMFVideoPositionMapper_iface; + IMFVideoSampleAllocatorNotify allocator_cb; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -131,6 +132,11 @@ static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPosition return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); } +static struct video_presenter *impl_from_IMFVideoSampleAllocatorNotify(IMFVideoSampleAllocatorNotify *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, allocator_cb); +} + static void video_presenter_notify_renderer(struct video_presenter *presenter, LONG event, LONG_PTR param1, LONG_PTR param2) { @@ -183,6 +189,18 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen IMFMediaType_Release(media_type); } +/* It is important this is called to reset callback too to break circular referencing, + when allocator keeps a reference of its container, that created it. */ +static void video_presenter_set_allocator_callback(struct video_presenter *presenter, + IMFVideoSampleAllocatorNotify *notify_cb) +{ + IMFVideoSampleAllocatorCallback *cb; + + IMFVideoSampleAllocator_QueryInterface(presenter->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&cb); + IMFVideoSampleAllocatorCallback_SetCallback(cb, notify_cb); + IMFVideoSampleAllocatorCallback_Release(cb); +} + static void video_presenter_reset_media_type(struct video_presenter *presenter) { if (presenter->media_type) @@ -190,6 +208,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) presenter->media_type = NULL; IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator); + video_presenter_set_allocator_callback(presenter, NULL); } static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) @@ -298,6 +317,8 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter return E_FAIL; } + video_presenter_set_allocator_callback(presenter, &presenter->allocator_cb); + WaitForSingleObject(presenter->thread.ready_event, INFINITE); CloseHandle(presenter->thread.ready_event); presenter->thread.ready_event = NULL; @@ -320,6 +341,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#x.\n", presenter->thread.tid); memset(&presenter->thread, 0, sizeof(presenter->thread)); + video_presenter_set_allocator_callback(presenter, NULL); return S_OK; } @@ -1222,6 +1244,47 @@ static const IMFVideoPositionMapperVtbl video_presenter_position_mapper_vtbl = video_presenter_position_mapper_MapOutputCoordinateToInputStream, }; +static HRESULT WINAPI video_presenter_allocator_cb_QueryInterface(IMFVideoSampleAllocatorNotify *iface, + REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFVideoSampleAllocatorNotify) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFVideoSampleAllocatorNotify_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI video_presenter_allocator_cb_AddRef(IMFVideoSampleAllocatorNotify *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_allocator_cb_Release(IMFVideoSampleAllocatorNotify *iface) +{ + struct video_presenter *presenter = impl_from_IMFVideoSampleAllocatorNotify(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_allocator_cb_NotifyRelease(IMFVideoSampleAllocatorNotify *iface) +{ + return E_NOTIMPL; +} + +static const IMFVideoSampleAllocatorNotifyVtbl video_presenter_allocator_cb_vtbl = +{ + video_presenter_allocator_cb_QueryInterface, + video_presenter_allocator_cb_AddRef, + video_presenter_allocator_cb_Release, + video_presenter_allocator_cb_NotifyRelease, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -1290,6 +1353,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->IMFRateSupport_iface.lpVtbl = &video_presenter_rate_support_vtbl; object->IMFGetService_iface.lpVtbl = &video_presenter_getservice_vtbl; object->IMFVideoPositionMapper_iface.lpVtbl = &video_presenter_position_mapper_vtbl; + object->allocator_cb.lpVtbl = &video_presenter_allocator_cb_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1;

1 0

Nikolay Sivov : evr/allocator: Call user callback when sample is returned to the pool.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2192d0146a0a066c8d04dc4d03667b48631a754a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2192d0146a0a066c8d04dc4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:22 2020 +0300 evr/allocator: Call user callback when sample is returned to the pool. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 729f279fafe..a44e3ef45c6 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -815,6 +815,9 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback IUnknown_Release(sample); + if (allocator->callback) + IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + LeaveCriticalSection(&allocator->cs); return S_OK;

1 0

Damjan Jovanovic : ntdll: Fix wrong return values in get_dir_case_sensitivity_stat().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 4e6621f3a65636d7db53a34c897013445dea79fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6621f3a65636d7db53a34c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:33 2020 +0200 ntdll: Fix wrong return values in get_dir_case_sensitivity_stat(). It should be returning TRUE (= case sensitive) on failure as case sensitive is the safe assumption, but some returns are FALSE on failure and even TRUE when case insensitive. Fix that. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d6a7b0c1550..c8531bb4f93 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1122,7 +1122,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) struct statfs stfs; - if (statfs( dir, &stfs ) == -1) return FALSE; + if (statfs( dir, &stfs ) == -1) return TRUE; /* Assume these file systems are always case insensitive on Mac OS. * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS * is the only UNIX that supports case-insensitive lookup). @@ -1159,12 +1159,12 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) #elif defined(__NetBSD__) struct statvfs stfs; - if (statvfs( dir, &stfs ) == -1) return FALSE; + if (statvfs( dir, &stfs ) == -1) return TRUE; /* Only assume CIOPFS is case insensitive. */ if (strcmp( stfs.f_fstypename, "fusefs" ) || strncmp( stfs.f_mntfromname, "ciopfs", 5 )) - return TRUE; - return FALSE; + return FALSE; + return TRUE; #elif defined(__linux__) BOOLEAN sens = TRUE;

1 0

Damjan Jovanovic : ntdll: FAT filesystems are called "msdosfs" on FreeBSD >= 5.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: d1c8611886f65c11f6985bc6f4e7c72a5e349083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c8611886f65c11f6985bc6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:46 2020 +0200 ntdll: FAT filesystems are called "msdosfs" on FreeBSD >= 5. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c8531bb4f93..3699f8b8891 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6349,7 +6349,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io fs_type = MOUNTMGR_FS_TYPE_ISO9660; else if (!strcmp( stfs.f_fstypename, "udf" )) fs_type = MOUNTMGR_FS_TYPE_UDF; - else if (!strcmp( stfs.f_fstypename, "msdos" )) + else if (!strcmp( stfs.f_fstypename, "msdos" )) /* FreeBSD < 5, Apple */ + fs_type = MOUNTMGR_FS_TYPE_FAT32; + else if (!strcmp( stfs.f_fstypename, "msdosfs" )) /* FreeBSD >= 5 */ fs_type = MOUNTMGR_FS_TYPE_FAT32; #endif }

1 0

Damjan Jovanovic : ntdll: Msdosfs was case-insensitive since FreeBSD 8 or even earlier.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 9ba13fbca604d35037d3da60146091e8be92d697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba13fbca604d35037d3da60… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:52 2020 +0200 ntdll: Msdosfs was case-insensitive since FreeBSD 8 or even earlier. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3699f8b8891..7a97f2bdd85 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1123,13 +1123,13 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) struct statfs stfs; if (statfs( dir, &stfs ) == -1) return TRUE; - /* Assume these file systems are always case insensitive on Mac OS. - * For FreeBSD, only assume CIOPFS is case insensitive (AFAIK, Mac OS - * is the only UNIX that supports case-insensitive lookup). - */ + /* Assume these file systems are always case insensitive.*/ if (!strcmp( stfs.f_fstypename, "fusefs" ) && !strncmp( stfs.f_mntfromname, "ciopfs", 5 )) return FALSE; + /* msdosfs was case-insensitive since FreeBSD 8, if not earlier */ + if (!strcmp( stfs.f_fstypename, "msdosfs" )) + return FALSE; #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) ||

1 0