July 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move get_scroll_info_ptr implementation from user32.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 4de61c465fe8bb44fc6000e9b351ba918d5ded34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4de61c465fe8bb44fc6000e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 4 00:07:04 2022 +0200 win32u: Move get_scroll_info_ptr implementation from user32. --- dlls/user32/scroll.c | 73 +------------------------------------------- dlls/user32/user_main.c | 7 ----- dlls/win32u/defwnd.c | 2 +- dlls/win32u/ntuser_private.h | 4 +-- dlls/win32u/scroll.c | 66 ++++++++++++++++++++++++++++++++++++--- dlls/win32u/window.c | 4 +-- 6 files changed, 66 insertions(+), 90 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 54517311731..9453df9dedd 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -31,17 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); -typedef struct scroll_info SCROLLBAR_INFO, *LPSCROLLBAR_INFO; -typedef struct scroll_bar_win_data SCROLLBAR_WNDDATA; - -/* data for window that has (one or two) scroll bars */ -typedef struct -{ - SCROLLBAR_INFO horz; - SCROLLBAR_INFO vert; -} WINSCROLLBAR_INFO, *LPWINSCROLLBAR_INFO; - -#define SCROLLBAR_MAGIC 0x5c6011ba /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0 @@ -54,71 +43,11 @@ const struct builtin_class_descr SCROLL_builtin_class = L"ScrollBar", /* name */ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ WINPROC_SCROLLBAR, /* proc */ - sizeof(SCROLLBAR_WNDDATA), /* extra */ + sizeof(struct scroll_bar_win_data), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ }; -/*********************************************************************** - * SCROLL_GetInternalInfo - - * Returns pointer to internal SCROLLBAR_INFO structure for nBar - * or NULL if failed (f.i. scroll bar does not exist yet) - * If alloc is TRUE and the struct does not exist yet, create it. - */ -SCROLLBAR_INFO *SCROLL_GetInternalInfo( HWND hwnd, INT nBar, BOOL alloc ) -{ - SCROLLBAR_INFO *infoPtr = NULL; - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return NULL; - switch(nBar) - { - case SB_HORZ: - if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->horz; - break; - case SB_VERT: - if (wndPtr->pScroll) infoPtr = &((LPWINSCROLLBAR_INFO)wndPtr->pScroll)->vert; - break; - case SB_CTL: - if (wndPtr->cbWndExtra >= sizeof(SCROLLBAR_WNDDATA)) - { - SCROLLBAR_WNDDATA *data = (SCROLLBAR_WNDDATA*)wndPtr->wExtra; - if (data->magic == SCROLLBAR_MAGIC) - infoPtr = &data->info; - } - if (!infoPtr) WARN("window is not a scrollbar control\n"); - break; - case SB_BOTH: - WARN("with SB_BOTH\n"); - break; - } - - if (!infoPtr && alloc) - { - WINSCROLLBAR_INFO *winInfoPtr; - - if (nBar != SB_HORZ && nBar != SB_VERT) - WARN("Cannot initialize nBar=%d\n",nBar); - else if ((winInfoPtr = HeapAlloc( GetProcessHeap(), 0, sizeof(WINSCROLLBAR_INFO) ))) - { - /* Set default values */ - winInfoPtr->horz.minVal = 0; - winInfoPtr->horz.curVal = 0; - winInfoPtr->horz.page = 0; - /* From MSDN and our own tests: - * max for a standard scroll bar is 100 by default. */ - winInfoPtr->horz.maxVal = 100; - winInfoPtr->horz.flags = ESB_ENABLE_BOTH; - winInfoPtr->vert = winInfoPtr->horz; - wndPtr->pScroll = winInfoPtr; - infoPtr = nBar == SB_HORZ ? &winInfoPtr->horz : &winInfoPtr->vert; - } - } - WIN_ReleasePtr( wndPtr ); - return infoPtr; -} - /*********************************************************************** * SCROLL_DrawArrows diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index fb9ce74736d..26427bd2cf6 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -135,11 +135,6 @@ static void WINAPI unregister_imm( HWND hwnd ) imm_unregister_window( hwnd ); } -static void CDECL free_win_ptr( WND *win ) -{ - HeapFree( GetProcessHeap(), 0, win->pScroll ); -} - static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, void (CALLBACK *finally_func)( BOOL )) { @@ -157,8 +152,6 @@ static const struct user_callbacks user_funcs = ImmProcessKey, ImmTranslateMessage, NtWaitForMultipleObjects, - free_win_ptr, - SCROLL_GetInternalInfo, notify_ime, post_dde_message, unpack_dde_message, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 702673e0cdd..f44540f7f98 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2379,7 +2379,7 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, if (!win) return 0; free( win->text ); win->text = NULL; - if (user_callbacks) user_callbacks->free_win_ptr( win ); + free( win->pScroll ); win->pScroll = NULL; release_win_ptr( win ); break; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index b2765a70a3d..fb6e5a5200b 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -35,8 +35,6 @@ struct user_callbacks BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - void (CDECL *free_win_ptr)( struct tagWND *win ); - struct scroll_info *(CDECL *get_scroll_info)( HWND hwnd, INT nBar, BOOL alloc ); void (CDECL *notify_ime)( HWND hwnd, UINT param ); BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ); @@ -97,7 +95,7 @@ typedef struct tagWND POINT min_pos; /* Position for minimized window */ POINT max_pos; /* Position for maximized window */ WCHAR *text; /* Window text */ - void *pScroll; /* Scroll-bar info */ + struct win_scroll_bar_info *pScroll; /* Scroll-bar info */ DWORD dwStyle; /* Window style (from CreateWindow) */ DWORD dwExStyle; /* Extended style (from CreateWindowEx) */ UINT_PTR wIDmenu; /* ID or hmenu (from CreateWindow) */ diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index c4c26e3bc6e..cb6d4b7a7c9 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -62,13 +62,69 @@ static struct SCROLL_TRACKING_INFO g_tracking_info; /* Is the moving thumb being displayed? */ static BOOL scroll_moving_thumb = FALSE; +/* data for window that has (one or two) scroll bars */ +struct win_scroll_bar_info +{ + struct scroll_info horz; + struct scroll_info vert; +}; + +#define SCROLLBAR_MAGIC 0x5c6011ba + + static struct scroll_info *get_scroll_info_ptr( HWND hwnd, int bar, BOOL alloc ) { - struct scroll_info *ret = NULL; - user_lock(); - if (user_callbacks) ret = user_callbacks->get_scroll_info( hwnd, bar, alloc ); - if (!ret) user_unlock(); - return ret; + struct scroll_info *info = NULL; + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return NULL; + + switch (bar) + { + case SB_HORZ: + if (win->pScroll) info = &win->pScroll->horz; + break; + case SB_VERT: + if (win->pScroll) info = &win->pScroll->vert; + break; + case SB_CTL: + if (win->cbWndExtra >= sizeof(struct scroll_bar_win_data)) + { + struct scroll_bar_win_data *data = (struct scroll_bar_win_data *)win->wExtra; + if (data->magic == SCROLLBAR_MAGIC) info = &data->info; + } + if (!info) WARN( "window is not a scrollbar control\n" ); + break; + case SB_BOTH: + WARN( "with SB_BOTH\n" ); + break; + } + + if (!info && alloc) + { + struct win_scroll_bar_info *win_info; + + if (bar != SB_HORZ && bar != SB_VERT) + WARN("Cannot initialize bar=%d\n",bar); + else if ((win_info = malloc( sizeof(struct win_scroll_bar_info) ))) + { + /* Set default values */ + win_info->horz.minVal = 0; + win_info->horz.curVal = 0; + win_info->horz.page = 0; + /* From MSDN and our own tests: + * max for a standard scroll bar is 100 by default. */ + win_info->horz.maxVal = 100; + win_info->horz.flags = ESB_ENABLE_BOTH; + win_info->vert = win_info->horz; + win->pScroll = win_info; + info = bar == SB_HORZ ? &win_info->horz : &win_info->vert; + } + } + + if (info) user_lock(); + release_win_ptr( win ); + return info; } static void release_scroll_info_ptr( struct scroll_info *info ) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index de4779aee59..e7ccbf7a928 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4662,7 +4662,7 @@ static void free_window_handle( HWND hwnd ) } SERVER_END_REQ; user_unlock(); - if (user_callbacks) user_callbacks->free_win_ptr( win ); + free( win->pScroll ); free( win->text ); free( win ); } @@ -4865,7 +4865,7 @@ void destroy_thread_windows(void) register_window_surface( win->surface, NULL ); window_surface_release( win->surface ); } - if (user_callbacks) user_callbacks->free_win_ptr( win ); + free( win->pScroll ); free( win->text ); free( win ); }

1 0

Jacek Caban : win32u: Move WM_NCCREATE scroll handling from user32.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: f85985abbec9b2528fea1f97b56c38ab45cb98bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f85985abbec9b2528fea1f97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 00:37:50 2022 +0200 win32u: Move WM_NCCREATE scroll handling from user32. --- dlls/user32/defwnd.c | 32 -------------------------------- dlls/win32u/defwnd.c | 8 ++++++++ 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 8373aa8e797..70d62c4f718 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -93,22 +93,6 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam switch(msg) { - case WM_NCCREATE: - if (lParam) - { - CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; - - result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, TRUE ); - - if(cs->style & (WS_HSCROLL | WS_VSCROLL)) - { - SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; - NtUserSetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); - NtUserSetScrollInfo( hwnd, SB_VERT, &si, FALSE ); - } - } - break; - case WM_SYSCOMMAND: result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; @@ -220,22 +204,6 @@ LRESULT WINAPI DefWindowProcW( switch(msg) { - case WM_NCCREATE: - if (lParam) - { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - - result = NtUserMessageCall( hwnd, msg, wParam, lParam, 0, NtUserDefWindowProc, FALSE ); - - if(cs->style & (WS_HSCROLL | WS_VSCROLL)) - { - SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; - NtUserSetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); - NtUserSetScrollInfo( hwnd, SB_VERT, &si, FALSE ); - } - } - break; - case WM_SYSCOMMAND: result = NC_HandleSysCommand( hwnd, wParam, lParam ); break; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index f44540f7f98..3e42e3b1e22 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -2369,6 +2369,14 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, { CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; set_window_text( hwnd, cs->lpszName, ansi ); + + if (cs->style & (WS_HSCROLL | WS_VSCROLL)) + { + SCROLLINFO si = { .cbSize = sizeof(si), .fMask = SIF_ALL, .nMax = 100 }; + NtUserSetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); + NtUserSetScrollInfo( hwnd, SB_VERT, &si, FALSE ); + } + result = 1; } break;

1 0

Rémi Bernon : winegstreamer: Fix Resampler transform GetCurrent(Input|Output)Type.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 963f76180b9ec05c65fb4e0bdee7d1e642379207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=963f76180b9ec05c65fb4e0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 29 23:13:45 2022 +0200 winegstreamer: Fix Resampler transform GetCurrent(Input|Output)Type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/resampler.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index ea000e3b96f..65a29d96794 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -435,7 +435,6 @@ failed: static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct resampler *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -446,16 +445,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i if (!impl->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct resampler *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -466,10 +467,13 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD if (!impl->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Rémi Bernon : winegstreamer: Fix ColorConvert transform GetCurrent(Input|Output)Type.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: a3b3708134a8956c79929764df7271b2a153f5f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b3708134a8956c79929764… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 29 23:13:45 2022 +0200 winegstreamer: Fix ColorConvert transform GetCurrent(Input|Output)Type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/color_convert.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 66a86aa4602..b47832b2c30 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -466,7 +466,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct color_convert *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -477,16 +476,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i if (!impl->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct color_convert *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -497,10 +498,13 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD if (!impl->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Rémi Bernon : mf/tests: Add more MFGetTopoNodeCurrentType tests.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: b43e4a54e2ab646570bc2a08d0ebccd6e15e245b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43e4a54e2ab646570bc2a08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 08:48:23 2022 +0200 mf/tests: Add more MFGetTopoNodeCurrentType tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 351 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 321 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b43e4a54e2ab646570bc…

1 0

Rémi Bernon : mf: Add error cases for MFGetTopoNodeCurrentType.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 4676273b888458f1d47f4a7823c9033dc4f3441d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4676273b888458f1d47f4a78… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 09:27:42 2022 +0200 mf: Add error cases for MFGetTopoNodeCurrentType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 5 ----- dlls/mf/topology.c | 8 +++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c447bad59e2..fd4acf6dfbf 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6117,10 +6117,8 @@ static void test_MFGetTopoNodeCurrentType(void) hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); hr = pMFGetTopoNodeCurrentType(node, 1, TRUE, &media_type); - todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); - todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = IMFTopologyNode_SetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)input_descriptor); @@ -6143,13 +6141,10 @@ static void test_MFGetTopoNodeCurrentType(void) hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &node); ok(hr == S_OK, "Failed to create a node, hr %#lx.\n", hr); hr = pMFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); hr = pMFGetTopoNodeCurrentType(node, 1, FALSE, &media_type); - todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); hr = pMFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); - todo_wine ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#lx.\n", hr); stream_sink.handler = output_handler; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 8d64c10b5c7..34c20dbc735 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1841,7 +1841,10 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + if (output || stream) + return MF_E_INVALIDSTREAMNUMBER; + + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); IMFStreamSink_Release(stream_sink); @@ -1854,6 +1857,9 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (!output || stream) + return MF_E_INVALIDSTREAMNUMBER; + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, (void **)&sd))) {

1 0

Zebediah Figura : wineusb.sys: Spawn a separate thread to consume Unix library events.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 443489709654cf19e3a34216db33bcf62cd9cd62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=443489709654cf19e3a34216… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 18:43:23 2022 -0500 wineusb.sys: Spawn a separate thread to consume Unix library events. --- dlls/wineusb.sys/wineusb.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index cfa88616a8f..b3d14e91839 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -20,6 +20,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdbool.h> #include <stdlib.h> #include <pthread.h> #include <libusb.h> @@ -107,6 +108,71 @@ static DEVICE_OBJECT *bus_fdo, *bus_pdo; static libusb_hotplug_callback_handle hotplug_cb_handle; +static pthread_cond_t event_cond = PTHREAD_COND_INITIALIZER; +static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; + +enum usb_event_type +{ + USB_EVENT_SHUTDOWN, +}; + +struct usb_event +{ + enum usb_event_type type; +}; + +static struct usb_event *usb_events; +static size_t usb_event_count, usb_events_capacity; + +static bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return true; + + max_capacity = ~(size_t)0 / size; + if (count > max_capacity) + return false; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return false; + + *elements = new_elements; + *capacity = new_capacity; + + return true; +} + +static void queue_event(const struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + if (array_reserve((void **)&usb_events, &usb_events_capacity, usb_event_count + 1, sizeof(*usb_events))) + usb_events[usb_event_count++] = *event; + else + ERR("Failed to queue event.\n"); + pthread_mutex_unlock(&event_mutex); + pthread_cond_signal(&event_cond); +} + +static void get_event(struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + while (!usb_event_count) + pthread_cond_wait(&event_cond, &event_mutex); + *event = usb_events[0]; + if (--usb_event_count) + memmove(usb_events, usb_events + 1, usb_event_count * sizeof(*usb_events)); + pthread_mutex_unlock(&event_mutex); +} + static void destroy_unix_device(struct unix_device *unix_device) { pthread_mutex_lock(&unix_device_mutex); @@ -293,7 +359,7 @@ static void remove_usb_device(libusb_device *libusb_device) } static BOOL thread_shutdown; -static HANDLE event_thread; +static HANDLE libusb_event_thread, event_thread; static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, libusb_hotplug_event event, void *user_data) @@ -306,11 +372,12 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device return 0; } -static DWORD CALLBACK event_thread_proc(void *arg) +static DWORD CALLBACK libusb_event_thread_proc(void *arg) { + static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; int ret; - TRACE("Starting event thread.\n"); + TRACE("Starting libusb event thread.\n"); while (!thread_shutdown) { @@ -318,10 +385,31 @@ static DWORD CALLBACK event_thread_proc(void *arg) ERR("Error handling events: %s\n", libusb_strerror(ret)); } - TRACE("Shutting down event thread.\n"); + queue_event(&shutdown_event); + + TRACE("Shutting down libusb event thread.\n"); return 0; } +static DWORD CALLBACK event_thread_proc(void *arg) +{ + struct usb_event event; + + TRACE("Starting client event thread.\n"); + + for (;;) + { + get_event(&event); + + switch (event.type) + { + case USB_EVENT_SHUTDOWN: + TRACE("Shutting down client event thread.\n"); + return 0; + } + } +} + static NTSTATUS fdo_pnp(IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -391,6 +479,8 @@ static NTSTATUS fdo_pnp(IRP *irp) libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); thread_shutdown = TRUE; libusb_interrupt_event_handler(NULL); + WaitForSingleObject(libusb_event_thread, INFINITE); + CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread); @@ -1007,6 +1097,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_UNSUCCESSFUL; } + libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); driver->DriverExtension->AddDevice = driver_add_device;

1 0

Zebediah Figura : wineusb.sys: Remove devices through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 4ed25028052a8e40a065cdf1aacf418083ccadeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed25028052a8e40a065cdf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:39:08 2022 -0500 wineusb.sys: Remove devices through the event thread. --- dlls/wineusb.sys/wineusb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b3d14e91839..b8bcb816e95 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -113,12 +113,18 @@ static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; enum usb_event_type { + USB_EVENT_REMOVE_DEVICE, USB_EVENT_SHUTDOWN, }; struct usb_event { enum usb_event_type type; + + union + { + struct unix_device *removed_device; + } u; }; static struct usb_event *usb_events; @@ -348,13 +354,18 @@ static void remove_unix_device(struct unix_device *unix_device) static void remove_usb_device(libusb_device *libusb_device) { struct unix_device *unix_device; + struct usb_event usb_event; TRACE("Removing device %p.\n", libusb_device); LIST_FOR_EACH_ENTRY(unix_device, &unix_device_list, struct unix_device, entry) { if (libusb_get_device(unix_device->handle) == libusb_device) - remove_unix_device(unix_device); + { + usb_event.type = USB_EVENT_REMOVE_DEVICE; + usb_event.u.removed_device = unix_device; + queue_event(&usb_event); + } } } @@ -403,6 +414,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { + case USB_EVENT_REMOVE_DEVICE: + TRACE("Got remove event for device %p.\n", event.u.removed_device); + remove_unix_device(event.u.removed_device); + break; + case USB_EVENT_SHUTDOWN: TRACE("Shutting down client event thread.\n"); return 0;

1 0

Zebediah Figura : wineusb.sys: Report new devices through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: f8e5e72a5978d011e7d9f91266a582cec81946be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e5e72a5978d011e7d9f912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:46:22 2022 -0500 wineusb.sys: Report new devices through the event thread. --- dlls/wineusb.sys/wineusb.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b8bcb816e95..37434074b91 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -113,6 +113,7 @@ static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; enum usb_event_type { + USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, USB_EVENT_SHUTDOWN, }; @@ -123,6 +124,7 @@ struct usb_event union { + struct unix_device *added_device; struct unix_device *removed_device; } u; }; @@ -304,6 +306,7 @@ static void add_usb_device(libusb_device *libusb_device) { struct libusb_device_descriptor device_desc; struct unix_device *unix_device; + struct usb_event usb_event; int ret; libusb_get_device_descriptor(libusb_device, &device_desc); @@ -324,7 +327,9 @@ static void add_usb_device(libusb_device *libusb_device) list_add_tail(&unix_device_list, &unix_device->entry); pthread_mutex_unlock(&unix_device_mutex); - add_unix_device(unix_device); + usb_event.type = USB_EVENT_ADD_DEVICE; + usb_event.u.added_device = unix_device; + queue_event(&usb_event); } static void remove_unix_device(struct unix_device *unix_device) @@ -414,8 +419,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { + case USB_EVENT_ADD_DEVICE: + add_unix_device(event.u.added_device); + break; + case USB_EVENT_REMOVE_DEVICE: - TRACE("Got remove event for device %p.\n", event.u.removed_device); remove_unix_device(event.u.removed_device); break;

1 0

Zebediah Figura : wineusb.sys: Complete IRPs through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: d4bb82af35de5011110e0da93c3a0c0b1fbc3963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bb82af35de5011110e0da9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 16:15:01 2022 -0500 wineusb.sys: Complete IRPs through the event thread. --- dlls/wineusb.sys/wineusb.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 37434074b91..0b8af43a3dc 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -115,6 +115,7 @@ enum usb_event_type { USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, + USB_EVENT_TRANSFER_COMPLETE, USB_EVENT_SHUTDOWN, }; @@ -126,6 +127,7 @@ struct usb_event { struct unix_device *added_device; struct unix_device *removed_device; + IRP *completed_irp; } u; }; @@ -407,6 +409,16 @@ static DWORD CALLBACK libusb_event_thread_proc(void *arg) return 0; } +static void complete_irp(IRP *irp) +{ + EnterCriticalSection(&wineusb_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&wineusb_cs); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static DWORD CALLBACK event_thread_proc(void *arg) { struct usb_event event; @@ -427,6 +439,10 @@ static DWORD CALLBACK event_thread_proc(void *arg) remove_unix_device(event.u.removed_device); break; + case USB_EVENT_TRANSFER_COMPLETE: + complete_irp(event.u.completed_irp); + break; + case USB_EVENT_SHUTDOWN: TRACE("Shutting down client event thread.\n"); return 0; @@ -772,6 +788,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) { IRP *irp = transfer->user_data; URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + struct usb_event event; TRACE("Completing IRP %p, status %#x.\n", irp, transfer->status); @@ -807,12 +824,9 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) } } - EnterCriticalSection(&wineusb_cs); - RemoveEntryList(&irp->Tail.Overlay.ListEntry); - LeaveCriticalSection(&wineusb_cs); - - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); + event.type = USB_EVENT_TRANSFER_COMPLETE; + event.u.completed_irp = irp; + queue_event(&event); } static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer)

1 0