October 2023 - Wine-Commits

Mohamad Al-Jaf : include: Add ISystemMediaTransportControlsDisplayUpdater interface definition.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 9a4dbd9a179e784052eebaae8717f58c95906f74 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a4dbd9a179e784052eebaae8717f5… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 03:05:08 2023 -0400 include: Add ISystemMediaTransportControlsDisplayUpdater interface definition. --- dlls/windows.media.mediacontrol/main.c | 2 +- include/windows.media.idl | 80 ++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/windows.media.mediacontrol/main.c b/dlls/windows.media.mediacontrol/main.c index b052ef5dda3..d55c2ae6461 100644 --- a/dlls/windows.media.mediacontrol/main.c +++ b/dlls/windows.media.mediacontrol/main.c @@ -215,7 +215,7 @@ static HRESULT WINAPI media_control_put_PlaybackStatus( ISystemMediaTransportCon return S_OK; } -static HRESULT WINAPI media_control_get_DisplayUpdater( ISystemMediaTransportControls *iface, __x_ABI_CWindows_CMedia_CISystemMediaTransportControlsDisplayUpdater **value ) +static HRESULT WINAPI media_control_get_DisplayUpdater( ISystemMediaTransportControls *iface, ISystemMediaTransportControlsDisplayUpdater **value ) { FIXME( "iface %p, value %p stub!\n", iface, value ); return E_NOTIMPL; diff --git a/include/windows.media.idl b/include/windows.media.idl index 4896f66b45b..7c5b8ff41d1 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -22,28 +22,40 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.storage.idl"; +import "windows.storage.streams.idl"; namespace Windows.Media { typedef enum AudioProcessing AudioProcessing; typedef enum MediaPlaybackStatus MediaPlaybackStatus; + typedef enum MediaPlaybackType MediaPlaybackType; typedef enum SoundLevel SoundLevel; typedef enum SystemMediaTransportControlsButton SystemMediaTransportControlsButton; typedef enum SystemMediaTransportControlsProperty SystemMediaTransportControlsProperty; + interface IImageDisplayProperties; interface IMediaControl; interface IMediaMarker; + interface IMusicDisplayProperties; + interface IMusicDisplayProperties2; + interface IMusicDisplayProperties3; interface ISystemMediaTransportControls; interface ISystemMediaTransportControls2; interface ISystemMediaTransportControlsButtonPressedEventArgs; interface ISystemMediaTransportControlsDisplayUpdater; interface ISystemMediaTransportControlsPropertyChangedEventArgs; interface ISystemMediaTransportControlsStatics; + interface IVideoDisplayProperties; + interface IVideoDisplayProperties2; + runtimeclass ImageDisplayProperties; + runtimeclass MusicDisplayProperties; runtimeclass SystemMediaTransportControls; runtimeclass SystemMediaTransportControlsButtonPressedEventArgs; runtimeclass SystemMediaTransportControlsDisplayUpdater; runtimeclass SystemMediaTransportControlsPropertyChangedEventArgs; + runtimeclass VideoDisplayProperties; declare { @@ -76,6 +88,17 @@ namespace Windows.Media Paused = 4, }; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum MediaPlaybackType + { + Unknown = 0, + Music = 1, + Video = 2, + Image = 3, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -167,6 +190,30 @@ namespace Windows.Media [eventremove] HRESULT PropertyChanged([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SystemMediaTransportControlsDisplayUpdater), + uuid(8abbc53e-fa55-4ecf-ad8e-c984e5dd1550) + ] + interface ISystemMediaTransportControlsDisplayUpdater : IInspectable + { + [propget] HRESULT Type([out, retval] Windows.Media.MediaPlaybackType *value); + [propput] HRESULT Type([in] Windows.Media.MediaPlaybackType value); + [propget] HRESULT AppMediaId([out, retval] HSTRING *value); + [propput] HRESULT AppMediaId([in] HSTRING value); + [propget] HRESULT Thumbnail([out, retval] Windows.Storage.Streams.RandomAccessStreamReference **value); + [propput] HRESULT Thumbnail([in] Windows.Storage.Streams.RandomAccessStreamReference *value); + [propget] HRESULT MusicProperties([out, retval] Windows.Media.MusicDisplayProperties **value); + [propget] HRESULT VideoProperties([out, retval] Windows.Media.VideoDisplayProperties **value); + [propget] HRESULT ImageProperties([out, retval] Windows.Media.ImageDisplayProperties **value); + HRESULT CopyFromFileAsync( + [in] Windows.Media.MediaPlaybackType type, [in] Windows.Storage.StorageFile *source, + [out, retval] Windows.Foundation.IAsyncOperation<boolean> **operation + ); + HRESULT ClearAll(); + HRESULT Update(); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SystemMediaTransportControlsButtonPressedEventArgs), @@ -187,6 +234,28 @@ namespace Windows.Media [propget] HRESULT Property([out, retval] Windows.Media.SystemMediaTransportControlsProperty *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass ImageDisplayProperties + { + [default] interface Windows.Media.IImageDisplayProperties; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass MusicDisplayProperties + { + [default] interface Windows.Media.IMusicDisplayProperties; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.IMusicDisplayProperties2; + [contract(Windows.Foundation.UniversalApiContract, 3.0)] interface Windows.Media.IMusicDisplayProperties3; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -226,4 +295,15 @@ namespace Windows.Media { [default] interface Windows.Media.ISystemMediaTransportControlsPropertyChangedEventArgs; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass VideoDisplayProperties + { + [default] interface Windows.Media.IVideoDisplayProperties; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.IVideoDisplayProperties2; + } }

1 0

Mohamad Al-Jaf : windows.media.mediacontrol/tests: Remove flakey ref count test.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: wine Branch: master Commit: 3cb90b60a56156da735e717acdd2a172ecbc2797 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cb90b60a56156da735e717acdd2a1… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Oct 12 01:18:15 2023 -0400 windows.media.mediacontrol/tests: Remove flakey ref count test. --- dlls/windows.media.mediacontrol/tests/mediacontrol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windows.media.mediacontrol/tests/mediacontrol.c b/dlls/windows.media.mediacontrol/tests/mediacontrol.c index a714cb84b44..275527333f8 100644 --- a/dlls/windows.media.mediacontrol/tests/mediacontrol.c +++ b/dlls/windows.media.mediacontrol/tests/mediacontrol.c @@ -146,8 +146,7 @@ static void test_MediaControlStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); ok( value == FALSE, "got value %d.\n", value ); - ref = ISystemMediaTransportControls_Release( media_control_statics ); - ok( ref == 1 || broken(ref == 3) /* Win10 1507 */ || broken(ref == 2) /* Win10 1607 */, "got ref %ld.\n", ref ); + ISystemMediaTransportControls_Release( media_control_statics ); done: DestroyWindow( window ); ref = ISystemMediaTransportControlsInterop_Release( media_control_interop_statics );

1 0

Conor McCarthy : vkd3d-shader/dxil: Read DXIL global flags.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: vkd3d Branch: master Commit: 4b7ca0c294f7f8e0ee38cd8717087c4d2f3d0cb9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b7ca0c294f7f8e0ee38cd8717087… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 3 15:06:29 2023 +1000 vkd3d-shader/dxil: Read DXIL global flags. --- libs/vkd3d-shader/dxil.c | 118 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 47b26194..bbc1b202 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -222,6 +222,23 @@ enum dxil_element_additional_tag ADDITIONAL_TAG_USED_MASK = 3, }; +enum dxil_shader_properties_tag +{ + SHADER_PROPERTIES_FLAGS = 0, + SHADER_PROPERTIES_GEOMETRY = 1, + SHADER_PROPERTIES_DOMAIN = 2, + SHADER_PROPERTIES_HULL = 3, + SHADER_PROPERTIES_COMPUTE = 4, + SHADER_PROPERTIES_AUTO_BINDING_SPACE = 5, + SHADER_PROPERTIES_RAY_PAYLOAD_SIZE = 6, + SHADER_PROPERTIES_RAY_ATTRIB_SIZE = 7, + SHADER_PROPERTIES_SHADER_KIND = 8, + SHADER_PROPERTIES_MESH = 9, + SHADER_PROPERTIES_AMPLIFICATION = 10, + SHADER_PROPERTIES_WAVE_SIZE = 11, + SHADER_PROPERTIES_ENTRY_ROOT_SIG = 12, +}; + enum dx_intrinsic_opcode { DX_LOAD_INPUT = 4, @@ -1657,6 +1674,17 @@ static unsigned int register_get_uint_value(const struct vkd3d_shader_register * return reg->u.immconst_uint[0]; } +static uint64_t register_get_uint64_value(const struct vkd3d_shader_register *reg) +{ + if (!register_is_constant(reg) || !data_type_is_integer(reg->data_type)) + return UINT64_MAX; + + if (reg->dimension == VSIR_DIMENSION_VEC4) + WARN("Returning vec4.x.\n"); + + return (reg->type == VKD3DSPR_IMMCONST64) ? reg->u.immconst_uint64[0] : reg->u.immconst_uint[0]; +} + static inline bool sm6_value_is_function_dcl(const struct sm6_value *value) { return value->value_type == VALUE_TYPE_FUNCTION; @@ -1755,6 +1783,8 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type return VKD3D_DATA_UINT8; case 32: return VKD3D_DATA_UINT; + case 64: + return VKD3D_DATA_UINT64; default: FIXME("Unhandled width %u.\n", type->u.width); return VKD3D_DATA_UINT; @@ -2812,6 +2842,25 @@ static bool sm6_metadata_get_uint_value(const struct sm6_parser *sm6, return true; } +static bool sm6_metadata_get_uint64_value(const struct sm6_parser *sm6, + const struct sm6_metadata_value *m, uint64_t *u) +{ + const struct sm6_value *value; + + if (!m || m->type != VKD3D_METADATA_VALUE) + return false; + + value = m->u.value; + if (!sm6_value_is_constant(value)) + return false; + if (!sm6_type_is_integer(value->type)) + return false; + + *u = register_get_uint64_value(&value->u.reg); + + return true; +} + static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const struct dxil_block *block, struct sm6_function *function) { @@ -3598,10 +3647,34 @@ static enum vkd3d_result sm6_parser_signatures_init(struct sm6_parser *sm6, cons return VKD3D_OK; } +static void sm6_parser_emit_global_flags(struct sm6_parser *sm6, const struct sm6_metadata_value *m) +{ + enum vkd3d_shader_global_flags global_flags, mask, rotated_flags; + struct vkd3d_shader_instruction *ins; + + if (!sm6_metadata_get_uint64_value(sm6, m, &global_flags)) + { + WARN("Failed to load global flags.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Global flags metadata value is not an integer."); + return; + } + /* Rotate SKIP_OPTIMIZATION from bit 0 to bit 4 to match vkd3d_shader_global_flags. */ + mask = (VKD3DSGF_SKIP_OPTIMIZATION << 1) - 1; + rotated_flags = global_flags & mask; + rotated_flags = (rotated_flags >> 1) | ((rotated_flags & 1) << 4); + global_flags = (global_flags & ~mask) | rotated_flags; + + ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_GLOBAL_FLAGS); + ins->declaration.global_flags = global_flags; +} + static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); - const struct sm6_metadata_node *entry_node = m ? m->u.node : NULL; + const struct sm6_metadata_node *node, *entry_node = m ? m->u.node : NULL; + enum dxil_shader_properties_tag tag; + unsigned int i, operand_count; const struct sm6_value *value; enum vkd3d_result ret; @@ -3645,6 +3718,49 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) return ret; } + if (entry_node->operand_count >= 5 && (m = entry_node->operands[4])) + { + if (!sm6_metadata_value_is_node(m)) + { + WARN("Shader properties list is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Shader properties tag/value list is not a metadata node."); + return VKD3D_ERROR_INVALID_SHADER; + } + + node = m->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 shader properties 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)) + { + WARN("Tag is not an integer value.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Shader properties tag at index %u is not an integer.", i); + return VKD3D_ERROR_INVALID_SHADER; + } + + switch (tag) + { + case SHADER_PROPERTIES_FLAGS: + sm6_parser_emit_global_flags(sm6, node->operands[i + 1]); + break; + default: + FIXME("Unhandled tag %#x.\n", tag); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Shader properties tag %#x is unhandled.", tag); + break; + } + } + } + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ab148b3b..85041f2a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -179,6 +179,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_METADATA = 8014, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT = 8015, VKD3D_SHADER_ERROR_DXIL_INVALID_SIGNATURE = 8016, + VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES = 8017, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, @@ -571,11 +572,13 @@ enum vkd3d_data_type VKD3D_DATA_CONTINUED, VKD3D_DATA_UNUSED, VKD3D_DATA_UINT8, + VKD3D_DATA_UINT64, }; static inline bool data_type_is_integer(enum vkd3d_data_type data_type) { - return data_type == VKD3D_DATA_INT || data_type == VKD3D_DATA_UINT8 || data_type == VKD3D_DATA_UINT; + return data_type == VKD3D_DATA_INT || data_type == VKD3D_DATA_UINT8 || data_type == VKD3D_DATA_UINT + || data_type == VKD3D_DATA_UINT64; } enum vsir_dimension

1 0

Conor McCarthy : vkd3d-shader/dxil: Read DXIL compute shader thread group dimensions.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: vkd3d Branch: master Commit: 85c165ff394928e06fc4f23e800006d7f499ba7c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85c165ff394928e06fc4f23e80000… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Oct 4 00:03:00 2023 +1000 vkd3d-shader/dxil: Read DXIL compute shader thread group dimensions. --- libs/vkd3d-shader/dxil.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index bbc1b202..06faddac 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -26,6 +26,8 @@ #define BITCODE_MAGIC VKD3D_MAKE_TAG('B', 'C', 0xc0, 0xde) #define DXIL_OP_MAX_OPERANDS 17 +static const unsigned int dx_max_thread_group_size[3] = {1024, 1024, 64}; + enum bitcode_block_id { BLOCKINFO_BLOCK = 0, @@ -3669,6 +3671,65 @@ static void sm6_parser_emit_global_flags(struct sm6_parser *sm6, const struct sm ins->declaration.global_flags = global_flags; } +static enum vkd3d_result sm6_parser_emit_thread_group(struct sm6_parser *sm6, const struct sm6_metadata_value *m) +{ + const struct sm6_metadata_node *node; + struct vkd3d_shader_instruction *ins; + unsigned int group_sizes[3]; + unsigned int i; + + if (sm6->p.shader_version.type != VKD3D_SHADER_TYPE_COMPUTE) + { + WARN("Shader of type %#x has thread group dimensions.\n", sm6->p.shader_version.type); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Shader has thread group dimensions but is not a compute shader."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!m || !sm6_metadata_value_is_node(m)) + { + WARN("Thread group dimension value is not a node.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Thread group dimension metadata value is not a node."); + return VKD3D_ERROR_INVALID_SHADER; + } + + node = m->u.node; + if (node->operand_count != 3) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Thread group dimension operand count %u is invalid.", node->operand_count); + return VKD3D_ERROR_INVALID_SHADER; + } + + for (i = 0; i < 3; ++i) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &group_sizes[i])) + { + WARN("Thread group dimension is not an integer value.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Thread group dimension metadata value is not an integer."); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!group_sizes[i] || group_sizes[i] > dx_max_thread_group_size[i]) + { + char dim = "XYZ"[i]; + WARN("Invalid thread group %c dimension %u.\n", dim, group_sizes[i]); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Thread group %c dimension %u is invalid.", dim, group_sizes[i]); + return VKD3D_ERROR_INVALID_SHADER; + } + } + + ins = sm6_parser_add_instruction(sm6, VKD3DSIH_DCL_THREAD_GROUP); + ins->declaration.thread_group_size.x = group_sizes[0]; + ins->declaration.thread_group_size.y = group_sizes[1]; + ins->declaration.thread_group_size.z = group_sizes[2]; + + return VKD3D_OK; +} + static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); @@ -3752,6 +3813,10 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) case SHADER_PROPERTIES_FLAGS: sm6_parser_emit_global_flags(sm6, node->operands[i + 1]); break; + case SHADER_PROPERTIES_COMPUTE: + if ((ret = sm6_parser_emit_thread_group(sm6, node->operands[i + 1])) < 0) + return ret; + break; default: FIXME("Unhandled tag %#x.\n", tag); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES,

1 0

Conor McCarthy : vkd3d-shader: Define more global flags.
by Alexandre Julliard Oct. 17, 2023

Oct. 17, 2023

Module: vkd3d Branch: master Commit: 06f8a88466c69fb014f22bfb9332e2696c97d7be URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06f8a88466c69fb014f22bfb9332e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Oct 3 14:50:09 2023 +1000 vkd3d-shader: Define more global flags. --- libs/vkd3d-shader/d3d_asm.c | 9 +++++---- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 27 +++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 566680be..5a75cf25 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -391,13 +391,14 @@ static unsigned int shader_get_float_offset(enum vkd3d_shader_register_type regi } } -static void shader_dump_global_flags(struct vkd3d_d3d_asm_compiler *compiler, uint32_t global_flags) +static void shader_dump_global_flags(struct vkd3d_d3d_asm_compiler *compiler, + enum vkd3d_shader_global_flags global_flags) { unsigned int i; static const struct { - unsigned int flag; + enum vkd3d_shader_global_flags flag; const char *name; } global_flag_info[] = @@ -423,7 +424,7 @@ static void shader_dump_global_flags(struct vkd3d_d3d_asm_compiler *compiler, ui } if (global_flags) - vkd3d_string_buffer_printf(&compiler->buffer, "unknown_flags(%#x)", global_flags); + vkd3d_string_buffer_printf(&compiler->buffer, "unknown_flags(%#"PRIx64")", global_flags); } static void shader_dump_sync_flags(struct vkd3d_d3d_asm_compiler *compiler, uint32_t sync_flags) @@ -1637,7 +1638,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, case VKD3DSIH_DCL_GLOBAL_FLAGS: vkd3d_string_buffer_printf(buffer, " "); - shader_dump_global_flags(compiler, ins->flags); + shader_dump_global_flags(compiler, ins->declaration.global_flags); break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 73801602..90f1adeb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5378,7 +5378,7 @@ static size_t spirv_compiler_get_current_function_location(struct spirv_compiler static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - unsigned int flags = instruction->flags; + enum vkd3d_shader_global_flags flags = instruction->declaration.global_flags; if (flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) { @@ -5393,9 +5393,9 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler } if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unhandled global flags %#x.\n", flags); + FIXME("Unhandled global flags %#"PRIx64".\n", flags); else - WARN("Unhandled global flags %#x.\n", flags); + WARN("Unhandled global flags %#"PRIx64".\n", flags); } static void spirv_compiler_emit_temps(struct spirv_compiler *compiler, uint32_t count) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5c42a588..bf4c03c0 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1092,7 +1092,7 @@ static void shader_sm4_read_dcl_indexable_temp(struct vkd3d_shader_instruction * static void shader_sm4_read_dcl_global_flags(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - ins->flags = (opcode_token & VKD3D_SM4_GLOBAL_FLAGS_MASK) >> VKD3D_SM4_GLOBAL_FLAGS_SHIFT; + ins->declaration.global_flags = (opcode_token & VKD3D_SM4_GLOBAL_FLAGS_MASK) >> VKD3D_SM4_GLOBAL_FLAGS_SHIFT; } static void shader_sm5_read_fcall(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 2c84cb10..ab148b3b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -642,6 +642,32 @@ enum vkd3d_shader_global_flags VKD3DSGF_SKIP_OPTIMIZATION = 0x10, VKD3DSGF_ENABLE_MINIMUM_PRECISION = 0x20, VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS = 0x40, + VKD3DSGF_ENABLE_SHADER_EXTENSIONS = 0x80, /* never emitted? */ + VKD3DSGF_BIND_FOR_DURATION = 0x100, + VKD3DSGF_ENABLE_VP_AND_RT_ARRAY_INDEX = 0x200, + VKD3DSGF_ENABLE_INNER_COVERAGE = 0x400, + VKD3DSGF_ENABLE_STENCIL_REF = 0x800, + VKD3DSGF_ENABLE_TILED_RESOURCE_INTRINSICS = 0x1000, + VKD3DSGF_ENABLE_RELAXED_TYPED_UAV_FORMATS = 0x2000, + VKD3DSGF_ENABLE_LVL_9_COMPARISON_FILTERING = 0x4000, + VKD3DSGF_ENABLE_UP_TO_64_UAVS = 0x8000, + VKD3DSGF_ENABLE_UAVS_AT_EVERY_STAGE = 0x10000, + VKD3DSGF_ENABLE_CS4_RAW_STRUCTURED_BUFFERS = 0x20000, + VKD3DSGF_ENABLE_RASTERIZER_ORDERED_VIEWS = 0x40000, + VKD3DSGF_ENABLE_WAVE_INTRINSICS = 0x80000, + VKD3DSGF_ENABLE_INT64 = 0x100000, + VKD3DSGF_ENABLE_VIEWID = 0x200000, + VKD3DSGF_ENABLE_BARYCENTRICS = 0x400000, + VKD3DSGF_FORCE_NATIVE_LOW_PRECISION = 0x800000, + VKD3DSGF_ENABLE_SHADINGRATE = 0x1000000, + VKD3DSGF_ENABLE_RAYTRACING_TIER_1_1 = 0x2000000, + VKD3DSGF_ENABLE_SAMPLER_FEEDBACK = 0x4000000, + VKD3DSGF_ENABLE_ATOMIC_INT64_ON_TYPED_RESOURCE = 0x8000000, + VKD3DSGF_ENABLE_ATOMIC_INT64_ON_GROUP_SHARED = 0x10000000, + VKD3DSGF_ENABLE_DERIVATIVES_IN_MESH_AND_AMPLIFICATION_SHADERS = 0x20000000, + VKD3DSGF_ENABLE_RESOURCE_DESCRIPTOR_HEAP_INDEXING = 0x40000000, + VKD3DSGF_ENABLE_SAMPLER_DESCRIPTOR_HEAP_INDEXING = 0x80000000, + VKD3DSGF_ENABLE_ATOMIC_INT64_ON_DESCRIPTOR_HEAP_RESOURCE = 0x100000000ull, }; enum vkd3d_shader_sync_flags @@ -1016,6 +1042,7 @@ struct vkd3d_shader_instruction const struct vkd3d_shader_src_param *predicate; union { + enum vkd3d_shader_global_flags global_flags; struct vkd3d_shader_semantic semantic; struct vkd3d_shader_register_semantic register_semantic; struct vkd3d_shader_primitive_type primitive_type;

1 0

Zebediah Figura : user32/tests: Add basic tests for GetUserObjectSecurity().
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 2408676fa27b793378d8a84ee21ec14ba8908873 URL: https://gitlab.winehq.org/wine/wine/-/commit/2408676fa27b793378d8a84ee21ec1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 15 16:13:40 2023 -0500 user32/tests: Add basic tests for GetUserObjectSecurity(). --- dlls/user32/tests/winstation.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 23b86443af0..805bf57ec6f 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -1093,6 +1093,31 @@ static void test_invisible_winstation(char **argv) SetProcessWindowStation(old_winstation); } +static void test_get_security(void) +{ + SECURITY_INFORMATION info = DACL_SECURITY_INFORMATION; + HDESK desktop = GetThreadDesktop(GetCurrentThreadId()); + DWORD size, expect_size; + char buffer[500]; + BOOL ret; + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetUserObjectSecurity( desktop, &info, NULL, 0, &size ); + ok( !ret, "got %#x\n", ret ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %lu\n", GetLastError() ); + ok( size && size < sizeof(buffer), "got size %lu\n", size ); + expect_size = size; + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetUserObjectSecurity( desktop, &info, buffer, sizeof(buffer), &size ); + ok( ret == TRUE, "got %#x\n", ret ); + ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); + ok( size == expect_size, "got size %lu\n", size ); + ok( IsValidSecurityDescriptor(buffer), "expected valid SD\n" ); +} + START_TEST(winstation) { char **argv; @@ -1126,4 +1151,5 @@ START_TEST(winstation) test_getuserobjectinformation(); test_foregroundwindow(); test_invisible_winstation(argv); + test_get_security(); }

1 0

Alexandros Frantzis : winewayland.drv: Ensure the logical output dimensions have sane values.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: de66ea9df6746917cada71d2c27b5cc38cbdd2f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/de66ea9df6746917cada71d2c27b5c… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Sat Oct 14 17:53:39 2023 +0300 winewayland.drv: Ensure the logical output dimensions have sane values. If the compositor doesn't provide the logical dimensions (or sane ones), use the physical pixel dimensions as the logical dimensions. --- dlls/winewayland.drv/wayland_output.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 268b4593fd8..f5941c10f6f 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -167,6 +167,14 @@ static void wayland_output_done(struct wayland_output *output) output->pending_flags = 0; + /* Ensure the logical dimensions have sane values. */ + if ((!output->current.logical_w || !output->current.logical_h) && + output->current.current_mode) + { + output->current.logical_w = output->current.current_mode->width; + output->current.logical_h = output->current.current_mode->height; + } + pthread_mutex_unlock(&process_wayland.output_mutex); TRACE("name=%s logical=%d,%d+%dx%d\n",

1 0

Bartosz Kosiorek : gdiplus: Optimize GDI32_GdipDrawPath (via prepare_dc function).
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 8cfcc211b8b3c98c7fca68a0cb958bf0b649e7ec URL: https://gitlab.winehq.org/wine/wine/-/commit/8cfcc211b8b3c98c7fca68a0cb958b… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Wed Sep 27 21:31:49 2023 +0200 gdiplus: Optimize GDI32_GdipDrawPath (via prepare_dc function). --- dlls/gdiplus/graphics.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 65b33cdc960..58b2de213a6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -268,15 +268,13 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) width = pen->width; } else{ + REAL scale_x, scale_y; /* Get an estimate for the amount the pen width is affected by the world * transform. (This is similar to what some of the wine drivers do.) */ - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 1.0; - GdipTransformMatrixPoints(&graphics->worldtrans, pt, 2); - width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + - (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); + scale_x = graphics->worldtrans.matrix[0] + graphics->worldtrans.matrix[2]; + scale_y = graphics->worldtrans.matrix[1] + graphics->worldtrans.matrix[3]; + + width = sqrt(scale_x * scale_x + scale_y * scale_y) / sqrt(2.0); width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres, graphics->printer_display);

1 0

Zebediah Figura : advapi32: Implement GetSecurityInfo(SE_WINDOW_OBJECT).
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 245bdef5b11c19ccd4e8625b86267ca731badcc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/245bdef5b11c19ccd4e8625b86267c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 15 16:13:25 2023 -0500 advapi32: Implement GetSecurityInfo(SE_WINDOW_OBJECT). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55763 --- dlls/advapi32/Makefile.in | 2 +- dlls/advapi32/security.c | 15 +++++++++++++++ dlls/advapi32/tests/Makefile.in | 2 +- dlls/advapi32/tests/security.c | 23 +++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index f791e497a74..8ed0754ca9c 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_ADVAPI32_ MODULE = advapi32.dll IMPORTLIB = advapi32 IMPORTS = kernelbase sechost msvcrt -DELAYIMPORTS = rpcrt4 +DELAYIMPORTS = rpcrt4 user32 C_SRCS = \ advapi.c \ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 82feb00a0f0..8d0c6977d72 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1529,6 +1529,21 @@ DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFOR } break; + case SE_WINDOW_OBJECT: + if (!GetUserObjectSecurity( handle, &SecurityInfo, NULL, 0, &size ) + && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); + + if (!(sd = LocalAlloc( 0, size ))) + return ERROR_NOT_ENOUGH_MEMORY; + + if (!GetUserObjectSecurity( handle, &SecurityInfo, sd, size, &size )) + { + LocalFree( sd ); + return GetLastError(); + } + break; + case SE_KERNEL_OBJECT: case SE_FILE_OBJECT: case SE_WMIGUID_OBJECT: diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index c2fc7aeb954..3dec3cbabeb 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advapi32.dll -IMPORTS = advapi32 +IMPORTS = advapi32 user32 C_SRCS = \ cred.c \ diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4f3bcb917b2..2840f6bd75a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8780,6 +8780,28 @@ static void test_IsValidSecurityDescriptor(void) free(sd); } +static void test_window_security(void) +{ + PSECURITY_DESCRIPTOR sd; + BOOL present, defaulted; + HDESK desktop; + DWORD ret; + ACL *dacl; + + desktop = GetThreadDesktop(GetCurrentThreadId()); + + ret = GetSecurityInfo(desktop, SE_WINDOW_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd); + ok(!ret, "got error %lu\n", ret); + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret == TRUE, "got error %lu\n", GetLastError()); + todo_wine ok(present == TRUE, "got present %d\n", present); + ok(defaulted == FALSE, "got defaulted %d\n", defaulted); + + LocalFree(sd); +} + START_TEST(security) { init(); @@ -8850,6 +8872,7 @@ START_TEST(security) test_elevation(); test_group_as_file_owner(); test_IsValidSecurityDescriptor(); + test_window_security(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Alexandros Frantzis : winewayland.drv: Ensure outputs can access xdg information robustly.
by Alexandre Julliard Oct. 16, 2023

Oct. 16, 2023

Module: wine Branch: master Commit: 1bc84c177d15aac42f3a2756a153cccbeaeb1578 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bc84c177d15aac42f3a2756a153cc… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Sat Oct 14 17:39:01 2023 +0300 winewayland.drv: Ensure outputs can access xdg information robustly. Add outputs to the output_list on creation (instead of when they are first configured), so they are detected and "upgraded" with xdg information even if the compositor advertises the zxdg_output_manager global after the wl_outputs themselves. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55788 --- dlls/winewayland.drv/wayland_output.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index 4b2cb0505be..268b4593fd8 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -165,9 +165,6 @@ static void wayland_output_done(struct wayland_output *output) output->current.logical_h = output->pending.logical_h; } - if (wl_list_empty(&output->link)) - wl_list_insert(process_wayland.output_list.prev, &output->link); - output->pending_flags = 0; pthread_mutex_unlock(&process_wayland.output_mutex); @@ -334,6 +331,10 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) if (process_wayland.zxdg_output_manager_v1) wayland_output_use_xdg_extension(output); + pthread_mutex_lock(&process_wayland.output_mutex); + wl_list_insert(process_wayland.output_list.prev, &output->link); + pthread_mutex_unlock(&process_wayland.output_mutex); + return TRUE; err:

1 0