September 2023 - Wine-commits

Connor McAdams : uiautomationcore: Add a common helper function for creating HUIANODEs.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: 815e3889c66085a347d35cb634ee6b029b55d126 URL: https://gitlab.winehq.org/wine/wine/-/commit/815e3889c66085a347d35cb634ee6b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 21 09:00:42 2023 -0400 uiautomationcore: Add a common helper function for creating HUIANODEs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 85f29c0219c..b1a21de3a17 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -597,6 +597,23 @@ static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface) return CONTAINING_RECORD(iface, struct uia_node, IWineUiaNode_iface); } +static HRESULT create_uia_node(struct uia_node **out_node) +{ + struct uia_node *node; + + *out_node = NULL; + if (!(node = calloc(1, sizeof(*node)))) + return E_OUTOFMEMORY; + + node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; + list_init(&node->prov_thread_list_entry); + list_init(&node->node_map_list_entry); + node->ref = 1; + + *out_node = node; + return S_OK; +} + static BOOL is_nested_node_provider(IWineUiaProvider *iface); static HRESULT prepare_uia_node(struct uia_node *node) { @@ -697,15 +714,11 @@ HRESULT clone_uia_node(HUIANODE in_node, HUIANODE *out_node) } } - if (!(node = calloc(1, sizeof(*node)))) - return E_OUTOFMEMORY; + hr = create_uia_node(&node); + if (FAILED(hr)) + return hr; - node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; - list_init(&node->prov_thread_list_entry); - list_init(&node->node_map_list_entry); - node->ref = 1; node->hwnd = in_node_data->hwnd; - for (i = 0; i < PROV_TYPE_COUNT; i++) { struct uia_provider *in_prov_data; @@ -1967,15 +1980,11 @@ HRESULT create_uia_node_from_elprov(IRawElementProviderSimple *elprov, HUIANODE else prov_type = PROV_TYPE_MAIN; - node = calloc(1, sizeof(*node)); - if (!node) - return E_OUTOFMEMORY; + hr = create_uia_node(&node); + if (FAILED(hr)) + return hr; - node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; node->hwnd = get_hwnd_from_provider(elprov); - list_init(&node->prov_thread_list_entry); - list_init(&node->node_map_list_entry); - node->ref = 1; hr = create_wine_uia_provider(node, elprov, prov_type); if (FAILED(hr)) @@ -2493,14 +2502,10 @@ HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) HRESULT hr; *huianode = NULL; - node = calloc(1, sizeof(*node)); - if (!node) - return E_OUTOFMEMORY; - node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; - list_init(&node->prov_thread_list_entry); - list_init(&node->node_map_list_entry); - node->ref = 1; + hr = create_uia_node(&node); + if (FAILED(hr)) + return hr; uia_start_client_thread(); hr = create_wine_uia_nested_node_provider(node, lr, FALSE); @@ -2577,16 +2582,11 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) if (!IsWindow(hwnd)) return UIA_E_ELEMENTNOTAVAILABLE; - node = calloc(1, sizeof(*node)); - if (!node) - return E_OUTOFMEMORY; + hr = create_uia_node(&node); + if (FAILED(hr)) + return hr; node->hwnd = hwnd; - node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; - list_init(&node->prov_thread_list_entry); - list_init(&node->node_map_list_entry); - node->ref = 1; - hr = uia_get_providers_for_hwnd(node); if (FAILED(hr)) {

1 0

Connor McAdams : uiautomationcore: Implement UiaHasServerSideProvider.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: wine Branch: master Commit: f0525a5ff6c9bf35d6704a24aa95d1dcc45d71b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0525a5ff6c9bf35d6704a24aa95d1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 21 10:28:33 2023 -0400 uiautomationcore: Implement UiaHasServerSideProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 59 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 54 +++++++++++++++++++-------- dlls/uiautomationcore/uia_private.h | 8 ++++ 3 files changed, 105 insertions(+), 16 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index a733e183312..fd1f5d0414b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -15302,6 +15302,64 @@ static void test_UiaAddEvent(const char *name) UnregisterClassA("UiaAddEvent test class", NULL); } +static const struct prov_method_sequence serverside_prov_seq[] = { + NODE_CREATE_SEQ2(&Provider), + /* Windows 10+ calls this. */ + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, + { 0 } +}; + +static void test_UiaHasServerSideProvider(void) +{ + BOOL ret_val; + HWND hwnd; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hwnd = create_test_hwnd("UiaHasServerSideProvider test class"); + + /* NULL hwnd. */ + ret_val = UiaHasServerSideProvider(NULL); + ok(!ret_val, "UiaHasServerSideProvider returned TRUE\n"); + + /* Desktop window has no serverside providers. */ + UiaRegisterProviderCallback(test_uia_provider_callback); + ret_val = UiaHasServerSideProvider(GetDesktopWindow()); + ok(!ret_val, "UiaHasServerSideProvider returned TRUE\n"); + + /* No provider to pass to UiaReturnRawElementProvider, returns FALSE. */ + prov_root = NULL; + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + ret_val = UiaHasServerSideProvider(hwnd); + ok(!ret_val, "UiaHasServerSideProvider returned TRUE\n"); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + + /* + * Provider passed to UiaReturnRawElementProvider returns a failure from + * get_ProviderOptions. Returns FALSE. + */ + initialize_provider(&Provider, 0, hwnd, TRUE); + prov_root = &Provider.IRawElementProviderSimple_iface; + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + ret_val = UiaHasServerSideProvider(hwnd); + ok(!ret_val, "UiaHasServerSideProvider returned TRUE\n"); + ok_method_sequence(node_from_hwnd1, NULL); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + + /* Successfully return a provider from UiaReturnRawElementProvider. */ + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, hwnd, TRUE); + SET_EXPECT(winproc_GETOBJECT_UiaRoot); + ret_val = UiaHasServerSideProvider(hwnd); + ok(ret_val, "UiaHasServerSideProvider returned FALSE\n"); + ok_method_sequence(serverside_prov_seq, "serverside_prov_seq"); + CHECK_CALLED(winproc_GETOBJECT_UiaRoot); + + UiaRegisterProviderCallback(NULL); + prov_root = NULL; + CoUninitialize(); + DestroyWindow(hwnd); + UnregisterClassA("UiaHasServerSideProvider test class", NULL); +} + /* * Once a process returns a UI Automation provider with * UiaReturnRawElementProvider it ends up in an implicit MTA until exit. This @@ -15375,6 +15433,7 @@ START_TEST(uiautomation) test_UiaGetRootNode(); test_UiaNodeFromFocus(); test_UiaAddEvent(argv[0]); + test_UiaHasServerSideProvider(); if (uia_dll) { pUiaProviderFromIAccessible = (void *)GetProcAddress(uia_dll, "UiaProviderFromIAccessible"); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index b1a21de3a17..57d1ca812f7 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -597,7 +597,7 @@ static struct uia_node *unsafe_impl_from_IWineUiaNode(IWineUiaNode *iface) return CONTAINING_RECORD(iface, struct uia_node, IWineUiaNode_iface); } -static HRESULT create_uia_node(struct uia_node **out_node) +static HRESULT create_uia_node(struct uia_node **out_node, int node_flags) { struct uia_node *node; @@ -609,6 +609,10 @@ static HRESULT create_uia_node(struct uia_node **out_node) list_init(&node->prov_thread_list_entry); list_init(&node->node_map_list_entry); node->ref = 1; + if (node_flags & NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS) + node->ignore_clientside_hwnd_provs = TRUE; + if (node_flags & NODE_FLAG_NO_PREPARE) + node->no_prepare = TRUE; *out_node = node; return S_OK; @@ -620,6 +624,9 @@ static HRESULT prepare_uia_node(struct uia_node *node) int i, prov_idx; HRESULT hr; + if (node->no_prepare) + return S_OK; + /* Get the provider index for the provider that created the node. */ for (i = prov_idx = 0; i < PROV_TYPE_COUNT; i++) { @@ -714,7 +721,7 @@ HRESULT clone_uia_node(HUIANODE in_node, HUIANODE *out_node) } } - hr = create_uia_node(&node); + hr = create_uia_node(&node, 0); if (FAILED(hr)) return hr; @@ -1980,7 +1987,7 @@ HRESULT create_uia_node_from_elprov(IRawElementProviderSimple *elprov, HUIANODE else prov_type = PROV_TYPE_MAIN; - hr = create_uia_node(&node); + hr = create_uia_node(&node, 0); if (FAILED(hr)) return hr; @@ -2503,7 +2510,7 @@ HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) *huianode = NULL; - hr = create_uia_node(&node); + hr = create_uia_node(&node, 0); if (FAILED(hr)) return hr; @@ -2564,25 +2571,20 @@ static HRESULT uia_get_provider_from_hwnd(struct uia_node *node) return SendMessageW(client_thread.hwnd, WM_UIA_CLIENT_GET_NODE_PROV, (WPARAM)&args, (LPARAM)node); } -/*********************************************************************** - * UiaNodeFromHandle (uiautomationcore.@) - */ -HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) +static HRESULT create_uia_node_from_hwnd(HWND hwnd, HUIANODE *out_node, int node_flags) { struct uia_node *node; HRESULT hr; - TRACE("(%p, %p)\n", hwnd, huianode); - - if (!huianode) + if (!out_node) return E_INVALIDARG; - *huianode = NULL; + *out_node = NULL; if (!IsWindow(hwnd)) return UIA_E_ELEMENTNOTAVAILABLE; - hr = create_uia_node(&node); + hr = create_uia_node(&node, node_flags); if (FAILED(hr)) return hr; @@ -2601,11 +2603,21 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) return hr; } - *huianode = (void *)&node->IWineUiaNode_iface; + *out_node = (void *)&node->IWineUiaNode_iface; return S_OK; } +/*********************************************************************** + * UiaNodeFromHandle (uiautomationcore.@) + */ +HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) +{ + TRACE("(%p, %p)\n", hwnd, huianode); + + return create_uia_node_from_hwnd(hwnd, huianode, 0); +} + /*********************************************************************** * UiaGetRootNode (uiautomationcore.@) */ @@ -2621,8 +2633,15 @@ HRESULT WINAPI UiaGetRootNode(HUIANODE *huianode) */ BOOL WINAPI UiaHasServerSideProvider(HWND hwnd) { - FIXME("(%p): stub\n", hwnd); - return FALSE; + HUIANODE node = NULL; + HRESULT hr; + + TRACE("(%p)\n", hwnd); + + hr = create_uia_node_from_hwnd(hwnd, &node, NODE_FLAG_NO_PREPARE | NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS); + UiaNodeRelease(node); + + return SUCCEEDED(hr); } static HRESULT get_focused_uia_node(HUIANODE in_node, HUIANODE *out_node) @@ -3026,6 +3045,9 @@ static HRESULT uia_get_clientside_provider(struct uia_node *node, int prov_type, VARTYPE vt; HRESULT hr; + if (node->ignore_clientside_hwnd_provs) + return S_OK; + if (!(sa = uia_provider_callback(node->hwnd, prov_type))) return S_OK; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 253eacbc4e7..e8bb4845189 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -54,6 +54,11 @@ enum uia_node_prov_type { PROV_TYPE_COUNT, }; +enum uia_node_flags { + NODE_FLAG_IGNORE_CLIENTSIDE_HWND_PROVS = 0x01, + NODE_FLAG_NO_PREPARE = 0x02, +}; + struct uia_node { IWineUiaNode IWineUiaNode_iface; LONG ref; @@ -65,9 +70,12 @@ struct uia_node { int creator_prov_idx; HWND hwnd; + BOOL no_prepare; BOOL nested_node; BOOL disconnected; int creator_prov_type; + BOOL ignore_clientside_hwnd_provs; + struct list prov_thread_list_entry; struct list node_map_list_entry; struct uia_provider_thread_map_entry *map;

1 0

Martin Storsjö : include: Add DirectX 12 Agility SDK definitions.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: vkd3d Branch: master Commit: 5d13a90e37b8459bf04b2d9f346dffe49f781f89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d13a90e37b8459bf04b2d9f346df… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Sep 18 00:18:00 2023 +0300 include: Add DirectX 12 Agility SDK definitions. This ports parts of commit 83625459c8227b0bd7b86c18946a35d3a806c80d from wine.git into vkd3d. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 20 ++++++++++++++++++++ include/vkd3d_unknown.idl | 2 ++ include/vkd3d_windows.h | 3 +++ 3 files changed, 25 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 46eba4d0..7a043d81 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -4983,6 +4983,22 @@ interface ID3D12Tools : IUnknown BOOL ShaderInstrumentationEnabled(); } +cpp_quote("DEFINE_GUID(CLSID_D3D12Debug, 0xf2352aeb, 0xdd84, 0x49fe, 0xb9, 0x7b, 0xa9, 0xdc, 0xfd, 0xcc, 0x1b, 0x4f);") +cpp_quote("DEFINE_GUID(CLSID_D3D12Tools, 0xe38216b1, 0x3c8c, 0x4833, 0xaa, 0x09, 0x0a, 0x06, 0xb6, 0x5d, 0x96, 0xc8);") +cpp_quote("DEFINE_GUID(CLSID_D3D12DeviceRemovedExtendedData, 0x4a75bbc4, 0x9ff4, 0x4ad8, 0x9f, 0x18, 0xab, 0xae, 0x84, 0xdc, 0x5f, 0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D3D12SDKConfiguration, 0x7cda6aca, 0xa03e, 0x49c8, 0x94, 0x58, 0x03, 0x34, 0xd2, 0x0e, 0x07, 0xce);") + +[ + uuid(e9eb5314-33aa-42b2-a718-d77f58b1f1c7), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration : IUnknown +{ + HRESULT SetSDKVersion(UINT version, const char *path); +} + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer); @@ -5022,3 +5038,7 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); + +typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); diff --git a/include/vkd3d_unknown.idl b/include/vkd3d_unknown.idl index 9a7198c8..3353e6f8 100644 --- a/include/vkd3d_unknown.idl +++ b/include/vkd3d_unknown.idl @@ -23,6 +23,8 @@ cpp_quote("#define __VKD3D_UNKNOWN_H") cpp_quote("#if 0") typedef IID *REFIID; typedef IID *REFGUID; +typedef GUID CLSID,*LPCLSID; +typedef CLSID *REFCLSID; cpp_quote("#endif") cpp_quote("#if !defined(_WIN32)") diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 2daa74e9..d53fd00b 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -125,6 +125,7 @@ typedef struct _GUID # endif typedef GUID IID; +typedef GUID CLSID; # ifdef INITGUID # ifndef __cplusplus @@ -223,9 +224,11 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # if defined(__cplusplus) && !defined(CINTERFACE) # define REFIID const IID & # define REFGUID const GUID & +# define REFCLSID const CLSID & # else # define REFIID const IID * const # define REFGUID const GUID * const +# define REFCLSID const CLSID * const # endif #if defined(__cplusplus) && !defined(CINTERFACE)

1 0

Martin Storsjö : include: Add the ID3D12GraphicsCommandList{5,6,7} interfaces.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: vkd3d Branch: master Commit: b484a9e1f65f25a45181ca7e3492858df425b862 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b484a9e1f65f25a45181ca7e34928… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Sep 18 00:42:52 2023 +0300 include: Add the ID3D12GraphicsCommandList{5,6,7} interfaces. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 7a043d81..ae9498fc 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -4999,6 +4999,90 @@ interface ID3D12SDKConfiguration : IUnknown HRESULT SetSDKVersion(UINT version, const char *path); } +typedef enum D3D12_AXIS_SHADING_RATE +{ + D3D12_AXIS_SHADING_RATE_1X = 0x0, + D3D12_AXIS_SHADING_RATE_2X = 0x1, + D3D12_AXIS_SHADING_RATE_4X = 0x2, +} D3D12_AXIS_SHADING_RATE; + +typedef enum D3D12_SHADING_RATE +{ + D3D12_SHADING_RATE_1X1 = 0x0, + D3D12_SHADING_RATE_1X2 = 0x1, + D3D12_SHADING_RATE_2X1 = 0x4, + D3D12_SHADING_RATE_2X2 = 0x5, + D3D12_SHADING_RATE_2X4 = 0x6, + D3D12_SHADING_RATE_4X2 = 0x9, + D3D12_SHADING_RATE_4X4 = 0xa, +} D3D12_SHADING_RATE; + +typedef enum D3D12_SHADING_RATE_COMBINER +{ + D3D12_SHADING_RATE_COMBINER_PASSTHROUGH = 0x0, + D3D12_SHADING_RATE_COMBINER_OVERRIDE = 0x1, + D3D12_SHADING_RATE_COMBINER_MIN = 0x2, + D3D12_SHADING_RATE_COMBINER_MAX = 0x3, + D3D12_SHADING_RATE_COMBINER_SUM = 0x4, +} D3D12_SHADING_RATE_COMBINER; + +[ + uuid(55050859-4024-474c-87f5-6472eaee44ea), + object, + local, + pointer_default(unique) +] +interface ID3D12GraphicsCommandList5 : ID3D12GraphicsCommandList4 +{ + void RSSetShadingRate( + D3D12_SHADING_RATE base_shading_rate, + const D3D12_SHADING_RATE_COMBINER *combiners); + + void RSSetShadingRateImage( + ID3D12Resource *shading_rate_image); +} + +const UINT D3D12_SHADING_RATE_X_AXIS_SHIFT = 2; +const UINT D3D12_SHADING_RATE_VALID_MASK = 3; + +cpp_quote("#define D3D12_MAKE_COARSE_SHADING_RATE(x, y) ((x) << D3D12_SHADING_RATE_X_AXIS_SHIFT | (y))") +cpp_quote("#define D3D12_GET_COARSE_SHADING_RATE_X_AXIS(val) (((val) >> D3D12_SHADING_RATE_X_AXIS_SHIFT) & D3D12_SHADING_RATE_VALID_MASK)") +cpp_quote("#define D3D12_GET_COARSE_SHADING_RATE_Y_AXIS(val) ((val) & D3D12_SHADING_RATE_VALID_MASK)") + +typedef struct D3D12_DISPATCH_MESH_ARGUMENTS +{ + UINT ThreadGroupCountX; + UINT ThreadGroupCountY; + UINT ThreadGroupCountZ; +} D3D12_DISPATCH_MESH_ARGUMENTS; + +[ + uuid(c3827890-e548-4cfa-96cf-5689a9370f80), + object, + local, + pointer_default(unique) +] +interface ID3D12GraphicsCommandList6 : ID3D12GraphicsCommandList5 +{ + void DispatchMesh( + UINT thread_group_count_x, + UINT thread_group_count_y, + UINT thread_group_count_z); +} + +[ + uuid(dd171223-8b61-4769-90e3-160ccde4e2c1), + object, + local, + pointer_default(unique) +] +interface ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandList6 +{ + void Barrier( + UINT32 barrier_groups_count, + const D3D12_BARRIER_GROUP *barrier_groups); +}; + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Martin Storsjö : include: Add UUIDs for use with D3D12EnableExperimentalFeatures.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: vkd3d Branch: master Commit: e597b0d80f39f716a8740cb0be55edc78f4599d6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e597b0d80f39f716a8740cb0be55e… Author: Martin Storsjö <martin(a)martin.st> Date: Mon Sep 18 01:06:15 2023 +0300 include: Add UUIDs for use with D3D12EnableExperimentalFeatures. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 4 ++++ include/vkd3d_windows.h | 1 + 2 files changed, 5 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ae9498fc..71faf611 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -5123,6 +5123,10 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); +cpp_quote("static const UUID D3D12ExperimentalShaderModels = { 0x76f5573e, 0xf13a, 0x40f5, { 0xb2, 0x97, 0x81, 0xce, 0x9e, 0x18, 0x93, 0x3f } };") +cpp_quote("static const UUID D3D12TiledResourceTier4 = { 0xc9c4725f, 0xa81a, 0x4f56, { 0x8c, 0x5b, 0xc5, 0x10, 0x39, 0xd6, 0x94, 0xfb } };") +cpp_quote("static const UUID D3D12MetaCommand = { 0xc734c97e, 0x8077, 0x48c8, { 0x9f, 0xdc, 0xd9, 0xd1, 0xdd, 0x31, 0xdd, 0x77 } };") + typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index d53fd00b..7b0e972d 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -126,6 +126,7 @@ typedef struct _GUID typedef GUID IID; typedef GUID CLSID; +typedef GUID UUID; # ifdef INITGUID # ifndef __cplusplus

1 0

Henri Verbeet : vkd3d-shader: Hide support for DXIL sources.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: vkd3d Branch: master Commit: da89da2bf3ce38f2d42d125f5a21743c0a439a6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da89da2bf3ce38f2d42d125f5a217… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 18 13:54:00 2023 +0200 vkd3d-shader: Hide support for DXIL sources. Unfortunately this is not sufficiently ready to release. --- include/private/vkd3d_shader_utils.h | 4 ++++ libs/vkd3d-shader/dxil.c | 2 ++ libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/include/private/vkd3d_shader_utils.h b/include/private/vkd3d_shader_utils.h index 00052a89..c9f8001e 100644 --- a/include/private/vkd3d_shader_utils.h +++ b/include/private/vkd3d_shader_utils.h @@ -43,12 +43,16 @@ static inline enum vkd3d_result vkd3d_shader_parse_dxbc_source_type(const struct if (tag == TAG_SHDR || tag == TAG_SHEX) { *type = VKD3D_SHADER_SOURCE_DXBC_TPF; +#ifndef VKD3D_SHADER_UNSUPPORTED_DXIL + break; +#else } else if (tag == TAG_DXIL) { *type = VKD3D_SHADER_SOURCE_DXBC_DXIL; /* Default to DXIL if both are present. */ break; +#endif } } diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 666d8b08..b78c78d3 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2920,6 +2920,8 @@ int vkd3d_shader_sm6_parser_create(const struct vkd3d_shader_compile_info *compi struct sm6_parser *sm6; int ret; + ERR("Creating a DXIL parser. This is unsupported; you get to keep all the pieces if it breaks.\n"); + if (!(sm6 = vkd3d_calloc(1, sizeof(*sm6)))) { ERR("Failed to allocate parser.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 0c3422f6..9ccb917c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1647,7 +1647,9 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns VKD3D_SHADER_SOURCE_DXBC_TPF, VKD3D_SHADER_SOURCE_HLSL, VKD3D_SHADER_SOURCE_D3D_BYTECODE, +#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL VKD3D_SHADER_SOURCE_DXBC_DXIL, +#endif }; TRACE("count %p.\n", count); @@ -1686,7 +1688,9 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( switch (source_type) { +#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL case VKD3D_SHADER_SOURCE_DXBC_DXIL: +#endif case VKD3D_SHADER_SOURCE_DXBC_TPF: *count = ARRAY_SIZE(dxbc_tpf_types); return dxbc_tpf_types;

1 0

Giovanni Mascellani : tests: Relax the precision of some tests so that they pass on MoltenVK.
by Alexandre Julliard 18 Sep '23

18 Sep '23

Module: vkd3d Branch: master Commit: b8f2c3e1f44adb3b9e3bfca3e36feb01517d6966 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8f2c3e1f44adb3b9e3bfca3e36fe… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 18 09:10:15 2023 +0200 tests: Relax the precision of some tests so that they pass on MoltenVK. --- tests/hlsl/exp.shader_test | 2 +- tests/hlsl/ldexp.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/hlsl/exp.shader_test b/tests/hlsl/exp.shader_test index de3be685..1d188997 100644 --- a/tests/hlsl/exp.shader_test +++ b/tests/hlsl/exp.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 1.0 2.0 draw quad -probe all rgba (0.5, 1.0, 2.0, 4.0) 1 +probe all rgba (0.5, 1.0, 2.0, 4.0) 2 [pixel shader] uniform float4 f; diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index 92988d37..f8ad40d8 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -11,7 +11,7 @@ float4 main() : SV_TARGET uniform 0 float4 2.0 3.0 4.0 5.0 uniform 4 float4 0.0 -10.0 10.0 100.0 draw quad -probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) +probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 [require] shader model >= 4.0 @@ -29,7 +29,7 @@ float4 main() : SV_TARGET uniform 0 int4 2 3 4 5 uniform 4 int4 0 -10 10 100 draw quad -probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) +probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 [pixel shader]

1 0

Alexandre Julliard : Wine release 8.16
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: website Branch: master Commit: 299810cc15ae758ed0a8ff0893c0dfa3d4fabb3d URL: https://gitlab.winehq.org/winehq/winehq/-/commit/299810cc15ae758ed0a8ff0893… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 21:48:24 2023 +0200 Wine release 8.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023091501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2023091501.xml b/news/en/2023091501.xml new file mode 100644 index 00000000..4daf2eba --- /dev/null +++ b/news/en/2023091501.xml @@ -0,0 +1,15 @@ +<news> +<date>September 15, 2023</date> +<title>Wine 8.16 Released</title> +<body> + The Wine development release 8.16 is now available. + <a href="{$root}/announce/8.16">What's new</a> in this release: +<ul> + <li>Beginnings of a DirectMusic revival.</li> + <li>Many fixes and improvements in the regression tests.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/8.x/wine-8.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-8.16 : Alexandre Julliard : Release 8.16
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: refs/tags/wine-8.16 Tag: 6b3b4da8bbe98b3f57b1cc2d0002ffe160a62ca0 URL: https://gitlab.winehq.org/wine/wine/-/tags/6b3b4da8bbe98b3f57b1cc2d0002ffe1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 21:46:24 2023 +0200 Release 8.16

1 0

Esme Povirk : user32/tests: Ignore other messages in test_broadcast.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: b61ff6df21c27ba58393e19dcb9d8940787288cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b61ff6df21c27ba58393e19dcb9d89… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Sep 15 12:44:54 2023 -0500 user32/tests: Ignore other messages in test_broadcast. If the SendMessageTimeout call takes a long time, we can get other messages which also set the observed wparam value. Apparently, this is especially likely on Windows 7. This also removes the (wParam == 0xbaadbeef) check which may have been intended to serve the same goal but doesn't work because the observed wParam value is still assigned. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54194 --- dlls/user32/tests/msg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c931ca6a983..b5c4de23bc1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17847,14 +17847,13 @@ static void test_PostMessage(void) } static WPARAM g_broadcast_wparam; +static UINT g_broadcast_msg; static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - if (wParam == 0xbaadbeef) + if (message == g_broadcast_msg) g_broadcast_wparam = wParam; - else - g_broadcast_wparam = 0; return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } @@ -17864,7 +17863,8 @@ static LRESULT WINAPI broadcast_test_sub_proc(HWND hwnd, UINT message, WPARAM wP { int sub_index = GetWindowLongPtrA(hwnd, GWLP_USERDATA); - g_broadcast_sub_wparam[sub_index] = (wParam == 0xbaadbeef) ? wParam : 0; + if (message == g_broadcast_msg) + g_broadcast_sub_wparam[sub_index] = wParam; return CallWindowProcA(g_oldproc_sub[sub_index], hwnd, message, wParam, lParam); } @@ -17966,6 +17966,7 @@ static void test_broadcast(void) g_broadcast_wparam = 0xdead; for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) g_broadcast_sub_wparam[j] = 0xdead; + g_broadcast_msg = messages[i]; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i);

1 0