June 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : evr: Store background color property for the mixer.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 7a2dc025a3342821de2810ab6e6cfedff1408f55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a2dc025a3342821de2810ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:39 2020 +0300 evr: Store background color property for the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 25 +++++++++++++++++++++---- dlls/evr/tests/evr.c | 10 +++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 6fcad15ec6..23994375d4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -67,6 +67,8 @@ struct video_mixer unsigned int input_count; struct output_stream output; + COLORREF bkgnd_color; + IDirect3DDeviceManager9 *device_manager; CRITICAL_SECTION cs; @@ -1187,16 +1189,31 @@ static HRESULT WINAPI video_mixer_processor_SetFilteringValue(IMFVideoProcessor static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor *iface, COLORREF *color) { - FIXME("%p, %p.\n", iface, color); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, color); + + if (!color) + return E_POINTER; + + EnterCriticalSection(&mixer->cs); + *color = mixer->bkgnd_color; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { - FIXME("%p, %#x.\n", iface, color); + struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, color); + + EnterCriticalSection(&mixer->cs); + mixer->bkgnd_color = color; + LeaveCriticalSection(&mixer->cs); + + return S_OK; } static const IMFVideoProcessorVtbl video_mixer_processor_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6259e63632..70fc6b18e2 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -413,21 +413,21 @@ static void test_default_mixer(void) hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoProcessor_GetBackgroundColor(processor, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + color = 1; hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!color, "Unexpected color %#x.\n", color); -} + hr = IMFVideoProcessor_SetBackgroundColor(processor, 0x00121212); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetBackgroundColor(processor, &color); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(color == 0x121212, "Unexpected color %#x.\n", color); -} + hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll: Setup the main thread before initializing ntdll.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 43be3507c04b56938e985047f2ab55147ed8ddd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43be3507c04b56938e985047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 29 12:19:13 2020 +0200 ntdll: Setup the main thread before initializing ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 47 +++++++++++++++++++++++++++--- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/thread.c | 65 +----------------------------------------- dlls/ntdll/unix/loader.c | 28 ++++++++++++++++-- dlls/ntdll/unix/thread.c | 27 ------------------ dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +- 7 files changed, 70 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43be3507c04b56938e98…

1 0

Nikolay Sivov : evr: Add input type validation through dxva.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 43eebcd3e6f27b385715bc95f4b86dad665bd97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43eebcd3e6f27b385715bc95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 15:43:38 2020 +0300 evr: Add input type validation through dxva. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 87 +++++++++++++++++++++- 2 files changed, 269 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43eebcd3e6f27b385715…

1 0

Changping Yu : kernel32: Adjust thread creation insertion order.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 59ce4e3eb878ca470ec0f153f567e92a3a577922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ce4e3eb878ca470ec0f153… Author: Changping Yu <dead.ash(a)hotmail.com> Date: Mon Jun 29 13:08:27 2020 +0800 kernel32: Adjust thread creation insertion order. Signed-off-by: Changping Yu <dead.ash(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/toolhelp.c | 4 ---- server/thread.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index eab35e0a47..7d27f22196 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -227,7 +227,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) /* Reset data */ thread_traversed[i] = 0; } - todo_wine ok(found == FALSE, "The thread order is not strictly consistent\n"); /* Determine the order by NtQuerySystemInformation function */ @@ -282,7 +281,6 @@ static DWORD WINAPI get_id_thread(void* curr_pid) break; } } - todo_wine ok(found == FALSE, "wrong order in NtQuerySystemInformation function\n"); SetEvent(ev); @@ -303,7 +301,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) /* Check that the main thread id is first one in this thread. */ tid = get_id_thread(ULongToPtr(curr_pid)); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); /* Check that the main thread id is first one in other thread. */ @@ -312,7 +309,6 @@ static void test_main_thread(DWORD curr_pid, DWORD main_tid) ok(error == WAIT_OBJECT_0, "Thread did not complete within timelimit\n"); ok(GetExitCodeThread(thread, &tid), "Could not retrieve exit code\n"); - todo_wine ok(tid == main_tid, "The first thread id returned is not the main thread id\n"); } diff --git a/server/thread.c b/server/thread.c index 3cf447b1a0..23c0538150 100644 --- a/server/thread.c +++ b/server/thread.c @@ -329,7 +329,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu thread->affinity = process->affinity; if (!current) current = thread; - list_add_head( &thread_list, &thread->entry ); + list_add_tail( &thread_list, &thread->entry ); if (sd && !set_sd_defaults_from_token( &thread->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |

1 0

Hans Leidekker : winhttp: Reimplement the task queue using thread pool work objects.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: c7d140d34aa6f40a92f95fd8698501d3283c9296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d140d34aa6f40a92f95fd8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:10 2020 +0200 winhttp: Reimplement the task queue using thread pool work objects. Simplifies cleanup. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 336 +++++++++++++++++++---------------------- dlls/winhttp/session.c | 12 +- dlls/winhttp/winhttp_private.h | 31 ++-- 3 files changed, 169 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c7d140d34aa6f40a92f9…

1 0

Hans Leidekker : winhttp: Copy the reason buffer.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 7b7fdb8585b78fcb9ead0b65472196c0fffe23c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b7fdb8585b78fcb9ead0b65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:11 2020 +0200 winhttp: Copy the reason buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/tests/winhttp.c | 6 ++++++ dlls/winhttp/winhttp_private.h | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index bc3d365f7c..06588d6f60 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3463,7 +3463,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3484,7 +3484,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); @@ -3569,7 +3569,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas TRACE("%p, %u, %p, %u\n", hsocket, status, reason, len); - if (len && !reason) return ERROR_INVALID_PARAMETER; + if ((len && !reason) || len > sizeof(socket->reason)) return ERROR_INVALID_PARAMETER; if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3590,7 +3590,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (!(s = heap_alloc( sizeof(*s) ))) return FALSE; s->socket = socket; s->status = status; - s->reason = reason; + memcpy( s->reason, reason, len ); s->len = len; addref_object( &socket->hdr ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 12f5136973..84063fdc82 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3356,6 +3356,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketShutdown(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success", sizeof("success")); ok(!error, "got %u\n", error); @@ -3363,6 +3366,9 @@ static void test_websocket(int port) error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, NULL, 1); ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, buf, sizeof(buf)); + ok(error == ERROR_INVALID_PARAMETER, "got %u\n", error); + error = pWinHttpWebSocketClose(socket, WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS, (void *)"success2", sizeof("success2")); ok(!error, "got %u\n", error); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ac7e9ff09b..9d0b9c308a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -244,7 +244,7 @@ struct socket enum socket_opcode opcode; DWORD read_size; USHORT status; - char reason[128]; + char reason[123]; DWORD reason_len; }; @@ -305,7 +305,7 @@ struct socket_shutdown { struct socket *socket; USHORT status; - const void *reason; + char reason[123]; DWORD len; };

1 0

Hans Leidekker : winhttp: Stop the send queue before sending the close message.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 97f9dc7ff46a161468dcf7866381db23474a1031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f9dc7ff46a161468dcf786… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 29 15:46:13 2020 +0200 winhttp: Stop the send queue before sending the close message. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 14 ++++++++++++-- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 7cb07b5c10..e31803ccfe 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -138,6 +138,14 @@ static DWORD start_queue( struct queue *queue ) return ERROR_SUCCESS; } +void stop_queue( struct queue *queue ) +{ + if (!queue->pool) return; + CloseThreadpool( queue->pool ); + queue->pool = NULL; + TRACE("stopped %p\n", queue); +} + static DWORD queue_task( struct queue *queue, PTP_WORK_CALLBACK task, void *ctx ) { TP_WORK *work; @@ -3037,8 +3045,8 @@ static void socket_destroy( struct object_header *hdr ) TRACE("%p\n", socket); - if (socket->send_q.pool) CloseThreadpool( socket->send_q.pool ); - if (socket->recv_q.pool) CloseThreadpool( socket->recv_q.pool ); + stop_queue( &socket->send_q ); + stop_queue( &socket->recv_q ); release_object( &socket->request->hdr ); heap_free( socket ); @@ -3526,6 +3534,7 @@ static DWORD socket_shutdown( struct socket *socket, USHORT status, const void * struct netconn *netconn = socket->request->netconn; DWORD ret; + stop_queue( &socket->send_q ); if (!(ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) { socket->state = SOCKET_STATE_SHUTDOWN; @@ -3609,6 +3618,7 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (socket->state < SOCKET_STATE_SHUTDOWN) { + stop_queue( &socket->send_q ); if ((ret = send_frame( netconn, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE ))) goto done; socket->state = SOCKET_STATE_SHUTDOWN; } diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f3ab8c9b95..080837eb1e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -578,7 +578,7 @@ static void request_destroy( struct object_header *hdr ) TRACE("%p\n", request); - if (request->queue.pool) CloseThreadpool( request->queue.pool ); + stop_queue( &request->queue ); release_object( &request->connect->hdr ); if (request->cred_handle_initialized) FreeCredentialsHandle( &request->cred_handle ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9d0b9c308a..23aba00780 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -317,6 +317,7 @@ BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; void send_callback( struct object_header *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( struct request * ) DECLSPEC_HIDDEN; +void stop_queue( struct queue * ) DECLSPEC_HIDDEN; void netconn_close( struct netconn * ) DECLSPEC_HIDDEN; DWORD netconn_create( struct hostdata *, const struct sockaddr_storage *, int, struct netconn ** ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Return success in :HTMLStyle3::scrollbar* setters.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 5b2dd5d8fdf27f25c8b0a7bc92d7c8753c73432e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b2dd5d8fdf27f25c8b0a7bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 16:50:06 2020 +0200 mshtml: Return success in :HTMLStyle3::scrollbar* setters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 02de13580f..7128d2a58a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4170,7 +4170,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarBaseColor(IHTMLStyle3 *iface, VARI { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarBaseColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4184,7 +4184,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarFaceColor(IHTMLStyle3 *iface, VARI { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarFaceColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4198,7 +4198,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbar3dLightColor(IHTMLStyle3 *iface, V { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbar3dLightColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4212,7 +4212,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarShadowColor(IHTMLStyle3 *iface, VA { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarShadowColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4226,7 +4226,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarHighlightColor(IHTMLStyle3 *iface, { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarHighlightColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4240,7 +4240,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarDarkShadowColor(IHTMLStyle3 *iface { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarDarkShadowColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4254,7 +4254,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarArrowColor(IHTMLStyle3 *iface, VAR { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarArrowColor(IHTMLStyle3 *iface, VARIANT *p) @@ -4268,7 +4268,7 @@ static HRESULT WINAPI HTMLStyle3_put_scrollbarTrackColor(IHTMLStyle3 *iface, VAR { HTMLStyle *This = impl_from_IHTMLStyle3(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle3_get_scrollbarTrackColor(IHTMLStyle3 *iface, VARIANT *p)

1 0

Zebediah Figura : qcap: Pass a single AM_MEDIA_TYPE pointer to get_format().
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: ebd4b38f90f00f259daf6044903967cc92a26691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd4b38f90f00f259daf6044… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 10:26:17 2020 -0500 qcap: Pass a single AM_MEDIA_TYPE pointer to get_format(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_private.h | 2 +- dlls/qcap/v4l.c | 8 ++------ dlls/qcap/vfwcapture.c | 12 +++++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 823f8fed93..70a8c85ad4 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -50,7 +50,7 @@ struct video_capture_device_ops void (*destroy)(struct video_capture_device *device); HRESULT (*check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (*set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); - HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE **mt); + HRESULT (*get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt); HRESULT (*get_caps)(struct video_capture_device *device, LONG index, AM_MEDIA_TYPE **mt, VIDEO_STREAM_CONFIG_CAPS *caps); LONG (*get_caps_count)(struct video_capture_device *device); HRESULT (*get_prop_range)(struct video_capture_device *device, VideoProcAmpProperty property, diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 5c2de2e3d6..2cf50b0c28 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -212,15 +212,11 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A return S_OK; } -static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDIA_TYPE **mt) +static HRESULT v4l_device_get_format(struct video_capture_device *iface, AM_MEDIA_TYPE *mt) { struct v4l_device *device = v4l_device(iface); - *mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - if (!*mt) - return E_OUTOFMEMORY; - - return CopyMediaType(*mt, &device->current_caps->media_type); + return CopyMediaType(mt, &device->current_caps->media_type); } static __u32 v4l2_cid_from_qcap_property(VideoProcAmpProperty property) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 9f4b859863..7d82a01109 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -223,16 +223,18 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return hr; } -static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt) +static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE **mt) { VfwCapture *filter = impl_from_IAMStreamConfig(iface); HRESULT hr; - TRACE("filter %p, mt %p.\n", filter, pmt); + TRACE("filter %p, mt %p.\n", filter, mt); - hr = filter->device->ops->get_format(filter->device, pmt); - if (SUCCEEDED(hr)) - strmbase_dump_media_type(*pmt); + if (!(*mt = CoTaskMemAlloc(sizeof(**mt)))) + return E_OUTOFMEMORY; + + if (SUCCEEDED(hr = filter->device->ops->get_format(filter->device, *mt))) + strmbase_dump_media_type(*mt); return hr; }

1 0

Zebediah Figura : qcap: Use a condition variable to synchronize with the video capture thread.
by Alexandre Julliard June 29, 2020

June 29, 2020

Module: wine Branch: master Commit: 6d675064f8f9eeb873a2c91d02c3ccbbfd982d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d675064f8f9eeb873a2c91d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 29 10:26:18 2020 -0500 qcap: Use a condition variable to synchronize with the video capture thread. This fixes a hang that can be triggered by calling Pause() followed by Stop(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 58 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 2cf50b0c28..d8c5e168e1 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -98,9 +98,11 @@ struct v4l_device struct strmbase_source *pin; int fd, mmap; - FILTER_STATE state; - HANDLE thread, run_event; + HANDLE thread; + FILTER_STATE state; + CONDITION_VARIABLE state_cv; + CRITICAL_SECTION state_cs; }; static inline struct v4l_device *v4l_device(struct video_capture_device *iface) @@ -123,6 +125,8 @@ static void v4l_device_destroy(struct video_capture_device *iface) { struct v4l_device *device = v4l_device(iface); + device->state_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&device->state_cs); if (device->fd != -1) video_close(device->fd); if (device->caps_count) @@ -320,19 +324,18 @@ static void reverse_image(struct v4l_device *device, LPBYTE output, const BYTE * } } -static DWORD WINAPI ReadThread(LPVOID lParam) +static DWORD WINAPI ReadThread(void *arg) { - struct v4l_device *capBox = lParam; + struct v4l_device *device = arg; HRESULT hr; IMediaSample *pSample = NULL; - ULONG framecount = 0; unsigned char *pTarget, *image_data; unsigned int image_size; UINT width, height, depth; - width = capBox->current_caps->video_info.bmiHeader.biWidth; - height = capBox->current_caps->video_info.bmiHeader.biHeight; - depth = capBox->current_caps->video_info.bmiHeader.biBitCount / 8; + width = device->current_caps->video_info.bmiHeader.biWidth; + height = device->current_caps->video_info.bmiHeader.biHeight; + depth = device->current_caps->video_info.bmiHeader.biBitCount / 8; image_size = width * height * depth; if (!(image_data = heap_alloc(image_size))) { @@ -340,12 +343,22 @@ static DWORD WINAPI ReadThread(LPVOID lParam) return 0; } - while (capBox->state != State_Stopped) + for (;;) { - if (capBox->state == State_Paused) - WaitForSingleObject(capBox->run_event, INFINITE); + EnterCriticalSection(&device->state_cs); + + while (device->state == State_Paused) + SleepConditionVariableCS(&device->state_cv, &device->state_cs, INFINITE); - hr = BaseOutputPinImpl_GetDeliveryBuffer(capBox->pin, &pSample, NULL, NULL, 0); + if (device->state == State_Stopped) + { + LeaveCriticalSection(&device->state_cs); + break; + } + + LeaveCriticalSection(&device->state_cs); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(device->pin, &pSample, NULL, NULL, 0); if (SUCCEEDED(hr)) { int len; @@ -358,7 +371,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(capBox->fd, image_data, image_size) == -1) + while (video_read(device->fd, image_data, image_size) == -1) { if (errno != EAGAIN) { @@ -367,11 +380,11 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - reverse_image(capBox, pTarget, image_data); - hr = IMemInputPin_Receive(capBox->pin->pMemInputPin, pSample); - TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); + reverse_image(device, pTarget, image_data); + hr = IMemInputPin_Receive(device->pin->pMemInputPin, pSample); IMediaSample_Release(pSample); } + if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); @@ -412,15 +425,17 @@ static void v4l_device_init_stream(struct video_capture_device *iface) static void v4l_device_start_stream(struct video_capture_device *iface) { struct v4l_device *device = v4l_device(iface); + EnterCriticalSection(&device->state_cs); device->state = State_Running; - SetEvent(device->run_event); + LeaveCriticalSection(&device->state_cs); } static void v4l_device_stop_stream(struct video_capture_device *iface) { struct v4l_device *device = v4l_device(iface); + EnterCriticalSection(&device->state_cs); device->state = State_Paused; - ResetEvent(device->run_event); + LeaveCriticalSection(&device->state_cs); } static void v4l_device_cleanup_stream(struct video_capture_device *iface) @@ -428,7 +443,10 @@ static void v4l_device_cleanup_stream(struct video_capture_device *iface) struct v4l_device *device = v4l_device(iface); HRESULT hr; + EnterCriticalSection(&device->state_cs); device->state = State_Stopped; + LeaveCriticalSection(&device->state_cs); + WakeConditionVariable(&device->state_cv); WaitForSingleObject(device->thread, INFINITE); CloseHandle(device->thread); device->thread = NULL; @@ -656,7 +674,9 @@ struct video_capture_device *v4l_device_create(struct strmbase_source *pin, USHO device->d.ops = &v4l_device_ops; device->pin = pin; device->state = State_Stopped; - device->run_event = CreateEventW(NULL, TRUE, FALSE, NULL); + InitializeConditionVariable(&device->state_cv); + InitializeCriticalSection(&device->state_cs); + device->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": v4l_device.state_cs"); TRACE("Format: %d bpp - %dx%d.\n", device->current_caps->video_info.bmiHeader.biBitCount, device->current_caps->video_info.bmiHeader.biWidth,

1 0