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

Bernhard Kölbl : windows.media.speech/tests: Compile with long types.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 56accc2532acc452767606f2b5e76eccedcca13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56accc2532acc452767606f2… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Mar 10 11:47:51 2022 +0100 windows.media.speech/tests: Compile with long types. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/tests/Makefile.in | 1 - dlls/windows.media.speech/tests/speech.c | 92 ++++++++++++++--------------- 2 files changed, 46 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56accc2532acc4527676…

1 0

Jacek Caban : win32u: Move NtUserGetWindowRgnEx implementation from user32.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 929052a9c6f8b2758bd86c7d67c4fe67cc537791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=929052a9c6f8b2758bd86c7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:31:20 2022 +0100 win32u: Move NtUserGetWindowRgnEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 45 ++------------------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 7 files changed, 63 insertions(+), 44 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 1387552ca55..c4c61347704 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -97,50 +97,9 @@ BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect ) /*********************************************************************** * GetWindowRgn (USER32.@) */ -int WINAPI GetWindowRgn ( HWND hwnd, HRGN hrgn ) +int WINAPI GetWindowRgn( HWND hwnd, HRGN hrgn ) { - int nRet = ERROR; - NTSTATUS status; - HRGN win_rgn = 0; - RGNDATA *data; - size_t size = 256; - - do - { - if (!(data = HeapAlloc( GetProcessHeap(), 0, sizeof(*data) + size - 1 ))) - { - SetLastError( ERROR_OUTOFMEMORY ); - return ERROR; - } - SERVER_START_REQ( get_window_region ) - { - req->window = wine_server_user_handle( hwnd ); - wine_server_set_reply( req, data->Buffer, size ); - if (!(status = wine_server_call( req ))) - { - size_t reply_size = wine_server_reply_size( reply ); - if (reply_size) - { - data->rdh.dwSize = sizeof(data->rdh); - data->rdh.iType = RDH_RECTANGLES; - data->rdh.nCount = reply_size / sizeof(RECT); - data->rdh.nRgnSize = reply_size; - win_rgn = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); - } - } - else size = reply->total_size; - } - SERVER_END_REQ; - HeapFree( GetProcessHeap(), 0, data ); - } while (status == STATUS_BUFFER_OVERFLOW); - - if (status) SetLastError( RtlNtStatusToDosError(status) ); - else if (win_rgn) - { - nRet = CombineRgn( hrgn, win_rgn, 0, RGN_COPY ); - DeleteObject( win_rgn ); - } - return nRet; + return NtUserGetWindowRgnEx( hwnd, hrgn, 0 ); } /*********************************************************************** diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 0db90cc185d..41f9cfead49 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -139,6 +139,7 @@ static void * const syscalls[] = NtUserGetProp, NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, + NtUserGetWindowRgnEx, NtUserInitializeClientPfnArrays, NtUserInternalGetWindowText, NtUserNotifyWinEvent, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index fdc4aa153b0..5c493c54629 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1016,7 +1016,7 @@ @ stub NtUserGetWindowMinimizeRect @ stub NtUserGetWindowPlacement @ stub NtUserGetWindowProcessHandle -@ stub NtUserGetWindowRgnEx +@ stdcall -syscall NtUserGetWindowRgnEx(long long long) @ stub NtUserGhostWindowFromHungWindow @ stub NtUserHandleDelegatedInput @ stub NtUserHardErrorControl diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index abfc19de40a..2129afa405e 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1163,6 +1163,54 @@ static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) return TRUE; } +/******************************************************************* + * NtUserGetWindowRgnEx (win32u.@) + */ +int WINAPI NtUserGetWindowRgnEx( HWND hwnd, HRGN hrgn, UINT unk ) +{ + NTSTATUS status; + HRGN win_rgn = 0; + RGNDATA *data; + size_t size = 256; + int ret = ERROR; + + do + { + if (!(data = malloc( sizeof(*data) + size - 1 ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return ERROR; + } + SERVER_START_REQ( get_window_region ) + { + req->window = wine_server_user_handle( hwnd ); + wine_server_set_reply( req, data->Buffer, size ); + if (!(status = wine_server_call( req ))) + { + size_t reply_size = wine_server_reply_size( reply ); + if (reply_size) + { + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = reply_size / sizeof(RECT); + data->rdh.nRgnSize = reply_size; + win_rgn = NtGdiExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); + } + } + else size = reply->total_size; + } + SERVER_END_REQ; + free( data ); + } while (status == STATUS_BUFFER_OVERFLOW); + + if (set_ntstatus( status ) && win_rgn) + { + ret = NtGdiCombineRgn( hrgn, win_rgn, 0, RGN_COPY ); + NtGdiDeleteObjectApp( win_rgn ); + } + return ret; +} + /***************************************************************************** * NtUserGetLayeredWindowAttributes (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 303d719d3a8..82262cd83ab 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -124,6 +124,7 @@ SYSCALL_ENTRY( NtUserGetProp ) \ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserGetWindowRgnEx ) \ SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \ SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 18486c92305..4ee05838b47 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -197,6 +197,15 @@ NTSTATUS WINAPI wow64_NtUserGetAncestor( UINT *args ) return HandleToUlong( NtUserGetAncestor( hwnd, type )); } +NTSTATUS WINAPI wow64_NtUserGetWindowRgnEx( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + HRGN hrgn = get_handle( &args ); + UINT unk = get_ulong( &args ); + + return NtUserGetWindowRgnEx( hwnd, hrgn, unk ); +} + NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) { HDESK desktop = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 547471daf69..25d58de5992 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -333,6 +333,7 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ); ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ); +int WINAPI NtUserGetWindowRgnEx( HWND hwnd, HRGN hrgn, UINT unk ); NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs *client_procsA, const struct user_client_procs *client_procsW, const void *client_workers, HINSTANCE user_module );

1 0

Jacek Caban : win32u: Move NtUserSetWindowRgn implementation from user32.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: b308b9cb31716ffb60605fdc3edf8a7023abba64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b308b9cb31716ffb60605fdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:31:41 2022 +0100 win32u: Move NtUserSetWindowRgn implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 12 +------- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/user32/winpos.c | 55 ------------------------------------- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 2 ++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u.spec | 4 +-- dlls/win32u/win32u_private.h | 2 ++ dlls/win32u/window.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 12 ++++++++ include/ntuser.h | 2 ++ 12 files changed, 95 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b308b9cb31716ffb6060…

1 0

Jacek Caban : win32u: Move NtUserMoveWindow implementation from user32.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: a34032b0f0afcc6b0d8d4cf1f00a01e90317accd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a34032b0f0afcc6b0d8d4cf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:32:16 2022 +0100 win32u: Move NtUserMoveWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 6 +++--- dlls/user32/scroll.c | 36 ++++++++++++++++++------------------ dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 13 ------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 11 +++++++++++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 3 +++ 10 files changed, 45 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a34032b0f0afcc6b0d8d…

1 0

Jacek Caban : win32u: Move NtUserWindowFromPoint implementation from user32.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: c45af8f3533e6418eb6cedb786031b40125b8831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45af8f3533e6418eb6cedb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:31:55 2022 +0100 win32u: Move NtUserWindowFromPoint implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 3 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 107 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/wrappers.c | 6 +++ include/ntuser.h | 1 + 7 files changed, 116 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d144c53f4e4..2d2c83f503c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -233,8 +233,7 @@ HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) */ HWND WINAPI WindowFromPoint( POINT pt ) { - INT hittest; - return WINPOS_WindowFromPoint( 0, pt, &hittest ); + return NtUserWindowFromPoint( pt.x, pt.y ); } diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index bb4daf54279..e5c320f8bcc 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1198,6 +1198,7 @@ static struct unix_funcs unix_funcs = NtUserUnregisterClass, NtUserUnregisterHotKey, NtUserVkKeyScanEx, + NtUserWindowFromPoint, GetDCHook, SetDCHook, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 9e426b40e48..f011feb3ec7 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1311,7 +1311,7 @@ @ stub NtUserWaitMessage @ stub NtUserWindowFromDC @ stub NtUserWindowFromPhysicalPoint -@ stub NtUserWindowFromPoint +@ stdcall NtUserWindowFromPoint(long long) @ stub NtUserYieldTask @ stub NtValidateCompositionSurfaceHandle @ stub NtVisualCaptureBits diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a3fbf8a8a4c..9db06e1dd76 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -247,6 +247,7 @@ struct unix_funcs struct client_menu_name *client_menu_name ); BOOL (WINAPI *pNtUserUnregisterHotKey)( HWND hwnd, INT id ); WORD (WINAPI *pNtUserVkKeyScanEx)( WCHAR chr, HKL layout ); + HWND (WINAPI *pNtUserWindowFromPoint)( LONG x, LONG y ); /* Wine-specific functions */ DWORD_PTR (WINAPI *pGetDCHook)( HDC hdc, DCHOOKPROC *proc ); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e3564646d0a..e5907e8422d 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1257,8 +1257,8 @@ int WINAPI NtUserSetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) if (ret) { - UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED| - SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; + UINT swp_flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED | + SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE; if (!redraw) swp_flags |= SWP_NOREDRAW; user_driver->pSetWindowRgn( hwnd, hrgn, redraw ); NtUserSetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); @@ -1309,6 +1309,109 @@ BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE *al return ret; } +/*********************************************************************** + * list_children_from_point + * + * Get the list of children that can contain point from the server. + * Point is in screen coordinates. + * Returned list must be freed by caller. + */ +static HWND *list_children_from_point( HWND hwnd, POINT pt ) +{ + int i, size = 128; + HWND *list; + + for (;;) + { + int count = 0; + + if (!(list = malloc( size * sizeof(HWND) ))) break; + + SERVER_START_REQ( get_window_children_from_point ) + { + req->parent = wine_server_user_handle( hwnd ); + req->x = pt.x; + req->y = pt.y; + req->dpi = get_thread_dpi(); + wine_server_set_reply( req, list, (size-1) * sizeof(user_handle_t) ); + if (!wine_server_call( req )) count = reply->count; + } + SERVER_END_REQ; + if (count && count < size) + { + /* start from the end since HWND is potentially larger than user_handle_t */ + for (i = count - 1; i >= 0; i--) + list[i] = wine_server_ptr_handle( ((user_handle_t *)list)[i] ); + list[count] = 0; + return list; + } + free( list ); + if (!count) break; + size = count + 1; /* restart with a large enough buffer */ + } + return NULL; +} + +/*********************************************************************** + * window_from_point + * + * Find the window and hittest for a given point. + */ +static HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) +{ + int i, res; + HWND ret, *list; + POINT win_pt; + + if (!hwnd) hwnd = get_desktop_window(); + + *hittest = HTNOWHERE; + + if (!(list = list_children_from_point( hwnd, pt ))) return 0; + + /* now determine the hittest */ + + for (i = 0; list[i]; i++) + { + LONG style = get_window_long( list[i], GWL_STYLE ); + + /* If window is minimized or disabled, return at once */ + if (style & WS_DISABLED) + { + *hittest = HTERROR; + break; + } + /* Send WM_NCCHITTEST (if same thread) */ + if (!is_current_thread_window( list[i] )) + { + *hittest = HTCLIENT; + break; + } + win_pt = map_dpi_point( pt, get_thread_dpi(), get_dpi_for_window( list[i] )); + res = send_message( list[i], WM_NCHITTEST, 0, MAKELPARAM( win_pt.x, win_pt.y )); + if (res != HTTRANSPARENT) + { + *hittest = res; /* Found the window */ + break; + } + /* continue search with next window in z-order */ + } + ret = list[i]; + free( list ); + TRACE( "scope %p (%d,%d) returning %p\n", hwnd, pt.x, pt.y, ret ); + return ret; +} + +/******************************************************************* + * NtUserWindowFromPoint (win32u.@) + */ +HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) +{ + POINT pt = { .x = x, .y = y }; + INT hittest; + return window_from_point( 0, pt, &hittest ); +} + /***************************************************************************** * NtUserBuildHwndList (win32u.@) */ diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 99c01c326c3..b1c86949db2 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1002,6 +1002,12 @@ WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ) return unix_funcs->pNtUserVkKeyScanEx( chr, layout ); } +HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ) +{ + if (!unix_funcs) return 0; + return unix_funcs->pNtUserWindowFromPoint( x, y ); +} + DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) { if (!unix_funcs) return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 3c5c73f5f48..e6c724fa683 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -389,5 +389,6 @@ BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, BOOL WINAPI NtUserUnregisterHotKey( HWND hwnd, INT id ); WORD WINAPI NtUserVkKeyScanEx( WCHAR chr, HKL layout ); DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ); +HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); #endif /* _NTUSER_ */

1 0

Georg Lehmann : winevulkan: Avoid zero-sized allocations.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: be8b50b82d4d71975a7a49a9b0e9685b27de8e68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8b50b82d4d71975a7a49a9… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Mar 9 22:11:48 2022 +0100 winevulkan: Avoid zero-sized allocations. Fixes some -Wmaybe-uninitialized warnings in the next patch. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 84 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be8b50b82d4d71975a7a…

1 0

Georg Lehmann : winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 71b034c34cef101608ca94c4ea91901a6aed9de5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b034c34cef101608ca94c4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Mar 9 22:11:49 2022 +0100 winevulkan: Manually fixup struct alignment for VkPipelineCreationFeedback. We can't reasonably auto generate this because it's output in an otherwise input pNext chain. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 +++ dlls/winevulkan/vulkan.c | 107 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 56 ++++++++------------- dlls/winevulkan/vulkan_thunks.h | 8 +++ 4 files changed, 143 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71b034c34cef101608ca…

1 0

Georg Lehmann : winevulkan: Enable VK_EXT_pipeline_creation_feedback.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: d08d3c184e088972f0d29ea77456409bbce5d5ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08d3c184e088972f0d29ea7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Mar 9 22:11:50 2022 +0100 winevulkan: Enable VK_EXT_pipeline_creation_feedback. We did previously not support this extension because it runs into 32bit alignment issues but those are now fixed. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 1 + include/wine/vulkan.h | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3f2f3371cfa..583388ecaf7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -96,7 +96,6 @@ UNSUPPORTED_EXTENSIONS = [ "VK_AMD_display_native_hdr", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_pipeline_creation_feedback", "VK_GOOGLE_display_timing", "VK_KHR_external_fence_win32", "VK_KHR_external_semaphore_win32", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 7533f9248b8..54a658c0629 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -9609,6 +9609,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_pageable_device_local_memory", "VK_EXT_pci_bus_info", "VK_EXT_pipeline_creation_cache_control", + "VK_EXT_pipeline_creation_feedback", "VK_EXT_post_depth_coverage", "VK_EXT_primitive_topology_list_restart", "VK_EXT_private_data", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index a89e8ebf9fb..250a03634c4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -293,6 +293,8 @@ #define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_EXTENSION_NAME "VK_AMD_memory_overallocation_behavior" #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 3 #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" +#define VK_EXT_PIPELINE_CREATION_FEEDBACK_SPEC_VERSION 1 +#define VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME "VK_EXT_pipeline_creation_feedback" #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 #define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties" #define VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION 4 @@ -3842,6 +3844,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_EXTENDED_TYPES_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES, + VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO_EXT = VK_STRUCTURE_TYPE_PIPELINE_CREATION_FEEDBACK_CREATE_INFO, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES,

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.207.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: ddd9a4239a5fdfa77bbcf1c826041910e2c4952f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd9a4239a5fdfa77bbcf1c8… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Mar 8 14:44:51 2022 +0100 winevulkan: Update to VK spec version 1.3.207. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 20 +++++++++++++++ dlls/winevulkan/loader_thunks.h | 16 ++++++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 16 ++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 48 +++++++++++++++++++++++++++------- 7 files changed, 150 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddd9a4239a5fdfa77bbc…

1 0

Zebediah Figura : winegstreamer: Deliver samples in PTS order instead of alternating.
by Alexandre Julliard 10 Mar '22

10 Mar '22

Module: wine Branch: master Commit: 446bb1ebf6618383a4f81864a17bbaf2d6abe2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446bb1ebf6618383a4f81864… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Mar 9 18:56:15 2022 -0600 winegstreamer: Deliver samples in PTS order instead of alternating. For the async reader, and when requesting stream 0. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 4 +- dlls/winegstreamer/wm_asyncreader.c | 93 ++++++++++++++++------------------- dlls/winegstreamer/wm_reader.c | 97 +++++++++++++++++++++++++++++++------ dlls/winegstreamer/wm_syncreader.c | 57 +++------------------- 4 files changed, 135 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=446bb1ebf6618383a4f8…

1 0