November 2020 - Wine-Commits

Nikolay Sivov : evr/allocator: Fix reference counting for returned samples.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 0066be78ae7ef93c86de254d358b4ce3935d3de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0066be78ae7ef93c86de254d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:36 2020 +0300 evr/allocator: Fix reference counting for returned samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 6 ++++-- dlls/evr/tests/evr.c | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index e84d7450c7f..7764ec945d2 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -459,7 +459,6 @@ static void sample_allocator_release_samples(struct sample_allocator *allocator) LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &allocator->used_samples, struct queued_sample, entry) { list_remove(&iter->entry); - IMFSample_Release(iter->sample); heap_free(iter); } } @@ -676,8 +675,10 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocator *i list_add_tail(&allocator->used_samples, head); allocator->free_sample_count--; + /* Reference counter is not increased when sample is returned, so next release could trigger + tracking condition. This is balanced by incremented reference counter when sample is returned + back to the free list. */ *out = sample; - IMFSample_AddRef(*out); } } @@ -816,6 +817,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback { list_remove(&iter->entry); list_add_tail(&allocator->free_samples, &iter->entry); + IMFSample_AddRef(iter->sample); allocator->free_sample_count++; break; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a1d7b7109d9..b8a16fc7cc9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1326,13 +1326,13 @@ static void test_MFCreateVideoSampleAllocator(void) IDirect3DSurface9 *surface; IDirect3DDevice9 *device; IMFMediaBuffer *buffer; + LONG refcount, count; unsigned int token; IMFGetService *gs; IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; - LONG count; BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); @@ -1397,7 +1397,7 @@ todo_wine sample = NULL; hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + refcount = get_refcount(sample); hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); @@ -1405,8 +1405,7 @@ todo_wine /* Reinitialize with active sample. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine - ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/session: Query and initialize sample allocators for capable output nodes.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 9008b2c9b77364d98cd6671ee6b2f9fc936bf90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9008b2c9b77364d98cd6671e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:37 2020 +0300 mf/session: Query and initialize sample allocators for capable output nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d586f1c6be9..af8500cb7d6 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -171,6 +171,7 @@ struct topo_node struct { unsigned int requests; + IMFVideoSampleAllocator *allocator; } sink; struct { @@ -742,6 +743,10 @@ static void release_topo_node(struct topo_node *node) heap_free(node->u.transform.input_map); heap_free(node->u.transform.output_map); break; + case MF_TOPOLOGY_OUTPUT_NODE: + if (node->u.sink.allocator) + IMFVideoSampleAllocator_Release(node->u.sink.allocator); + break; default: ; } @@ -1185,10 +1190,25 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) return hr; } +static HRESULT session_get_stream_sink_type(IMFStreamSink *sink, IMFMediaType **media_type) +{ + IMFMediaTypeHandler *handler; + HRESULT hr; + + if (SUCCEEDED(hr = IMFStreamSink_GetMediaTypeHandler(sink, &handler))) + { + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, media_type); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + static HRESULT session_append_node(struct media_session *session, IMFTopologyNode *node) { struct topo_node *topo_node; IMFMediaSink *media_sink; + IMFMediaType *media_type; IMFStreamDescriptor *sd; HRESULT hr = S_OK; IUnknown *object; @@ -1217,7 +1237,18 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(hr = IMFStreamSink_GetMediaSink(topo_node->object.sink_stream, &media_sink))) break; - hr = session_add_media_sink(session, node, media_sink); + if (SUCCEEDED(hr = session_add_media_sink(session, node, media_sink))) + { + if (SUCCEEDED(session_get_stream_sink_type(topo_node->object.sink_stream, &media_type))) + { + if (SUCCEEDED(MFGetService(topo_node->object.object, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IMFVideoSampleAllocator, (void **)&topo_node->u.sink.allocator))) + { + IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type); + } + IMFMediaType_Release(media_type); + } + } IMFMediaSink_Release(media_sink); break;

1 0

Jacek Caban : kernel32/tests: Add more unbound console handles tests.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: b0eaf439d1fab53f1c239e4cfde411b00ac6d44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0eaf439d1fab53f1c239e4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:30 2020 +0100 kernel32/tests: Add more unbound console handles tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 61 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index f621c5f6a8d..a306a5144a3 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -84,6 +84,25 @@ static void init_function_pointers(void) #undef KERNEL32_GET_PROC } +static HANDLE create_unbound_handle(BOOL output, BOOL test_status) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + IO_STATUS_BLOCK iosb; + UNICODE_STRING name; + HANDLE handle; + NTSTATUS status; + + attr.ObjectName = &name; + attr.Attributes = OBJ_INHERIT; + RtlInitUnicodeString( &name, output ? L"\\Device\\ConDrv\\Output" : L"\\Device\\ConDrv\\Input" ); + status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | + FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + if (test_status) ok(!status, "NtCreateFile failed: %#x\n", status); + return status ? NULL : handle; +} + /* FIXME: this could be optimized on a speed point of view */ static void resetContent(HANDLE hCon, COORD sbSize, BOOL content) { @@ -993,9 +1012,9 @@ static void testWaitForConsoleInput(HANDLE input_handle) static void test_wait(HANDLE input, HANDLE orig_output) { + HANDLE output, unbound_output, unbound_input; LARGE_INTEGER zero; INPUT_RECORD ir; - HANDLE output; DWORD res, count; NTSTATUS status; BOOL ret; @@ -1016,12 +1035,19 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); FlushConsoleInputBuffer(input); + unbound_output = create_unbound_handle(TRUE, TRUE); + unbound_input = create_unbound_handle(FALSE, TRUE); + res = WaitForSingleObject(input, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_output, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_input, 0); + ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1038,6 +1064,10 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_output, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); + res = WaitForSingleObject(unbound_input, 0); + ok(!res, "WaitForSingleObject returned %x\n", res); status = NtWaitForSingleObject(input, FALSE, &zero); ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1048,6 +1078,8 @@ static void test_wait(HANDLE input, HANDLE orig_output) ret = SetConsoleActiveScreenBuffer(orig_output); ok(ret, "SetConsoleActiveScreenBuffer failed: %u\n", GetLastError()); + CloseHandle(unbound_input); + CloseHandle(unbound_output); CloseHandle(output); } @@ -1386,12 +1418,6 @@ static void test_CreateFileW(void) ret = CreateFileW(cf_table[index].input ? L"\\??\\CONIN$" : L"\\??\\CONOUT$", cf_table[index].access, FILE_SHARE_READ|FILE_SHARE_WRITE, &sa, cf_table[index].creation, FILE_ATTRIBUTE_NORMAL, NULL); - if (!index && ret == INVALID_HANDLE_VALUE) - { - win_skip("Skipping NT path tests, not supported on this Windows version\n"); - skip_nt = TRUE; - continue; - } if (cf_table[index].gle) ok(ret == INVALID_HANDLE_VALUE && GetLastError() == cf_table[index].gle, "CreateFileW to returned %p %u for index %d\n", ret, GetLastError(), index); @@ -3749,14 +3775,15 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) static void test_FreeConsole(void) { + HANDLE handle, unbound_output = NULL; + DWORD size, mode; WCHAR title[16]; - HANDLE handle; - DWORD size; HWND hwnd; UINT cp; BOOL ret; ok(RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle != NULL, "ConsoleHandle is NULL\n"); + if (!skip_nt) unbound_output = create_unbound_handle(TRUE, TRUE); ret = FreeConsole(); ok(ret, "FreeConsole failed: %u\n", GetLastError()); @@ -3836,6 +3863,12 @@ static void test_FreeConsole(void) SetStdHandle( STD_INPUT_HANDLE, NULL ); handle = GetConsoleInputWaitHandle(); ok(!handle, "GetConsoleInputWaitHandle returned %p\n", handle); + + ret = GetConsoleMode(unbound_output, &mode); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "GetConsoleMode returned %x %u\n", ret, GetLastError()); + + CloseHandle(unbound_output); } static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) @@ -4241,7 +4274,7 @@ static void test_pseudo_console(void) START_TEST(console) { - HANDLE hConIn, hConOut, revert_output = NULL; + HANDLE hConIn, hConOut, revert_output = NULL, unbound_output; BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; BOOL using_pseudo_console; @@ -4329,6 +4362,13 @@ START_TEST(console) } } + unbound_output = create_unbound_handle(TRUE, FALSE); + if (!unbound_output) + { + win_skip("Skipping NT path tests, not supported on this Windows version\n"); + skip_nt = TRUE; + } + if (test_current) { HANDLE sb; @@ -4449,4 +4489,5 @@ START_TEST(console) } else if (revert_output) SetConsoleActiveScreenBuffer(revert_output); + CloseHandle(unbound_output); }

1 0

Jacek Caban : server: Support unbound console output device.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: d8d2b8a38d6a04f19f3774e860e32c7859bc0fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d2b8a38d6a04f19f3774e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:23 2020 +0100 server: Support unbound console output device. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 1 - dlls/kernelbase/console.c | 3 +- server/console.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 13e17e14e4c..f621c5f6a8d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4035,7 +4035,6 @@ static void test_AllocConsole_child(void) ok(GetStdHandle(STD_OUTPUT_HANDLE) == prev_output, "GetStdHandle(STD_OUTPUT_HANDLE) = %p\n", GetStdHandle(STD_OUTPUT_HANDLE)); ok(GetStdHandle(STD_ERROR_HANDLE) == prev_error, "GetStdHandle(STD_ERROR_HANDLE) = %p\n", GetStdHandle(STD_ERROR_HANDLE)); res = GetConsoleMode(unbound_output, &mode); - todo_wine ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failed: %u\n", GetLastError()); res = AllocConsole(); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index ed5550bb0b6..9fc34e3c9bc 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -254,8 +254,7 @@ static BOOL init_console_std_handles( BOOL override_all ) if (std_out && std_err) return TRUE; } - /* FIXME: Use unbound console handle */ - RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentOut" ); + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\Output" ); status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, diff --git a/server/console.c b/server/console.c index bc93809ab97..a290e0647e4 100644 --- a/server/console.c +++ b/server/console.c @@ -313,6 +313,36 @@ static const struct object_ops input_device_ops = no_destroy /* destroy */ }; +static void output_device_dump( struct object *obj, int verbose ); +static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *output_device_get_fd( struct object *obj ); +static struct object *output_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); + +static const struct object_ops output_device_ops = +{ + sizeof(struct object), /* size */ + output_device_dump, /* dump */ + console_device_get_type, /* get_type */ + output_device_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + output_device_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + output_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + struct console_connection { struct object obj; /* object header */ @@ -1096,6 +1126,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; static const WCHAR inputW[] = {'I','n','p','u','t'}; + static const WCHAR outputW[] = {'O','u','t','p','u','t'}; static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; static const WCHAR serverW[] = {'S','e','r','v','e','r'}; @@ -1133,6 +1164,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return alloc_object( &input_device_ops ); } + if (name->len == sizeof(outputW) && !memcmp( name->str, outputW, name->len )) + { + name->len = 0; + return alloc_object( &output_device_ops ); + } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) { if (!current->process->console) @@ -1209,6 +1246,38 @@ static struct object *input_device_open_file( struct object *obj, unsigned int a return grab_object( obj ); } +static void output_device_dump( struct object *obj, int verbose ) +{ + fputs( "console Output device\n", stderr ); +} + +static int output_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + if (!current->process->console || !current->process->console->active) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &current->process->console->obj, entry ); +} + +static struct fd *output_device_get_fd( struct object *obj ) +{ + if (!current->process->console || !current->process->console->active) + { + set_error( STATUS_ACCESS_DENIED ); + return NULL; + } + + return get_obj_fd( &current->process->console->active->obj ); +} + +static struct object *output_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + struct object *create_console_device( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Jacek Caban : server: Support unbound console input device.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 4e4872d59d0124544ad0bd8b446be8195ae8e780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4872d59d0124544ad0bd8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:18 2020 +0100 server: Support unbound console input device. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 3 +-- server/console.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f812b2b9a55..ed5550bb0b6 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -237,8 +237,7 @@ static BOOL init_console_std_handles( BOOL override_all ) if (override_all || !GetStdHandle( STD_INPUT_HANDLE )) { - /* FIXME: Use unbound console handle */ - RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\CurrentIn" ); + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\Input" ); status = NtCreateFile( &handle, FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_CREATE, diff --git a/server/console.c b/server/console.c index ebcc8beb97c..bc93809ab97 100644 --- a/server/console.c +++ b/server/console.c @@ -283,6 +283,36 @@ static const struct object_ops console_device_ops = no_destroy /* destroy */ }; +static void input_device_dump( struct object *obj, int verbose ); +static struct object *input_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); +static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static struct fd *input_device_get_fd( struct object *obj ); + +static const struct object_ops input_device_ops = +{ + sizeof(struct object), /* size */ + input_device_dump, /* dump */ + console_device_get_type, /* get_type */ + input_device_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + input_device_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + directory_link_name, /* link_name */ + default_unlink_name, /* unlink_name */ + input_device_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + no_destroy /* destroy */ +}; + struct console_connection { struct object obj; /* object header */ @@ -1065,6 +1095,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR inputW[] = {'I','n','p','u','t'}; static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; static const WCHAR serverW[] = {'S','e','r','v','e','r'}; @@ -1096,6 +1127,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return grab_object( obj ); } + if (name->len == sizeof(inputW) && !memcmp( name->str, inputW, name->len )) + { + name->len = 0; + return alloc_object( &input_device_ops ); + } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) { if (!current->process->console) @@ -1141,6 +1178,37 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } +static void input_device_dump( struct object *obj, int verbose ) +{ + fputs( "console Input device\n", stderr ); +} + +static int input_device_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + if (!current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &current->process->console->obj, entry ); +} + +static struct fd *input_device_get_fd( struct object *obj ) +{ + if (!current->process->console) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return get_obj_fd( &current->process->console->obj ); +} + +static struct object *input_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + struct object *create_console_device( struct object *root, const struct unicode_str *name, unsigned int attr, const struct security_descriptor *sd ) {

1 0

Nikolay Sivov : mf/evr: Set display window to the presenter if it was specified on sink creation.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 176ca7b87bcaf830d93c5a219b966ecb7879841c URL: https://source.winehq.org/git/wine.git/?a=commit;h=176ca7b87bcaf830d93c5a21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:39 2020 +0300 mf/evr: Set display window to the presenter if it was specified on sink creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 19 ++++++++++++++++--- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index d01bb0f06f1..f14f2f46612 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -84,6 +84,7 @@ struct video_renderer IMFTransform *mixer; IMFVideoPresenter *presenter; + HWND window; IUnknown *device_manager; unsigned int flags; unsigned int state; @@ -1098,13 +1099,18 @@ static HRESULT video_renderer_create_mixer(IMFAttributes *attributes, IMFTransfo return CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)out); } -static HRESULT video_renderer_create_presenter(IMFAttributes *attributes, IMFVideoPresenter **out) +static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, IMFAttributes *attributes, + IMFVideoPresenter **out) { unsigned int flags = 0; IMFActivate *activate; + UINT64 value; CLSID clsid; HRESULT hr; + if (attributes && SUCCEEDED(IMFAttributes_GetUINT64(attributes, &MF_ACTIVATE_VIDEO_WINDOW, &value))) + renderer->window = UlongToHandle(value); + if (attributes && SUCCEEDED(IMFAttributes_GetUnknown(attributes, &MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, &IID_IMFActivate, (void **)&activate))) { @@ -1193,8 +1199,15 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) static HRESULT video_renderer_configure_presenter(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; + IMFVideoDisplayControl *control; HRESULT hr; + if (SUCCEEDED(IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFVideoDisplayControl, (void **)&control))) + { + IMFVideoDisplayControl_SetVideoWindow(control, renderer->window); + IMFVideoDisplayControl_Release(control); + } + if (SUCCEEDED(hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client))) { @@ -1270,7 +1283,7 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, if (presenter) IMFVideoPresenter_AddRef(presenter); - else if (FAILED(hr = video_renderer_create_presenter(NULL, &presenter))) + else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) { WARN("Failed to create default presenter, hr %#x.\n", hr); IMFTransform_Release(mixer); @@ -2141,7 +2154,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, if (FAILED(hr = video_renderer_create_mixer(attributes, &mixer))) goto failed; - if (FAILED(hr = video_renderer_create_presenter(attributes, &presenter))) + if (FAILED(hr = video_renderer_create_presenter(object, attributes, &presenter))) goto failed; if (FAILED(hr = video_renderer_initialize(object, mixer, presenter))) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index b26c8630063..5eb9ee4d4e3 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat mfuuid ole32 +IMPORTS = mf mfplat mfuuid ole32 user32 C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7780bf4ea58..9eccafee633 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -56,6 +56,16 @@ static void _expect_ref(IUnknown* obj, ULONG expected_refcount, int line) expected_refcount); } +static HWND create_window(void) +{ + RECT r = {0, 0, 640, 480}; + + AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW | WS_VISIBLE, FALSE); + + return CreateWindowA("static", "mf_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); +} + static WCHAR *load_resource(const WCHAR *name) { static WCHAR pathW[MAX_PATH]; @@ -3235,6 +3245,7 @@ static void test_evr(void) IMFMediaSink *sink, *sink2; IMFAttributes *attributes; IMFActivate *activate; + HWND window, window2; DWORD flags, count; LONG sample_count; IMFGetService *gs; @@ -3258,6 +3269,32 @@ static void test_evr(void) hr = MFCreateVideoRendererActivate(NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + /* Window */ + window = create_window(); + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + + hr = IMFActivate_GetUINT64(activate, &MF_ACTIVATE_VIDEO_WINDOW, &value); + ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); + ok(UlongToHandle(value) == window, "Unexpected value.\n"); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, + (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + window2 = NULL; + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &window2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(window2 == window, "Unexpected window %p.\n", window2); + + IMFVideoDisplayControl_Release(display_control); + IMFMediaSink_Release(sink); + IMFActivate_Release(activate); + DestroyWindow(window); + hr = MFCreateVideoRendererActivate(NULL, &activate); ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/session: Implement support for sinks that provide sample allocators.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: e272e1a1c321de601a4b175bdb657f8f40baa34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e272e1a1c321de601a4b175b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:38 2020 +0300 mf/session: Implement support for sinks that provide sample allocators. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 173 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 146 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e272e1a1c321de601a4b…

1 0

Alexandre Julliard : glu32: No longer load the Unix libGLU.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: ec55b1c271ae4710677f70a2a28474c96a650a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec55b1c271ae4710677f70a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 11:20:12 2020 +0100 glu32: No longer load the Unix libGLU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 76 ------------------------------------ configure.ac | 8 ---- dlls/glu32/glu.c | 110 ++++++++++++++++------------------------------------ include/config.h.in | 3 -- 4 files changed, 33 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec55b1c271ae4710677f…

1 0

Sven Baars : gdi32/tests: Fix a compiler warning.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: ca96e04637a2b562ac8abd87bd8673232b76440e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca96e04637a2b562ac8abd87… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Nov 9 15:07:13 2020 +0100 gdi32/tests: Fix a compiler warning. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4c8b1cbb91b..d3ec971dce0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1330,17 +1330,16 @@ static void test_GetCharABCWidths(void) memset(&lf, 0, sizeof(lf)); lf.lfHeight = 20; - switch(i) + if (i == 1) { - case 1: strcpy(lf.lfFaceName, "Tahoma"); code = 'a'; - break; - case 2: + } + else + { strcpy(lf.lfFaceName, "Times New Roman"); lf.lfItalic = TRUE; code = 'f'; - break; } if (!is_truetype_font_installed(lf.lfFaceName)) {

1 0

Jacek Caban : kernelbase: Remove no longer needed console handle handling from create_process_params.
by Alexandre Julliard Nov. 12, 2020

Nov. 12, 2020

Module: wine Branch: master Commit: 6b5a2637422085ebf90f6edf6906f1ea307faa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5a2637422085ebf90f6edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 19:56:38 2020 +0100 kernelbase: Remove no longer needed console handle handling from create_process_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 57f0721f397..7689e1adf28 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -215,20 +215,6 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename params->hStdError = NtCurrentTeb()->Peb->ProcessParameters->hStdError; } - if (flags & CREATE_NEW_CONSOLE) - { - /* this is temporary (for console handles). We have no way to control that the handle is invalid in child process otherwise */ - if (is_console_handle(params->hStdInput)) params->hStdInput = INVALID_HANDLE_VALUE; - if (is_console_handle(params->hStdOutput)) params->hStdOutput = INVALID_HANDLE_VALUE; - if (is_console_handle(params->hStdError)) params->hStdError = INVALID_HANDLE_VALUE; - } - else - { - if (is_console_handle(params->hStdInput)) params->hStdInput = (HANDLE)((UINT_PTR)params->hStdInput & ~3); - if (is_console_handle(params->hStdOutput)) params->hStdOutput = (HANDLE)((UINT_PTR)params->hStdOutput & ~3); - if (is_console_handle(params->hStdError)) params->hStdError = (HANDLE)((UINT_PTR)params->hStdError & ~3); - } - params->dwX = startup->dwX; params->dwY = startup->dwY; params->dwXSize = startup->dwXSize;

1 0