June 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Reference the back buffer in wined3d_swapchain_vk_blit().
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 26e961b39a28128f2fc3ff6671db72c71f17f943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26e961b39a28128f2fc3ff66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 16:37:30 2020 +0430 wined3d: Reference the back buffer in wined3d_swapchain_vk_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3497a4d560..e034bdf624 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1026,6 +1026,7 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, swapchain_vk->vk_images[image_idx], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit, VK_FILTER_NEAREST)); + wined3d_context_vk_reference_texture(context_vk, back_buffer_vk); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_ACCESS_TRANSFER_WRITE_BIT, 0,

1 0

Hans Leidekker : bcrypt: Handle different sized R/S signature components.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: ec3ca4ee7336e4462fcd240f78c5e779e17bb2ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec3ca4ee7336e4462fcd240f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 5 15:32:48 2020 +0200 bcrypt: Handle different sized R/S signature components. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index d447e90a11..19a00e2ee2 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1431,8 +1431,9 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat case ALG_ID_DSA: { int err; - unsigned int pad_size, sig_len = get_signature_length( type ); + unsigned int pad_size_r, pad_size_s, sig_len = get_signature_length( type ); gnutls_datum_t r, s; /* format as r||s */ + unsigned char *r_data, *s_data; if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) { @@ -1442,31 +1443,35 @@ static NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signat if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; - /* remove prepended zero byte */ - if (r.size % 2) + if (r.size % 2) /* remove prepended zero byte */ { r.size--; - r.data += 1; + r_data = r.data + 1; } + else r_data = r.data; + if (s.size % 2) { s.size--; - s.data += 1; + s_data = s.data + 1; } + else s_data = s.data; - if (r.size != s.size || r.size + s.size > sig_len) + if (r.size + s.size > sig_len) { ERR( "we didn't get a correct signature\n" ); return STATUS_INTERNAL_ERROR; } - pad_size = (sig_len / 2) - s.size; + pad_size_r = (sig_len / 2) - r.size; + pad_size_s = (sig_len / 2) - s.size; memset( output, 0, sig_len ); - memcpy( output + pad_size, r.data, r.size ); - memcpy( output + (sig_len / 2) + pad_size, s.data, s.size ); + memcpy( output + pad_size_r, r_data, r.size ); + memcpy( output + (sig_len / 2) + pad_size_s, s_data, s.size ); *ret_len = sig_len; + free( r.data ); free( s.data ); return STATUS_SUCCESS; } default:

1 0

Zebediah Figura : d3dcompiler: Use hlsl_report_message() where possible.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 3b662459223927e2c8b439a5834862408bf921e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b662459223927e2c8b439a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:54 2020 -0500 d3dcompiler: Use hlsl_report_message() where possible. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 111 ++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 820352b046..436b731fd1 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1826,48 +1826,52 @@ input_mod: KW_IN $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; } -type: base_type - { - $$ = $1; - } - | KW_VECTOR '<' base_type ',' C_INTEGER '>' - { - if ($3->type != HLSL_CLASS_SCALAR) - { - hlsl_message("Line %u: vectors of non-scalar types are not allowed.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } - if ($5 < 1 || $5 > 4) - { - hlsl_message("Line %u: vector size must be between 1 and 4.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } +type: - $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); - } - | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' - { - if ($3->type != HLSL_CLASS_SCALAR) - { - hlsl_message("Line %u: matrices of non-scalar types are not allowed.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } - if ($5 < 1 || $5 > 4 || $7 < 1 || $7 > 4) - { - hlsl_message("Line %u: matrix dimensions must be between 1 and 4.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - YYABORT; - } + base_type + { + $$ = $1; + } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "vectors of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "vector size must be between 1 and 4\n"); + YYABORT; + } - $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); - } + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, + "matrices of non-scalar types are not allowed\n"); + YYABORT; + } + if ($5 < 1 || $5 > 4) + { + hlsl_report_message(get_location(&@5), HLSL_LEVEL_ERROR, + "matrix row count must be between 1 and 4\n"); + YYABORT; + } + if ($7 < 1 || $7 > 4) + { + hlsl_report_message(get_location(&@7), HLSL_LEVEL_ERROR, + "matrix column count must be between 1 and 4\n"); + YYABORT; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); + } base_type: @@ -1904,11 +1908,7 @@ base_type: { $$ = get_type(hlsl_ctx.cur_scope, $2, TRUE); if ($$->type != HLSL_CLASS_STRUCT) - { - hlsl_message("Line %u: redefining %s as a structure.\n", - hlsl_ctx.line_no, $2); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - } + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "'%s' redefined as a structure\n", $2); d3dcompiler_free($2); } @@ -2291,9 +2291,8 @@ primary_expr: C_FLOAT if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) { - hlsl_message("Line %d: variable '%s' not declared\n", - hlsl_ctx.line_no, $1); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "variable '%s' is not declared\n", $1); YYABORT; } if ((load = new_var_load(var, get_location(&@1)))) @@ -2425,23 +2424,21 @@ postfix_expr: primary_expr TRACE("%s constructor.\n", debug_hlsl_type($2)); if ($1) { - hlsl_message("Line %u: unexpected modifier in a constructor.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifier on a constructor\n"); YYABORT; } if ($2->type > HLSL_CLASS_LAST_NUMERIC) { - hlsl_message("Line %u: constructors are allowed only for numeric data types.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "constructors may only be used with numeric data types\n"); YYABORT; } if ($2->dimx * $2->dimy != initializer_size(&$4)) { - hlsl_message("Line %u: wrong number of components in constructor.\n", - hlsl_ctx.line_no); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(get_location(&@4), HLSL_LEVEL_ERROR, + "expected %u components in constructor, but got %u\n", + $2->dimx * $2->dimy, initializer_size(&$4)); YYABORT; } assert($4.args_count <= ARRAY_SIZE(constructor->args));

1 0

Zebediah Figura : d3dcompiler: Coerce the RHS before unwrapping swizzles.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 1dcfb01b2944403d49a68902e582019c2f73b28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dcfb01b2944403d49a68902… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:52 2020 -0500 d3dcompiler: Coerce the RHS before unwrapping swizzles. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 43 ++++++++++++------------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 767d2dee50..ec0da2d403 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1443,8 +1443,17 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign struct hlsl_ir_node *rhs) { struct hlsl_ir_assignment *assign = d3dcompiler_alloc(sizeof(*assign)); - DWORD writemask = (1 << lhs->data_type->dimx) - 1; - struct hlsl_type *type; + struct hlsl_type *lhs_type; + DWORD writemask = 0; + + lhs_type = lhs->data_type; + if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + writemask = (1 << lhs_type->dimx) - 1; + + if (!(rhs = implicit_conversion(rhs, lhs_type, &rhs->loc))) + return NULL; + } if (!assign) { @@ -1505,36 +1514,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign lhs = lhs_inner; } - TRACE("Creating proper assignment expression.\n"); - if (writemask == BWRITERSP_WRITEMASK_ALL) - type = lhs->data_type; - else - { - unsigned int dimx = 0; - DWORD bitmask; - enum hlsl_type_class type_class; - - bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); - while (bitmask) - { - if (bitmask & 1) - dimx++; - bitmask >>= 1; - } - if (lhs->data_type->type == HLSL_CLASS_MATRIX) - FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); - if (dimx == 1) - type_class = HLSL_CLASS_SCALAR; - else - type_class = lhs->data_type->type; - type = new_hlsl_type(NULL, type_class, lhs->data_type->base_type, dimx, 1); - } - - init_node(&assign->node, HLSL_IR_ASSIGNMENT, type, lhs->loc); + init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); assign->writemask = writemask; - - rhs = implicit_conversion(rhs, type, &rhs->loc); - assign->lhs = load_from_node(lhs)->src; if (assign_op != ASSIGN_OP_ASSIGN) {

1 0

Zebediah Figura : d3dcompiler: Fix matrix dimension declaration for matrix<...> syntax.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: f114a0a8e6bd81f7f943e26d8a57e49e7424a755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f114a0a8e6bd81f7f943e26d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:53 2020 -0500 d3dcompiler: Fix matrix dimension declaration for matrix<...> syntax. Addendum to 4952bcfa4cf. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 2 +- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1797996ddb..820352b046 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1866,7 +1866,7 @@ type: base_type YYABORT; } - $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $5, $7); + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $7, $5); } base_type: diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index c8cf86d05c..059f39e4c3 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -897,9 +897,10 @@ static void test_constant_table(void) "uniform float2 g[5];\n" "uniform matrix_t i;\n" "uniform struct matrix_record j;\n" + "uniform matrix<float,3,1> k;\n" "float4 main(uniform float4 h) : COLOR\n" "{\n" - " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33;\n" + " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33 + k._31;\n" "}"; D3DXCONSTANTTABLE_DESC table_desc; @@ -923,6 +924,7 @@ static void test_constant_table(void) {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, + {"k", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, }; static const D3DXCONSTANT_DESC expect_fields_f[] =

1 0

Zebediah Figura : d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 9ba2bb0f3b692bef812d7f3b617d41a74276785a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ba2bb0f3b692bef812d7f3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:50 2020 -0500 d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 60bb5ff814..7093e9eb2c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1403,29 +1403,29 @@ static enum hlsl_ir_expr_op op_from_assignment(enum parse_assign_op op) return ops[op]; } -static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask) +static BOOL invert_swizzle(unsigned int *swizzle, unsigned int *writemask, unsigned int *ret_width) { - unsigned int i, j, bit = 0, inverted = 0, components, new_writemask = 0, new_swizzle = 0; + unsigned int i, j, bit = 0, inverted = 0, width, new_writemask = 0, new_swizzle = 0; /* Apply the writemask to the swizzle to get a new writemask and swizzle. */ for (i = 0; i < 4; ++i) { - if (writemask & (1 << i)) + if (*writemask & (1 << i)) { unsigned int s = (*swizzle >> (i * 2)) & 3; new_swizzle |= s << (bit++ * 2); if (new_writemask & (1 << s)) - return 0; + return FALSE; new_writemask |= 1 << s; } } - components = bit; + width = bit; /* Invert the swizzle. */ bit = 0; for (i = 0; i < 4; ++i) { - for (j = 0; j < components; ++j) + for (j = 0; j < width; ++j) { unsigned int s = (new_swizzle >> (j * 2)) & 3; if (s == i) @@ -1434,7 +1434,9 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask } *swizzle = inverted; - return new_writemask; + *writemask = new_writemask; + *ret_width = width; + return TRUE; } struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, @@ -1463,6 +1465,8 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign else if (lhs->type == HLSL_IR_SWIZZLE) { struct hlsl_ir_swizzle *swizzle = swizzle_from_node(lhs); + const struct hlsl_type *swizzle_type = swizzle->node.data_type; + unsigned int width; if (lhs->data_type->type == HLSL_CLASS_MATRIX) FIXME("Assignments with writemasks and matrices on lhs are not supported yet.\n"); @@ -1472,12 +1476,23 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign list_add_after(&rhs->entry, &lhs->entry); swizzle->val = rhs; - if (!(writemask = invert_swizzle(&swizzle->swizzle, writemask))) + if (!invert_swizzle(&swizzle->swizzle, &writemask, &width)) { hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid writemask"); d3dcompiler_free(assign); return NULL; } + assert(swizzle_type->type == HLSL_CLASS_VECTOR); + if (swizzle_type->dimx != width) + { + struct hlsl_type *type; + if (!(type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, swizzle_type->base_type, width, 1))) + { + d3dcompiler_free(assign); + return NULL; + } + swizzle->node.data_type = type; + } rhs = &swizzle->node; } else

1 0

Alexandre Julliard : ntdll: Move DbgUiIssueRemoteBreakin() to the Unix library.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 8e5d3042786917c04d3065755d81e7f8a751e529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5d3042786917c04d306575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 16:54:17 2020 +0200 ntdll: Move DbgUiIssueRemoteBreakin() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 13 +------------ dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 19 ++++++++++++++++++- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unixlib.h | 6 ++++-- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index f47d3c4bc6..35937ce602 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1788,16 +1788,5 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) */ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) { - apc_call_t call; - apc_result_t result; - NTSTATUS status; - - TRACE( "(%p)\n", process ); - - memset( &call, 0, sizeof(call) ); - - call.type = APC_BREAK_PROCESS; - status = unix_funcs->server_queue_process_apc( process, &call, &result ); - if (status) return status; - return result.break_process.status; + return unix_funcs->DbgUiIssueRemoteBreakin( process ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 4502be5f87..b5ee692024 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1036,6 +1036,7 @@ static struct unix_funcs unix_funcs = NtWaitForSingleObject, NtWriteVirtualMemory, NtYieldExecution, + DbgUiIssueRemoteBreakin, get_main_args, get_paths, get_dll_path, @@ -1072,7 +1073,6 @@ static struct unix_funcs unix_funcs = wine_server_call, server_select, server_wait, - server_queue_process_apc, server_send_fd, server_get_unix_fd, server_fd_to_handle, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a7592f5e15..fb3f98dd57 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -727,7 +727,7 @@ unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t size, /*********************************************************************** * server_queue_process_apc */ -unsigned int CDECL server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) +unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) { for (;;) { @@ -1556,6 +1556,23 @@ size_t server_init_thread( void *entry_point, BOOL *suspend ) } +/*********************************************************************** + * DbgUiIssueRemoteBreakin + */ +NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) +{ + apc_call_t call; + apc_result_t result; + NTSTATUS status; + + memset( &call, 0, sizeof(call) ); + call.type = APC_BREAK_PROCESS; + status = server_queue_process_apc( process, &call, &result ); + if (status) return status; + return result.break_process.status; +} + + /****************************************************************************** * NtDuplicateObject */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index debc14f68c..a422fd825e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -83,7 +83,6 @@ extern unsigned int CDECL server_select( const select_op_t *select_op, data_size user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int CDECL server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; -extern unsigned int CDECL server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result ) DECLSPEC_HIDDEN; extern void CDECL server_send_fd( int fd ) DECLSPEC_HIDDEN; extern int CDECL server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, @@ -127,6 +126,8 @@ extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSP extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_context( HANDLE handle, context_t *context, unsigned int flags, BOOL *self ) DECLSPEC_HIDDEN; +extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, + apc_result_t *result ) DECLSPEC_HIDDEN; extern NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 5eea152a0e..58bdad1939 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 29 +#define NTDLL_UNIXLIB_VERSION 30 struct unix_funcs { @@ -131,6 +131,9 @@ struct unix_funcs SIZE_T size, SIZE_T *bytes_written ); NTSTATUS (WINAPI *NtYieldExecution)(void); + /* other Win32 API functions */ + NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process ); + /* environment functions */ void (CDECL *get_main_args)( int *argc, char **argv[], char **envp[] ); void (CDECL *get_paths)( const char **builddir, const char **datadir, const char **configdir ); @@ -183,7 +186,6 @@ struct unix_funcs user_apc_t *user_apc ); unsigned int (CDECL *server_wait)( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ); - unsigned int (CDECL *server_queue_process_apc)( HANDLE process, const apc_call_t *call, apc_result_t *result ); void (CDECL *server_send_fd)( int fd ); int (CDECL *server_get_unix_fd)( HANDLE handle, unsigned int wanted_access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: f4efea22337f1099097471b48c002f6ed5290f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4efea22337f1099097471b4… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jun 5 00:19:11 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index c61d89b1d1..5d4a4eadeb 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: 2020-06-04 01:06+0300\n" +"PO-Revision-Date: 2020-06-05 00:17+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" @@ -3632,10 +3632,8 @@ msgid "Subscript out of range" msgstr "Indeksas nepatenka į rėžius" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Pasibaigęs popierius; " +msgstr "Trūksta vietos dėkle" #: jscript.rc:32 msgid "Object required"

1 0

Alexandre Julliard : ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx().
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: 39e7f25e0918d23e5b9ef5fc5049948b6f56525e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e7f25e0918d23e5b9ef5fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:09:27 2020 +0200 ntdll: Implement RtlCreateUserThread() on top of NtCreateThreadEx(). Based on a patch by Andrew Wesie. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 43 ++++++++++++++++++++++++++++++++----------- include/winternl.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 91a6a90d26..f2fa9a8b75 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -326,16 +326,33 @@ static void WINAPI call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void * * NtCreateThreadEx (NTDLL.@) */ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - HANDLE process, LPTHREAD_START_ROUTINE start, void *param, - ULONG flags, ULONG zero_bits, ULONG stack_commit, - ULONG stack_reserve, void *attribute_list ) + HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, + ULONG flags, SIZE_T zero_bits, SIZE_T stack_commit, + SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { - FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, - process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + NTSTATUS status; + CLIENT_ID client_id; - return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, - NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, - param, handle_ptr, NULL ); + if (!access) access = THREAD_ALL_ACCESS; + + status = unix_funcs->create_thread( handle_ptr, access, attr, process, + start, param, call_thread_entry_point, flags, + stack_commit, stack_reserve, &client_id ); + if (!status && attr_list) + { + SIZE_T i, count = (attr_list->TotalLength - sizeof(attr_list->TotalLength)) / sizeof(PS_ATTRIBUTE); + for (i = 0; i < count; i++) + { + if (attr_list->Attributes[i].Attribute == PS_ATTRIBUTE_CLIENT_ID) + { + SIZE_T size = min( attr_list->Attributes[i].Size, sizeof(client_id) ); + memcpy( attr_list->Attributes[i].ValuePtr, &client_id, size ); + if (attr_list->Attributes[i].ReturnLength) *attr_list->Attributes[i].ReturnLength = size; + } + else FIXME( "Unsupported attribute %08lx\n", attr_list->Attributes[i].Attribute ); + } + } + return status; } @@ -353,12 +370,16 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, SECURITY_DESCRIPTOR *descr, NTSTATUS status; CLIENT_ID client_id; OBJECT_ATTRIBUTES attr; + PS_ATTRIBUTE_LIST attr_list = { sizeof(attr_list) }; + + attr_list.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr_list.Attributes[0].Size = sizeof(client_id); + attr_list.Attributes[0].ValuePtr = &client_id; InitializeObjectAttributes( &attr, NULL, 0, NULL, descr ); - status = unix_funcs->create_thread( &handle, THREAD_ALL_ACCESS, &attr, process, - start, param, call_thread_entry_point, flags, - stack_commit, stack_reserve, &client_id ); + status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, start, param, + flags, 0, stack_commit, stack_reserve, &attr_list ); if (!status) { if (id) *id = client_id; diff --git a/include/winternl.h b/include/winternl.h index f362790dbc..2342835911 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2453,6 +2453,55 @@ typedef LONG (CALLBACK *PRTL_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *PTP_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,void*,void*,IO_STATUS_BLOCK*,PTP_IO); +#define PS_ATTRIBUTE_THREAD 0x00010000 +#define PS_ATTRIBUTE_INPUT 0x00020000 +#define PS_ATTRIBUTE_UNKNOWN 0x00040000 + +typedef enum _PS_ATTRIBUTE_NUM +{ + PsAttributeParentProcess, + PsAttributeDebugPort, + PsAttributeToken, + PsAttributeClientId, + PsAttributeTebAddress, + PsAttributeImageName, + PsAttributeImageInfo, + PsAttributeMemoryReserve, + PsAttributePriorityClass, + PsAttributeErrorMode, + PsAttributeStdHandleInfo, + PsAttributeHandleList, + PsAttributeGroupAffinity, + PsAttributePreferredNode, + PsAttributeIdealProcessor, + PsAttributeUmsThread, + PsAttributeMitigationOptions, + PsAttributeProtectionLevel, + PsAttributeSecureProcess, + PsAttributeJobList, + PsAttributeMax +} PS_ATTRIBUTE_NUM; + +#define PS_ATTRIBUTE_CLIENT_ID (PsAttributeClientId | PS_ATTRIBUTE_THREAD) + +typedef struct _PS_ATTRIBUTE +{ + ULONG_PTR Attribute; + SIZE_T Size; + union + { + ULONG_PTR Value; + void *ValuePtr; + }; + SIZE_T *ReturnLength; +} PS_ATTRIBUTE; + +typedef struct _PS_ATTRIBUTE_LIST +{ + SIZE_T TotalLength; + PS_ATTRIBUTE Attributes[1]; +} PS_ATTRIBUTE_LIST, *PPS_ATTRIBUTE_LIST; + /*********************************************************************** * Function declarations */

1 0

Alexandre Julliard : ntdll: Move the rest of the thread creation code to the Unix library.
by Alexandre Julliard June 5, 2020

June 5, 2020

Module: wine Branch: master Commit: ca3ca7b046ae94a152b1367ca982774345887e55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca3ca7b046ae94a152b1367c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 14:09:19 2020 +0200 ntdll: Move the rest of the thread creation code to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 92 ++++++------------------------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 2 +- dlls/ntdll/unix/sync.c | 4 +- dlls/ntdll/unix/thread.c | 91 ++++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/unix_private.h | 11 +++-- dlls/ntdll/unixlib.h | 10 ++--- 7 files changed, 109 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3ca7b046ae94a152b1…

1 0