November 2020 - Wine-commits

Esme Povirk : windowscodes: Move tiff encoding to the unix lib.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 942141d17df78bb6513845f26189db54cfe76168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=942141d17df78bb6513845f2… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 20 14:23:27 2020 -0600 windowscodes: Move tiff encoding to the unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/encoder.c | 6 +- dlls/windowscodecs/libtiff.c | 260 ++++++++- dlls/windowscodecs/main.c | 28 + dlls/windowscodecs/tiffformat.c | 1001 -------------------------------- dlls/windowscodecs/unix_lib.c | 3 + dlls/windowscodecs/wincodecs_private.h | 3 + 7 files changed, 297 insertions(+), 1005 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=942141d17df78bb65138…

1 0

Esme Povirk : windowscodecs: Initialize encoder flags for png encoder.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 97504067059a55674fec419c911f233b63b3edff URL: https://source.winehq.org/git/wine.git/?a=commit;h=97504067059a55674fec419c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Nov 20 14:23:28 2020 -0600 windowscodecs: Initialize encoder flags for png encoder. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index ee02d493f57..a5068c20349 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -997,6 +997,7 @@ HRESULT CDECL png_encoder_create(struct encoder_info *info, struct encoder **res This->data = NULL; *result = &This->encoder; + info->flags = 0; info->container_format = GUID_ContainerFormatPng; info->clsid = CLSID_WICPngEncoder; info->encoder_options[0] = ENCODER_OPTION_INTERLACE;

1 0

Zebediah Figura : ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 74ec9773dd3892f34003811cdee7da3e47a550c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ec9773dd3892f34003811c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 20 18:10:02 2020 -0600 ntdll: Use a dynamically allocated buffer in find_forwarded_export() if necessary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50105 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 368448c9f8d..ff5a175027c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -608,19 +608,20 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; WINE_MODREF *wm; - WCHAR mod_name[32]; + WCHAR buffer[32], *mod_name = buffer; const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name)) return NULL; + if ((end - forward) * sizeof(WCHAR) > sizeof(buffer) - sizeof(dllW)) + { + if (!(mod_name = RtlAllocateHeap( GetProcessHeap(), 0, (end - forward + sizeof(dllW)) * sizeof(WCHAR) ))) + return NULL; + } ascii_to_unicode( mod_name, forward, end - forward ); mod_name[end - forward] = 0; if (!wcschr( mod_name, '.' )) - { - if ((end - forward) * sizeof(WCHAR) >= sizeof(mod_name) - sizeof(dllW)) return NULL; memcpy( mod_name + (end - forward), dllW, sizeof(dllW) ); - } if (!(wm = find_basename_module( mod_name ))) { @@ -642,6 +643,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!wm) { + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); ERR( "module not found for forward '%s' used by %s\n", forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); return NULL; @@ -664,6 +666,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer), debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) ); } + if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); return proc; }

1 0

Jacek Caban : server: Properly handle NtQueryInformationFile on console handles.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 382b2072e35e921e2697bfb3e54444cd97269e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=382b2072e35e921e2697bfb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:39:44 2020 +0100 server: Properly handle NtQueryInformationFile on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 28 ++++++++++++++++++++++++++++ server/console.c | 10 ++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a306a5144a3..5943213fb17 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3942,6 +3942,33 @@ static void test_console_title(void) } } +static void test_file_info(HANDLE input, HANDLE output) +{ + FILE_STANDARD_INFORMATION std_info; + LARGE_INTEGER size; + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOL ret; + + if (skip_nt) return; + + status = NtQueryInformationFile(input, &io, &std_info, sizeof(std_info), FileStandardInformation); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); + + status = NtQueryInformationFile(output, &io, &std_info, sizeof(std_info), FileStandardInformation); + ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); + + ret = GetFileSizeEx(input, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, + "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); + + ret = GetFileSizeEx(output, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, + "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -4479,6 +4506,7 @@ START_TEST(console) } test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); + test_file_info(hConIn, hConOut); test_console_title(); if (!test_current) { diff --git a/server/console.c b/server/console.c index 48f92dd66e6..cecd1455d60 100644 --- a/server/console.c +++ b/server/console.c @@ -98,6 +98,7 @@ static const struct object_ops console_input_ops = }; static enum server_fd_type console_get_fd_type( struct fd *fd ); +static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -110,7 +111,7 @@ static const struct fd_ops console_input_fd_ops = console_input_read, /* read */ no_fd_write, /* write */ console_input_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + console_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -248,7 +249,7 @@ static const struct fd_ops screen_buffer_fd_ops = no_fd_read, /* read */ screen_buffer_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + console_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -420,6 +421,11 @@ static enum server_fd_type console_get_fd_type( struct fd *fd ) return FD_TYPE_CHAR; } +static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) +{ + set_error( STATUS_INVALID_DEVICE_REQUEST ); +} + static struct object *create_console_input(void) { struct console_input *console_input;

1 0

Jacek Caban : kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: a055f4128657f473e1ceec1aaa7cbbe61d3851b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a055f4128657f473e1ceec1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:04 2020 +0100 kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 -- dlls/kernelbase/file.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5943213fb17..1a86aedbc82 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3959,12 +3959,10 @@ static void test_file_info(HANDLE input, HANDLE output) ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status); ret = GetFileSizeEx(input, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); ret = GetFileSizeEx(output, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index b265866ac54..bfa44b4da50 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3047,12 +3047,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileSizeEx( HANDLE file, PLARGE_INTEGER size ) FILE_STANDARD_INFORMATION info; IO_STATUS_BLOCK io; - if (is_console_handle( file )) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - if (!set_ntstatus( NtQueryInformationFile( file, &io, &info, sizeof(info), FileStandardInformation ))) return FALSE;

1 0

Jacek Caban : server: Support FileFsDeviceInformation queries on console handles.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 8ca9b44fd1ce98c4fa8e61ad4f7028a29a1a6a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca9b44fd1ce98c4fa8e61ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:19 2020 +0100 server: Support FileFsDeviceInformation queries on console handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 20 ++++++++++++++++++++ server/console.c | 27 +++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 1a86aedbc82..0376d00892e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -23,6 +23,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winternl.h> +#include <winioctl.h> #include <stdio.h> #include "wine/test.h" @@ -3945,8 +3946,10 @@ static void test_console_title(void) static void test_file_info(HANDLE input, HANDLE output) { FILE_STANDARD_INFORMATION std_info; + FILE_FS_DEVICE_INFORMATION fs_info; LARGE_INTEGER size; IO_STATUS_BLOCK io; + DWORD type; NTSTATUS status; BOOL ret; @@ -3965,6 +3968,23 @@ static void test_file_info(HANDLE input, HANDLE output) ret = GetFileSizeEx(output, &size); ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); + + status = NtQueryVolumeInformationFile(input, &io, &fs_info, sizeof(fs_info), FileFsDeviceInformation); + ok(!status, "NtQueryVolumeInformationFile failed: %#x\n", status); + ok(fs_info.DeviceType == FILE_DEVICE_CONSOLE, "DeviceType = %u\n", fs_info.DeviceType); + ok(fs_info.Characteristics == FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL, + "Characteristics = %x\n", fs_info.Characteristics); + + status = NtQueryVolumeInformationFile(output, &io, &fs_info, sizeof(fs_info), FileFsDeviceInformation); + ok(!status, "NtQueryVolumeInformationFile failed: %#x\n", status); + ok(fs_info.DeviceType == FILE_DEVICE_CONSOLE, "DeviceType = %u\n", fs_info.DeviceType); + ok(fs_info.Characteristics == FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL, + "Characteristics = %x\n", fs_info.Characteristics); + + type = GetFileType(input); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); + type = GetFileType(output); + ok(type == FILE_TYPE_CHAR, "GetFileType returned %u\n", type); } static void test_AttachConsole_child(DWORD console_pid) diff --git a/server/console.c b/server/console.c index cecd1455d60..799d31c6fde 100644 --- a/server/console.c +++ b/server/console.c @@ -99,6 +99,7 @@ static const struct object_ops console_input_ops = static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); +static void console_get_volume_info( struct fd *fd, unsigned int info_class ); static int console_input_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_input_flush( struct fd *fd, struct async *async ); static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -112,7 +113,7 @@ static const struct fd_ops console_input_fd_ops = no_fd_write, /* write */ console_input_flush, /* flush */ console_get_file_info, /* get_file_info */ - no_fd_get_volume_info, /* get_volume_info */ + console_get_volume_info, /* get_volume_info */ console_input_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ @@ -250,7 +251,7 @@ static const struct fd_ops screen_buffer_fd_ops = screen_buffer_write, /* write */ no_fd_flush, /* flush */ console_get_file_info, /* get_file_info */ - no_fd_get_volume_info, /* get_volume_info */ + console_get_volume_info, /* get_volume_info */ screen_buffer_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ @@ -426,6 +427,28 @@ static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned set_error( STATUS_INVALID_DEVICE_REQUEST ); } +static void console_get_volume_info( struct fd *fd, unsigned int info_class ) +{ + switch (info_class) + { + case FileFsDeviceInformation: + { + static const FILE_FS_DEVICE_INFORMATION device_info = + { + FILE_DEVICE_CONSOLE, + FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL + }; + if (get_reply_max_size() >= sizeof(device_info)) + set_reply_data( &device_info, sizeof(device_info) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } +} + static struct object *create_console_input(void) { struct console_input *console_input;

1 0

Jacek Caban : server: Remove no longer needed hack for inheriting console from stdin.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: c1bfa103a2e72149f6326e4d2926dd109172e0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1bfa103a2e72149f6326e4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 15:40:40 2020 +0100 server: Remove no longer needed hack for inheriting console from stdin. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 ------------------------------ server/process.c | 12 +++--------- server/process.h | 2 -- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/server/console.c b/server/console.c index 799d31c6fde..9190dcc02dd 100644 --- a/server/console.c +++ b/server/console.c @@ -595,36 +595,6 @@ int free_console( struct process *process ) return 1; } -/* let process inherit the console from parent... this handle two cases : - * 1/ generic console inheritance - * 2/ parent is a renderer which launches process, and process should attach to the console - * rendered by parent - */ -obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, struct process *process, - obj_handle_t hconin ) -{ - struct console_input *console = NULL; - - if (handle) return duplicate_handle( current->process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); - - /* if parent is a renderer, then attach current process to its console - * a bit hacky.... - */ - if (hconin && parent_thread) - { - /* FIXME: should we check some access rights ? */ - if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin, - 0, &console_input_ops ))) - clear_error(); /* ignore error */ - } - if (!console) return 0; - - process->console = console; - console->num_proc++; - return alloc_handle( process, process->console, - SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); -} - struct thread *console_get_renderer( struct console_input *console ) { return console->renderer; diff --git a/server/process.c b/server/process.c index 1786493a814..d5b9a2548cf 100644 --- a/server/process.c +++ b/server/process.c @@ -1254,15 +1254,9 @@ DECL_HANDLER(new_process) connect_process_winstation( process, parent_thread, parent ); /* set the process console */ - if (!(req->create_flags & (DETACHED_PROCESS | CREATE_NEW_CONSOLE))) - { - /* FIXME: some better error checking should be done... - * like if hConOut and hConIn are console handles, then they should be on the same - * physical console - */ - info->data->console = inherit_console( parent_thread, info->data->console, - process, req->inherit_all ? info->data->hstdin : 0 ); - } + if (info->data->console > 3) + info->data->console = duplicate_handle( parent, info->data->console, process, + 0, 0, DUPLICATE_SAME_ACCESS ); if (!req->inherit_all && !(req->create_flags & CREATE_NEW_CONSOLE)) { diff --git a/server/process.h b/server/process.h index 56092e5b1ac..7e8c1d3beb7 100644 --- a/server/process.h +++ b/server/process.h @@ -132,8 +132,6 @@ extern void detach_debugged_processes( struct thread *debugger ); extern void enum_processes( int (*cb)(struct process*, void*), void *user); /* console functions */ -extern obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, - struct process *process, obj_handle_t hconin ); extern int free_console( struct process *process ); extern struct thread *console_get_renderer( struct console_input *console );

1 0

Zebediah Figura : quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 9281b542ff445ef69f7880b2e3435415de57bcaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9281b542ff445ef69f7880b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:56 2020 -0600 quartz/tests: Add some tests for IPin::EndOfStream() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 142 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 558e6989c98..c33c074d93d 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -877,6 +877,147 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = send_frame(input); + todo_wine ok(hr == VFW_E_SAMPLE_REJECTED_EOS, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 2000); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_connect_pin(void) { ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; @@ -971,6 +1112,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Add some tests for IMediaSeeking on parser filters.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 08026a2c664c74d7a2603eca2b0d396635c4106e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08026a2c664c74d7a2603eca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:57 2020 -0600 quartz/tests: Add some tests for IMediaSeeking on parser filters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 207 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 193 +++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.avi | Bin 6938 -> 11642 bytes dlls/quartz/tests/waveparser.c | 210 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 611 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08026a2c664c74d7a260…

1 0

Zebediah Figura : quartz/tests: Add some tests for parser streaming.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: b04c0a56e38b1d429163e42d9db049f80d93d1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04c0a56e38b1d429163e42d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 21 15:24:58 2020 -0600 quartz/tests: Add some tests for parser streaming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 150 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b04c0a56e38b1d429163…

1 0