January 2023 - Wine-Commits

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

Jan. 25, 2023

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 Jan. 25, 2023

Jan. 25, 2023

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

Nikolay Sivov : vkd3d-shader/hlsl: Support frac() intrinsic.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 3e6fccdbf96802f62b001cd2461af2c6a58b85a4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e6fccdbf96802f62b001cd2461af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 10:57:18 2023 +0300 vkd3d-shader/hlsl: Support frac() intrinsic. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34242 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ tests/frac.shader_test | 12 ++++++++++++ 4 files changed, 29 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0536c53b..be84e829 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/compute.shader_test \ tests/conditional.shader_test \ tests/floor.shader_test \ + tests/frac.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-attributes.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b3e38d1f..93d4ca7d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2502,6 +2502,17 @@ static bool intrinsic_floor(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FLOOR, arg, loc); } +static bool intrinsic_frac(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_FRACT, arg, loc); +} + static bool intrinsic_ldexp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2922,6 +2933,7 @@ intrinsic_functions[] = {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, {"floor", 1, true, intrinsic_floor}, + {"frac", 1, true, intrinsic_frac}, {"ldexp", 2, true, intrinsic_ldexp}, {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index ba22925e..fb505473 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -658,6 +658,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_binary_op(ctx, buffer, D3DSIO_MUL, &instr->reg, &arg1->reg, &arg2->reg); break; + case HLSL_OP1_FRACT: + write_sm1_unary_op(ctx, buffer, D3DSIO_FRC, &instr->reg, &arg1->reg, D3DSPSM_NONE); + break; + default: hlsl_fixme(ctx, &instr->loc, "SM1 \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; diff --git a/tests/frac.shader_test b/tests/frac.shader_test new file mode 100644 index 00000000..f54f3fe8 --- /dev/null +++ b/tests/frac.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return frac(f); +} + +[test] +uniform 0 float4 -1.1 1.6 1.3 0.5 +draw quad +probe all rgba (0.9, 0.6, 0.3, 0.5) 2

1 0

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

Jan. 25, 2023

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

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

Jan. 25, 2023

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

Nikolay Sivov : vkd3d-shader/hlsl: Handle RSQ output for SM1.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: b84b9349bfe547ee8fb49a94a90f7c2348b1b3ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b84b9349bfe547ee8fb49a94a90f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 24 15:44:09 2023 +0300 vkd3d-shader/hlsl: Handle RSQ output for SM1. --- libs/vkd3d-shader/hlsl_sm1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index fb505473..5050b7a9 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -632,13 +632,14 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; case HLSL_OP1_RCP: + case HLSL_OP1_RSQ: for (i = 0; i < instr->data_type->dimx; ++i) { struct hlsl_reg src = arg1->reg, dst = instr->reg; src.writemask = hlsl_combine_writemasks(src.writemask, 1u << i); dst.writemask = hlsl_combine_writemasks(dst.writemask, 1u << i); - write_sm1_unary_op(ctx, buffer, D3DSIO_RCP, &dst, &src, 0); + write_sm1_unary_op(ctx, buffer, expr->op == HLSL_OP1_RCP ? D3DSIO_RCP : D3DSIO_RSQ, &dst, &src, 0); } break;

1 0

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

Jan. 25, 2023

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

Jinoh Kang : ws2_32/test: Fix sockaddr buffer overflow in test_reuseaddr.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 876742bf2bf23765cd8a845a20b297cdf7803c67 URL: https://gitlab.winehq.org/wine/wine/-/commit/876742bf2bf23765cd8a845a20b297… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jan 26 02:20:34 2023 +0900 ws2_32/test: Fix sockaddr buffer overflow in test_reuseaddr. Today, test_reuseaddr() triggers a buffer overflow when accept()-ing an IPv6 client due to the supplied peer name buffer (`struct sockaddr`) being too small to hold an AF_INET6 address (`struct sockaddr_in6`). Fix this by changing the type of `saddr` from `struct sockaddr` to `struct sockaddr_storage`. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54376 --- dlls/ws2_32/tests/sock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6f2bcb73a06..1336889b9fd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2153,7 +2153,7 @@ static void test_reuseaddr(void) }; unsigned int rc, reuse, value; - struct sockaddr saddr; + struct sockaddr_storage saddr; SOCKET s1, s2, s3, s4; unsigned int i, j; int size; @@ -2245,7 +2245,7 @@ static void test_reuseaddr(void) /* The connection is delivered to the first socket. */ size = tests[i].addrlen; - s4 = accept(s1, &saddr, &size); + s4 = accept(s1, (struct sockaddr *)&saddr, &size); ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); closesocket(s1); @@ -2279,7 +2279,7 @@ static void test_reuseaddr(void) ok(!rc, "got error %d.\n", WSAGetLastError()); size = tests[i].addrlen; - s4 = accept(s2, &saddr, &size); + s4 = accept(s2, (struct sockaddr *)&saddr, &size); todo_wine ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); closesocket(s1); @@ -2313,7 +2313,7 @@ static void test_reuseaddr(void) rc = connect(s3, tests[i].addr_loopback, tests[i].addrlen); ok(!rc, "got error %d.\n", WSAGetLastError()); size = tests[i].addrlen; - s4 = accept(s1, &saddr, &size); + s4 = accept(s1, (struct sockaddr *)&saddr, &size); ok(s4 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError());

1 0

Rémi Bernon : include: Add Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> definition.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: c5c9108d8c67e55720c121ffd7e6ae09b8aad80a URL: https://gitlab.winehq.org/wine/wine/-/commit/c5c9108d8c67e55720c121ffd7e6ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 include: Add Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> definition. --- include/windows.foundation.collections.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 0f10f4dbc00..680d7803cc8 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -96,6 +96,34 @@ cpp_quote("#endif") HRESULT GetResults(); } + interface IAsyncOperationWithProgress<TResult, TProgress>; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(55690902-0aab-421a-8778-f8ce5026d758) + ] + delegate HRESULT AsyncOperationProgressHandler<TResult, TProgress>([in] Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> *info, + [in] TProgress progress); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(e85df41d-6aa7-46e3-a8e2-f009d840c627) + ] + delegate HRESULT AsyncOperationWithProgressCompletedHandler<TResult, TProgress>([in] Windows.Foundation.IAsyncOperationWithProgress<TResult, TProgress> *info, + [in] AsyncStatus status); + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(b5d036d7-e297-498f-ba60-0289e76e23dd) + ] + interface IAsyncOperationWithProgress<TResult, TProgress> : IInspectable + { + [propput] HRESULT Progress([in] Windows.Foundation.AsyncOperationProgressHandler<TResult, TProgress> *handler); + [propget] HRESULT Progress([out, retval] Windows.Foundation.AsyncOperationProgressHandler<TResult, TProgress> **handler); + [propput] HRESULT Completed([in] Windows.Foundation.AsyncOperationWithProgressCompletedHandler<TResult, TProgress> *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncOperationWithProgressCompletedHandler<TResult, TProgress> **handler); + HRESULT GetResults([out, retval] TResult *results); + } + [ contract(Windows.Foundation.FoundationContract, 1.0), uuid(9de1c534-6ae1-11e0-84e1-18a905bcc53f)

1 0

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

Jan. 25, 2023

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