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

Mohamad Al-Jaf : include: Add IHolographicSpaceStatics3 interface definition.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 0f018523332c10da70220100ca28369d51e33f9e URL: https://gitlab.winehq.org/wine/wine/-/commit/0f018523332c10da70220100ca2836… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 17 00:08:45 2023 -0400 include: Add IHolographicSpaceStatics3 interface definition. --- include/windows.graphics.holographic.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/windows.graphics.holographic.idl b/include/windows.graphics.holographic.idl index cada5796916..568003cd7a3 100644 --- a/include/windows.graphics.holographic.idl +++ b/include/windows.graphics.holographic.idl @@ -99,6 +99,16 @@ namespace Windows.Graphics.Holographic { [eventremove] HRESULT IsAvailableChanged([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 5.0), + exclusiveto(Windows.Graphics.Holographic.HolographicSpace), + uuid(3b00de3d-b1a3-4dfe-8e79-fec5909e6df8) + ] + interface IHolographicSpaceStatics3 : IInspectable + { + [propget] HRESULT IsConfigured([out, retval] boolean *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 2.0), exclusiveto(Windows.Graphics.Holographic.HolographicSpaceCameraAddedEventArgs),

1 0

Mohamad Al-Jaf : windows.perception.stub: Add IHolographicSpaceStatics3 stub interface.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: d0ec6366e4423b16fc55f79430c2efa0d267b5ff URL: https://gitlab.winehq.org/wine/wine/-/commit/d0ec6366e4423b16fc55f79430c2ef… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Mar 10 20:40:57 2023 -0500 windows.perception.stub: Add IHolographicSpaceStatics3 stub interface. --- dlls/windows.perception.stub/holographicspace.c | 30 +++++++++++++++++++++++++ dlls/windows.perception.stub/tests/perception.c | 13 +++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index a99932f7889..52fd6421075 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -26,6 +26,7 @@ struct holographicspace { IActivationFactory IActivationFactory_iface; IHolographicSpaceStatics2 IHolographicSpaceStatics2_iface; + IHolographicSpaceStatics3 IHolographicSpaceStatics3_iface; LONG ref; }; @@ -57,6 +58,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IHolographicSpaceStatics3 )) + { + *out = &impl->IHolographicSpaceStatics3_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -162,10 +170,32 @@ static const struct IHolographicSpaceStatics2Vtbl holographicspace_statics2_vtbl holographicspace_statics2_remove_IsAvailableChanged, }; +DEFINE_IINSPECTABLE( holographicspace_statics3, IHolographicSpaceStatics3, struct holographicspace, IActivationFactory_iface ) + +static HRESULT WINAPI holographicspace_statics3_get_IsConfigured( IHolographicSpaceStatics3 *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl = +{ + holographicspace_statics3_QueryInterface, + holographicspace_statics3_AddRef, + holographicspace_statics3_Release, + /* IInspectable methods */ + holographicspace_statics3_GetIids, + holographicspace_statics3_GetRuntimeClassName, + holographicspace_statics3_GetTrustLevel, + /* IHolographicSpaceStatics3 methods */ + holographicspace_statics3_get_IsConfigured, +}; + static struct holographicspace holographicspace_statics = { {&factory_vtbl}, {&holographicspace_statics2_vtbl}, + {&holographicspace_statics3_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 2fb526ed3d5..67c45e2a480 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -99,6 +99,7 @@ static void test_HolographicSpaceStatics(void) { static const WCHAR *holographicspace_statics_name = L"Windows.Graphics.Holographic.HolographicSpace"; IHolographicSpaceStatics2 *holographicspace_statics2; + IHolographicSpaceStatics3 *holographicspace_statics3; IActivationFactory *factory; BOOLEAN value; HSTRING str; @@ -142,6 +143,18 @@ static void test_HolographicSpaceStatics(void) ref = IHolographicSpaceStatics2_Release( holographicspace_statics2 ); ok( ref == 2, "got ref %ld.\n", ref ); + + hr = IActivationFactory_QueryInterface( factory, &IID_IHolographicSpaceStatics3, (void **)&holographicspace_statics3 ); + if (hr == E_NOINTERFACE) /* win1703 */ + { + win_skip( "IHolographicSpaceStatics3 is not supported, skipping tests.\n" ); + goto done; + } + + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IHolographicSpaceStatics3_Release( holographicspace_statics3 ); + ok( ref == 2, "got ref %ld.\n", ref ); done: ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref );

1 0

Alex Henrie : comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests.
by Alexandre Julliard 17 Mar '23

17 Mar '23

Module: wine Branch: master Commit: 231199bc462e2aa8fa98247b66022c62281fb508 URL: https://gitlab.winehq.org/wine/wine/-/commit/231199bc462e2aa8fa98247b66022c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Mar 14 21:59:04 2023 -0600 comctl32/treeview: Ignore the lParam to WM_PRINTCLIENT and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54640 --- dlls/comctl32/tests/treeview.c | 61 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 17 ++++-------- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eda57ed2c81..4b5703b6b76 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2181,6 +2181,66 @@ static void test_WM_PAINT(void) DestroyWindow(hTree); } +static void test_WM_PRINTCLIENT(void) +{ + static const LPARAM params[] = {0, PRF_CHECKVISIBLE, PRF_NONCLIENT, PRF_CLIENT, PRF_ERASEBKGND, + PRF_CHILDREN, PRF_OWNED}; + BOOL glyph_is_transparent; + HTHEME hTheme; + HWND hTree; + COLORREF clr; + LONG ret; + RECT rc; + HDC hdc; + int i; + + hTree = create_treeview_control(0); + + clr = SendMessageA(hTree, TVM_SETBKCOLOR, 0, RGB(255, 0, 0)); + ok(clr == CLR_NONE, "got 0x%lx, expected 0x%lx\n", clr, CLR_NONE); + + hdc = GetDC(hMainWnd); + GetClientRect(hMainWnd, &rc); + + hTheme = pGetWindowTheme(hTree); + glyph_is_transparent = hTheme && pIsThemeBackgroundPartiallyTransparent(hTheme, TVP_GLYPH, 0); + + /* test parameters when the treeview is visible */ + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + + /* test parameters when the treeview is hidden */ + ShowWindow(hTree, SW_HIDE); + for (i = 0; i < ARRAY_SIZE(params); i++) + { + winetest_push_context("lParam=0x%Ix", params[i]); + FillRect(hdc, &rc, GetStockObject(BLACK_BRUSH)); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(0, 0, 0), "got 0x%lx\n", clr); + ret = SendMessageA(hTree, WM_PRINTCLIENT, (WPARAM)hdc, params[i]); + ok(ret == 0, "got %ld\n", ret); + clr = GetPixel(hdc, 1, 1); + ok(clr == RGB(255, 0, 0) || (glyph_is_transparent && clr == GetSysColor(COLOR_WINDOW)), + "got 0x%lx\n", clr); + winetest_pop_context(); + } + ShowWindow(hTree, SW_SHOW); + + ReleaseDC(hMainWnd, hdc); + DestroyWindow(hTree); +} + static void test_delete_items(void) { const struct message *msg; @@ -3042,6 +3102,7 @@ START_TEST(treeview) test_expandnotify(); test_TVS_SINGLEEXPAND(); test_WM_PAINT(); + test_WM_PRINTCLIENT(); test_delete_items(); test_cchildren(); test_htreeitem_layout(FALSE); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 1c87dc29b05..e866f82db11 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3114,20 +3114,13 @@ TREEVIEW_Paint(TREEVIEW_INFO *infoPtr, HDC hdc_ref) static LRESULT TREEVIEW_PrintClient(TREEVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwnd)) - return 0; + RECT rc; - if (options & PRF_ERASEBKGND) - TREEVIEW_EraseBackground(infoPtr, hdc); + FIXME("Partial Stub: (hdc=%p options=%#lx)\n", hdc, options); - if (options & PRF_CLIENT) - { - RECT rc; - GetClientRect(infoPtr->hwnd, &rc); - TREEVIEW_Refresh(infoPtr, hdc, &rc); - } + TREEVIEW_EraseBackground(infoPtr, hdc); + GetClientRect(infoPtr->hwnd, &rc); + TREEVIEW_Refresh(infoPtr, hdc, &rc); return 0; }

1 0

Zebediah Figura : ddraw: Do not return a wined3d_texture from ddraw_surface_create_wined3d_texture().
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: d4072dc870bada87ac33aaeebb40d5a0e890d9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4072dc870bada87ac33aaeebb40d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 24 22:12:24 2022 -0600 ddraw: Do not return a wined3d_texture from ddraw_surface_create_wined3d_texture(). --- dlls/ddraw/surface.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c80083a4eac..6dcb1af13db 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6051,12 +6051,13 @@ static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, unsigned int layers, unsigned int levels, struct ddraw_texture *texture, - bool sysmem_fallback, bool reserve_memory, struct wined3d_texture **wined3d_texture) + bool sysmem_fallback, bool reserve_memory) { struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; struct wined3d_texture *draw_texture = NULL; struct wined3d_resource_desc wined3d_desc; + struct wined3d_texture *wined3d_texture; struct ddraw_surface *parent, *root; unsigned int bind_flags; unsigned int pitch = 0; @@ -6134,29 +6135,29 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, { if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, - NULL, &ddraw_null_wined3d_parent_ops, wined3d_texture))) + NULL, &ddraw_null_wined3d_parent_ops, &wined3d_texture))) goto fail; - wined3d_resource_set_parent(wined3d_texture_get_resource(*wined3d_texture), texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(wined3d_texture), texture); for (i = 0; i < layers * levels; ++i) { parent = wined3d_texture_get_sub_resource_parent(draw_texture, i); assert(parent->wined3d_texture == draw_texture); parent->draw_texture = draw_texture; - parent->wined3d_texture = *wined3d_texture; - wined3d_texture_set_sub_resource_parent(*wined3d_texture, i, parent); - wined3d_texture_incref(*wined3d_texture); + parent->wined3d_texture = wined3d_texture; + wined3d_texture_set_sub_resource_parent(wined3d_texture, i, parent); + wined3d_texture_incref(wined3d_texture); } } else { if (FAILED(hr = wined3d_texture_create(wined3d_device, &wined3d_desc, layers, levels, WINED3D_TEXTURE_CREATE_GET_DC_LENIENT, NULL, - texture, &ddraw_texture_wined3d_parent_ops, wined3d_texture))) + texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture))) return hr; } - if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(*wined3d_texture, 0, + if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_texture_update_desc(wined3d_texture, 0, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) { @@ -6164,7 +6165,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, goto fail; } - root = wined3d_texture_get_sub_resource_parent(*wined3d_texture, 0); + root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); texture->root = root; for (i = 0; i < layers; ++i) @@ -6179,14 +6180,14 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, struct ddraw_surface *mip; DDSURFACEDESC2 *mip_desc; - mip = wined3d_texture_get_sub_resource_parent(*wined3d_texture, sub_resource_idx); + mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, sub_resource_idx); mip->sysmem_fallback = sysmem_fallback; mip_desc = &mip->surface_desc; *mip_desc = *desc; - wined3d_texture_get_pitch(*wined3d_texture, j, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(wined3d_texture, j, &row_pitch, &slice_pitch); if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { if (desc->dwFlags & DDSD_LPSURFACE) @@ -6212,7 +6213,7 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, if (j) { - wined3d_texture_get_sub_resource_desc(*wined3d_texture, sub_resource_idx, &wined3d_mip_desc); + wined3d_texture_get_sub_resource_desc(wined3d_texture, sub_resource_idx, &wined3d_mip_desc); mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwHeight = wined3d_mip_desc.height; @@ -6274,15 +6275,15 @@ static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, ddraw_surface_set_wined3d_textures_colour_key(root, DDCKEY_SRCBLT, (struct wined3d_color_key *)&desc->ddckCKSrcBlt); - wined3d_texture_decref(*wined3d_texture); + wined3d_texture_decref(wined3d_texture); - if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(*wined3d_texture, 1))) + if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, 1))) { hr = hr_ddraw_from_wined3d(hr); goto fail; } - TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", root, draw_texture, *wined3d_texture); + TRACE("Surface %p, created draw_texture %p, wined3d_texture %p.\n", root, draw_texture, wined3d_texture); return D3D_OK; fail: @@ -6300,7 +6301,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) { DDPIXELFORMAT wined3d_display_mode_format; - struct wined3d_texture *wined3d_texture; struct ddraw_surface *root, **attach; struct wined3d_display_mode mode; struct ddraw_texture *texture; @@ -6735,7 +6735,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ && wined3d_display_mode_format.u1.dwRGBBitCount <= 16; if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels, - texture, sysmem_fallback, reserve_memory, &wined3d_texture))) + texture, sysmem_fallback, reserve_memory))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); heap_free(texture); @@ -6773,7 +6773,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->u5.dwBackBufferCount = 0; if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, 1, 1, - texture, sysmem_fallback, reserve_memory, &wined3d_texture))) + texture, sysmem_fallback, reserve_memory))) { heap_free(texture); hr = hr_ddraw_from_wined3d(hr);

1 0

Zebediah Figura : ddraw: Rename ddraw_surface_create_wined3d_texture() to ddraw_texture_init().
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 06e6b164799c7e070b037d51aa4e116f9f3e856c URL: https://gitlab.winehq.org/wine/wine/-/commit/06e6b164799c7e070b037d51aa4e11… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Dec 24 22:16:20 2022 -0600 ddraw: Rename ddraw_surface_create_wined3d_texture() to ddraw_texture_init(). --- dlls/ddraw/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6dcb1af13db..4d8812cf106 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6049,9 +6049,8 @@ static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d return true; } -static HRESULT ddraw_surface_create_wined3d_texture(struct ddraw *ddraw, - unsigned int layers, unsigned int levels, struct ddraw_texture *texture, - bool sysmem_fallback, bool reserve_memory) +static HRESULT ddraw_texture_init(struct ddraw_texture *texture, struct ddraw *ddraw, + unsigned int layers, unsigned int levels, bool sysmem_fallback, bool reserve_memory) { struct wined3d_device *wined3d_device = ddraw->wined3d_device; const DDSURFACEDESC2 *desc = &texture->surface_desc; @@ -6734,8 +6733,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ && desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY && wined3d_display_mode_format.u1.dwRGBBitCount <= 16; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, layers, levels, - texture, sysmem_fallback, reserve_memory))) + if (FAILED(hr = ddraw_texture_init(texture, ddraw, layers, levels, sysmem_fallback, reserve_memory))) { WARN("Failed to create wined3d texture, hr %#lx.\n", hr); heap_free(texture); @@ -6772,8 +6770,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->u5.dwBackBufferCount = 0; - if (FAILED(hr = ddraw_surface_create_wined3d_texture(ddraw, 1, 1, - texture, sysmem_fallback, reserve_memory))) + if (FAILED(hr = ddraw_texture_init(texture, ddraw, 1, 1, sysmem_fallback, reserve_memory))) { heap_free(texture); hr = hr_ddraw_from_wined3d(hr);

1 0

Henri Verbeet : wined3d: Get rid of the wined3d_shader_byte_code_format enum.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 8493a6678a0ebac364663b3e36620830c5cd721c URL: https://gitlab.winehq.org/wine/wine/-/commit/8493a6678a0ebac364663b3e366208… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 22:43:39 2023 +0100 wined3d: Get rid of the wined3d_shader_byte_code_format enum. It's been made redundant by the vkd3d_shader_source_type enum. --- dlls/wined3d/shader.c | 18 +++++++++--------- dlls/wined3d/shader_sm4.c | 10 +++++----- dlls/wined3d/shader_spirv.c | 2 -- dlls/wined3d/wined3d_private.h | 10 +++------- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a156d27e7ac..6c274fe2017 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -404,18 +404,18 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element e->mask = write_mask; } -static const struct wined3d_shader_frontend *shader_select_frontend(enum wined3d_shader_byte_code_format format) +static const struct wined3d_shader_frontend *shader_select_frontend(enum vkd3d_shader_source_type source_type) { - switch (format) + switch (source_type) { - case WINED3D_SHADER_BYTE_CODE_FORMAT_SM1: + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: return &sm1_shader_frontend; - case WINED3D_SHADER_BYTE_CODE_FORMAT_SM4: + case VKD3D_SHADER_SOURCE_DXBC_TPF: return &sm4_shader_frontend; default: - WARN("Invalid byte code format %#x specified.\n", format); + WARN("Invalid source type %#x specified.\n", source_type); return NULL; } } @@ -3628,7 +3628,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device const DWORD *ptr; void *fe_data; - if (!(shader->frontend = shader_select_frontend(WINED3D_SHADER_BYTE_CODE_FORMAT_SM1))) + if (!(shader->frontend = shader_select_frontend(VKD3D_SHADER_SOURCE_D3D_BYTECODE))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; @@ -3663,7 +3663,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device } else { - enum wined3d_shader_byte_code_format format; + enum vkd3d_shader_source_type source_type; unsigned int max_version; if (!(shader->byte_code = heap_alloc(desc->byte_code_size))) @@ -3675,10 +3675,10 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->byte_code_size = desc->byte_code_size; max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level); - if (FAILED(hr = shader_extract_from_dxbc(shader, max_version, &format))) + if (FAILED(hr = shader_extract_from_dxbc(shader, max_version, &source_type))) goto fail; - if (!(shader->frontend = shader_select_frontend(format))) + if (!(shader->frontend = shader_select_frontend(source_type))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d5ca8ea9501..a55bc2df3f5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1845,7 +1845,7 @@ struct aon9_header struct shader_handler_context { struct wined3d_shader *shader; - enum wined3d_shader_byte_code_format *format; + enum vkd3d_shader_source_type *source_type; unsigned int max_version; }; @@ -2094,7 +2094,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz FIXME("Multiple shader code chunks.\n"); shader->function = (const DWORD *)data; shader->functionLength = data_size; - *ctx->format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM4; + *ctx->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; break; case TAG_AON9: @@ -2123,7 +2123,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz FIXME("Multiple shader code chunks.\n"); shader->function = (const DWORD *)byte_code; shader->functionLength = data_size - header->byte_code_offset; - *ctx->format = WINED3D_SHADER_BYTE_CODE_FORMAT_SM1; + *ctx->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; TRACE("Feature level 9 shader version 0%08x, 0%08lx.\n", header->shader_version, *shader->function); } @@ -2142,13 +2142,13 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, unsigned int data_siz } HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, - unsigned int max_shader_version, enum wined3d_shader_byte_code_format *format) + unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) { struct shader_handler_context ctx; HRESULT hr; ctx.shader = shader; - ctx.format = format; + ctx.source_type = source_type; ctx.max_version = max_shader_version; hr = parse_dxbc(shader->byte_code, shader->byte_code_size, shader_dxbc_chunk_handler, &ctx); diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 05e670d3af9..fa99df0388a 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -18,8 +18,6 @@ */ #include "wined3d_private.h" -#define LIBVKD3D_SHADER_SOURCE -#include <vkd3d_shader.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c8cc03738a..2d420a60369 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -34,6 +34,8 @@ #include <math.h> #include <limits.h> #include <float.h> +#define LIBVKD3D_SHADER_SOURCE +#include <vkd3d_shader.h> #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION @@ -560,12 +562,6 @@ struct wined3d_settings extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -enum wined3d_shader_byte_code_format -{ - WINED3D_SHADER_BYTE_CODE_FORMAT_SM1, - WINED3D_SHADER_BYTE_CODE_FORMAT_SM4, -}; - enum wined3d_shader_resource_type { WINED3D_SHADER_RESOURCE_NONE, @@ -1470,7 +1466,7 @@ extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, - unsigned int max_shader_version, enum wined3d_shader_byte_code_format *format) DECLSPEC_HIDDEN; + unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) DECLSPEC_HIDDEN; BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, const struct wined3d_stream_output_element *so_element, unsigned int *register_idx, unsigned int *component_idx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use vkd3d-shader to disassemble shaders.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 0791c3ac44d40e460dd3e44b38db846b3dbbe3f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0791c3ac44d40e460dd3e44b38db84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 14 22:43:39 2023 +0100 wined3d: Use vkd3d-shader to disassemble shaders. --- dlls/wined3d/shader.c | 1627 +++++++------------------------------------------ 1 file changed, 219 insertions(+), 1408 deletions(-)

1 0

Paul Gofman : winex11.drv: Don't allow changing internal pixel format if conflicts with non-internal.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 446da60e78beb321d776b48cdee6f764c81b924b URL: https://gitlab.winehq.org/wine/wine/-/commit/446da60e78beb321d776b48cdee6f7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 13 17:07:56 2023 -0600 winex11.drv: Don't allow changing internal pixel format if conflicts with non-internal. --- dlls/winex11.drv/opengl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b2169de9bf7..565df8bb4c6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1412,6 +1412,7 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) const struct wgl_pixel_format *fmt; int value; HWND hwnd = NtUserWindowFromDC( hdc ); + int prev; TRACE("(%p,%d)\n", hdc, format); @@ -1435,14 +1436,12 @@ static BOOL set_pixel_format( HDC hdc, int format, BOOL internal ) return FALSE; } - if (!internal) - { - /* cannot change it if already set */ - int prev = win32u_get_window_pixel_format( hwnd ); - - if (prev) - return prev == format; - } + /* Even for internal pixel format fail setting it if the app has already set a + * different pixel format. Let wined3d create a backup GL context instead. + * Switching pixel format involves drawable recreation and is much more expensive + * than blitting from backup context. */ + if ((prev = win32u_get_window_pixel_format( hwnd ))) + return prev == format; return set_win_format( hwnd, fmt, internal ); }

1 0

Max Figura : wined3d: Move the WINED3D_RS_SOFTWAREVERTEXPROCESSING stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: dfa5f0082f9e31040a7372c6f5d6c2d78d141adc URL: https://gitlab.winehq.org/wine/wine/-/commit/dfa5f0082f9e31040a7372c6f5d6c2… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:47:51 2022 -0600 wined3d: Move the WINED3D_RS_SOFTWAREVERTEXPROCESSING stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 12 +----------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 6e46106a5e6..2db44cc8000 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d745a6e382..4b17afd87d1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4163,6 +4163,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_COLORKEYBLENDENABLE not implemented yet.\n"); break; + case WINED3D_RS_SOFTWAREVERTEXPROCESSING: + { + static unsigned int once; + + if ((state->rs[WINED3D_RS_SOFTWAREVERTEXPROCESSING]) && !once++) + FIXME("Software vertex processing not implemented.\n"); + break; + } + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0ec9570e1b6..3426e222d33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6ef82e9be4c..a7f8aa91574 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2018,16 +2018,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_swvp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - static int once; - if (state->render_states[WINED3D_RS_SOFTWAREVERTEXPROCESSING]) - { - if (!once++) - FIXME("Software vertex processing not implemented.\n"); - } -} - static void get_src_and_opr(uint32_t arg, BOOL is_alpha, GLenum* source, GLenum* operand) { /* The WINED3DTA_ALPHAREPLICATE flag specifies the alpha component of the * input should be used for all input components. The WINED3DTA_COMPLEMENT @@ -4645,7 +4635,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE }, @@ -5426,6 +5415,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {138, 138}, {144, 144}, {149, 150}, + {153, 153}, {162, 162}, {168, 169}, {171, 171},

1 0

Max Figura : wined3d: Move the WINED3D_RS_PATCHEDGESTYLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard 16 Mar '23

16 Mar '23

Module: wine Branch: master Commit: 0076908b4aa743b1607548ecdd66155ce8c043eb URL: https://gitlab.winehq.org/wine/wine/-/commit/0076908b4aa743b1607548ecdd6615… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:54:34 2022 -0600 wined3d: Move the WINED3D_RS_PATCHEDGESTYLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 6 ++++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 10 +--------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2db44cc8000..1b61801e68d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_nop}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4b17afd87d1..634fa9576dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4172,6 +4172,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; } + case WINED3D_RS_PATCHEDGESTYLE: + if (state->rs[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE) + FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n", + state->rs[WINED3D_RS_PATCHEDGESTYLE]); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3426e222d33..6ad3e26ca55 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_POSITIONDEGREE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_NORMALDEGREE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a7f8aa91574..8ec7bb45b77 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1970,13 +1970,6 @@ static void state_sample_mask_w(struct wined3d_context *context, const struct wi WARN("Unsupported in local OpenGL implementation: glSampleMaski.\n"); } -static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE) - FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n", - state->render_states[WINED3D_RS_PATCHEDGESTYLE]); -} - static void state_patchsegments(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { union { @@ -4635,7 +4628,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), { STATE_RENDER(WINED3D_RS_POSITIONDEGREE), state_positiondegree}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_NORMALDEGREE), { STATE_RENDER(WINED3D_RS_NORMALDEGREE), state_normaldegree }, WINED3D_GL_EXT_NONE }, @@ -5416,7 +5408,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) {144, 144}, {149, 150}, {153, 153}, - {162, 162}, + {162, 163}, {168, 169}, {171, 171}, {174, 177},

1 0