wine-commits April 2024

wine-commits@winehq.org

1 participants
590 discussions

Rémi Bernon : winex11: Introduce a new detach_client_window helper.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: ead277993218fac9c2d3f544930156b77f9702f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ead277993218fac9c2d3f544930156… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 28 10:57:42 2023 +0100 winex11: Introduce a new detach_client_window helper. --- dlls/winex11.drv/window.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a35e53079aa..031d754a3ef 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1587,6 +1587,31 @@ Window get_dummy_parent(void) return dummy_parent; } +static void client_window_events_disable( struct x11drv_win_data *data, Window client_window ) +{ + XSelectInput( data->display, client_window, 0 ); + XFlush( data->display ); /* make sure XSelectInput doesn't use client_window after this point */ + XDeleteContext( data->display, client_window, winContext ); +} + +/********************************************************************** + * detach_client_window + */ +static void detach_client_window( struct x11drv_win_data *data, Window client_window ) +{ + if (data->client_window != client_window || !client_window) return; + + TRACE( "%p/%lx detaching client window %lx\n", data->hwnd, data->whole_window, client_window ); + + if (data->whole_window) + { + client_window_events_disable( data, client_window ); + XReparentWindow( gdi_display, client_window, get_dummy_parent(), 0, 0 ); + } + + data->client_window = 0; +} + /********************************************************************** * create_client_window @@ -1609,12 +1634,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colo data->window_rect = data->whole_rect = data->client_rect; } - if (data->client_window) - { - XDeleteContext( data->display, data->client_window, winContext ); - XReparentWindow( gdi_display, data->client_window, dummy_parent, 0, 0 ); - TRACE( "%p reparent xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); - } + detach_client_window( data, data->client_window ); attr.colormap = colormap; attr.bit_gravity = NorthWestGravity; @@ -1635,11 +1655,11 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colo CWBackingStore | CWColormap | CWBorderPixel, &attr ); if (data->client_window) { - XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XMapWindow( gdi_display, data->client_window ); if (data->whole_window) { XFlush( gdi_display ); /* make sure client_window is created for XSelectInput */ + XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd ); XSync( data->display, False ); /* make sure client_window is known from data->display */ XSelectInput( data->display, data->client_window, ExposureMask ); } @@ -1730,8 +1750,6 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des { TRACE( "win %p xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); - if (data->client_window) XDeleteContext( data->display, data->client_window, winContext ); - if (!data->whole_window) { if (data->embedded) @@ -1753,12 +1771,8 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des } else { - if (data->client_window && !already_destroyed) - { - XSelectInput( data->display, data->client_window, 0 ); - XFlush( data->display ); /* make sure XSelectInput doesn't use client_window after this point */ - XReparentWindow( gdi_display, data->client_window, get_dummy_parent(), 0, 0 ); - } + if (!already_destroyed) detach_client_window( data, data->client_window ); + else if (data->client_window) client_window_events_disable( data, data->client_window ); XDeleteContext( data->display, data->whole_window, winContext ); if (!already_destroyed) {

1 0

Rémi Bernon : winex11: Get rid of ref held from the HWND to its Vk surface.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: ccd332c8544c22bdf3d2c3b9b0329ba5c97fb015 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccd332c8544c22bdf3d2c3b9b0329b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 29 10:20:06 2024 +0100 winex11: Get rid of ref held from the HWND to its Vk surface. --- dlls/winex11.drv/vulkan.c | 31 +++++++++---------------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f51fb79b362..6f43164b074 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -51,8 +51,6 @@ WINE_DECLARE_DEBUG_CHANNEL(fps); static pthread_mutex_t vulkan_mutex; -static XContext vulkan_hwnd_context; - #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 static struct list surface_list = LIST_INIT( surface_list ); @@ -91,13 +89,7 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static struct wine_vk_surface *wine_vk_surface_grab(struct wine_vk_surface *surface) -{ - InterlockedIncrement(&surface->ref); - return surface; -} - -static void wine_vk_surface_release(struct wine_vk_surface *surface) +static void wine_vk_surface_release( struct wine_vk_surface *surface ) { if (InterlockedDecrement(&surface->ref)) return; @@ -115,18 +107,18 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) free(surface); } -void wine_vk_surface_destroy(HWND hwnd) +void destroy_vk_surface( HWND hwnd ) { - struct wine_vk_surface *surface; - pthread_mutex_lock(&vulkan_mutex); - if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) + struct wine_vk_surface *surface, *next; + + pthread_mutex_lock( &vulkan_mutex ); + LIST_FOR_EACH_ENTRY_SAFE( surface, next, &surface_list, struct wine_vk_surface, entry ) { + if (surface->hwnd != hwnd) continue; surface->hwnd_thread_id = 0; surface->hwnd = NULL; - wine_vk_surface_release(surface); } - XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); - pthread_mutex_unlock(&vulkan_mutex); + pthread_mutex_unlock( &vulkan_mutex ); } void vulkan_thread_detach(void) @@ -143,7 +135,6 @@ void vulkan_thread_detach(void) TRACE("Detaching surface %p, hwnd %p.\n", surface, surface->hwnd); XReparentWindow(gdi_display, surface->window, get_dummy_parent(), 0, 0); XSync(gdi_display, False); - wine_vk_surface_destroy(surface->hwnd); } pthread_mutex_unlock(&vulkan_mutex); } @@ -220,9 +211,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, } pthread_mutex_lock(&vulkan_mutex); - wine_vk_surface_destroy( x11_surface->hwnd ); - XSaveContext( gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, - (char *)wine_vk_surface_grab( x11_surface ) ); list_add_tail(&surface_list, &x11_surface->entry); pthread_mutex_unlock(&vulkan_mutex); @@ -359,7 +347,6 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs * LOAD_FUNCPTR( vkQueuePresentKHR ); #undef LOAD_FUNCPTR - vulkan_hwnd_context = XUniqueContext(); *driver_funcs = vulkan_funcs; return STATUS_SUCCESS; } @@ -372,7 +359,7 @@ UINT X11DRV_VulkanInit( UINT version, void *vulkan_handle, struct vulkan_funcs * return STATUS_NOT_IMPLEMENTED; } -void wine_vk_surface_destroy(HWND hwnd) +void destroy_vk_surface( HWND hwnd ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5ea95df17cf..a35e53079aa 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1881,7 +1881,7 @@ void X11DRV_DestroyWindow( HWND hwnd ) release_win_data( data ); free( data ); destroy_gl_drawable( hwnd ); - wine_vk_surface_destroy( hwnd ); + destroy_vk_surface( hwnd ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 381c2c6fbe4..ef736c86522 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -640,7 +640,7 @@ extern Window get_dummy_parent(void); extern void sync_gl_drawable( HWND hwnd, BOOL known_child ); extern void set_gl_drawable_parent( HWND hwnd, HWND parent ); extern void destroy_gl_drawable( HWND hwnd ); -extern void wine_vk_surface_destroy( HWND hwnd ); +extern void destroy_vk_surface( HWND hwnd ); extern void vulkan_thread_detach(void); extern void wait_for_withdrawn_state( HWND hwnd, BOOL set );

1 0

Rémi Bernon : winex11: Keep the client window colormap on the GL drawable.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: 6c9e7948e79b97699ec4e7a547be6f46ec1b3c62 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c9e7948e79b97699ec4e7a547be6f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Nov 30 14:22:24 2023 +0100 winex11: Keep the client window colormap on the GL drawable. Making sure it is kept alive as long as the client window lives. --- dlls/winex11.drv/opengl.c | 12 ++++++++++-- dlls/winex11.drv/vulkan.c | 2 +- dlls/winex11.drv/window.c | 10 ++-------- dlls/winex11.drv/x11drv.h | 3 +-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index afedfb38af3..97618daef65 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -223,6 +223,7 @@ struct gl_drawable enum dc_gl_type type; /* type of GL surface */ GLXDrawable drawable; /* drawable for rendering with GL */ Window window; /* window if drawable is a GLXWindow */ + Colormap colormap; /* colormap for the client window */ Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ const struct wgl_pixel_format *format; /* pixel format for the drawable */ SIZE pixmap_size; /* pixmap size for GLXPixmap drawables */ @@ -1158,6 +1159,7 @@ static void release_gl_drawable( struct gl_drawable *gl ) TRACE( "destroying %lx drawable %lx\n", gl->window, gl->drawable ); pglXDestroyWindow( gdi_display, gl->drawable ); XDestroyWindow( gdi_display, gl->window ); + XFreeColormap( gdi_display, gl->colormap ); break; case DC_GL_PIXMAP_WIN: TRACE( "destroying pixmap %lx drawable %lx\n", gl->pixmap, gl->drawable ); @@ -1332,7 +1334,10 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel NtUserGetAncestor( hwnd, GA_PARENT ) == NtUserGetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; - gl->window = create_client_window( hwnd, visual ); + gl->colormap = XCreateColormap( gdi_display, get_dummy_parent(), visual->visual, + (visual->class == PseudoColor || visual->class == GrayScale || + visual->class == DirectColor) ? AllocAll : AllocNone ); + gl->window = create_client_window( hwnd, visual, gl->colormap ); if (gl->window) gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); TRACE( "%p created client %lx drawable %lx\n", hwnd, gl->window, gl->drawable ); @@ -1341,7 +1346,10 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel else if(usexcomposite) { gl->type = DC_GL_CHILD_WIN; - gl->window = create_client_window( hwnd, visual ); + gl->colormap = XCreateColormap( gdi_display, get_dummy_parent(), visual->visual, + (visual->class == PseudoColor || visual->class == GrayScale || + visual->class == DirectColor) ? AllocAll : AllocNone ); + gl->window = create_client_window( hwnd, visual, gl->colormap ); if (gl->window) { gl->drawable = pglXCreateWindow( gdi_display, gl->format->fbconfig, gl->window, NULL ); diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index edd4553f7f7..f51fb79b362 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -194,7 +194,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, x11_surface->ref = 1; x11_surface->hwnd = create_info->hwnd; - x11_surface->window = create_client_window( create_info->hwnd, &default_visual ); + x11_surface->window = create_client_window( create_info->hwnd, &default_visual, default_colormap ); x11_surface->hwnd_thread_id = NtUserGetWindowThread( x11_surface->hwnd, NULL ); if (!x11_surface->window) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5a014c9080d..5ea95df17cf 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1591,7 +1591,7 @@ Window get_dummy_parent(void) /********************************************************************** * create_client_window */ -Window create_client_window( HWND hwnd, const XVisualInfo *visual ) +Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colormap ) { Window dummy_parent = get_dummy_parent(); struct x11drv_win_data *data = get_win_data( hwnd ); @@ -1616,12 +1616,7 @@ Window create_client_window( HWND hwnd, const XVisualInfo *visual ) TRACE( "%p reparent xwin %lx/%lx\n", data->hwnd, data->whole_window, data->client_window ); } - if (data->client_colormap) XFreeColormap( gdi_display, data->client_colormap ); - data->client_colormap = XCreateColormap( gdi_display, dummy_parent, visual->visual, - (visual->class == PseudoColor || - visual->class == GrayScale || - visual->class == DirectColor) ? AllocAll : AllocNone ); - attr.colormap = data->client_colormap; + attr.colormap = colormap; attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; @@ -1881,7 +1876,6 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); - if (data->client_colormap) XFreeColormap( data->display, data->client_colormap ); free( data->icon_bits ); XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8fdb46d98da..381c2c6fbe4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -604,7 +604,6 @@ struct x11drv_win_data Display *display; /* display connection for the thread owning the window */ XVisualInfo vis; /* X visual used by this window */ Colormap whole_colormap; /* colormap if non-default visual */ - Colormap client_colormap; /* colormap for the client window */ HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */ @@ -650,7 +649,7 @@ extern void update_user_time( Time time ); extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void update_net_wm_states( struct x11drv_win_data *data ); extern void make_window_embedded( struct x11drv_win_data *data ); -extern Window create_client_window( HWND hwnd, const XVisualInfo *visual ); +extern Window create_client_window( HWND hwnd, const XVisualInfo *visual, Colormap colormap ); extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ); extern void change_systray_owner( Display *display, Window systray_window ); extern HWND create_foreign_window( Display *display, Window window );

1 0

Zhiyi Zhang : winemac.drv: Show the window after setting layered attributes.
by Alexandre Julliard 05 Apr '24

05 Apr '24

Module: wine Branch: master Commit: ffc02008a5475d0295f7e9aa738769ee03fd694d URL: https://gitlab.winehq.org/wine/wine/-/commit/ffc02008a5475d0295f7e9aa738769… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 5 15:24:00 2024 +0800 winemac.drv: Show the window after setting layered attributes. Show the window after setting layered attributes in macdrv_UpdateLayeredWindow(). This corresponds to a22dd45 for winex11.drv. Fix a regression from 8892b79, which called set_window_pos() before calling USER_Driver->pUpdateLayeredWindow(). Fix Active Trader Pro doesn't show splash screen at startup on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51984 --- dlls/winemac.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 67f45d301df..a04ff5fd4c9 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1930,6 +1930,11 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, else set_surface_use_alpha(surface, TRUE); if (surface) window_surface_add_ref(surface); + + /* Since layered attributes are now set, can now show the window */ + if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + show_window(data); + release_win_data(data); if (!surface) return FALSE;

1 0

Giovanni Mascellani : ci: Build the macOS image each time the Linux image is built.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 9c0d04c86204fd360a7528faf2b53acc7301b598 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c0d04c86204fd360a7528faf2b53… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 4 11:49:44 2024 +0200 ci: Build the macOS image each time the Linux image is built. --- gitlab/image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitlab/image.yml b/gitlab/image.yml index c93ea0d6..8b235a66 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -19,6 +19,10 @@ image-linux: - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE" - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL" +# Job `image-mac' must be run each time the pipeline is run on a push, +# otherwise macOS artifacts are not regenerated and macOS jobs cannot find them. +# So we add a dependency on image.docker too, even if that file is not really +# used for macOS. image-mac: stage: image rules: @@ -26,6 +30,7 @@ image-mac: changes: - .gitlab-ci.yml - gitlab/image.yml + - gitlab/image.docker interruptible: true tags: - mac

1 0

Henri Verbeet : tests: Free the shader blobs once we're done with them in test_create_pipeline_state(). (Valgrind).
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 4f589356f1195bb4cf54c60b6a8b3f751ba4dd32 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f589356f1195bb4cf54c60b6a8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 18:06:24 2024 +0200 tests: Free the shader blobs once we're done with them in test_create_pipeline_state(). (Valgrind). --- tests/d3d12.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index a374025f..b8d20a58 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3399,12 +3399,15 @@ static void test_create_pipeline_state(void) NULL, /* fill in dynamically */ }; - D3D12_SHADER_BYTECODE cs = shader_bytecode_from_blob(compile_shader(cs_code, sizeof(cs_code) - 1, "cs_4_0")); - D3D12_SHADER_BYTECODE ps = shader_bytecode_from_blob(compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0")); - D3D12_SHADER_BYTECODE vs = shader_bytecode_from_blob(compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0")); - const struct d3d12_shader_bytecode_subobject vs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, vs }; - const struct d3d12_shader_bytecode_subobject ps_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, ps }; - const struct d3d12_shader_bytecode_subobject cs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, cs }; + ID3D10Blob *cs = compile_shader(cs_code, sizeof(cs_code) - 1, "cs_4_0"); + ID3D10Blob *ps = compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0"); + ID3D10Blob *vs = compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0"); + const struct d3d12_shader_bytecode_subobject vs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + shader_bytecode_from_blob(vs) }; + const struct d3d12_shader_bytecode_subobject ps_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + shader_bytecode_from_blob(ps) }; + const struct d3d12_shader_bytecode_subobject cs_subobject = { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + shader_bytecode_from_blob(cs) }; static const D3D12_SO_DECLARATION_ENTRY so_entries[] = { @@ -3683,14 +3686,14 @@ static void test_create_pipeline_state(void) if (!(device = create_device())) { skip("Failed to create device.\n"); - return; + goto cleanup; } if (ID3D12Device_QueryInterface(device, &IID_ID3D12Device2, (void **)&device2)) { skip("ID3D12Device2 not supported.\n"); ID3D12Device_Release(device); - return; + goto cleanup; } root_signature_desc.NumParameters = 0; @@ -3740,6 +3743,10 @@ static void test_create_pipeline_state(void) ok(refcount == 1, "ID3D12Device2 has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +cleanup: + ID3D10Blob_Release(vs); + ID3D10Blob_Release(ps); + ID3D10Blob_Release(cs); } static void test_create_fence(void)

1 0

Henri Verbeet : vkd3d-dxbc: Allow the section to extract to be specified by tag.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 73996c994139afcf7630a7df87cade50a0344898 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73996c994139afcf7630a7df87cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 18:00:19 2024 +0200 vkd3d-dxbc: Allow the section to extract to be specified by tag. --- programs/vkd3d-dxbc/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index ff463584..c08e50af 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -279,7 +279,13 @@ static void print_usage(const char *program_name) " --colour Enable colour, even when not supported by the output.\n" " -e, --emit Emit the content of the DXBC blob.\n" " -x, --extract=<section> Extract the data contained in <section>.\n" - " <section> must be of the form 'i:<index>'.\n" + " <section> may either be of the form 'i:<index>' in\n" + " order to specify a section by its index or of the\n" + " form 't:<tag>' in order to specify a section by its\n" + " tag. <tag> may be either a four-character string or a\n" + " 32-bit hexadecimal integer. For example: 'i:2',\n" + " 't:SHDR', 't:52444853'. If multiple sections match\n" + " the same tag, the first matching section is used.\n" " -h, --help Display this information and exit.\n" " --ignore-checksum Do not validate the checksum when parsing the DXBC\n" " blob.\n" @@ -428,6 +434,26 @@ static const char *dump_tag(char *out, uint32_t tag) return out; } +static bool parse_tag(uint32_t *t, const char *s) +{ + char *end; + + if (strlen(s) == 4) + { + *t = VKD3D_MAKE_TAG(s[0], s[1], s[2], s[3]); + return true; + } + + if (strlen(s) == 8) + { + *t = strtoul(s, &end, 16); + if (!*end) + return true; + } + + return false; +} + static void dump_line(const struct colours *colours, const char *prefix, const uint8_t *data, size_t offset, size_t count) { @@ -561,6 +587,7 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, struct vkd3d_shader_dxbc_section_desc *sections, const char *s) { + uint32_t tag; size_t idx; char *end; @@ -576,6 +603,23 @@ static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, return &sections[idx]; } + if (!strncmp("t:", s, 2)) + { + s += 2; + if (!parse_tag(&tag, s)) + { + fprintf(stderr, "Invalid section tag '%s' specified.\n", s); + return NULL; + } + for (idx = 0; idx < section_count; ++idx) + { + if (sections[idx].tag == tag) + return &sections[idx]; + } + fprintf(stderr, "Section '%s' not found.\n", s); + return NULL; + } + fprintf(stderr, "Invalid section specifier '%s' specified.\n", s); return NULL; }

1 0

Henri Verbeet : vkd3d-dxbc: Implement extracting section data.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 6c3b87bed04857c61610b27d1d1a521af004959f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6c3b87bed04857c61610b27d1d1a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:48 2024 +0200 vkd3d-dxbc: Implement extracting section data. --- programs/vkd3d-dxbc/main.c | 91 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index aaccffad..ff463584 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -65,6 +65,7 @@ enum { OPTION_COLOUR = CHAR_MAX + 1, OPTION_EMIT, + OPTION_EXTRACT, OPTION_HELP, OPTION_IGNORE_CHECKSUM, OPTION_LIST, @@ -79,6 +80,7 @@ struct action enum action_type { ACTION_TYPE_EMIT, + ACTION_TYPE_EXTRACT, } type; union { @@ -86,6 +88,11 @@ struct action { const char *output_filename; } emit; + struct extract + { + const char *section; + const char *output_filename; + } extract; } u; }; @@ -157,6 +164,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"colour", no_argument, NULL, OPTION_COLOUR}, {"emit", no_argument, NULL, OPTION_EMIT}, + {"extract", required_argument, NULL, OPTION_EXTRACT}, {"help", no_argument, NULL, OPTION_HELP}, {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM}, {"list", no_argument, NULL, OPTION_LIST}, @@ -191,7 +199,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ehtVo:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ex:hto:V", long_options, NULL)) == -1) break; switch (option) @@ -212,6 +220,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) action->u.emit.output_filename = options->output_filename; break; + case 'x': + case OPTION_EXTRACT: + if (!(action = action_push(options, ACTION_TYPE_EXTRACT))) + return false; + action->u.extract.section = optarg; + action->u.extract.output_filename = options->output_filename; + break; + case 'h': case OPTION_HELP: options->print_help = true; @@ -234,8 +250,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->colours = no_colours; break; - case OPTION_OUTPUT: case 'o': + case OPTION_OUTPUT: options->output_filename = optarg; break; @@ -262,27 +278,30 @@ static void print_usage(const char *program_name) "Options:\n" " --colour Enable colour, even when not supported by the output.\n" " -e, --emit Emit the content of the DXBC blob.\n" + " -x, --extract=<section> Extract the data contained in <section>.\n" + " <section> must be of the form 'i:<index>'.\n" " -h, --help Display this information and exit.\n" + " --ignore-checksum Do not validate the checksum when parsing the DXBC\n" + " blob.\n" " -t, --list List the contents of the DXBC blob.\n" " --list-data List the data contained in the DXBC sections.\n" " --no-colour Disable colour, even when supported by the output.\n" + " -o, --output=<file> Set the output filename for --emit or --extract.\n" " -V, --version Display version information and exit.\n" - " --ignore-checksum Do not validate the checksum when parsing the DXBC blob.\n" - " -o, --output=<file> Set the output filename for --emit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n" "If the input file is '-' or not specified, input will be read from standard\n" "input. Similarly, if the output file is '-' or not specified at the point\n" - "--emit is found, output will be written to the standard output.\n" + "--emit or --extract is found, output will be written to the standard output.\n" "\n" "Currently this tool can only re-emit the same DXBC blob it loaded. However, it\n" - "will recompute the checksum while doing so, so --emit can be useful\n" - "together with --ignore-checksum to fix the checksum for a blob.\n" + "will recompute the checksum while doing so, so --emit can be useful together\n" + "with --ignore-checksum to fix the checksum for a blob.\n" "\n" - "Options --emit and --output can be specified more than once. The DXBC blob\n" - "will be emitted once for each --emit occurrence, each time using the closest\n" - "previous --output occurrence as output filename.\n"; + "Options --emit, --extract, and --output can be specified more than once. The\n" + "DXBC blob will be emitted once for each --emit occurrence, each time using the\n" + "closest previous --output occurrence as output filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -539,6 +558,53 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru return success; } +static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, + struct vkd3d_shader_dxbc_section_desc *sections, const char *s) +{ + size_t idx; + char *end; + + if (!strncmp("i:", s, 2)) + { + s += 2; + idx = strtoul(s, &end, 10); + if (*end || idx >= section_count) + { + fprintf(stderr, "Invalid section index '%s' specified.\n", s); + return NULL; + } + return &sections[idx]; + } + + fprintf(stderr, "Invalid section specifier '%s' specified.\n", s); + return NULL; +} + +static bool extract_section(struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct extract *extract) +{ + const struct vkd3d_shader_dxbc_section_desc *section; + bool close_output, success = true; + FILE *output; + + if (!(section = get_section(dxbc_desc->section_count, dxbc_desc->sections, extract->section))) + return false; + + if (!(output = open_output(extract->output_filename, &close_output))) + return false; + + if (!extract->output_filename && isatty(fileno(output))) + fprintf(stderr, "Output is a tty, skipping section '%s'.\n" + "If this is really what you intended, specify the output explicitly.\n", + extract->section); + else if (!(success = write_output(output, &section->data))) + fprintf(stderr, "Failed to write output.\n"); + + if (close_output) + fclose(output); + + return success; +} + static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, size_t action_count, const struct action *actions) { @@ -552,6 +618,11 @@ static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, if (!emit_dxbc(dxbc_desc, &action->u.emit)) return false; break; + + case ACTION_TYPE_EXTRACT: + if (!extract_section(dxbc_desc, &action->u.extract)) + return false; + break; } }

1 0

Henri Verbeet : vkd3d-dxbc: Free the blob if parsing it failed.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 806afd7b50a1762c3260e74fde92626744505a55 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/806afd7b50a1762c3260e74fde926… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:30 2024 +0200 vkd3d-dxbc: Free the blob if parsing it failed. --- programs/vkd3d-dxbc/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 0fb99bc0..aaccffad 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -610,7 +610,10 @@ int main(int argc, char **argv) fputs(messages, stderr); vkd3d_shader_free_messages(messages); if (ret < 0) + { + vkd3d_shader_free_shader_code(&dxbc); goto done; + } if (options.list || options.list_data) dump_dxbc(&dxbc, &dxbc_desc, &options);

1 0

Henri Verbeet : vkd3d-dxbc: Introduce a helper function to apply actions.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 8f529cd0ae962a5801f26cdac41a6b3a8ee4ae18 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f529cd0ae962a5801f26cdac41a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:00 2024 +0200 vkd3d-dxbc: Introduce a helper function to apply actions. --- programs/vkd3d-dxbc/main.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index c23cfa81..0fb99bc0 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -539,6 +539,25 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru return success; } +static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, + size_t action_count, const struct action *actions) +{ + for (size_t i = 0; i < action_count; ++i) + { + const struct action *action = &actions[i]; + + switch (action->type) + { + case ACTION_TYPE_EMIT: + if (!emit_dxbc(dxbc_desc, &action->u.emit)) + return false; + break; + } + } + + return true; +} + int main(int argc, char **argv) { struct vkd3d_shader_dxbc_desc dxbc_desc; @@ -549,7 +568,6 @@ int main(int argc, char **argv) uint32_t flags; int fail = 1; FILE *input; - size_t i; int ret; if (!parse_command_line(argc, argv, &options)) @@ -597,22 +615,10 @@ int main(int argc, char **argv) if (options.list || options.list_data) dump_dxbc(&dxbc, &dxbc_desc, &options); - for (i = 0; i < options.action_count; ++i) - { - struct action *action = &options.actions[i]; - - switch (action->type) - { - case ACTION_TYPE_EMIT: - if (!emit_dxbc(&dxbc_desc, &action->u.emit)) - goto done; - break; - } - } + fail = !apply_actions(&dxbc_desc, options.action_count, options.actions); vkd3d_shader_free_dxbc(&dxbc_desc); vkd3d_shader_free_shader_code(&dxbc); - fail = 0; done: free(options.actions); if (close_input)

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
59
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2024