- Wine-Commits - list.winehq.org

Connor McAdams : uiautomationcore/tests: Add tests for COM API EVENT_OBJECT_FOCUS translation.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 5a987d48b29e05b640f7fb503fccdf50ec0f9047 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a987d48b29e05b640f7fb503fccdf… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 28 14:52:28 2023 -0400 uiautomationcore/tests: Add tests for COM API EVENT_OBJECT_FOCUS translation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 228 +++++++++++++++++++++++++++-- 1 file changed, 215 insertions(+), 13 deletions(-)

1 0

Nikolay Sivov : include: Add IMFMediaEngineAudioEndpointId definition.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 5617d78f0d391e1e11723a10dbbda2c1df8ba9dd URL: https://gitlab.winehq.org/wine/wine/-/commit/5617d78f0d391e1e11723a10dbbda2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 08:12:30 2023 +0200 include: Add IMFMediaEngineAudioEndpointId definition. --- include/mfmediaengine.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index aaf3bb55e4d..f73b9d78914 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -353,3 +353,15 @@ interface IMFMediaEngineNotify : IUnknown { HRESULT EventNotify([in] DWORD event, [in] DWORD_PTR param1, [in] DWORD param2); } + +[ + object, + uuid(7a3bac98-0e76-49fb-8c20-8a86fd98eaf2), + local, + pointer_default(unique) +] +interface IMFMediaEngineAudioEndpointId : IUnknown +{ + HRESULT SetAudioEndpointId([in] LPCWSTR id); + HRESULT GetAudioEndpointId([out] LPWSTR *id); +}

1 0

Nikolay Sivov : mfmediaengine: Keep engine extension pointer.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: b5d43949139ea89e708fd5e3ec9f937b72febec1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5d43949139ea89e708fd5e3ec9f93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 11:30:04 2023 +0200 mfmediaengine: Keep engine extension pointer. --- dlls/mfmediaengine/main.c | 17 +++- dlls/mfmediaengine/tests/mfmediaengine.c | 133 +++++++++++++++++++++++++++++++ include/mfmediaengine.idl | 15 ++++ 3 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 1395eb9bffc..b0c67f031a9 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -158,6 +158,7 @@ struct media_engine IMFMediaSession *session; IMFPresentationClock *clock; IMFSourceResolver *resolver; + IMFMediaEngineExtension *extension; BSTR current_source; struct { @@ -1460,6 +1461,8 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + if (engine->extension) + IMFMediaEngineExtension_Release(engine->extension); media_engine_clear_effects(&engine->audio_effects); media_engine_clear_effects(&engine->video_effects); media_engine_release_video_frame_resources(engine); @@ -1559,6 +1562,9 @@ static HRESULT media_engine_set_source(struct media_engine *engine, IMFByteStrea if (url || bytestream) { + if (engine->extension) + FIXME("Use extension to load from.\n"); + flags = MF_RESOLUTION_MEDIASOURCE | MF_RESOLUTION_CONTENT_DOES_NOT_HAVE_TO_MATCH_EXTENSION_OR_MIME_TYPE; if (engine->flags & MF_MEDIA_ENGINE_DISABLE_LOCAL_PLUGINS) flags |= MF_RESOLUTION_DISABLE_LOCAL_PLUGINS; @@ -3246,10 +3252,15 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->video_frame.pts = MINLONGLONG; InitializeCriticalSection(&engine->cs); - hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine->callback); - if (FAILED(hr)) + if (FAILED(hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, + (void **)&engine->callback))) + { + WARN("Notification callback was not provided.\n"); return hr; + } + + IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_EXTENSION, &IID_IMFMediaEngineExtension, + (void **)&engine->extension); IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, (void **)&engine->device_manager); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 08caa73f8e8..d236d2b4bb8 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -2373,6 +2373,138 @@ done: IMFByteStream_Release(stream); } +struct test_extension +{ + IMFMediaEngineExtension IMFMediaEngineExtension_iface; + LONG refcount; +}; + +static struct test_extension *impl_from_IMFMediaEngineExtension(IMFMediaEngineExtension *iface) +{ + return CONTAINING_RECORD(iface, struct test_extension, IMFMediaEngineExtension_iface); +} + +static HRESULT WINAPI test_extension_QI(IMFMediaEngineExtension *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFMediaEngineExtension) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaEngineExtension_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_extension_AddRef(IMFMediaEngineExtension *iface) +{ + struct test_extension *extension = impl_from_IMFMediaEngineExtension(iface); + return InterlockedIncrement(&extension->refcount); +} + +static ULONG WINAPI test_extension_Release(IMFMediaEngineExtension *iface) +{ + struct test_extension *extension = impl_from_IMFMediaEngineExtension(iface); + ULONG refcount = InterlockedDecrement(&extension->refcount); + + if (!refcount) + free(extension); + + return refcount; +} + +static HRESULT WINAPI test_extension_CanPlayType(IMFMediaEngineExtension *iface, + BOOL audio_only, BSTR mime_type, MF_MEDIA_ENGINE_CANPLAY *answer) +{ + return 0x80001234; +} + +static HRESULT WINAPI test_extension_BeginCreateObject(IMFMediaEngineExtension *iface, + BSTR url, IMFByteStream *bytestream, MF_OBJECT_TYPE type, IUnknown **cancel_cookie, + IMFAsyncCallback *callback, IUnknown *state) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_extension_CancelObjectCreation(IMFMediaEngineExtension *iface, + IUnknown *cancel_cookie) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_extension_EndCreateObject(IMFMediaEngineExtension *iface, IMFAsyncResult *result, + IUnknown **object) +{ + return E_NOTIMPL; +} + +static const IMFMediaEngineExtensionVtbl test_extension_vtbl = +{ + test_extension_QI, + test_extension_AddRef, + test_extension_Release, + test_extension_CanPlayType, + test_extension_BeginCreateObject, + test_extension_CancelObjectCreation, + test_extension_EndCreateObject, +}; + +static struct test_extension *create_extension(void) +{ + struct test_extension *object; + + object = calloc(1, sizeof(*object)); + + object->IMFMediaEngineExtension_iface.lpVtbl = &test_extension_vtbl; + object->refcount = 1; + + return object; +} + +static void test_media_extension(void) +{ + struct media_engine_notify *notify; + struct test_extension *extension; + MF_MEDIA_ENGINE_CANPLAY answer; + IMFMediaEngine *media_engine; + IMFAttributes *attributes; + HRESULT hr; + BSTR mime; + + notify = create_callback(); + + hr = MFCreateAttributes(&attributes, 3); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + extension = create_extension(); + ok(!!extension, "Failed to create an extension.\n"); + + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, (IUnknown *)&notify->IMFMediaEngineNotify_iface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, DXGI_FORMAT_UNKNOWN); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_SetUnknown(attributes, &MF_MEDIA_ENGINE_EXTENSION, (IUnknown *)&extension->IMFMediaEngineExtension_iface); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_AUDIOONLY, attributes, &media_engine); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IMFAttributes_Release(attributes); + + mime = SysAllocString(L"doesnotexist"); + hr = IMFMediaEngine_CanPlayType(media_engine, mime, &answer); + todo_wine + ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); + SysFreeString(mime); + + IMFMediaEngine_Release(media_engine); + + IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface); + IMFMediaEngineExtension_Release(&extension->IMFMediaEngineExtension_iface); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -2407,6 +2539,7 @@ START_TEST(mfmediaengine) test_effect(); test_GetDuration(); test_GetSeekable(); + test_media_extension(); IMFMediaEngineClassFactory_Release(factory); diff --git a/include/mfmediaengine.idl b/include/mfmediaengine.idl index f73b9d78914..6547ef87462 100644 --- a/include/mfmediaengine.idl +++ b/include/mfmediaengine.idl @@ -365,3 +365,18 @@ interface IMFMediaEngineAudioEndpointId : IUnknown HRESULT SetAudioEndpointId([in] LPCWSTR id); HRESULT GetAudioEndpointId([out] LPWSTR *id); } + +[ + object, + uuid(2f69d622-20b5-41e9-afdf-89ced1dda04e), + local, + pointer_default(unique) +] +interface IMFMediaEngineExtension : IUnknown +{ + HRESULT CanPlayType([in] BOOL audio_only, [in] BSTR mime_type, [out] MF_MEDIA_ENGINE_CANPLAY *answer); + HRESULT BeginCreateObject([in] BSTR url, [in] IMFByteStream *bytestream, [in] MF_OBJECT_TYPE type, + [out] IUnknown **cancel_cookie, [in] IMFAsyncCallback *callback, [in] IUnknown *state); + HRESULT CancelObjectCreation([in] IUnknown *cancel_cookie); + HRESULT EndCreateObject([in] IMFAsyncResult *result, [out] IUnknown **object); +}

1 0

Nikolay Sivov : mfmediaengine/tests: Use a single helper to create engine instances.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 5f48e7816c1bb0e90ee6214c60e9f9e37d3a2270 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f48e7816c1bb0e90ee6214c60e9f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 08:11:30 2023 +0200 mfmediaengine/tests: Use a single helper to create engine instances. --- dlls/mfmediaengine/tests/mfmediaengine.c | 104 +++++++++++++++++-------------- 1 file changed, 57 insertions(+), 47 deletions(-)

1 0

Nikolay Sivov : mfmediaengine: Use extension object in CanPlayType().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 48e110e0fd3e90d6a5fee011ee52ea3481adf3cd URL: https://gitlab.winehq.org/wine/wine/-/commit/48e110e0fd3e90d6a5fee011ee52ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 13 11:57:18 2023 +0200 mfmediaengine: Use extension object in CanPlayType(). --- dlls/mfmediaengine/main.c | 12 ++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b0c67f031a9..5a63974967d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1705,17 +1705,25 @@ static HRESULT WINAPI media_engine_Load(IMFMediaEngineEx *iface) return hr; } -static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngineEx *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngineEx *iface, BSTR mime_type, MF_MEDIA_ENGINE_CANPLAY *answer) { struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = E_NOTIMPL; - FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); + TRACE("%p, %s, %p.\n", iface, debugstr_w(mime_type), answer); EnterCriticalSection(&engine->cs); if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) hr = MF_E_SHUTDOWN; + else + { + FIXME("Check builtin supported types.\n"); + + if (engine->extension) + hr = IMFMediaEngineExtension_CanPlayType(engine->extension, !!(engine->flags & MF_MEDIA_ENGINE_AUDIOONLY), + mime_type, answer); + } LeaveCriticalSection(&engine->cs); diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index d236d2b4bb8..66a1f0b79e9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -2495,7 +2495,6 @@ static void test_media_extension(void) mime = SysAllocString(L"doesnotexist"); hr = IMFMediaEngine_CanPlayType(media_engine, mime, &answer); - todo_wine ok(hr == 0x80001234, "Unexpected hr %#lx.\n", hr); SysFreeString(mime);

1 0

Connor McAdams : uiautomationcore: Release node lresult upon failure to allocate a node in uia_node_from_lresult().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 05928721610ae4719ae1429f4c170de19eabd24c URL: https://gitlab.winehq.org/wine/wine/-/commit/05928721610ae4719ae1429f4c170d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 11 11:51:54 2023 -0400 uiautomationcore: Release node lresult upon failure to allocate a node in uia_node_from_lresult(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 11 +++++++++++ dlls/uiautomationcore/uia_event.c | 8 -------- dlls/uiautomationcore/uia_private.h | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index f57ffb4bc4c..88e607b6e6a 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -2572,7 +2572,10 @@ HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) hr = create_uia_node(&node, 0); if (FAILED(hr)) + { + uia_node_lresult_release(lr); return hr; + } uia_start_client_thread(); hr = create_wine_uia_nested_node_provider(node, lr, FALSE); @@ -2601,6 +2604,14 @@ HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) return hr; } +void uia_node_lresult_release(LRESULT lr) +{ + IWineUiaNode *node; + + if (lr && SUCCEEDED(ObjectFromLresult(lr, &IID_IWineUiaNode, 0, (void **)&node))) + IWineUiaNode_Release(node); +} + /* * UiaNodeFromHandle is expected to work even if the calling thread hasn't * initialized COM. We marshal our node on a separate thread that initializes diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 2cb61a2062e..a82af6b495c 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -588,14 +588,6 @@ static struct uia_queue_event *uia_event_queue_pop(struct list *event_queue) return queue_event; } -static void uia_node_lresult_release(LRESULT lr) -{ - IWineUiaNode *node; - - if (lr && SUCCEEDED(ObjectFromLresult(lr, &IID_IWineUiaNode, 0, (void **)&node))) - IWineUiaNode_Release(node); -} - static HRESULT uia_event_invoke(HUIANODE node, HUIANODE nav_start_node, struct uia_event_args *args, struct uia_event *event); static HRESULT uia_raise_clientside_event(struct uia_queue_uia_event *event) diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index b55379b459d..49d42cbeb45 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -219,6 +219,7 @@ HRESULT navigate_uia_node(struct uia_node *node, int nav_dir, HUIANODE *out_node HRESULT create_uia_node_from_elprov(IRawElementProviderSimple *elprov, HUIANODE *out_node, BOOL get_hwnd_providers, int node_flags) DECLSPEC_HIDDEN; HRESULT uia_node_from_lresult(LRESULT lr, HUIANODE *huianode) DECLSPEC_HIDDEN; +void uia_node_lresult_release(LRESULT lr) DECLSPEC_HIDDEN; HRESULT create_uia_node_from_hwnd(HWND hwnd, HUIANODE *out_node, int node_flags) DECLSPEC_HIDDEN; HRESULT uia_condition_check(HUIANODE node, struct UiaCondition *condition) DECLSPEC_HIDDEN; BOOL uia_condition_matched(HRESULT hr) DECLSPEC_HIDDEN;

1 0

Giovanni Mascellani : tests: Skip test_unbounded_resource_arrays() on WARP.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 0d4a5f18601ec357b4df169ac6604d134297da06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d4a5f18601ec357b4df169ac6604… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 13:54:54 2023 +0200 tests: Skip test_unbounded_resource_arrays() on WARP. Most reads on WARP are off by a few units. I haven't investigated the reason. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e859b4f..02c36c43 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36063,6 +36063,12 @@ static void test_unbounded_resource_arrays(void) 0x00100556, 0x00000000, 0x01000015, 0x0100003e, }; + if (test_options.use_warp_device) + { + skip("Broken on WARP.\n"); + return; + } + if (!init_compute_test_context(&context)) return; device = context.device;

1 0

Giovanni Mascellani : tests: Skip test_atomic_instructions() on WARP.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: eaf35c394d949c16e6694a7cefde64a83c2c36c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eaf35c394d949c16e6694a7cefde6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 14:15:02 2023 +0200 tests: Skip test_atomic_instructions() on WARP. Pipeline creation fails with E_INVALIDARG, atomics are likely not supported on WARP. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 02c36c43..c2a6ca92 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23325,6 +23325,12 @@ static void test_atomic_instructions(void) {{~0u, ~0u}, { 0}, {0xffff, ~0u, 0}, {0xffff, 0, ~0u}}, }; + if (test_options.use_warp_device) + { + skip("Broken on WARP.\n"); + return; + } + memset(&desc, 0, sizeof(desc)); desc.rt_width = 1; desc.rt_height = 1;

1 0

Henri Verbeet : vkd3d-utils: Check for a NULL 'blob' pointer in D3DCreateBlob().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 47d4097efaa616452c10b708d878136fa3528c8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/47d4097efaa616452c10b708d8781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 16:49:11 2023 +0200 vkd3d-utils: Check for a NULL 'blob' pointer in D3DCreateBlob(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 6 ++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 4 ++++ tests/hlsl_d3d12.c | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index b0c025f4..e7985e3c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -537,6 +537,12 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) TRACE("data_size %lu, blob %p.\n", data_size, blob); + if (!blob) + { + WARN("Invalid 'blob' pointer specified.\n"); + return D3DERR_INVALIDCALL; + } + if (!(data = vkd3d_calloc(data_size, 1))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 1b8254b6..e0a697de 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -31,4 +31,8 @@ #include "vkd3d_memory.h" #include <vkd3d_utils.h> +#ifndef D3DERR_INVALIDCALL +#define D3DERR_INVALIDCALL _HRESULT_TYPEDEF_(0x8876086c) +#endif + #endif /* __VKD3D_UTILS_PRIVATE_H */ diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index ff29f1f7..de3737f6 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -20,6 +20,10 @@ #include "d3d12_crosstest.h" #include "vkd3d_common.h" +#ifndef D3DERR_INVALIDCALL +#define D3DERR_INVALIDCALL 0x8876086c +#endif + struct test_options test_options = {0}; #define check_preprocess(a, b, c, d, e) check_preprocess_(__LINE__, a, b, c, d, e) @@ -602,6 +606,25 @@ static void test_thread_id(void) destroy_test_context(&context); } +static void test_create_blob(void) +{ + unsigned int refcount; + ID3D10Blob *blob; + HRESULT hr; + + hr = D3DCreateBlob(1, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x.\n", hr); + + hr = D3DCreateBlob(0, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x.\n", hr); + + hr = D3DCreateBlob(0, &blob); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "Got refcount %u.\n", refcount); +} + START_TEST(hlsl_d3d12) { parse_args(argc, argv); @@ -610,4 +633,5 @@ START_TEST(hlsl_d3d12) run_test(test_preprocess); run_test(test_thread_id); + run_test(test_create_blob); }

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle signature element additional tag/value pairs.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: vkd3d Branch: master Commit: 7113064a1914d3ad56a19fe1af5c3f50f00e37c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7113064a1914d3ad56a19fe1af5c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 2 12:24:04 2023 +1000 vkd3d-shader/dxil: Handle signature element additional tag/value pairs. --- libs/vkd3d-shader/dxil.c | 84 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 48fbcaf1..7e3a1257 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -214,6 +214,14 @@ enum dxil_semantic_kind SEMANTIC_KIND_INVALID = SEMANTIC_KIND_COUNT, }; +enum dxil_element_additional_tag +{ + ADDITIONAL_TAG_STREAM_INDEX = 0, + ADDITIONAL_TAG_GLOBAL_SYMBOL = 1, /* not used */ + ADDITIONAL_TAG_RELADDR_MASK = 2, + ADDITIONAL_TAG_USED_MASK = 3, +}; + enum dx_intrinsic_opcode { DX_LOAD_INPUT = 4, @@ -3306,6 +3314,76 @@ static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm return NULL; } +static void signature_element_read_additional_element_values(struct signature_element *e, + const struct sm6_metadata_node *node, struct sm6_parser *sm6) +{ + unsigned int i, operand_count, value; + enum dxil_element_additional_tag tag; + + if (node->operand_count < 11 || !node->operands[10]) + return; + + if (!sm6_metadata_value_is_node(node->operands[10])) + { + WARN("Additional values list is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, + "Signature element additional values list is not a metadata node."); + return; + } + + node = node->operands[10]->u.node; + if (node->operand_count & 1) + { + WARN("Operand count is not even.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Operand count for signature element additional tag/value pairs is not even."); + } + operand_count = node->operand_count & ~1u; + + for (i = 0; i < operand_count; i += 2) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &tag) + || !sm6_metadata_get_uint_value(sm6, node->operands[i + 1], &value)) + { + WARN("Failed to extract tag/value pair.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE, + "Signature element tag/value pair at index %u is not an integer pair.", i); + continue; + } + + switch (tag) + { + case ADDITIONAL_TAG_STREAM_INDEX: + e->stream_index = value; + break; + case ADDITIONAL_TAG_RELADDR_MASK: + /* A mask of components accessed via relative addressing. Seems to replace TPF 'dcl_index_range'. */ + if (value > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid relative addressed mask %#x.\n", value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_MASK, + "Mask %#x of relative-addressed components is invalid.", value); + } + break; + case ADDITIONAL_TAG_USED_MASK: + if (value > VKD3DSP_WRITEMASK_ALL) + { + WARN("Invalid used mask %#x.\n", value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_MASK, + "Mask %#x of used components is invalid.", value); + value &= VKD3DSP_WRITEMASK_ALL; + } + e->used_mask = value; + break; + default: + FIXME("Unhandled tag %u, value %u.\n", tag, value); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Tag %#x for signature element additional value %#x is unhandled.", tag, value); + break; + } + } +} + static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const struct sm6_metadata_value *m, struct shader_signature *s) { @@ -3396,9 +3474,6 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } e->semantic_name = element_node->operands[1]->u.string_value; - /* TODO: load from additional tag/value pairs. */ - e->stream_index = 0; - e->component_type = vkd3d_component_type_from_dxil_component_type(values[2]); e->min_precision = minimum_precision_from_dxil_component_type(values[2]); @@ -3442,9 +3517,10 @@ static enum vkd3d_result sm6_parser_read_signature(struct sm6_parser *sm6, const } e->mask = vkd3d_write_mask_from_component_count(column_count) << index; - /* TODO: load from additional tag/value pairs. */ e->used_mask = e->mask; + signature_element_read_additional_element_values(e, element_node, sm6); + m = element_node->operands[4]; if (!sm6_metadata_value_is_node(m)) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b5171ba6..2c84cb10 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -187,6 +187,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH = 8305, VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH = 8306, + VKD3D_SHADER_WARNING_DXIL_INVALID_MASK = 8307, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0