November 2020 - Wine-commits

Alistair Leslie-Hughes : msi: Correct Query for loading an image.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 358d4f5a914e574c026380666964fcefb0495517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358d4f5a914e574c02638066… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 17 22:21:10 2020 +1100 msi: Correct Query for loading an image. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f2bfbf1d913..703f9d43957 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -463,7 +463,7 @@ static HANDLE msi_load_image( MSIDATABASE *db, LPCWSTR name, UINT type, if (!(tmp = msi_create_temp_file( db ))) return NULL; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if( rec ) { r = MSI_RecordStreamToFile( rec, 2, tmp ); @@ -962,7 +962,7 @@ static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT BITMAP bm; UINT r; - rec = MSI_QueryGetRecord( db, L"SELCT * FROM `Binary` WHERE `Name` = '%s'", name ); + rec = MSI_QueryGetRecord( db, L"SELECT * FROM `Binary` WHERE `Name` = '%s'", name ); if (!rec) goto end;

1 0

Paul Gofman : user32: Avoid holding display_dc_section when creating display DC.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 073b6dc240bada1f700a7c37d6797a6b15a176d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=073b6dc240bada1f700a7c37… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 16 18:48:02 2020 +0300 user32: Avoid holding display_dc_section when creating display DC. get_display_dc() may be locking display_dc_section at the end of user driver initialization in LoadCursorA() called from register_builtin_classes(). If the driver initialization initiated in CreateDCW() goes in parallel with the initialization started elsewhere without holding display_dc_section, the process can deadlock. Fixes random lockup on start in Hammerting. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1381f387e03..a620116053a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -548,7 +548,18 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) HDC get_display_dc(void) { EnterCriticalSection( &display_dc_section ); - if (!display_dc) display_dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + if (!display_dc) + { + HDC dc; + + LeaveCriticalSection( &display_dc_section ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); + EnterCriticalSection( &display_dc_section ); + if (display_dc) + DeleteDC(dc); + else + display_dc = dc; + } return display_dc; }

1 0

Jacek Caban : kernelbase: Move Unicode conversion from WriteConsoleA to conhost.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 4cc4ea449be5bdc78971556829b2dc83d06d74d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc4ea449be5bdc789715568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:02 2020 +0100 kernelbase: Move Unicode conversion from WriteConsoleA to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 13 ++++--------- include/wine/condrv.h | 15 ++++++++------- programs/conhost/conhost.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 9fc34e3c9bc..47329886f07 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1634,17 +1634,12 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleA( HANDLE handle, const void *buffer, DWORD length, DWORD *written, void *reserved ) { - UINT cp = GetConsoleOutputCP(); - LPWSTR strW; - DWORD lenW; BOOL ret; - if (written) *written = 0; - lenW = MultiByteToWideChar( cp, 0, buffer, length, NULL, 0 ); - if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE; - MultiByteToWideChar( cp, 0, buffer, length, strW, lenW ); - ret = WriteConsoleW( handle, strW, lenW, written, 0 ); - HeapFree( GetProcessHeap(), 0, strW ); + TRACE( "(%p,%s,%d,%p,%p)\n", handle, debugstr_an(buffer, length), length, written, reserved ); + + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_FILE, (void *)buffer, length, NULL, 0, NULL ); + if (written) *written = ret ? length : 0; return ret; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index cf2524edc66..711341a2f6c 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -43,13 +43,14 @@ /* console output ioctls */ #define IOCTL_CONDRV_WRITE_CONSOLE CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_WRITE_FILE CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 38, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console connection ioctls */ #define IOCTL_CONDRV_BIND_PID CTL_CODE(FILE_DEVICE_CONSOLE, 51, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index c7562974222..edd5fd97b40 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2292,6 +2292,22 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign if (in_size % sizeof(WCHAR) || *out_size) return STATUS_INVALID_PARAMETER; return write_console( screen_buffer, in_data, in_size / sizeof(WCHAR) ); + case IOCTL_CONDRV_WRITE_FILE: + { + unsigned int len; + WCHAR *buf; + NTSTATUS status; + + len = MultiByteToWideChar( screen_buffer->console->output_cp, 0, in_data, in_size, + NULL, 0 ); + if (!len) return STATUS_SUCCESS; + if (!(buf = malloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; + MultiByteToWideChar( screen_buffer->console->output_cp, 0, in_data, in_size, buf, len ); + status = write_console( screen_buffer, buf, len ); + free( buf ); + return status; + } + case IOCTL_CONDRV_WRITE_OUTPUT: if ((*out_size != sizeof(DWORD) && *out_size != sizeof(SMALL_RECT)) || in_size < sizeof(struct condrv_output_params))

1 0

Jacek Caban : server: Support writing directly on console handle.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 22afbb8fe78968391f6d1e0890ee3bf3cc1504fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=22afbb8fe78968391f6d1e08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:16 2020 +0100 server: Support writing directly on console handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/server/console.c b/server/console.c index a290e0647e4..1215fc9603d 100644 --- a/server/console.c +++ b/server/console.c @@ -236,6 +236,7 @@ static const struct object_ops screen_buffer_ops = screen_buffer_destroy /* destroy */ }; +static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ); static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static const struct fd_ops screen_buffer_fd_ops = @@ -244,7 +245,7 @@ static const struct fd_ops screen_buffer_fd_ops = default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ no_fd_read, /* read */ - no_fd_write, /* write */ + screen_buffer_write, /* write */ no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ @@ -916,6 +917,31 @@ static int console_input_flush( struct fd *fd, struct async *async ) return queue_host_ioctl( console->server, IOCTL_CONDRV_FLUSH, 0, NULL, NULL ); } +static int screen_buffer_write( struct fd *fd, struct async *async, file_pos_t pos ) +{ + struct screen_buffer *screen_buffer = get_fd_user( fd ); + struct iosb *iosb; + + if (!screen_buffer->input || !screen_buffer->input->server) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + + if (!queue_host_ioctl( screen_buffer->input->server, IOCTL_CONDRV_WRITE_FILE, + screen_buffer->id, async, &screen_buffer->ioctl_q )) + return 0; + + /* we can't use default async handling, because write result is not + * compatible with ioctl result */ + iosb = async_get_iosb( async ); + iosb->status = STATUS_SUCCESS; + iosb->result = iosb->in_size; + async_terminate( async, iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); + release_object( iosb ); + return 1; +} + static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct screen_buffer *screen_buffer = get_fd_user( fd ); @@ -1336,21 +1362,29 @@ DECL_HANDLER(get_next_console_request) if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); - iosb->status = status; - iosb->out_size = min( iosb->out_size, get_req_data_size() ); - if (iosb->out_size) + if (iosb->status == STATUS_PENDING) { - if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) + iosb->status = status; + iosb->out_size = min( iosb->out_size, get_req_data_size() ); + if (iosb->out_size) { - iosb->result = iosb->out_size; - status = STATUS_ALERTED; - } - else if (!status) - { - iosb->status = STATUS_NO_MEMORY; - iosb->out_size = 0; + if ((iosb->out_data = memdup( get_req_data(), iosb->out_size ))) + { + iosb->result = iosb->out_size; + status = STATUS_ALERTED; + } + else if (!status) + { + iosb->status = STATUS_NO_MEMORY; + iosb->out_size = 0; + } } } + else + { + release_object( ioctl->async ); + ioctl->async = NULL; + } } console_host_ioctl_terminate( ioctl, status ); if (iosb) release_object( iosb );

1 0

Jacek Caban : kernel32: Import WriteFile from kernelbase.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 6a1a8bdf353ce4829308a7c2307edf417f1676a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1a8bdf353ce4829308a7c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 18:58:26 2020 +0100 kernel32: Import WriteFile from kernelbase. Console special-case is no longer needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 11 ----------- dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 897d8abd14a..fc83e618c3a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -306,17 +306,6 @@ BOOL WINAPI KERNEL32_ReadFile( HANDLE file, LPVOID buffer, DWORD count, } -/************************************************************************* - * WriteFile (KERNEL32.@) - */ -BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count, - LPDWORD result, LPOVERLAPPED overlapped ) -{ - if (is_console_handle( file )) return WriteConsoleA( file, buffer, count, result, NULL ); - return WriteFile( file, buffer, count, result, overlapped ); -} - - /*********************************************************************** * DosDateTimeToFileTime (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5508a10f9a0..d0a273fe39e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1630,7 +1630,7 @@ @ stdcall -import WriteConsoleOutputCharacterW(long ptr long long ptr) @ stdcall -import WriteConsoleOutputW(long ptr long long ptr) @ stdcall -import WriteConsoleW(long ptr long ptr ptr) -@ stdcall WriteFile(long ptr long ptr ptr) KERNEL32_WriteFile +@ stdcall -import WriteFile(long ptr long ptr ptr) @ stdcall -import WriteFileEx(long ptr long ptr ptr) @ stdcall -import WriteFileGather(long ptr long ptr ptr) @ stdcall WritePrivateProfileSectionA(str str str)

1 0

Zebediah Figura : quartz/tests: Pass an IMediaControl to some functions.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: f35e5c4de27037ef148fac5e2f1db26f572bf2df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f35e5c4de27037ef148fac5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:50 2020 -0600 quartz/tests: Pass an IMediaControl to some functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 12 +++++------ dlls/quartz/tests/videorenderer.c | 43 +++++++++++++-------------------------- dlls/quartz/tests/vmr7.c | 27 ++++++++---------------- 3 files changed, 28 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f35e5c4de27037ef148f…

1 0

Zebediah Figura : winegstreamer: Don't fail state change methods if the sink pin is not connected.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 60814198fed9a58083dfa80aac8c9ecb0cd1af56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60814198fed9a58083dfa80a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:51 2020 -0600 winegstreamer: Don't fail state change methods if the sink pin is not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 16 ++++++++-------- dlls/quartz/tests/mpegsplit.c | 16 ++++++++-------- dlls/quartz/tests/waveparser.c | 16 ++++++++-------- dlls/winegstreamer/gstdemux.c | 6 +++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index a277256255b..644807dc32f 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1300,25 +1300,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1328,11 +1328,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index e407fe44eeb..f8a0ac56356 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -1043,25 +1043,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1071,11 +1071,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c index e9540bc0f55..37f924b716f 100644 --- a/dlls/quartz/tests/waveparser.c +++ b/dlls/quartz/tests/waveparser.c @@ -780,25 +780,25 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -808,11 +808,11 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9f5e147b7ed..771694b4d3c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1438,7 +1438,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) unsigned int i; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; for (i = 0; i < filter->source_count; ++i) { @@ -1489,7 +1489,7 @@ static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TI GstStateChangeReturn ret; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; if ((ret = gst_element_set_state(filter->container, GST_STATE_PLAYING)) == GST_STATE_CHANGE_FAILURE) { @@ -1507,7 +1507,7 @@ static HRESULT gstdemux_stop_stream(struct strmbase_filter *iface) GstStateChangeReturn ret; if (!filter->container) - return VFW_E_NOT_CONNECTED; + return S_OK; if ((ret = gst_element_set_state(filter->container, GST_STATE_PAUSED)) == GST_STATE_CHANGE_FAILURE) {

1 0

Zebediah Figura : winegstreamer: Don't fail parser_init_stream() if a source pin is not connected.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: ef7dcc7d519845f7f2d4fdd69c52e50737a21eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7dcc7d519845f7f2d4fdd6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:52 2020 -0600 winegstreamer: Don't fail parser_init_stream() if a source pin is not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 771694b4d3c..215e2704a27 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1432,7 +1432,6 @@ static void gstdemux_destroy(struct strmbase_filter *iface) static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); - HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; const SourceSeeking *seeking; GstStateChangeReturn ret; unsigned int i; @@ -1442,12 +1441,11 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->source_count; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) - hr = pin_hr; - } + HRESULT hr; - if (FAILED(hr)) - return hr; + if (filter->sources[i]->pin.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->sources[i]->pin.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); + } if (filter->no_more_pads_event) ResetEvent(filter->no_more_pads_event); @@ -1480,7 +1478,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) stop_type, seeking->llStop * 100)); } - return hr; + return S_OK; } static HRESULT gstdemux_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time)

1 0

Zebediah Figura : wineqtdecoder: Do not fail state change methods if source pins are not connected.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 7905cc975f60ff7a95f33941df9052b22eba4b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7905cc975f60ff7a95f33941… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 11:37:53 2020 -0600 wineqtdecoder: Do not fail state change methods if source pins are not connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 20 ++++++++------------ dlls/wineqtdecoder/qtvdecoder.c | 26 +++++++++++++++++--------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index cabb090e8d3..21fa2376745 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -278,25 +278,21 @@ static void qt_splitter_destroy(struct strmbase_filter *iface) static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) { QTSplitter *filter = impl_from_strmbase_filter(iface); - HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + HRESULT hr; EnterCriticalSection(&filter->csReceive); - if (filter->pVideo_Pin) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin))) - hr = pin_hr; - } - if (filter->pAudio_Pin) - { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->pAudio_Pin->pin))) - hr = pin_hr; - } + if (filter->pVideo_Pin && filter->pVideo_Pin->pin.pin.peer + && FAILED(hr = IMemAllocator_Commit(filter->pVideo_Pin->pin.pAllocator))) + ERR("Failed to commit video allocator, hr %#x.\n", hr); + if (filter->pAudio_Pin && filter->pAudio_Pin->pin.pin.peer + && FAILED(hr = IMemAllocator_Commit(filter->pAudio_Pin->pin.pAllocator))) + ERR("Failed to commit audio allocator, hr %#x.\n", hr); SetEvent(filter->runEvent); LeaveCriticalSection(&filter->csReceive); - return hr; + return S_OK; } static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index a86cd432c22..0e17c067df5 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -561,16 +561,18 @@ static void video_decoder_destroy(struct strmbase_filter *iface) static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) { - QTVDecoderImpl *This = impl_from_strmbase_filter(iface); + QTVDecoderImpl *filter = impl_from_strmbase_filter(iface); + HRESULT hr; OSErr err = noErr; ICMDecompressionSessionOptionsRef sessionOptions = NULL; ICMDecompressionTrackingCallbackRecord trackingCallbackRecord; trackingCallbackRecord.decompressionTrackingCallback = trackingCallback; - trackingCallbackRecord.decompressionTrackingRefCon = (void*)This; + trackingCallbackRecord.decompressionTrackingRefCon = filter; - err = ICMDecompressionSessionCreate(NULL, This->hImageDescription, sessionOptions, This->outputBufferAttributes, &trackingCallbackRecord, &This->decompressionSession); + err = ICMDecompressionSessionCreate(NULL, filter->hImageDescription, sessionOptions, + filter->outputBufferAttributes, &trackingCallbackRecord, &filter->decompressionSession); if (err != noErr) { @@ -578,18 +580,24 @@ static HRESULT video_decoder_init_stream(struct strmbase_filter *iface) return E_FAIL; } - return BaseOutputPinImpl_Active(&This->source); + if (filter->source.pin.peer && FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#x.\n", hr); + + return S_OK; } static HRESULT video_decoder_cleanup_stream(struct strmbase_filter *iface) { - QTVDecoderImpl* This = impl_from_strmbase_filter(iface); + QTVDecoderImpl *filter = impl_from_strmbase_filter(iface); + + if (filter->decompressionSession) + ICMDecompressionSessionRelease(filter->decompressionSession); + filter->decompressionSession = NULL; - if (This->decompressionSession) - ICMDecompressionSessionRelease(This->decompressionSession); - This->decompressionSession = NULL; + if (filter->source.pin.peer) + IMemAllocator_Decommit(filter->source.pAllocator); - return BaseOutputPinImpl_Inactive(&This->source); + return S_OK; } static const struct strmbase_filter_ops filter_ops =

1 0

Zhiyi Zhang : winex11.drv: Clarify parent in struct x11drv_win_data comments.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: ae79a91902857f186b02e97ae81708cc19574e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae79a91902857f186b02e97a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 17 17:05:33 2020 +0800 winex11.drv: Clarify parent in struct x11drv_win_data comments. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b9efa..45855976607 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -563,9 +563,9 @@ struct x11drv_win_data HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */ - RECT window_rect; /* USER window rectangle relative to parent */ - RECT whole_rect; /* X window rectangle for the whole window relative to parent */ - RECT client_rect; /* client area relative to parent */ + RECT window_rect; /* USER window rectangle relative to win32 parent window client area */ + RECT whole_rect; /* X window rectangle for the whole window relative to win32 parent window client area */ + RECT client_rect; /* client area relative to win32 parent window client area */ XIC xic; /* X input context */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */

1 0