November 2022 - Wine-Commits

Paul Gofman : include: Add windows.gaming.ui.idl.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 0aacfd68611b4c6b464784616d56f5eadd8d4b2d URL: https://gitlab.winehq.org/wine/wine/-/commit/0aacfd68611b4c6b464784616d56f5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 3 10:42:43 2022 -0600 include: Add windows.gaming.ui.idl. --- include/Makefile.in | 1 + include/windows.gaming.ui.idl | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 28ac4b3f2dc..6083fd2754d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -800,6 +800,7 @@ SOURCES = \ windows.gaming.input.custom.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ + windows.gaming.ui.idl \ windows.globalization.idl \ windows.h \ windows.media.closedcaptioning.idl \ diff --git a/include/windows.gaming.ui.idl b/include/windows.gaming.ui.idl new file mode 100644 index 00000000000..fc7e661ccf9 --- /dev/null +++ b/include/windows.gaming.ui.idl @@ -0,0 +1,57 @@ +/* + * Copyright 2022 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +#endif + +namespace Windows.Gaming.UI { + runtimeclass GameBar; + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + exclusiveto(Windows.Gaming.UI.GameBar), + uuid(1db9a292-cc78-4173-be45-b61e67283ea7) + ] + interface IGameBarStatics : IInspectable + { + [eventadd] HRESULT VisibilityChanged([in] Windows.Foundation.EventHandler<IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT VisibilityChanged([in] EventRegistrationToken token); + [eventadd] HRESULT IsInputRedirectedChanged([in] Windows.Foundation.EventHandler<IInspectable *> *handler, [out, retval] EventRegistrationToken *token); + [eventremove] HRESULT IsInputRedirectedChanged([in] EventRegistrationToken token); + [propget] HRESULT Visible([out, retval] boolean *value); + [propget] HRESULT IsInputRedirected([out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 2.0), + marshaling_behavior(agile), + static(Windows.Gaming.UI.IGameBarStatics, Windows.Foundation.UniversalApiContract, 2.0), + threading(both) + ] + runtimeclass GameBar + { + } +}

1 0

Paul Gofman : windows.gaming.ui.gamebar: Add stub DLL.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: dde251a00845b463b991354c0cf7d061017d6f67 URL: https://gitlab.winehq.org/wine/wine/-/commit/dde251a00845b463b991354c0cf7d0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 3 10:55:35 2022 -0600 windows.gaming.ui.gamebar: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.gaming.ui.gamebar/Makefile.in | 8 ++ dlls/windows.gaming.ui.gamebar/classes.idl | 33 +++++ dlls/windows.gaming.ui.gamebar/main.c | 153 +++++++++++++++++++++ dlls/windows.gaming.ui.gamebar/private.h | 31 +++++ dlls/windows.gaming.ui.gamebar/tests/Makefile.in | 5 + dlls/windows.gaming.ui.gamebar/tests/gamebar.c | 86 ++++++++++++ .../windows.gaming.ui.gamebar.spec | 3 + 9 files changed, 324 insertions(+)

1 0

Jinoh Kang : server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 33617af8145b6fadfe41d48968a728ff57b3064b URL: https://gitlab.winehq.org/wine/wine/-/commit/33617af8145b6fadfe41d48968a728… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:30:20 2022 +0900 server: Don't invalidate the newly exposed child region on the parent if it doesn't clip children. This partly reverts e42eaaaf3a873d29b14f8f3a3617df2d0d4210ca. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 4 ---- server/window.c | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fb22f6042fe..e36eb7125e6 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9302,8 +9302,6 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( !EqualRect( &rect_old, &rect_new ) && - (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9365,8 +9363,6 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( !EqualRect( &rect_old, &rect_new ) && - (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/window.c b/server/window.c index 5dbe1cd1eb2..f713ed224aa 100644 --- a/server/window.c +++ b/server/window.c @@ -1766,10 +1766,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : - (win->parent->style & WS_CLIPCHILDREN) ? - subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : - xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) + if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) + : subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) { if (!is_region_empty( new_vis_rgn )) {

1 0

Jinoh Kang : server: Redraw composited window child when its z-order changes.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: c310e975f4b20e1401404c6aa3a93c0b4776b8e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c310e975f4b20e1401404c6aa3a93c… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:30:05 2022 +0900 server: Redraw composited window child when its z-order changes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53153 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 8 ++++---- server/window.c | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9b4680bbcc1..fb22f6042fe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9302,8 +9302,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9365,8 +9365,8 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare } else { - todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) + todo_wine_if( !EqualRect( &rect_old, &rect_new ) && + (extest->style & WS_CLIPCHILDREN) == 0 && !is_composited ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/window.c b/server/window.c index a56333cc6a5..5dbe1cd1eb2 100644 --- a/server/window.c +++ b/server/window.c @@ -254,15 +254,18 @@ static unsigned int get_monitor_dpi( struct window *win ) } /* link a window at the right place in the siblings list */ -static void link_window( struct window *win, struct window *previous ) +static int link_window( struct window *win, struct window *previous ) { + struct list *old_prev; + if (previous == WINPTR_NOTOPMOST) { - if (!(win->ex_style & WS_EX_TOPMOST) && win->is_linked) return; /* nothing to do */ + if (!(win->ex_style & WS_EX_TOPMOST) && win->is_linked) return 0; /* nothing to do */ win->ex_style &= ~WS_EX_TOPMOST; previous = WINPTR_TOP; /* fallback to the HWND_TOP case */ } + old_prev = win->is_linked ? win->entry.prev : NULL; list_remove( &win->entry ); /* unlink it from the previous location */ if (previous == WINPTR_BOTTOM) @@ -306,6 +309,7 @@ static void link_window( struct window *win, struct window *previous ) } win->is_linked = 1; + return old_prev != win->entry.prev; } /* change the parent of a window (or unlink the window if the new parent is NULL) */ @@ -1724,14 +1728,14 @@ static unsigned int get_window_update_flags( struct window *win, struct window * /* expose the areas revealed by a vis region change on the window parent */ /* returns the region exposed on the window itself (in client coordinates) */ static struct region *expose_window( struct window *win, const rectangle_t *old_window_rect, - struct region *old_vis_rgn ) + struct region *old_vis_rgn, int zorder_changed ) { struct region *new_vis_rgn, *exposed_rgn; int is_composited = is_parent_composited( win ); if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; - if (is_composited && + if (is_composited && !zorder_changed && is_rect_equal( old_window_rect, &win->window_rect ) && is_region_equal( old_vis_rgn, new_vis_rgn )) { @@ -1793,6 +1797,7 @@ static void set_window_pos( struct window *win, struct window *previous, rectangle_t rect; int client_changed, frame_changed; int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); + int zorder_changed = 0; if (win->parent && !is_visible( win->parent )) visible = 0; @@ -1804,7 +1809,7 @@ static void set_window_pos( struct window *win, struct window *previous, win->visible_rect = *visible_rect; win->surface_rect = *surface_rect; win->client_rect = *client_rect; - if (!(swp_flags & SWP_NOZORDER) && win->parent) link_window( win, previous ); + if (!(swp_flags & SWP_NOZORDER) && win->parent) zorder_changed |= link_window( win, previous ); if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; else if (swp_flags & SWP_HIDEWINDOW) win->style &= ~WS_VISIBLE; @@ -1833,7 +1838,7 @@ static void set_window_pos( struct window *win, struct window *previous, /* expose anything revealed by the change */ if (!(swp_flags & SWP_NOREDRAW)) - exposed_rgn = expose_window( win, &old_window_rect, old_vis_rgn ); + exposed_rgn = expose_window( win, &old_window_rect, old_vis_rgn, zorder_changed ); if (!(win->style & WS_VISIBLE)) { @@ -1964,7 +1969,7 @@ static void set_window_region( struct window *win, struct region *region, int re win->win_region = region; /* expose anything revealed by the change */ - if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn )))) + if (old_vis_rgn && ((exposed_rgn = expose_window( win, &win->window_rect, old_vis_rgn, 0 )))) { redraw_window( win, exposed_rgn, 1, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN ); free_region( exposed_rgn ); @@ -1989,7 +1994,7 @@ void free_window_handle( struct window *win ) win->style &= ~WS_VISIBLE; if (vis_rgn) { - struct region *exposed_rgn = expose_window( win, &win->window_rect, vis_rgn ); + struct region *exposed_rgn = expose_window( win, &win->window_rect, vis_rgn, 0 ); if (exposed_rgn) free_region( exposed_rgn ); free_region( vis_rgn ); }

1 0

Jinoh Kang : server: Correctly expose composited parent window and its child on position change.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 17e6ef6d7edcaac0adadb10f3aa89365bdc7a2e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/17e6ef6d7edcaac0adadb10f3aa893… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Oct 31 22:29:52 2022 +0900 server: Correctly expose composited parent window and its child on position change. Skip redrawing the composited child window when the window rect and visible region stays the same, since we're taking the union of the old and new visible regions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53153 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/user32/tests/msg.c | 4 ++-- server/class.c | 5 +++++ server/region.c | 17 +++++++++++++++++ server/user.h | 9 +++++++++ server/window.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 76c30b7dfe5..9b4680bbcc1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9303,7 +9303,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare else { todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 || is_composited) ) + ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) ok( !!rgn_ok, "Parent update region shall match expected region\n" ); } @@ -9366,7 +9366,7 @@ static void subtest_swp_paint_regions_( int line, int wrap_toplevel, LPCSTR pare else { todo_wine_if( EqualRect( &rect_old, &rect_new ) ? is_zorder_redraw : - ((extest->style & WS_CLIPCHILDREN) == 0 || is_composited) ) + ((extest->style & WS_CLIPCHILDREN) == 0 && !is_composited) ) ok( !!rgn_ok, "Child update region shall match expected region\n" ); } diff --git a/server/class.c b/server/class.c index e1e180bd97c..3231f366b26 100644 --- a/server/class.c +++ b/server/class.c @@ -141,6 +141,11 @@ int is_hwnd_message_class( struct window_class *class ) return (!class->local && class->atom == find_global_atom( NULL, &name )); } +int get_class_style( struct window_class *class ) +{ + return class->style; +} + atom_t get_class_atom( struct window_class *class ) { return class->base_atom; diff --git a/server/region.c b/server/region.c index 9f377ee05d3..d169f1ac2b4 100644 --- a/server/region.c +++ b/server/region.c @@ -684,6 +684,23 @@ int is_region_empty( const struct region *region ) } +/* checks if two regions are identical */ +int is_region_equal( const struct region *region1, const struct region *region2 ) +{ + int i; + + if (region1->num_rects != region2->num_rects) return 0; + if (region1->num_rects == 0) return 1; + if (!is_rect_equal( &region1->extents, &region2->extents )) return 0; + for (i = 0; i < region1->num_rects; i++) + { + if (!is_rect_equal( &region1->rects[i], &region2->rects[i] )) return 0; + } + + return 1; +} + + /* get the extents rect of a region */ void get_region_extents( const struct region *region, rectangle_t *rect ) { diff --git a/server/user.h b/server/user.h index 55a0d35feff..280da454d07 100644 --- a/server/user.h +++ b/server/user.h @@ -132,6 +132,7 @@ extern rectangle_t *get_region_data( const struct region *region, data_size_t ma extern rectangle_t *get_region_data_and_free( struct region *region, data_size_t max_size, data_size_t *total_size ); extern int is_region_empty( const struct region *region ); +extern int is_region_equal( const struct region *region1, const struct region *region2 ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); extern void mirror_region( const rectangle_t *client_rect, struct region *region ); @@ -175,6 +176,7 @@ extern struct window_class *grab_class( struct process *process, atom_t atom, extern void release_class( struct window_class *class ); extern int is_desktop_class( struct window_class *class ); extern int is_hwnd_message_class( struct window_class *class ); +extern int get_class_style( struct window_class *class ); extern atom_t get_class_atom( struct window_class *class ); extern client_ptr_t get_class_client_ptr( struct window_class *class ); @@ -191,6 +193,13 @@ extern void close_process_desktop( struct process *process ); extern void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ); extern void release_thread_desktop( struct thread *thread, int close ); +/* checks if two rectangles are identical */ +static inline int is_rect_equal( const rectangle_t *rect1, const rectangle_t *rect2 ) +{ + return (rect1->left == rect2->left && rect1->right == rect2->right && + rect1->top == rect2->top && rect1->bottom == rect2->bottom); +} + static inline int is_rect_empty( const rectangle_t *rect ) { return (rect->left >= rect->right || rect->top >= rect->bottom); diff --git a/server/window.c b/server/window.c index 7675cd1103d..a56333cc6a5 100644 --- a/server/window.c +++ b/server/window.c @@ -789,6 +789,21 @@ int is_window_transparent( user_handle_t window ) return (win->ex_style & (WS_EX_LAYERED|WS_EX_TRANSPARENT)) == (WS_EX_LAYERED|WS_EX_TRANSPARENT); } +static int is_window_using_parent_dc( struct window *win ) +{ + return (win->style & (WS_POPUP|WS_CHILD)) == WS_CHILD && (get_class_style( win->class ) & CS_PARENTDC) != 0; +} + +static int is_window_composited( struct window *win ) +{ + return (win->ex_style & WS_EX_COMPOSITED) != 0 && !is_window_using_parent_dc(win); +} + +static int is_parent_composited( struct window *win ) +{ + return win->parent && is_window_composited( win->parent ); +} + /* check if point is inside the window, and map to window dpi */ static int is_point_in_window( struct window *win, int *x, int *y, unsigned int dpi ) { @@ -1712,12 +1727,23 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ struct region *old_vis_rgn ) { struct region *new_vis_rgn, *exposed_rgn; + int is_composited = is_parent_composited( win ); if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return NULL; + if (is_composited && + is_rect_equal( old_window_rect, &win->window_rect ) && + is_region_equal( old_vis_rgn, new_vis_rgn )) + { + free_region( new_vis_rgn ); + return NULL; + } + if ((exposed_rgn = create_empty_region())) { - if (subtract_region( exposed_rgn, new_vis_rgn, old_vis_rgn ) && !is_region_empty( exposed_rgn )) + if ((is_composited ? union_region( exposed_rgn, new_vis_rgn, old_vis_rgn ) + : subtract_region( exposed_rgn, new_vis_rgn, old_vis_rgn )) && + !is_region_empty( exposed_rgn )) { /* make it relative to the new client area */ offset_region( exposed_rgn, win->window_rect.left - win->client_rect.left, @@ -1736,7 +1762,8 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left, win->window_rect.top - old_window_rect->top ); - if ((win->parent->style & WS_CLIPCHILDREN) ? + if (is_composited ? union_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : + (win->parent->style & WS_CLIPCHILDREN) ? subtract_region( new_vis_rgn, old_vis_rgn, new_vis_rgn ) : xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) {

1 0

Jacek Caban : winevulkan: Use struct conversion functions for array conversion implementations.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 511a8bfa09f842cf3d5f6bca38f54c66ee3a66a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/511a8bfa09f842cf3d5f6bca38f54c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 00:38:52 2022 +0100 winevulkan: Use struct conversion functions for array conversion implementations. --- dlls/winevulkan/make_vulkan | 34 +- dlls/winevulkan/vulkan_thunks.c | 1117 +++++++++++++++++++++++++-------------- 2 files changed, 744 insertions(+), 407 deletions(-)

1 0

Jacek Caban : winevulkan: Don't declare host types for structs that don't need it.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 692625a36a3e09780919ac7396d9c460db486c01 URL: https://gitlab.winehq.org/wine/wine/-/commit/692625a36a3e09780919ac7396d9c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:36:10 2022 +0100 winevulkan: Don't declare host types for structs that don't need it. --- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan_thunks.h | 30 ------------------------------ 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 56f3db64389..2d506e031aa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2097,7 +2097,6 @@ class ArrayConversionFunction(object): def __init__(self, array, direction, conv, unwrap): self.array = array self.direction = direction - self.operand = array.struct if array.is_struct() else array.handle self.type = array.type self.conv = conv self.unwrap = unwrap or not array.needs_unwrapping() @@ -2302,7 +2301,7 @@ class VkGenerator(object): if not any(c == conv for c in self.conversions): self.conversions.append(conv) - if not isinstance(conv.operand, VkStruct): + if not isinstance(conv, StructConversionFunction) or not conv.operand.needs_host_type(): continue # Structs can be used in different ways by different conversions diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 43e43664bd3..d77a6c0c3be 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1762,23 +1762,6 @@ typedef struct VkBindSparseInfo_host typedef VkBindSparseInfo VkBindSparseInfo_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkSubmitInfo_host -{ - VkStructureType sType; - const void *pNext; - uint32_t waitSemaphoreCount; - const VkSemaphore *pWaitSemaphores; - const VkPipelineStageFlags *pWaitDstStageMask; - uint32_t commandBufferCount; - const VkCommandBuffer *pCommandBuffers; - uint32_t signalSemaphoreCount; - const VkSemaphore *pSignalSemaphores; -} VkSubmitInfo_host; -#else -typedef VkSubmitInfo VkSubmitInfo_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkSemaphoreSubmitInfo_host { @@ -1794,19 +1777,6 @@ typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfoKHR; typedef VkSemaphoreSubmitInfo VkSemaphoreSubmitInfo_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkCommandBufferSubmitInfo_host -{ - VkStructureType sType; - const void *pNext; - VkCommandBuffer commandBuffer; - uint32_t deviceMask; -} VkCommandBufferSubmitInfo_host; -typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfoKHR; -#else -typedef VkCommandBufferSubmitInfo VkCommandBufferSubmitInfo_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkSubmitInfo2_host {

1 0

Jacek Caban : winevulkan: Skip unsupported functions in a few more places.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 04576c156edaf6e610a37c7c366fd44490097983 URL: https://gitlab.winehq.org/wine/wine/-/commit/04576c156edaf6e610a37c7c366fd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:58:55 2022 +0100 winevulkan: Skip unsupported functions in a few more places. --- dlls/winevulkan/make_vulkan | 10 +++++----- dlls/winevulkan/vulkan_thunks.c | 12 ------------ dlls/winevulkan/vulkan_thunks.h | 16 ---------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 2d506e031aa..2d9053f7c05 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2292,7 +2292,7 @@ class VkGenerator(object): self.struct_chain_conversions = [] self.host_structs = [] for func in self.registry.funcs.values(): - if not func.is_required(): + if not func.needs_exposing(): continue conversions = func.get_conversions() @@ -2517,7 +2517,7 @@ class VkGenerator(object): f.write("/* For use by vkDevice and children */\n") f.write("struct vulkan_device_funcs\n{\n") for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2530,7 +2530,7 @@ class VkGenerator(object): f.write("/* For use by vkInstance and children */\n") f.write("struct vulkan_instance_funcs\n{\n") for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2543,7 +2543,7 @@ class VkGenerator(object): f.write("#define ALL_VK_DEVICE_FUNCS() \\\n") first = True for vk_func in self.registry.device_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): @@ -2560,7 +2560,7 @@ class VkGenerator(object): f.write("#define ALL_VK_INSTANCE_FUNCS() \\\n") first = True for vk_func in self.registry.instance_funcs + self.registry.phys_dev_funcs: - if not vk_func.is_required(): + if not vk_func.needs_exposing(): continue if not vk_func.needs_dispatch(): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 7a04cfba6a7..4c87b807344 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2151,18 +2151,6 @@ static inline void convert_VkImageViewHandleInfoNVX_win32_to_host(const VkImageV } #endif /* USE_STRUCT_CONVERSION */ -#if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkMemoryGetWin32HandleInfoKHR_win32_to_host(const VkMemoryGetWin32HandleInfoKHR *in, VkMemoryGetWin32HandleInfoKHR_host *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->memory = in->memory; - out->handleType = in->handleType; -} -#endif /* USE_STRUCT_CONVERSION */ - #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkMicromapBuildSizesInfoEXT_win32_to_host(const VkMicromapBuildSizesInfoEXT *in, VkMicromapBuildSizesInfoEXT_host *out) { diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index d77a6c0c3be..13f2dcd21b0 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1409,18 +1409,6 @@ typedef struct VkImageViewHandleInfoNVX_host typedef VkImageViewHandleInfoNVX VkImageViewHandleInfoNVX_host; #endif -#if defined(USE_STRUCT_CONVERSION) -typedef struct VkMemoryGetWin32HandleInfoKHR_host -{ - VkStructureType sType; - const void *pNext; - VkDeviceMemory memory; - VkExternalMemoryHandleTypeFlagBits handleType; -} VkMemoryGetWin32HandleInfoKHR_host; -#else -typedef VkMemoryGetWin32HandleInfoKHR VkMemoryGetWin32HandleInfoKHR_host; -#endif - #if defined(USE_STRUCT_CONVERSION) typedef struct VkMicromapBuildSizesInfoEXT_host { @@ -2308,8 +2296,6 @@ struct vulkan_device_funcs VkResult (*p_vkGetImageViewAddressNVX)(VkDevice, VkImageView, VkImageViewAddressPropertiesNVX_host *); uint32_t (*p_vkGetImageViewHandleNVX)(VkDevice, const VkImageViewHandleInfoNVX_host *); VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); - VkResult (*p_vkGetMemoryWin32HandleKHR)(VkDevice, const VkMemoryGetWin32HandleInfoKHR_host *, HANDLE *); - VkResult (*p_vkGetMemoryWin32HandlePropertiesKHR)(VkDevice, VkExternalMemoryHandleTypeFlagBits, HANDLE, VkMemoryWin32HandlePropertiesKHR *); void (*p_vkGetMicromapBuildSizesEXT)(VkDevice, VkAccelerationStructureBuildTypeKHR, const VkMicromapBuildInfoEXT_host *, VkMicromapBuildSizesInfoEXT_host *); VkResult (*p_vkGetPerformanceParameterINTEL)(VkDevice, VkPerformanceParameterTypeINTEL, VkPerformanceValueINTEL *); VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); @@ -2823,8 +2809,6 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetImageViewAddressNVX) \ USE_VK_FUNC(vkGetImageViewHandleNVX) \ USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \ - USE_VK_FUNC(vkGetMemoryWin32HandleKHR) \ - USE_VK_FUNC(vkGetMemoryWin32HandlePropertiesKHR) \ USE_VK_FUNC(vkGetMicromapBuildSizesEXT) \ USE_VK_FUNC(vkGetPerformanceParameterINTEL) \ USE_VK_FUNC(vkGetPipelineCacheData) \

1 0

Jacek Caban : winevulkan: Support output array conversion in _generate_array_conversion_func.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: d44aadc5276b4c7f459b2759011f94c85f2bcb99 URL: https://gitlab.winehq.org/wine/wine/-/commit/d44aadc5276b4c7f459b2759011f94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 3 20:15:10 2022 +0100 winevulkan: Support output array conversion in _generate_array_conversion_func. And get rid of _generate_static_array_conversion_func. --- dlls/winevulkan/make_vulkan | 82 +++++++++++------------------------------ dlls/winevulkan/vulkan_thunks.c | 2 +- 2 files changed, 23 insertions(+), 61 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a2e3d6e2017..0125831dc84 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2003,6 +2003,9 @@ class ConversionFunction(object): self.unwrap = unwrap or not self.operand.needs_unwrapping() self.needs_alloc = direction != Direction.OUTPUT and variable.needs_alloc(conv, unwrap) + if variable.is_static_array() and direction == Direction.INPUT: + LOGGER.error("Static array input conversion is not supported") + self._set_name() def __eq__(self, other): @@ -2025,8 +2028,8 @@ class ConversionFunction(object): if self.conv: if self.direction == Direction.OUTPUT: - params = ["const {0} *in".format(host_type), "uint32_t count"] - return_type = self.type + params = ["const {0} *in".format(host_type), "{0} *out".format(self.type), "uint32_t count"] + return_type = None else: params = ["const {0} *in".format(self.type), "uint32_t count"] return_type = host_type @@ -2035,18 +2038,27 @@ class ConversionFunction(object): return_type = self.type # Generate function prototype. - body += "static inline {0} *{1}(".format(return_type, self.name) + if return_type: + body += "static inline {0} *{1}(".format(return_type, self.name) + else: + body += "static inline void {0}(".format(self.name) if self.needs_alloc: body += "struct conversion_context *ctx, " body += ", ".join(p for p in params) body += ")\n{\n" - body += " {0} *out;\n".format(return_type) + if return_type: + body += " {0} *out;\n".format(return_type) body += " unsigned int i;\n\n" - body += " if (!in || !count) return NULL;\n\n" - body += " out = conversion_context_alloc(ctx, count * sizeof(*out));\n" + if return_type: + body += " if (!in || !count) return NULL;\n\n" + else: + body += " if (!in) return;\n\n" + + if self.direction == Direction.INPUT: + body += " out = conversion_context_alloc(ctx, count * sizeof(*out));\n" body += " for (i = 0; i < count; i++)\n" body += " {\n" @@ -2063,8 +2075,9 @@ class ConversionFunction(object): LOGGER.warn("Unhandled conversion operand type") body += " out[i] = in[i];\n" - body += " }\n\n" - body += " return out;\n" + body += " }\n" + if return_type: + body += "\n return out;\n" body += "}\n" body += "#endif /* USE_STRUCT_CONVERSION */\n" @@ -2133,55 +2146,6 @@ class ConversionFunction(object): return body - def _generate_static_array_conversion_func(self): - """ Helper function for generating a conversion function for array operands. """ - - body = "" - - if self.conv: - body += "#if defined(USE_STRUCT_CONVERSION)\n" - if self.direction == Direction.OUTPUT: - params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - else: - params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] - - - # Generate function prototype. - body += "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n" - else: - body += "#if !defined(USE_STRUCT_CONVERSION)\n" - - params = ["const {0} *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - - # Generate function prototype. - body += "static inline void {0}(".format(self.name) - body += ", ".join(p for p in params) - body += ")\n" - - body += "{\n" - body += " unsigned int i;\n\n" - body += " if (!in) return;\n\n" - body += " for (i = 0; i < count; i++)\n" - body += " {\n" - - if isinstance(self.operand, VkStruct): - for m in self.operand: - # TODO: support copying of pNext extension structures! - body += " " + m.copy("in[i].", "out[i].", self.direction, self.conv, self.unwrap) - elif isinstance(self.operand, VkHandle) and self.direction == Direction.INPUT: - body += " out[i] = " + self.operand.driver_handle("in[i]") + ";\n" - else: - LOGGER.warn("Unhandled conversion operand type") - body += " out[i] = in[i];\n" - - body += " }\n" - body += "}\n" - body += "#endif /* USE_STRUCT_CONVERSION) */\n\n" - - return body - def _set_name(self): name = "convert_{0}_".format(self.type) if self.array: @@ -2199,9 +2163,7 @@ class ConversionFunction(object): self.name = name def definition(self): - if self.array: - return self._generate_static_array_conversion_func() - elif self.dyn_array: + if self.array or self.dyn_array: return self._generate_array_conversion_func() else: return self._generate_conversion_func() diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index dbdd0368b2a..18039ca3c6f 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2036,7 +2036,7 @@ static inline void convert_VkMemoryHeap_static_array_host_to_win32(const VkMemor out[i].flags = in[i].flags; } } -#endif /* USE_STRUCT_CONVERSION) */ +#endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkPhysicalDeviceMemoryProperties_host_to_win32(const VkPhysicalDeviceMemoryProperties_host *in, VkPhysicalDeviceMemoryProperties *out)

1 0

Jacek Caban : winevulkan: Pass type as uint32_t to wine_vk_unwrap_handle.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: c09a414525f4162423ab3f4f6d4c20bb0e5499d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/c09a414525f4162423ab3f4f6d4c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 10:44:07 2022 +0100 winevulkan: Pass type as uint32_t to wine_vk_unwrap_handle. Fixes -Wenum-conversion warning when VkDebugReportObjectTypeEXT is used as a type. --- dlls/winevulkan/make_vulkan | 40 ++++++++++++++--------------- dlls/winevulkan/vulkan_private.h | 1 - dlls/winevulkan/vulkan_thunks.c | 54 ++++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 783b781ff41..a2e3d6e2017 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2349,6 +2349,26 @@ class VkGenerator(object): f.write("WINE_DEFAULT_DEBUG_CHANNEL(vulkan);\n\n") + f.write("static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle)\n") + f.write("{\n") + f.write(" switch(type)\n") + f.write(" {\n") + for handle in self.registry.handles: + if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): + continue + f.write(" case {}:\n".format(handle.object_type)) + if handle.is_dispatchable(): + f.write(" return (uint64_t) (uintptr_t) ") + f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) + else: + f.write(" return (uint64_t) ") + f.write(handle.native_handle("handle")) + f.write(";\n"); + f.write(" default:\n") + f.write(" return handle;\n") + f.write(" }\n") + f.write("}\n\n") + # Generate any conversion helper functions. for conv in self.conversions: f.write(conv.definition()) @@ -2426,26 +2446,6 @@ class VkGenerator(object): f.write(";\n") f.write("}\n\n") - f.write("uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle)\n") - f.write("{\n") - f.write(" switch(type)\n") - f.write(" {\n") - for handle in self.registry.handles: - if not handle.is_required() or not handle.is_wrapped() or handle.is_alias(): - continue - f.write(" case {}:\n".format(handle.object_type)) - if handle.is_dispatchable(): - f.write(" return (uint64_t) (uintptr_t) ") - f.write(handle.native_handle("(({}) (uintptr_t) handle)".format(handle.name))) - else: - f.write(" return (uint64_t) ") - f.write(handle.native_handle("handle")) - f.write(";\n"); - f.write(" default:\n") - f.write(" return handle;\n") - f.write(" }\n") - f.write("}\n\n") - f.write("#if !defined(USE_STRUCT_CONVERSION)\n\n") f.write("const unixlib_entry_t __wine_unix_call_funcs[] =\n") diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 4221e97b73a..25890f00471 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -230,7 +230,6 @@ BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; BOOL wine_vk_is_type_wrapped(VkObjectType type) DECLSPEC_HIDDEN; -uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) DECLSPEC_HIDDEN; NTSTATUS init_vulkan(void *args) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6a8b15b6e32..dbdd0368b2a 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -21,6 +21,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +static uint64_t wine_vk_unwrap_handle(uint32_t type, uint64_t handle) +{ + switch(type) + { + case VK_OBJECT_TYPE_COMMAND_BUFFER: + return (uint64_t) (uintptr_t) wine_cmd_buffer_from_handle(((VkCommandBuffer) (uintptr_t) handle))->command_buffer; + case VK_OBJECT_TYPE_COMMAND_POOL: + return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; + case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: + return (uint64_t) wine_debug_report_callback_from_handle(handle)->debug_callback; + case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: + return (uint64_t) wine_debug_utils_messenger_from_handle(handle)->debug_messenger; + case VK_OBJECT_TYPE_DEVICE: + return (uint64_t) (uintptr_t) wine_device_from_handle(((VkDevice) (uintptr_t) handle))->device; + case VK_OBJECT_TYPE_INSTANCE: + return (uint64_t) (uintptr_t) wine_instance_from_handle(((VkInstance) (uintptr_t) handle))->instance; + case VK_OBJECT_TYPE_PHYSICAL_DEVICE: + return (uint64_t) (uintptr_t) wine_phys_dev_from_handle(((VkPhysicalDevice) (uintptr_t) handle))->phys_dev; + case VK_OBJECT_TYPE_QUEUE: + return (uint64_t) (uintptr_t) wine_queue_from_handle(((VkQueue) (uintptr_t) handle))->queue; + case VK_OBJECT_TYPE_SURFACE_KHR: + return (uint64_t) wine_surface_from_handle(handle)->surface; + default: + return handle; + } +} + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkAcquireNextImageInfoKHR_win32_to_host(const VkAcquireNextImageInfoKHR *in, VkAcquireNextImageInfoKHR_host *out) { @@ -19636,33 +19663,6 @@ BOOL wine_vk_is_type_wrapped(VkObjectType type) type == VK_OBJECT_TYPE_SURFACE_KHR; } -uint64_t wine_vk_unwrap_handle(VkObjectType type, uint64_t handle) -{ - switch(type) - { - case VK_OBJECT_TYPE_COMMAND_BUFFER: - return (uint64_t) (uintptr_t) wine_cmd_buffer_from_handle(((VkCommandBuffer) (uintptr_t) handle))->command_buffer; - case VK_OBJECT_TYPE_COMMAND_POOL: - return (uint64_t) wine_cmd_pool_from_handle(handle)->command_pool; - case VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT: - return (uint64_t) wine_debug_report_callback_from_handle(handle)->debug_callback; - case VK_OBJECT_TYPE_DEBUG_UTILS_MESSENGER_EXT: - return (uint64_t) wine_debug_utils_messenger_from_handle(handle)->debug_messenger; - case VK_OBJECT_TYPE_DEVICE: - return (uint64_t) (uintptr_t) wine_device_from_handle(((VkDevice) (uintptr_t) handle))->device; - case VK_OBJECT_TYPE_INSTANCE: - return (uint64_t) (uintptr_t) wine_instance_from_handle(((VkInstance) (uintptr_t) handle))->instance; - case VK_OBJECT_TYPE_PHYSICAL_DEVICE: - return (uint64_t) (uintptr_t) wine_phys_dev_from_handle(((VkPhysicalDevice) (uintptr_t) handle))->phys_dev; - case VK_OBJECT_TYPE_QUEUE: - return (uint64_t) (uintptr_t) wine_queue_from_handle(((VkQueue) (uintptr_t) handle))->queue; - case VK_OBJECT_TYPE_SURFACE_KHR: - return (uint64_t) wine_surface_from_handle(handle)->surface; - default: - return handle; - } -} - #if !defined(USE_STRUCT_CONVERSION) const unixlib_entry_t __wine_unix_call_funcs[] =

1 0