January 2023 - Wine-commits

Nikolay Sivov : vkd3d-shader/hlsl: Implement sqrt() for SM1.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: 3c23e1713c5199855cdeaf678875eab81a151861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c23e1713c5199855cdeaf678875e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 15:44:39 2023 +0300 vkd3d-shader/hlsl: Implement sqrt() for SM1. --- libs/vkd3d-shader/hlsl_codegen.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5e7cfff4..63002a5c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1494,6 +1494,27 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +/* Lower SQRT to RSQ + RCP. */ +static bool lower_sqrt(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_expr *expr; + struct hlsl_ir_node *rsq; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_SQRT) + return false; + + if (!(rsq = hlsl_new_unary_expr(ctx, HLSL_OP1_RSQ, expr->operands[0].node, instr->loc))) + return false; + list_add_before(&expr->node.entry, &rsq->entry); + expr->op = HLSL_OP1_RCP; + hlsl_src_remove(&expr->operands[0]); + hlsl_src_from_node(&expr->operands[0], rsq); + return true; +} + static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_type *type = instr->data_type, *arg_type; @@ -2905,7 +2926,10 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry while (progress); if (profile->major_version < 4) + { transform_ir(ctx, lower_division, body, NULL); + transform_ir(ctx, lower_sqrt, body, NULL); + } transform_ir(ctx, validate_static_object_references, body, NULL);

1 0

Francisco Casas : tests: Test minimum-precision numeric types.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: 4ce6a170539228471a60a1660242c2cf7b6d40a8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4ce6a170539228471a60a1660242c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Dec 14 16:42:35 2022 -0300 tests: Test minimum-precision numeric types. --- Makefile.am | 1 + tests/minimum-precision.shader_test | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Makefile.am b/Makefile.am index be84e829..b237b4af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,6 +117,7 @@ vkd3d_shader_tests = \ tests/math.shader_test \ tests/matrix-semantics.shader_test \ tests/max.shader_test \ + tests/minimum-precision.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/object-references.shader_test \ diff --git a/tests/minimum-precision.shader_test b/tests/minimum-precision.shader_test new file mode 100644 index 00000000..a9b43d74 --- /dev/null +++ b/tests/minimum-precision.shader_test @@ -0,0 +1,21 @@ +[require] +shader model >= 4.0 + + +[pixel shader todo] +float4 main() : sv_target +{ + min16float4 a = {0, 1, 2, 3}; + min10float2 b = {4, 5}; + min16int3 c = {6.4, 7, 8}; + min12int d = 9.4; + min16uint4x2 e = {14.4, 15, 16, 17, 18, 19, 20, 21}; + vector<min10float, 3> g = {22, 23, 24}; + matrix<min16uint, 3, 2> h = {25.4, 26, 27, 28, 29, 30}; + + return mul(e, b) + a + c.xyzx + d + g.xxyz + h[2].xyxy; +} + +[test] +todo draw quad +todo probe all rgba (197.0, 218.0, 238.0, 257.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Reinterpret minimum precision types as their regular counterparts.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: 404a2d6a3d1ad99cce27d19952f8ccfc28785fa6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/404a2d6a3d1ad99cce27d19952f8c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Dec 7 18:06:06 2022 -0300 vkd3d-shader/hlsl: Reinterpret minimum precision types as their regular counterparts. Reinterpret min16float, min10float, min16int, min12int, and min16uint as their regular counterparts: float, float, int, int, uint, respectively. A proper implementation would require adding minimum precision indicators to all the dxbc-tpf instructions that use these types. Consider the output of fxc 10.1 with the following shader: uniform int i; float4 main() : sv_target { min16float4 a = {0, 1, 2, i}; min16int2 b = {4, i}; min10float3 c = {6.4, 7, i}; min12int d = 9.4; min16uint4x2 e = {14.4, 15, 16, 17, 18, 19, 20, i}; return mul(e, b) + a + c.xyzx + d; } However, if the graphics driver doesn't have minimum precision support, it ignores the minimum precision indicators and runs at 32-bit precision, which is equivalent as working with regular types. --- libs/vkd3d-shader/hlsl.c | 66 +++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 18 ++++++++-- tests/minimum-precision.shader_test | 6 ++-- 4 files changed, 85 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 2b41d4d1..01172efd 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -680,6 +680,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; + type->is_minimum_precision = old->is_minimum_precision; switch (old->type) { case HLSL_CLASS_ARRAY: @@ -2392,7 +2393,7 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry) static void declare_predefined_types(struct hlsl_ctx *ctx) { - unsigned int x, y, bt, i; + unsigned int x, y, bt, i, v; struct hlsl_type *type; static const char * const names[] = @@ -2404,7 +2405,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) "uint", "bool", }; - char name[10]; + char name[15]; + + static const char *const variants_float[] = {"min10float", "min16float"}; + static const char *const variants_int[] = {"min12int", "min16int"}; + static const char *const variants_uint[] = {"min16uint"}; static const char *const sampler_names[] = { @@ -2464,6 +2469,63 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + unsigned int n_variants = 0; + const char *const *variants; + + switch (bt) + { + case HLSL_TYPE_FLOAT: + variants = variants_float; + n_variants = ARRAY_SIZE(variants_float); + break; + + case HLSL_TYPE_INT: + variants = variants_int; + n_variants = ARRAY_SIZE(variants_int); + break; + + case HLSL_TYPE_UINT: + variants = variants_uint; + n_variants = ARRAY_SIZE(variants_uint); + break; + + default: + break; + } + + for (v = 0; v < n_variants; ++v) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", variants[v], y, x); + type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + + if (y == 1) + { + sprintf(name, "%s%u", variants[v], x); + type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + + if (x == 1) + { + sprintf(name, "%s", variants[v]); + type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); + type->is_minimum_precision = 1; + hlsl_scope_add_type(ctx->globals, type); + } + } + } + } + } + } + for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f9526d9f..bb63f827 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -191,6 +191,8 @@ struct hlsl_type unsigned int reg_size; /* Offset where the type's description starts in the output bytecode, in bytes. */ size_t bytecode_offset; + + uint32_t is_minimum_precision : 1; }; /* In HLSL, a semantic is a string linked to a variable (or a field) to be recognized across diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 93d4ca7d..bca49ee6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4197,7 +4197,8 @@ type: YYABORT; } - $$ = hlsl_get_vector_type(ctx, $3->base_type, $5); + $$ = hlsl_type_clone(ctx, hlsl_get_vector_type(ctx, $3->base_type, $5), 0, 0); + $$->is_minimum_precision = $3->is_minimum_precision; } | KW_VECTOR { @@ -4229,7 +4230,8 @@ type: YYABORT; } - $$ = hlsl_get_matrix_type(ctx, $3->base_type, $7, $5); + $$ = hlsl_type_clone(ctx, hlsl_get_matrix_type(ctx, $3->base_type, $7, $5), 0, 0); + $$->is_minimum_precision = $3->is_minimum_precision; } | KW_MATRIX { @@ -4298,6 +4300,18 @@ type: | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); + if ($$->is_minimum_precision) + { + if (ctx->profile->major_version < 4) + { + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Target profile doesn't support minimum-precision types."); + } + else + { + FIXME("Reinterpreting type %s.\n", $$->name); + } + } vkd3d_free($1); } | KW_STRUCT TYPE_IDENTIFIER diff --git a/tests/minimum-precision.shader_test b/tests/minimum-precision.shader_test index a9b43d74..e5053e3d 100644 --- a/tests/minimum-precision.shader_test +++ b/tests/minimum-precision.shader_test @@ -2,7 +2,7 @@ shader model >= 4.0 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { min16float4 a = {0, 1, 2, 3}; @@ -17,5 +17,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (197.0, 218.0, 238.0, 257.0) +draw quad +probe all rgba (197.0, 218.0, 238.0, 257.0)

1 0

Zebediah Figura : tests: Add a test for compute thread IDs.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: 809a43f06b56f146e71783420a752ce651f47ebf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/809a43f06b56f146e71783420a752… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 18:55:56 2021 -0500 tests: Add a test for compute thread IDs. --- tests/d3d12.c | 39 ------------ tests/d3d12_test_utils.h | 29 +++++++++ tests/hlsl_d3d12.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ tests/utils.h | 10 +++ 4 files changed, 200 insertions(+), 39 deletions(-)

1 0

Alexandre Julliard : fixup! tests: Add a test for compute thread IDs.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: ef413356e25e38b997e7c69eef951c245b17ed7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ef413356e25e38b997e7c69eef951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 25 22:10:30 2023 +0100 fixup! tests: Add a test for compute thread IDs. --- tests/d3d12.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ea569bc3..56d8aa39 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11692,7 +11692,7 @@ static void test_root_signature_byte_code(void) HRESULT hr; #if 0 - #define RS "" +#define RS "" #endif /* /T rootsig_1_0 /E RS */ static const DWORD empty_rootsig[] = @@ -11718,7 +11718,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" +#define RS "RootFlags(ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)" #endif static const DWORD ia_rootsig[] = { @@ -11742,7 +11742,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" +#define RS "RootFlags(DENY_PIXEL_SHADER_ROOT_ACCESS)" #endif static const DWORD deny_ps_rootsig[] = { @@ -11766,7 +11766,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b3, space = 0)" +#define RS "CBV(b3, space = 0)" #endif static const DWORD cbv_rootsig[] = { @@ -11801,7 +11801,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" +#define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_GEOMETRY)" #endif static const DWORD cbv2_rootsig[] = { @@ -11835,7 +11835,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" +#define RS "RootFlags(DENY_VERTEX_SHADER_ROOT_ACCESS), SRV(t13)" #endif static const DWORD srv_rootsig[] = { @@ -11871,7 +11871,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "UAV(u6)" +#define RS "UAV(u6)" #endif static const DWORD uav_rootsig[] = { @@ -11905,7 +11905,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ +#define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ "SRV(t13, flags = DATA_STATIC), " \ "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)" #endif @@ -11941,7 +11941,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "RootConstants(num32BitConstants=3, b4), " \ +#define RS "RootConstants(num32BitConstants=3, b4), " \ "RootConstants(num32BitConstants=4, b5, space = 3)" #endif static const DWORD constants_rootsig[] = @@ -11980,7 +11980,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "DescriptorTable(CBV(b1, space = 7), " \ +#define RS "DescriptorTable(CBV(b1, space = 7), " \ "SRV(t16, numDescriptors = 8), " \ "UAV(u3, numDescriptors = unbounded, offset = 44))" #endif @@ -12034,7 +12034,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ +#define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \ "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))" #endif @@ -12068,7 +12068,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "StaticSampler(s4)" +#define RS "StaticSampler(s4)" #endif static const DWORD default_static_sampler_rootsig[] = { @@ -12108,7 +12108,7 @@ static void test_root_signature_byte_code(void) }; #if 0 - #define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ +#define RS "StaticSampler(s0, filter = FILTER_MIN_MAG_MIP_POINT, " \ "addressV = TEXTURE_ADDRESS_CLAMP, visibility = SHADER_VISIBILITY_PIXEL), " \ "StaticSampler(s0, filter = FILTER_MIN_MAG_POINT_MIP_LINEAR, " \ "AddressW = TEXTURE_ADDRESS_BORDER, MipLODBias = 1, maxLod = 10, " \ @@ -21426,7 +21426,7 @@ static void test_tgsm(void) static const DWORD structured_tgsm_code[] = { #if 0 - #define GROUP_SIZE 32 +#define GROUP_SIZE 32 RWByteAddressBuffer u; RWByteAddressBuffer u2; @@ -21477,7 +21477,7 @@ static void test_tgsm(void) static const DWORD structured_tgsm_float_code[] = { #if 0 - #define GROUP_SIZE 32 +#define GROUP_SIZE 32 struct data {

1 0

Conor McCarthy : vkd3d: Store a heap array index in each CBV/SRV/UAV descriptor.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: vkd3d Branch: master Commit: 3db509383b9f5a0963e76c08dcb2fe903a6ed560 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3db509383b9f5a0963e76c08dcb2f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 25 15:25:48 2023 +1000 vkd3d: Store a heap array index in each CBV/SRV/UAV descriptor. A pointer to the containing descriptor heap can be derived from this information. PE build of vkd3d uses Windows critical sections for synchronisation, and these slow down on the very high lock/unlock rate during multithreaded descriptor copying in Shadow of the Tomb Raider. This patch speeds up the demo by about 8%. By comparison, using SRW locks in the allocators and locking them for read only where applicable is about 4% faster. --- libs/vkd3d/command.c | 57 +++++-------- libs/vkd3d/device.c | 195 +++------------------------------------------ libs/vkd3d/resource.c | 174 +++++++++++++++++++++------------------- libs/vkd3d/vkd3d_private.h | 57 ++++++------- 4 files changed, 149 insertions(+), 334 deletions(-)

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.IVectorChangedEventArgs definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: a483e9928b4787d93f3bbe417f0a2fcbbaf7c564 URL: https://gitlab.winehq.org/wine/wine/-/commit/a483e9928b4787d93f3bbe417f0a2f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IVectorChangedEventArgs definition. --- include/Makefile.in | 1 + include/ivectorchangedeventargs.idl | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 54cbf4d955c..40d9bf44fdd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -378,6 +378,7 @@ SOURCES = \ iprtrmib.h \ iptypes.h \ isguids.h \ + ivectorchangedeventargs.idl \ knownfolders.h \ ks.h \ ksguid.h \ diff --git a/include/ivectorchangedeventargs.idl b/include/ivectorchangedeventargs.idl new file mode 100644 index 00000000000..45720b595f2 --- /dev/null +++ b/include/ivectorchangedeventargs.idl @@ -0,0 +1,49 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windowscontracts.idl"; + +namespace Windows.Foundation.Collections { + [contract(Windows.Foundation.FoundationContract, 1.0)] + enum CollectionChange + { + Reset = 0, + ItemInserted = 1, + ItemRemoved = 2, + ItemChanged = 3, + }; + typedef enum CollectionChange CollectionChange; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(575933df-34fe-4480-af15-07691f3d5d9b), + pointer_default(unique), + version(0x06020000 /* NTDDI_WIN8 */), + object, + ] + interface IVectorChangedEventArgs : IInspectable + { + [propget] HRESULT CollectionChange([out, retval] CollectionChange *value); + [propget] HRESULT Index([out, retval] unsigned *value); + }; +}

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.IMapChangedEventArgs<T> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: f122309f356571505d7cd6ec940bcede8781fb30 URL: https://gitlab.winehq.org/wine/wine/-/commit/f122309f356571505d7cd6ec940bce… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IMapChangedEventArgs<T> definition. --- include/windows.foundation.collections.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 395adad27aa..567c411e129 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -24,6 +24,7 @@ import "inspectable.idl"; import "asyncinfo.idl"; import "windowscontracts.idl"; /* import "eventtoken.idl"; */ +import "ivectorchangedeventargs.idl"; namespace Windows { namespace Foundation { @@ -105,6 +106,16 @@ cpp_quote("#endif") HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(9939f4df-050a-4c0f-aa60-77075f9c4777) + ] + interface IMapChangedEventArgs<T> : IInspectable + { + [propget] HRESULT CollectionChanged([out, retval] Windows.Foundation.Collections.CollectionChange *value); + [propget] HRESULT Key([out, retval] T *key); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(02b51929-c1c4-4a7e-8940-0312b5c18500)

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.MapChangedEventHandler<K, V> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 634b163407dab08406b014157991c3e69909a483 URL: https://gitlab.winehq.org/wine/wine/-/commit/634b163407dab08406b014157991c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.MapChangedEventHandler<K, V> definition. --- include/windows.foundation.collections.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 567c411e129..31da63d5f5d 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -116,6 +116,15 @@ cpp_quote("#endif") [propget] HRESULT Key([out, retval] T *key); } + interface IObservableMap<K, V>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(179517f3-94ee-41f8-bddc-768a895544f3) + ] + delegate HRESULT MapChangedEventHandler<K, V>([in] Windows.Foundation.Collections.IObservableMap<K, V> *sender, + [in] Windows.Foundation.Collections.IMapChangedEventArgs<K> *args); + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(02b51929-c1c4-4a7e-8940-0312b5c18500)

1 0

Rémi Bernon : include: Add Windows.Foundation.Collections.IMap<K, V> definition.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 44906b6051c216a021f0449f5e1b627e14f24948 URL: https://gitlab.winehq.org/wine/wine/-/commit/44906b6051c216a021f0449f5e1b62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.Collections.IMap<K, V> definition. --- include/windows.foundation.collections.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 31da63d5f5d..8156a833a96 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -149,6 +149,22 @@ cpp_quote("#endif") [out] Windows.Foundation.Collections.IMapView<K, V> **second); } + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(3c2925fe-8519-45c1-aa79-197b6718c1c1) + ] + interface IMap<K, V> : IInspectable + requires Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<K, V> *> + { + HRESULT Lookup([in] K key, [out, retval] V *value); + [propget] HRESULT Size([out, retval] unsigned int *size); + HRESULT HasKey([in] K key, [out, retval] boolean *found); + HRESULT GetView([out, retval] Windows.Foundation.Collections.IMapView<K, V> **view); + HRESULT Insert([in] K key, [in] V value, [out, retval] boolean *replaced); + HRESULT Remove([in] K key); + HRESULT Clear(); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)

1 0