April 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/2] ntdll/tests: Test NtMapViewOfSection with a DLL and zero_bits.
by Brendan Shanks April 27, 2022

April 27, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- The zero_bits mask test always passes on 32-bit (the pointer is either truncated, or version.dll is itself 32-bit). dlls/ntdll/tests/virtual.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 30a97ba9d94..cd374cf2ea4 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -37,6 +37,8 @@ static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64); static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char*); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID*); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID); static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static const BOOL is_win64 = sizeof(void*) != sizeof(int); @@ -904,6 +906,43 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL if possible */ + if (is_wow64) + pWow64DisableWow64FsRedirection(&ptr2); + + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + if (is_wow64) + pWow64RevertWow64FsRedirection(ptr2); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + if (!is_win64 && !is_wow64) + { + ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08lx\n", status); + } + else + { + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + todo_wine + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + } + + NtClose(mapping); + CloseHandle(file); + TerminateProcess(process, 0); CloseHandle(process); } @@ -1152,6 +1191,8 @@ START_TEST(virtual) mod = GetModuleHandleA("kernel32.dll"); pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + pWow64DisableWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64DisableWow64FsRedirection"); + pWow64RevertWow64FsRedirection = (void *)GetProcAddress(mod, "Wow64RevertWow64FsRedirection"); pGetEnabledXStateFeatures = (void *)GetProcAddress(mod, "GetEnabledXStateFeatures"); mod = GetModuleHandleA("ntdll.dll"); pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); -- 2.35.1

2 2

[PATCH v2 0/5] MR5: windows.media.speech: Backport tweaks from windows.gaming.input async.
by Rémi Bernon April 27, 2022

April 27, 2022

Some being more cosmetic than others. -- v2: windows.media.speech: Assume that async_run_work cannot be NULL in IAsyncInfo_Close. windows.media.speech: Simplify error handling in async_operation_create. windows.media.speech: Initialize HRESULT variables consistently. windows.media.speech: Return E_ILLEGAL_METHOD_CALL from get_ErrorCode. https://gitlab.winehq.org/wine/wine/-/merge_requests/5

2 8

[PATCH v2 3/3] msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Piotr Caban April 27, 2022

April 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 76 +++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-)

1 0

[PATCH v2 2/3] msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Piotr Caban April 27, 2022

April 27, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[PATCH v2 1/3] msvcp140_atomic_wait: Add __std_atomic_notify_one_direct implementation.
by Piotr Caban April 27, 2022

April 27, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - skip tests on Windows 7 dlls/msvcp140_atomic_wait/Makefile.in | 2 +- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH] winegstreamer: Check whether transforms are supported at creation time.
by Rémi Bernon April 27, 2022

April 27, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52908 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52914 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/h264_decoder.c | 10 ++++++++++ dlls/winegstreamer/wg_transform.c | 13 +++++++++---- dlls/winegstreamer/wma_decoder.c | 10 ++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8bfa15529db..778729f576c 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -585,10 +585,20 @@ static const IMFTransformVtbl transform_vtbl = HRESULT h264_decoder_create(REFIID riid, void **ret) { + struct wg_format output_format = {.major_type = WG_MAJOR_TYPE_UNKNOWN}; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_H264}; + struct wg_transform *transform; struct h264_decoder *decoder; TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support H264 decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 49c7bfaa927..0b975a8210e 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -169,7 +169,6 @@ NTSTATUS wg_transform_create(void *args) NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; struct wg_transform *transform; - const gchar *media_type; GstEvent *event; if (!init_gstreamer()) @@ -210,9 +209,13 @@ NTSTATUS wg_transform_create(void *args) * based on the actual output caps now. Matching decoders with the * raw output media type should be enough. */ - media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); - if (!(raw_caps = gst_caps_new_empty_simple(media_type))) + if (!(raw_caps = gst_caps_new_any())) goto out; + if (gst_caps_get_size(sink_caps)) + { + const gchar *media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + gst_caps_append_structure(raw_caps, gst_structure_new_empty(media_type)); + } switch (input_format.major_type) { @@ -268,9 +271,11 @@ NTSTATUS wg_transform_create(void *args) case WG_MAJOR_TYPE_H264: case WG_MAJOR_TYPE_WMA: - case WG_MAJOR_TYPE_UNKNOWN: GST_FIXME("Format %u not implemented!", output_format.major_type); goto out; + + case WG_MAJOR_TYPE_UNKNOWN: + break; } if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 57b0f204f9e..9d1ad20fba7 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -853,10 +853,20 @@ static const IPropertyBagVtbl property_bag_vtbl = HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) { + struct wg_format output_format = {.major_type = WG_MAJOR_TYPE_UNKNOWN}; + struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_WMA}; + struct wg_transform *transform; struct wma_decoder *decoder; TRACE("outer %p, out %p.\n", outer, out); + if (!(transform = wg_transform_create(&input_format, &output_format))) + { + FIXME("GStreamer doesn't support WMA decoding, please install appropriate plugins\n"); + return E_FAIL; + } + wg_transform_destroy(transform); + if (!(decoder = calloc(1, sizeof(*decoder)))) return E_OUTOFMEMORY; -- 2.35.1

2 1

[PATCH 1/5] quartz/tests: Add tests for MPEG audio decoder IEnumMediaTypes.
by Anton Baskanov April 27, 2022

April 27, 2022

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/mpegaudio.c | 76 +++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 44e1a9ad2e6..5f851cb5973 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -526,6 +526,81 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_mpeg_audio_codec(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[1]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"In", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, L"Out", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!count, "Got count %lu.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %ld.\n", ref); +} + START_TEST(mpegaudio) { CoInitialize(NULL); @@ -536,6 +611,7 @@ START_TEST(mpegaudio) test_enum_pins(); test_find_pin(); test_pin_info(); + test_enum_media_types(); CoUninitialize(); } -- 2.34.1

2 8

[PATCH v2 1/5] wined3d: Raise MAX_ATTRIBS to 32.
by Matteo Bruni April 27, 2022

April 27, 2022

Which is the SM5 limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43845 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- It also should fix a crash some ways into the game in Hellblade: Senua's Sacrifice. As it turns out, GL implementations in practice support only 16 attributes, while Vulkan requires at least 32. In the case of both ABZU and Hellblade: Senua's Sacrifice at least though, the problematic shaders don't actually make use of vertex attributes with index > 15, they just include a SV_InstanceID system value for attribute 16 in the shader input signature but don't declare it in the shader code at all. This patch is enough to make ABZU work on GL (I haven't retested Hellblade but I expect the same there). FWIW, both games are built around Unreal Engine 4. v2: Just raise MAX_ATTRIBS and fixup (hopefully) all the fallout. --- dlls/wined3d/context_gl.c | 13 +++++++++++-- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++--------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 45c1062b3ec..2e953fc9c78 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4818,7 +4818,8 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, unsigned int element_idx; stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); - for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) + for (element_idx = gl_info->limits.vertex_attribs - 1; use_map; + use_map &= ~(1u << element_idx), --element_idx) { if (!(use_map & 1u << element_idx)) continue; @@ -5657,7 +5658,15 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c context->instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; - for (i = 0; i < MAX_ATTRIBS; ++i) + if (stream_info->use_map & ~wined3d_mask_from_size(gl_info->limits.vertex_attribs)) + { + static unsigned int once; + + if (!once++) + FIXME("More than the supported %u vertex attributes are in use.\n", gl_info->limits.vertex_attribs); + } + + for (i = 0; i < gl_info->limits.vertex_attribs; ++i) { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; const void *offset = get_vertex_attrib_pointer(element, state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35925b04cd1..3210c628de3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -737,8 +737,7 @@ enum wined3d_shader_conditional_op /* Shader backends */ -/* TODO: Make this dynamic, based on shader limits ? */ -#define MAX_ATTRIBS 16 +#define MAX_ATTRIBS 32 #define MAX_REG_ADDR 1 #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 32 @@ -1453,6 +1452,9 @@ enum fog_src_type struct vs_compile_args { + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ + unsigned int next_shader_input_count; + DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; BYTE fog_src; BYTE clip_enabled : 1; BYTE point_size : 1; @@ -1460,9 +1462,6 @@ struct vs_compile_args BYTE flatshading : 1; BYTE next_shader_type : 3; BYTE padding : 1; - WORD swizzle_map; /* MAX_ATTRIBS, 16 */ - unsigned int next_shader_input_count; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct ds_compile_args @@ -1699,8 +1698,8 @@ struct wined3d_stream_info struct wined3d_stream_info_element elements[MAX_ATTRIBS]; DWORD position_transformed : 1; DWORD all_vbo : 1; - WORD swizzle_map; /* MAX_ATTRIBS, 16 */ - WORD use_map; /* MAX_ATTRIBS, 16 */ + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ + DWORD use_map; /* MAX_ATTRIBS, 32 */ }; void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, @@ -2149,28 +2148,28 @@ struct wined3d_context } current_rt; /* Stores some information about the context state for optimization */ + DWORD last_swizzle_map; /* MAX_ATTRIBS, 32 */ + DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD update_shader_resource_bindings : 1; DWORD update_compute_shader_resource_bindings : 1; DWORD update_unordered_access_view_bindings : 1; DWORD update_compute_unordered_access_view_bindings : 1; - DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ DWORD last_was_rhw : 1; /* True iff last draw_primitive was in xyzrhw mode. */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_diffuse : 1; DWORD last_was_specular : 1; DWORD last_was_normal : 1; - DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ - DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ - DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max WINED3D_MAX_TEXTURES, 8 */ + DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ + DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD use_immediate_mode_draw : 1; DWORD uses_uavs : 1; DWORD uses_fbo_attached_resources : 1; @@ -2181,9 +2180,10 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD namedArraysLoaded : 1; - DWORD padding : 13; + DWORD padding : 5; + + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3653,8 +3653,9 @@ struct wined3d_ffp_vs_settings DWORD texcoords : 8; /* WINED3D_MAX_TEXTURES */ DWORD ortho_fog : 1; DWORD flatshading : 1; - DWORD swizzle_map : 16; /* MAX_ATTRIBS, 16 */ - DWORD padding : 2; + DWORD padding : 18; + + DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ DWORD texgen[WINED3D_MAX_TEXTURES]; }; -- 2.34.1

2 9

[PATCH 1/3] include: Add defines for ID2D1Transform.
by Ziqing Hui April 27, 2022

April 27, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- include/d2d1effectauthor.idl | 162 +++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index cec7de8c311..6838492c498 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -258,3 +258,165 @@ interface ID2D1TransformGraph : IUnknown [in] UINT32 index ); } + +[ + object, + uuid(ef1a287d-342a-4f76-8fdb-da0d6ea9f92b), + local, +] +interface ID2D1Transform : ID2D1TransformNode +{ + HRESULT MapOutputRectToInputRects( + [in] const D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *input_rects, + [in] UINT32 input_rects_count + ); + HRESULT MapInputRectsToOutputRect( + [in] const D2D1_RECT_L *input_rects, + [in] const D2D1_RECT_L *input_opaque_rects, + [in] UINT32 input_rect_count, + [out] D2D1_RECT_L *output_rect, + [out] D2D1_RECT_L *output_opaque_rect + ); + HRESULT MapInvalidRect( + [in] UINT32 index, + [in] D2D1_RECT_L input_rect, + [out] D2D1_RECT_L *output_rect + ); +} + +[ + object, + uuid(36bfdcb6-9739-435d-a30d-a653beff6a6f), + local, +] +interface ID2D1DrawTransform : ID2D1Transform +{ + HRESULT SetDrawInfo( + [in] ID2D1DrawInfo *info + ); +} + +[ + object, + uuid(0d85573c-01e3-4f7d-bfd9-0d60608bf3c3), + local, +] +interface ID2D1ComputeTransform : ID2D1Transform +{ + HRESULT SetComputeInfo( + [in] ID2D1ComputeInfo *info + ); + HRESULT CalculateThreadgroups( + [in] const D2D1_RECT_L *output_rect, + [out] UINT32 *dimension_x, + [out] UINT32 *dimension_y, + [out] UINT32 *dimension_z + ); +} + +[ + object, + uuid(0359dc30-95e6-4568-9055-27720d130e93), + local, +] +interface ID2D1AnalysisTransform : IUnknown +{ + HRESULT ProcessAnalysisResults( + [in] const BYTE *data, + [in] UINT32 size + ); +} + +[ + object, + uuid(db1800dd-0c34-4cf9-be90-31cc0a5653e1), + local, +] +interface ID2D1SourceTransform : ID2D1Transform +{ + HRESULT SetRenderInfo( + [in] ID2D1RenderInfo *info + ); + HRESULT Draw( + [in] ID2D1Bitmap1 *target, + [in] const D2D1_RECT_L *draw_rect, + [in] D2D1_POINT_2U target_origin + ); +} + +[ + object, + uuid(1a799d8a-69f7-4e4c-9fed-437ccc6684cc), + local, +] +interface ID2D1ConcreteTransform : ID2D1TransformNode +{ + HRESULT SetOutputBuffer( + [in] D2D1_BUFFER_PRECISION precision, + [in] D2D1_CHANNEL_DEPTH depth + ); + void SetCached( + [in] BOOL is_cached + ); +} + +[ + object, + uuid(63ac0b32-ba44-450f-8806-7f4ca1ff2f1b), + local, +] +interface ID2D1BlendTransform : ID2D1ConcreteTransform +{ + void SetDescription( + [in] const D2D1_BLEND_DESCRIPTION *description + ); + void GetDescription( + [out] D2D1_BLEND_DESCRIPTION *description + ); +} + +[ + object, + uuid(4998735c-3a19-473c-9781-656847e3a347), + local, +] +interface ID2D1BorderTransform : ID2D1ConcreteTransform +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); +} + +[ + object, + uuid(3fe6adea-7643-4f53-bd14-a0ce63f24042), + local, +] +interface ID2D1OffsetTransform : ID2D1TransformNode +{ + void SetOffset( + [in] D2D1_POINT_2L offset + ); + D2D1_POINT_2L GetOffset(); +} + +[ + object, + uuid(90f732e2-5092-4606-a819-8651970baccd), + local, +] +interface ID2D1BoundsAdjustmentTransform : ID2D1TransformNode +{ + void SetOutputBounds( + [in] const D2D1_RECT_L *bounds + ); + void GetOutputBounds( + [out] D2D1_RECT_L *bounds + ); +} -- 2.25.1

2 5

[PATCH vkd3d] configure: Allow specifying the Vulkan library path with VULKAN_LIBS.
by Zebediah Figura April 27, 2022

April 27, 2022

Do not define it for the vkd3d build, but restore support for overriding it as a configure argument. This partially reverts 99a3adcc19f2a64fad630948851616f52c00d553. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + m4/check-vulkan.m4 | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index b386104a..7796ae8d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ case $host_os in esac AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) +AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) AS_IF([test "x$SONAME_LIBVULKAN" = "x"], [VKD3D_CHECK_VULKAN], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4 index b2c3f8a1..f651a077 100644 --- a/m4/check-vulkan.m4 +++ b/m4/check-vulkan.m4 @@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],, [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_MoltenVK"])], - [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])]) - ]) - ]) + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS])], + [$VULKAN_LIBS]) ]) -- 2.34.1

3 2