wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Jacek Caban : server: Support waiting on console input handles.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 459d37643ef72d284eec0dc50573eff59935ae69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=459d37643ef72d284eec0dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:43 2020 +0100 server: Support waiting on console input handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- server/console.c | 22 +++++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5064cfe5c6d..6d15abd8c5f 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1024,7 +1024,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); @@ -1043,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); diff --git a/server/console.c b/server/console.c index d1e3cae8919..4e51ed48a31 100644 --- a/server/console.c +++ b/server/console.c @@ -54,6 +54,7 @@ struct history_line struct console_input { struct object obj; /* object header */ + int signaled; /* is console signaled */ int num_proc; /* number of processes attached to this console */ struct thread *renderer; /* console renderer thread */ struct screen_buffer *active; /* active screen buffer */ @@ -67,6 +68,7 @@ struct console_input static void console_input_dump( struct object *obj, int verbose ); static void console_input_destroy( struct object *obj ); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_get_fd( struct object *obj ); static struct object *console_input_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_input_open_file( struct object *obj, unsigned int access, @@ -77,9 +79,9 @@ static const struct object_ops console_input_ops = sizeof(struct console_input), /* size */ console_input_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + console_input_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_get_fd, /* get_fd */ @@ -338,6 +340,12 @@ static const struct fd_ops console_connection_fd_ops = static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); +static int console_input_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct console_input *console = (struct console_input*)obj; + return console->signaled; +} + static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; @@ -358,6 +366,7 @@ static struct object *create_console_input(void) return NULL; console_input->renderer = NULL; + console_input->signaled = 0; console_input->num_proc = 0; console_input->active = NULL; console_input->server = NULL; @@ -1195,6 +1204,13 @@ DECL_HANDLER(get_next_console_request) if (req->signal) set_event( server->console->event); else reset_event( server->console->event ); + if (!req->signal) server->console->signaled = 0; + else if (!server->console->signaled) + { + server->console->signaled = 1; + wake_up( &server->console->obj, 0 ); + } + if (req->read) { /* set result of current pending ioctl */

1 0

Jacek Caban : kernel32/tests: Add more console waiting tests.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2b205a6d8c2226c13b3fbec5aa63fc6d5342398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b205a6d8c2226c13b3fbec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:34 2020 +0100 kernel32/tests: Add more console waiting tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 495fa1b9e57..5064cfe5c6d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -19,11 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/test.h" +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windows.h> #include <winternl.h> #include <stdio.h> +#include "wine/test.h" + static void (WINAPI *pClosePseudoConsole)(HPCON); static HRESULT (WINAPI *pCreatePseudoConsole)(COORD,HANDLE,HANDLE,DWORD,HPCON*); static BOOL (WINAPI *pGetConsoleInputExeNameA)(DWORD, LPSTR); @@ -988,6 +991,72 @@ static void testWaitForConsoleInput(HANDLE input_handle) CloseHandle(complete_event); } +static void test_wait(HANDLE input, HANDLE orig_output) +{ + LARGE_INTEGER zero; + INPUT_RECORD ir; + HANDLE output; + DWORD res, count; + NTSTATUS status; + BOOL ret; + + if (skip_nt) return; + + memset(&ir, 0, sizeof(ir)); + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwEventFlags = MOUSE_MOVED; + zero.QuadPart = 0; + + output = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(output != INVALID_HANDLE_VALUE, "CreateConsoleScreenBuffer failed: %u\n", GetLastError()); + + ret = SetConsoleActiveScreenBuffer(output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + FlushConsoleInputBuffer(input); + + res = WaitForSingleObject(input, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = WriteConsoleInputW(input, &ir, 1, &count); + ok(ret, "WriteConsoleInputW failed: %u\n", GetLastError()); + + res = WaitForSingleObject(input, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(output, 0); + todo_wine + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(orig_output, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + status = NtWaitForSingleObject(input, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + status = NtWaitForSingleObject(output, FALSE, &zero); + todo_wine + ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), + "NtWaitForSingleObject returned %x\n", status); + + ret = SetConsoleActiveScreenBuffer(orig_output); + ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + + CloseHandle(output); +} + static void test_GetSetConsoleInputExeName(void) { BOOL ret; @@ -4295,6 +4364,7 @@ START_TEST(console) if (!test_current) testScreenBuffer(hConOut); /* Test waiting for a console handle */ testWaitForConsoleInput(hConIn); + test_wait(hConIn, hConOut); if (!test_current) {

1 0

Paul Gofman : crypt32: Fix adding trusted roots to store.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 706e35f2a2db6beaebdf972572f897046c5e9585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706e35f2a2db6beaebdf9725… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 10 18:31:10 2020 +0300 crypt32: Fix adding trusted roots to store. Fixes Steam client errors on SSL connections (regression from bd59aa6d66001cb1f8b308300a5ce57a7f7b65d5). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 87c9808f51b..d93de8fb37a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -629,7 +629,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) buffer = HeapAlloc( GetProcessHeap(), 0, needed ); size = needed; } - else CertAddEncodedCertificateToStore( store, X509_ASN_ENCODING, buffer, size, + else CertAddEncodedCertificateToStore( from, X509_ASN_ENCODING, buffer, needed, CERT_STORE_ADD_NEW, NULL ); } HeapFree( GetProcessHeap(), 0, buffer );

1 0

Damjan Jovanovic : ntdll: Document a few other filesystem case-sensitivity cases.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 2f90b17ab23988b8f9744a79a43376c6b98b72d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f90b17ab23988b8f9744a79… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:59 2020 +0200 ntdll: Document a few other filesystem case-sensitivity cases. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index f7fa78db2be..cf413f46e5c 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1133,6 +1133,9 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) * newer versions should be case-insensitive on the server anyway */ !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; + /* no ntfs-3g: modern fusefs has no way to report the filesystem on FreeBSD + * no cd9660 or udf, they're case-sensitive on FreeBSD + */ #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) ||

1 0

Damjan Jovanovic : ntdll: Treat smbfs as case-insensitive on FreeBSD.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: eba4f333b9ed217d8b40bde9b4941c0edc336f6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba4f333b9ed217d8b40bde9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:56 2020 +0200 ntdll: Treat smbfs as case-insensitive on FreeBSD. 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, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7a97f2bdd85..f7fa78db2be 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1128,14 +1128,16 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) !strncmp( stfs.f_mntfromname, "ciopfs", 5 )) return FALSE; /* msdosfs was case-insensitive since FreeBSD 8, if not earlier */ - if (!strcmp( stfs.f_fstypename, "msdosfs" )) + if (!strcmp( stfs.f_fstypename, "msdosfs" ) || + /* older CIFS protocol versions uppercase filename on the client, + * newer versions should be case-insensitive on the server anyway */ + !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) || !strcmp( stfs.f_fstypename, "udf" ) || - !strcmp( stfs.f_fstypename, "ntfs" ) || - !strcmp( stfs.f_fstypename, "smbfs" )) + !strcmp( stfs.f_fstypename, "ntfs" )) return FALSE; #ifdef _DARWIN_FEATURE_64_BIT_INODE if (!strcmp( stfs.f_fstypename, "hfs" ) && (stfs.f_fssubtype == 0 ||

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

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: 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

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

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

← Newer
1
...
55
56
57
58
59
60
61
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020