- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_expr().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: vkd3d Branch: master Commit: 819c5f194396d59c7bcab12f306c418c80ea927b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/819c5f194396d59c7bcab12f306c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:43:13 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_expr(). --- libs/vkd3d-shader/hlsl.y | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 12f567e3..08bb1319 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1309,7 +1309,7 @@ static bool expr_common_shape(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct return true; } -static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, +static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) { @@ -1333,38 +1333,38 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, for (i = 0; i < type->dimy * type->dimx; ++i) { struct hlsl_ir_node *value, *cell_operands[HLSL_MAX_OPERANDS] = { NULL }; - struct hlsl_block block; + struct hlsl_block store_block; unsigned int j; for (j = 0; j < HLSL_MAX_OPERANDS; j++) { if (operands[j]) { - if (!(load = hlsl_add_load_component(ctx, instrs, operands[j], i, loc))) + if (!(load = hlsl_add_load_component(ctx, block_to_list(block), operands[j], i, loc))) return NULL; cell_operands[j] = load; } } - if (!(value = add_expr(ctx, instrs, op, cell_operands, scalar_type, loc))) + if (!(value = add_expr(ctx, block, op, cell_operands, scalar_type, loc))) return NULL; - if (!hlsl_new_store_component(ctx, &block, &var_deref, i, value)) + if (!hlsl_new_store_component(ctx, &store_block, &var_deref, i, value)) return NULL; - list_move_tail(instrs, &block.instrs); + hlsl_block_add_block(block, &store_block); } if (!(var_load = hlsl_new_var_load(ctx, var, loc))) return NULL; - list_add_tail(instrs, &var_load->node.entry); + hlsl_block_add_instr(block, &var_load->node); return &var_load->node; } if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc))) return NULL; - list_add_tail(instrs, &expr->entry); + hlsl_block_add_instr(block, expr); return expr; } @@ -1395,7 +1395,7 @@ static struct hlsl_ir_node *add_unary_arithmetic_expr(struct hlsl_ctx *ctx, stru { struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {arg}; - return add_expr(ctx, block_to_list(block), op, args, arg->data_type, loc); + return add_expr(ctx, block, op, args, arg->data_type, loc); } static struct hlsl_ir_node *add_unary_bitwise_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1418,7 +1418,7 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct if (!(args[0] = add_implicit_conversion(ctx, block, arg, bool_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, bool_type, loc); + return add_expr(ctx, block, op, args, bool_type, loc); } static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, @@ -1449,7 +1449,7 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, common_type, loc); + return add_expr(ctx, block, op, args, common_type, loc); } static struct hlsl_ir_node *add_binary_bitwise_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1484,7 +1484,7 @@ static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, str if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, return_type, loc); + return add_expr(ctx, block, op, args, return_type, loc); } static struct hlsl_ir_node *add_binary_logical_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1507,7 +1507,7 @@ static struct hlsl_ir_node *add_binary_logical_expr(struct hlsl_ctx *ctx, struct if (!(args[1] = add_implicit_conversion(ctx, block, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, common_type, loc); + return add_expr(ctx, block, op, args, common_type, loc); } static struct hlsl_ir_node *add_binary_shift_expr(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -1538,7 +1538,7 @@ static struct hlsl_ir_node *add_binary_shift_expr(struct hlsl_ctx *ctx, struct h if (!(args[1] = add_implicit_conversion(ctx, block, arg2, integer_type, loc))) return NULL; - return add_expr(ctx, block_to_list(block), op, args, return_type, loc); + return add_expr(ctx, block, op, args, return_type, loc); } static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct hlsl_block *instrs, @@ -1591,7 +1591,7 @@ static struct hlsl_ir_node *add_binary_dot_expr(struct hlsl_ctx *ctx, struct hls if (!(args[1] = add_implicit_conversion(ctx, instrs, arg2, common_type, loc))) return NULL; - return add_expr(ctx, block_to_list(instrs), op, args, ret_type, loc); + return add_expr(ctx, instrs, op, args, ret_type, loc); } static struct hlsl_block *add_binary_expr_merge(struct hlsl_ctx *ctx, struct hlsl_block *block1, @@ -2555,7 +2555,7 @@ static bool intrinsic_asfloat(struct hlsl_ctx *ctx, data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_FLOAT); operands[0] = params->args[0]; - return add_expr(ctx, block_to_list(params->instrs), HLSL_OP1_REINTERPRET, operands, data_type, loc); + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); } static bool intrinsic_asuint(struct hlsl_ctx *ctx, @@ -2591,7 +2591,7 @@ static bool intrinsic_asuint(struct hlsl_ctx *ctx, data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_UINT); operands[0] = params->args[0]; - return add_expr(ctx, block_to_list(params->instrs), HLSL_OP1_REINTERPRET, operands, data_type, loc); + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); } static bool intrinsic_clamp(struct hlsl_ctx *ctx,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_implicit_conversion().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: vkd3d Branch: master Commit: fe70ee2158fe7cb7dbf58ab4807b238c12dbb902 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe70ee2158fe7cb7dbf58ab4807b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:34:25 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_implicit_conversion(). --- libs/vkd3d-shader/hlsl.y | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_array_access().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: vkd3d Branch: master Commit: 21d5ee4df254b8953d469611a1f2a9f183b4a343 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/21d5ee4df254b8953d469611a1f2a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:30:28 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_array_access(). --- libs/vkd3d-shader/hlsl.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4ae81816..03767ff2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -722,7 +722,7 @@ static struct hlsl_ir_node *add_binary_arithmetic_expr(struct hlsl_ctx *ctx, str enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc); -static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct hlsl_ir_node *array, +static bool add_array_access(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *array, struct hlsl_ir_node *index, const struct vkd3d_shader_location *loc) { const struct hlsl_type *expr_type = array->data_type, *index_type = index->data_type; @@ -745,13 +745,13 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h return false; } - if (!(index = add_implicit_conversion(ctx, instrs, index, + if (!(index = add_implicit_conversion(ctx, block_to_list(block), index, hlsl_get_vector_type(ctx, HLSL_TYPE_UINT, dim_count), &index->loc))) return false; if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; - list_add_tail(instrs, &return_index->entry); + hlsl_block_add_instr(block, return_index); return true; } @@ -764,7 +764,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(cast = hlsl_new_cast(ctx, index, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT), &index->loc))) return false; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); index = cast; if (expr_type->class != HLSL_CLASS_ARRAY && expr_type->class != HLSL_CLASS_VECTOR && expr_type->class != HLSL_CLASS_MATRIX) @@ -778,7 +778,7 @@ static bool add_array_access(struct hlsl_ctx *ctx, struct list *instrs, struct h if (!(return_index = hlsl_new_index(ctx, array, index, loc))) return false; - list_add_tail(instrs, &return_index->entry); + hlsl_block_add_instr(block, return_index); return true; } @@ -6165,7 +6165,7 @@ postfix_expr: hlsl_block_add_block($3, $1); destroy_block($1); - if (!add_array_access(ctx, block_to_list($3), array, index, &@2)) + if (!add_array_access(ctx, $3, array, index, &@2)) { destroy_block($3); YYABORT;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_cast().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: vkd3d Branch: master Commit: 9d94506313e648082ece837ae525001372b63d9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d94506313e648082ece837ae5250… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:40:53 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_cast(). --- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2e5be57e..12f567e3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -294,7 +294,7 @@ static bool implicit_compatible_data_types(struct hlsl_ctx *ctx, struct hlsl_typ return hlsl_types_are_componentwise_equal(ctx, src, dst); } -static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, +static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct hlsl_block *block, struct hlsl_ir_node *node, struct hlsl_type *dst_type, const struct vkd3d_shader_location *loc) { struct hlsl_type *src_type = node->data_type; @@ -331,7 +331,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, { struct hlsl_ir_node *component_load; struct hlsl_type *dst_comp_type; - struct hlsl_block block; + struct hlsl_block store_block; unsigned int src_idx; if (broadcast) @@ -351,21 +351,21 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, dst_comp_type = hlsl_type_get_component_type(ctx, dst_type, dst_idx); - if (!(component_load = hlsl_add_load_component(ctx, instrs, node, src_idx, loc))) + if (!(component_load = hlsl_add_load_component(ctx, block_to_list(block), node, src_idx, loc))) return NULL; if (!(cast = hlsl_new_cast(ctx, component_load, dst_comp_type, loc))) return NULL; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); - if (!hlsl_new_store_component(ctx, &block, &var_deref, dst_idx, cast)) + if (!hlsl_new_store_component(ctx, &store_block, &var_deref, dst_idx, cast)) return NULL; - list_move_tail(instrs, &block.instrs); + hlsl_block_add_block(block, &store_block); } if (!(load = hlsl_new_var_load(ctx, var, loc))) return NULL; - list_add_tail(instrs, &load->node.entry); + hlsl_block_add_instr(block, &load->node); return &load->node; } @@ -373,7 +373,7 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, { if (!(cast = hlsl_new_cast(ctx, node, dst_type, loc))) return NULL; - list_add_tail(instrs, &cast->entry); + hlsl_block_add_instr(block, cast); return cast; } } @@ -404,7 +404,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct hlsl_warning(ctx, loc, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION, "Implicit truncation of %s type.", src_type->class == HLSL_CLASS_VECTOR ? "vector" : "matrix"); - return add_cast(ctx, &block->instrs, node, dst_type, loc); + return add_cast(ctx, block, node, dst_type, loc); } static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, @@ -2252,7 +2252,7 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var } hlsl_block_add_instr(&ctx->static_initializers, zero); - if (!(cast = add_cast(ctx, &ctx->static_initializers.instrs, zero, var->data_type, &var->loc))) + if (!(cast = add_cast(ctx, &ctx->static_initializers, zero, var->data_type, &var->loc))) { free_parse_variable_def(v); continue; @@ -3692,7 +3692,7 @@ static struct hlsl_block *add_call(struct hlsl_ctx *ctx, const char *name, { struct hlsl_ir_node *cast; - if (!(cast = add_cast(ctx, block_to_list(args->instrs), arg, param->data_type, &arg->loc))) + if (!(cast = add_cast(ctx, args->instrs, arg, param->data_type, &arg->loc))) goto fail; args->args[i] = cast; arg = cast; @@ -6304,7 +6304,7 @@ unary_expr: YYABORT; } - if (!add_cast(ctx, block_to_list($6), node_from_block($6), dst_type, &@3)) + if (!add_cast(ctx, $6, node_from_block($6), dst_type, &@3)) { destroy_block($6); YYABORT;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_method_call().
by Alexandre Julliard July 27, 2023

July 27, 2023

Module: vkd3d Branch: master Commit: c861a937e8b2722fd6d5090abf812218563a91c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c861a937e8b2722fd6d5090abf812… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 14 20:28:17 2022 -0600 vkd3d-shader/hlsl: Pass an hlsl_block pointer to add_method_call(). --- libs/vkd3d-shader/hlsl.y | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-)

1 0

Zebediah Figura : httpapi/tests: Do not test that a local TCP port is closed.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 3d02e9870a3cae7b0cbb339d37dbed0749c8441a URL: https://gitlab.winehq.org/wine/wine/-/commit/3d02e9870a3cae7b0cbb339d37dbed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 21 20:02:16 2023 -0500 httpapi/tests: Do not test that a local TCP port is closed. I suspect the intent of this test was to verify that httpapi really doesn't bind to that port. That HttpAddUrlToUrlGroup() fails implies this, but paranoia in a case like this is rarely unwarranted. However, this test cannot reliably succeed; some other operating system component may open a TCP port in the meantime, and it appears that on Windows 10 this does in fact happen. Since the goal of the test is just extra paranoia, I don't think it's worth keeping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55127 --- dlls/httpapi/tests/httpapi.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fa412b1093a..9db21635d3a 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1384,7 +1384,7 @@ static void test_v2_bound_port(void) WCHAR url[50]; HANDLE queue, dummy_queue; int ret; - SOCKET s, s2; + SOCKET s2; ret = pHttpCreateServerSession(version, &session, 0); ok(!ret, "Failed to create session, error %u.\n", ret); @@ -1421,12 +1421,6 @@ static void test_v2_bound_port(void) ret = pHttpSetUrlGroupProperty(group, HttpServerBindingProperty, &binding, sizeof(binding)); ok(!ret, "Failed to rebind request queue, error %u.\n", ret); - s = socket(AF_INET, SOCK_STREAM, 0); - ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); - ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); - - closesocket(s); ret = pHttpCloseRequestQueue(dummy_queue); ok(!ret, "Failed to close queue handle, error %u.\n", ret); ret = pHttpCloseRequestQueue(queue);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 330ef7a10bc8073e582d96e5685809254b20a5a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/330ef7a10bc8073e582d96e5685809… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jul 22 00:48:28 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index 334e48f53c9..eeef3ee9105 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-07-21 00:09+0300\n" +"PO-Revision-Date: 2023-07-22 00:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14853,51 +14853,40 @@ msgstr "Pirminis DNS sufiksas" #: programs/klist/klist.rc:28 msgid "Usage: klist <tickets | tgt | purge | get [service principal name]>\n" msgstr "" +"Naudojimas: klist <tickets | tgt | purge | get [tarnybos pagrindinis " +"pavadinimas]>\n" #: programs/klist/klist.rc:29 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown error\n" -msgstr "Nežinoma klaida" +msgstr "Nežinoma klaida\n" #: programs/klist/klist.rc:30 -#, fuzzy -#| msgid "Start Menu" msgid "Start Time" -msgstr "Pradžios meniu" +msgstr "Pradžios laikas" #: programs/klist/klist.rc:31 -#, fuzzy -#| msgctxt "maximum 31 characters" -#| msgid "FLE Standard Time" msgid "End Time" -msgstr "SLE juostinis laikas" +msgstr "Pabaigos laikas" #: programs/klist/klist.rc:32 -#, fuzzy -#| msgid "Enter new time: " msgid "Renew Time" -msgstr "Įveskite naują laiką: " +msgstr "Atnaujinimo laikas" #: programs/klist/klist.rc:33 msgid "Ticket Flags" -msgstr "" +msgstr "Leidimo žymos" #: programs/klist/klist.rc:34 msgid "Cached Tickets" -msgstr "" +msgstr "Leidimai podėlyje" #: programs/klist/klist.rc:36 -#, fuzzy -#| msgid "Encryption Type" msgid "KerbTicket Encryption Type" -msgstr "Šifravimo tipas" +msgstr "Kerberos leidimo šifravimo tipas" #: programs/klist/klist.rc:37 -#, fuzzy -#| msgid "Current Connections" msgid "Current LogonId is" -msgstr "Dabartiniai ryšiai" +msgstr "Dabartinis prisijungimo ID yra" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Zebediah Figura : ws2_32: Move the event reset in WSAEnumNetworkEvents() to the server.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 01afb21bf2b3a9c6b03847b03a1ac4a572ed49a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/01afb21bf2b3a9c6b03847b03a1ac4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 01:44:06 2023 -0500 ws2_32: Move the event reset in WSAEnumNetworkEvents() to the server. So that it is done atomically with retrieving events. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=52474 --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/afd.c | 14 ++++++++++++++ server/sock.c | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5d647d12699..8ef7920e0fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3604,10 +3604,8 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret TRACE( "socket %#Ix, event %p, events %p\n", s, event, ret_events ); - ResetEvent( event ); - status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, - NULL, 0, &params, sizeof(params) ); + event, 0, &params, sizeof(params) ); if (!status) { ret_events->lNetworkEvents = afd_poll_flag_to_win32( params.flags ); diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 97139605bf1..b856caee853 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1969,6 +1969,20 @@ static void test_get_events(void) for (i = 0; i < ARRAY_SIZE(params.status); ++i) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + SetEvent(event); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, event, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(!params.flags, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + + ret = WaitForSingleObject(event, 0); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + closesocket(client); closesocket(server); diff --git a/server/sock.c b/server/sock.c index f24abd2ab6f..550fe61e477 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3919,6 +3919,7 @@ DECL_HANDLER(socket_get_events) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); unsigned int status[13]; + struct event *event = NULL; unsigned int i; if (get_reply_max_size() < sizeof(status)) @@ -3929,6 +3930,15 @@ DECL_HANDLER(socket_get_events) if (!sock) return; + if (req->event) + { + if (!(event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ))) + { + release_object( sock ); + return; + } + } + reply->flags = sock->pending_events & sock->mask; for (i = 0; i < ARRAY_SIZE( status ); ++i) status[i] = sock_get_ntstatus( sock->errors[i] ); @@ -3936,6 +3946,12 @@ DECL_HANDLER(socket_get_events) sock->pending_events &= ~sock->mask; sock_reselect( sock ); + if (event) + { + reset_event( event ); + release_object( event ); + } + set_reply_data( status, sizeof(status) ); release_object( sock );

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.259.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: b5e19a33c9360784961918a364175ab2ad93870d URL: https://gitlab.winehq.org/wine/wine/-/commit/b5e19a33c9360784961918a364175a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Sat Jul 22 16:46:06 2023 +0200 winevulkan: Update to VK spec version 1.3.259. --- dlls/winevulkan/loader_thunks.c | 34 ++++++++ dlls/winevulkan/loader_thunks.h | 24 ++++++ dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan_thunks.c | 179 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 6 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 47 ++++++++++- 7 files changed, 291 insertions(+), 6 deletions(-)

1 0

Zebediah Figura : server: Move the implementation of IOCTL_AFD_GET_EVENTS to a dedicated server call.
by Alexandre Julliard July 24, 2023

July 24, 2023

Module: wine Branch: master Commit: 0a33ac4a53acf46cd5a709177bf998330f6cca90 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a33ac4a53acf46cd5a709177bf998… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 22 01:40:55 2023 -0500 server: Move the implementation of IOCTL_AFD_GET_EVENTS to a dedicated server call. --- dlls/ntdll/unix/socket.c | 26 +++++++++++++++++++++-- include/wine/server_protocol.h | 22 ++++++++++++++++++- server/protocol.def | 10 +++++++++ server/request.h | 7 ++++++ server/sock.c | 48 +++++++++++++++++++++++------------------- server/trace.c | 15 +++++++++++++ 6 files changed, 103 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 80105eda0c9..6969f411955 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1552,10 +1552,32 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } case IOCTL_AFD_GET_EVENTS: + { + struct afd_get_events_params *params = out_buffer; + HANDLE reset_event = in_buffer; /* sic */ + + TRACE( "reset_event %p\n", reset_event ); if (in_size) FIXME( "unexpected input size %u\n", in_size ); - status = STATUS_BAD_DEVICE_TYPE; - break; + if (out_size < sizeof(*params)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + SERVER_START_REQ( socket_get_events ) + { + req->handle = wine_server_obj_handle( handle ); + req->event = wine_server_obj_handle( reset_event ); + wine_server_set_reply( req, params->status, sizeof(params->status) ); + if (!(status = wine_server_call( req ))) + params->flags = reply->flags; + } + SERVER_END_REQ; + + complete_async( handle, event, apc, apc_user, io, status, 0 ); + return status; + } case IOCTL_AFD_POLL: status = STATUS_BAD_DEVICE_TYPE; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 51ac86b935e..e610a8941d7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1841,6 +1841,23 @@ struct send_socket_reply +struct socket_get_events_request +{ + struct request_header __header; + obj_handle_t handle; + obj_handle_t event; + char __pad_20[4]; +}; +struct socket_get_events_reply +{ + struct reply_header __header; + unsigned int flags; + /* VARARG(status,uints); */ + char __pad_12[4]; +}; + + + struct socket_send_icmp_id_request { struct request_header __header; @@ -5633,6 +5650,7 @@ enum request REQ_unlock_file, REQ_recv_socket, REQ_send_socket, + REQ_socket_get_events, REQ_socket_send_icmp_id, REQ_socket_get_icmp_id, REQ_get_next_console_request, @@ -5921,6 +5939,7 @@ union generic_request struct unlock_file_request unlock_file_request; struct recv_socket_request recv_socket_request; struct send_socket_request send_socket_request; + struct socket_get_events_request socket_get_events_request; struct socket_send_icmp_id_request socket_send_icmp_id_request; struct socket_get_icmp_id_request socket_get_icmp_id_request; struct get_next_console_request_request get_next_console_request_request; @@ -6207,6 +6226,7 @@ union generic_reply struct unlock_file_reply unlock_file_reply; struct recv_socket_reply recv_socket_reply; struct send_socket_reply send_socket_reply; + struct socket_get_events_reply socket_get_events_reply; struct socket_send_icmp_id_reply socket_send_icmp_id_reply; struct socket_get_icmp_id_reply socket_get_icmp_id_reply; struct get_next_console_request_reply get_next_console_request_reply; @@ -6436,7 +6456,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 779 +#define SERVER_PROTOCOL_VERSION 780 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 41c857f5cb9..919297c818c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1514,6 +1514,16 @@ enum server_fd_type @END +/* Get socket event flags */ +(a)REQ(socket_get_events) + obj_handle_t handle; /* socket handle */ + obj_handle_t event; /* event to reset */ +(a)REPLY + unsigned int flags; /* event mask */ + VARARG(status,uints); /* array of status codes */ +(a)END + + /* Store ICMP id for ICMP over datagram fixup */ @REQ(socket_send_icmp_id) obj_handle_t handle; /* socket handle */ diff --git a/server/request.h b/server/request.h index efc4eede9a2..de0931ab763 100644 --- a/server/request.h +++ b/server/request.h @@ -175,6 +175,7 @@ DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); DECL_HANDLER(recv_socket); DECL_HANDLER(send_socket); +DECL_HANDLER(socket_get_events); DECL_HANDLER(socket_send_icmp_id); DECL_HANDLER(socket_get_icmp_id); DECL_HANDLER(get_next_console_request); @@ -462,6 +463,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_unlock_file, (req_handler)req_recv_socket, (req_handler)req_send_socket, + (req_handler)req_socket_get_events, (req_handler)req_socket_send_icmp_id, (req_handler)req_socket_get_icmp_id, (req_handler)req_get_next_console_request, @@ -1085,6 +1087,11 @@ C_ASSERT( FIELD_OFFSET(struct send_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, options) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_socket_reply, nonblocking) == 16 ); C_ASSERT( sizeof(struct send_socket_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_request, event) == 16 ); +C_ASSERT( sizeof(struct socket_get_events_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct socket_get_events_reply, flags) == 8 ); +C_ASSERT( sizeof(struct socket_get_events_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, icmp_id) == 16 ); C_ASSERT( FIELD_OFFSET(struct socket_send_icmp_id_request, icmp_seq) == 18 ); diff --git a/server/sock.c b/server/sock.c index 2aae9aefbf0..f24abd2ab6f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2762,28 +2762,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return; - case IOCTL_AFD_GET_EVENTS: - { - struct afd_get_events_params params = {0}; - unsigned int i; - - if (get_reply_max_size() < sizeof(params)) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - params.flags = sock->pending_events & sock->mask; - for (i = 0; i < ARRAY_SIZE( params.status ); ++i) - params.status[i] = sock_get_ntstatus( sock->errors[i] ); - - sock->pending_events &= ~sock->mask; - sock_reselect( sock ); - - set_reply_data( &params, sizeof(params) ); - return; - } - case IOCTL_AFD_EVENT_SELECT: { struct event *event = NULL; @@ -3937,6 +3915,32 @@ DECL_HANDLER(send_socket) release_object( sock ); } +DECL_HANDLER(socket_get_events) +{ + struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); + unsigned int status[13]; + unsigned int i; + + if (get_reply_max_size() < sizeof(status)) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + if (!sock) return; + + reply->flags = sock->pending_events & sock->mask; + for (i = 0; i < ARRAY_SIZE( status ); ++i) + status[i] = sock_get_ntstatus( sock->errors[i] ); + + sock->pending_events &= ~sock->mask; + sock_reselect( sock ); + + set_reply_data( status, sizeof(status) ); + + release_object( sock ); +} + DECL_HANDLER(socket_send_icmp_id) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->handle, 0, &sock_ops ); diff --git a/server/trace.c b/server/trace.c index bb26608ad66..58a31670ea3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2089,6 +2089,18 @@ static void dump_send_socket_reply( const struct send_socket_reply *req ) fprintf( stderr, ", nonblocking=%d", req->nonblocking ); } +static void dump_socket_get_events_request( const struct socket_get_events_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", event=%04x", req->event ); +} + +static void dump_socket_get_events_reply( const struct socket_get_events_reply *req ) +{ + fprintf( stderr, " flags=%08x", req->flags ); + dump_varargs_uints( ", status=", cur_size ); +} + static void dump_socket_send_icmp_id_request( const struct socket_send_icmp_id_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4623,6 +4635,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_unlock_file_request, (dump_func)dump_recv_socket_request, (dump_func)dump_send_socket_request, + (dump_func)dump_socket_get_events_request, (dump_func)dump_socket_send_icmp_id_request, (dump_func)dump_socket_get_icmp_id_request, (dump_func)dump_get_next_console_request_request, @@ -4907,6 +4920,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_recv_socket_reply, (dump_func)dump_send_socket_reply, + (dump_func)dump_socket_get_events_reply, NULL, (dump_func)dump_socket_get_icmp_id_reply, (dump_func)dump_get_next_console_request_reply, @@ -5191,6 +5205,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "unlock_file", "recv_socket", "send_socket", + "socket_get_events", "socket_send_icmp_id", "socket_get_icmp_id", "get_next_console_request",

1 0