wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Matteo Bruni : user32: Make sure update_window_state() is always executed on the owner thread.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: f0e9cf11450e569b86174314f39dc687d41278c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0e9cf11450e569b86174314… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 11:47:30 2020 +0200 user32: Make sure update_window_state() is always executed on the owner thread. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +++ dlls/user32/spy.c | 3 ++- dlls/user32/user_private.h | 2 ++ dlls/user32/win.c | 8 +++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2717d91dbb..45fc07bbff 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1890,6 +1890,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return USER_Driver->pClipCursor( &rect ); } return USER_Driver->pClipCursor( NULL ); + case WM_WINE_UPDATEWINDOWSTATE: + update_window_state( hwnd ); + return 0; default: if (msg >= WM_WINE_FIRST_DRIVER_MSG && msg <= WM_WINE_LAST_DRIVER_MSG) return USER_Driver->pWindowMessage( hwnd, msg, wparam, lparam ); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 8a2fa430b5..dea97547b3 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_UPDATEWINDOWSTATE - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1163,6 +1163,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", "WM_WINE_CLIPCURSOR", + "WM_WINE_UPDATEWINDOWSTATE", }; /* Virtual key names */ diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7e294558ef..0230dd4500 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -56,6 +56,7 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_CLIPCURSOR, + WM_WINE_UPDATEWINDOWSTATE, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_LAST_DRIVER_MSG = 0x80001fff }; @@ -243,6 +244,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; extern void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN; +extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3323ed3e41..49cebe9979 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -445,11 +445,17 @@ static void send_parent_notify( HWND hwnd, UINT msg ) * * Trigger an update of the window's driver state and surface. */ -static void update_window_state( HWND hwnd ) +void update_window_state( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; RECT window_rect, client_rect, valid_rects[2]; + if (!WIN_IsCurrentThread( hwnd )) + { + PostMessageW( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); + return; + } + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); valid_rects[0] = valid_rects[1] = client_rect;

1 0

Matteo Bruni : user32: Add missing WM_WINE_CLIPCURSOR message type name.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 61ff6c306d23ce3f2af23cda614231ded4539e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61ff6c306d23ce3f2af23cda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 5 11:47:29 2020 +0200 user32: Add missing WM_WINE_CLIPCURSOR message type name. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index ddd90e664f..8a2fa430b5 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1150,7 +1150,7 @@ static const char * const CCMMessageTypeNames[SPY_MAX_CCMMSGNUM + 1] = "CCM_SETNOTIFYWINDOW" }; -#define SPY_MAX_WINEMSGNUM (WM_WINE_MOUSE_LL_HOOK - WM_WINE_DESTROYWINDOW) +#define SPY_MAX_WINEMSGNUM (WM_WINE_CLIPCURSOR - WM_WINE_DESTROYWINDOW) static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = { "WM_WINE_DESTROYWINDOW", @@ -1162,6 +1162,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", + "WM_WINE_CLIPCURSOR", }; /* Virtual key names */

1 0

Zebediah Figura : d3dcompiler: Use hlsl_report_message() where possible.
by Alexandre Julliard 05 Jun '20

05 Jun '20

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: Fix matrix dimension declaration for matrix<...> syntax.
by Alexandre Julliard 05 Jun '20

05 Jun '20

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: Coerce the RHS before unwrapping swizzles.
by Alexandre Julliard 05 Jun '20

05 Jun '20

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: Remove a redundant check for writemasks on non-numeric types.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 24a4f52bbf7ac482c0f9129c1afdeccc8d319702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24a4f52bbf7ac482c0f9129c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 3 21:06:51 2020 -0500 d3dcompiler: Remove a redundant check for writemasks on non-numeric types. This can only happen if a swizzle is emitted on a non-numeric type, but this is checked when emitting 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 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 7093e9eb2c..767d2dee50 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1514,13 +1514,6 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign DWORD bitmask; enum hlsl_type_class type_class; - if (lhs->data_type->type > HLSL_CLASS_LAST_NUMERIC) - { - hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, - "writemask on a non scalar/vector/matrix type"); - d3dcompiler_free(assign); - return NULL; - } bitmask = writemask & ((1 << lhs->data_type->dimx) - 1); while (bitmask) {

1 0

Zebediah Figura : d3dcompiler: Fix up the swizzle data type when unwrapping it from the assignment LHS.
by Alexandre Julliard 05 Jun '20

05 Jun '20

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 05 Jun '20

05 Jun '20

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

Alexandre Julliard : ntdll: Move NtCreateThreadEx() to the Unix library.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 245efd04e1456a71a6962acbb8ebc279481e9ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=245efd04e1456a71a6962acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 16:37:49 2020 +0200 ntdll: Move NtCreateThreadEx() to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 39 +++++-------------------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 66 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/unix_private.h | 4 --- dlls/ntdll/unixlib.h | 10 +++---- include/winternl.h | 1 + 7 files changed, 61 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=245efd04e1456a71a696…

1 0

Alexandre Julliard : ntdll: Use NtCreateThreadEx() for remote thread creation.
by Alexandre Julliard 05 Jun '20

05 Jun '20

Module: wine Branch: master Commit: 33c750f50ff8b6f1eae63140e8287c49a5130a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c750f50ff8b6f1eae63140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 15:23:37 2020 +0200 ntdll: Use NtCreateThreadEx() for remote thread creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 22 +++++++++++++++++----- dlls/ntdll/unix/thread.c | 8 ++++++-- include/wine/server_protocol.h | 5 +++-- include/winternl.h | 1 + server/protocol.def | 3 ++- server/trace.c | 6 +++--- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4b38a73039..a7592f5e15 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -555,6 +555,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) break; case APC_CREATE_THREAD: { + PS_ATTRIBUTE_LIST attr = { sizeof(attr) }; CLIENT_ID id; HANDLE handle; SIZE_T reserve = call->create_thread.reserve; @@ -566,20 +567,31 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) if (reserve == call->create_thread.reserve && commit == call->create_thread.commit && (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { - result->create_thread.status = RtlCreateUserThread( NtCurrentProcess(), NULL, - call->create_thread.suspend, NULL, - reserve, commit, func, arg, &handle, &id ); + attr.Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; + attr.Attributes[0].Size = sizeof(id); + attr.Attributes[0].ValuePtr = &id; + result->create_thread.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), func, arg, + call->create_thread.flags, 0, + commit, reserve, &attr ); result->create_thread.handle = wine_server_obj_handle( handle ); + result->create_thread.pid = HandleToULong(id.UniqueProcess); result->create_thread.tid = HandleToULong(id.UniqueThread); } else result->create_thread.status = STATUS_INVALID_PARAMETER; break; } case APC_BREAK_PROCESS: + { + HANDLE handle; + result->type = APC_BREAK_PROCESS; - result->break_process.status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, 0, 0, - DbgUiRemoteBreakin, NULL, NULL, NULL ); + result->break_process.status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, NULL, + NtCurrentProcess(), DbgUiRemoteBreakin, NULL, + 0, 0, 0, 0, NULL ); + if (!result->break_process.status) NtClose( handle ); break; + } default: server_protocol_error( "get_apc_request: bad type %d\n", call->type ); break; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 602e0930ab..ec8f1cf8c4 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -185,18 +185,22 @@ NTSTATUS CDECL create_thread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU memset( &call, 0, sizeof(call) ); call.create_thread.type = APC_CREATE_THREAD; + call.create_thread.flags = flags; call.create_thread.func = wine_server_client_ptr( start ); call.create_thread.arg = wine_server_client_ptr( param ); call.create_thread.reserve = stack_reserve; call.create_thread.commit = stack_commit; - call.create_thread.suspend = flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED; status = server_queue_process_apc( process, &call, &result ); if (status != STATUS_SUCCESS) return status; if (result.create_thread.status == STATUS_SUCCESS) { - if (id) id->UniqueThread = ULongToHandle( result.create_thread.tid ); *handle = wine_server_ptr_handle( result.create_thread.handle ); + if (id) + { + id->UniqueProcess = ULongToHandle( result.create_thread.pid ); + id->UniqueThread = ULongToHandle( result.create_thread.tid ); + } } return result.create_thread.status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 520251fd3d..4b40ba7772 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -557,7 +557,7 @@ typedef union struct { enum apc_type type; - int suspend; + unsigned int flags; client_ptr_t func; client_ptr_t arg; mem_size_t reserve; @@ -645,6 +645,7 @@ typedef union { enum apc_type type; unsigned int status; + process_id_t pid; thread_id_t tid; obj_handle_t handle; } create_thread; @@ -6683,7 +6684,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 607 +#define SERVER_PROTOCOL_VERSION 608 /* ### protocol_version end ### */ diff --git a/include/winternl.h b/include/winternl.h index 2342835911..ad64df9d2e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2580,6 +2580,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRI NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,SIZE_T,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); NTSYSAPI NTSTATUS WINAPI NtDelayExecution(BOOLEAN,const LARGE_INTEGER*); diff --git a/server/protocol.def b/server/protocol.def index 632c996dc0..95a3021ee8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -573,7 +573,7 @@ typedef union struct { enum apc_type type; /* APC_CREATE_THREAD */ - int suspend; /* suspended thread? */ + unsigned int flags; /* creation flags */ client_ptr_t func; /* void (__stdcall *func)(void*); start function */ client_ptr_t arg; /* argument for start function */ mem_size_t reserve; /* reserve size for thread stack */ @@ -661,6 +661,7 @@ typedef union { enum apc_type type; /* APC_CREATE_THREAD */ unsigned int status; /* status returned by call */ + process_id_t pid; /* process id */ thread_id_t tid; /* thread id */ obj_handle_t handle; /* handle to new thread */ } create_thread; diff --git a/server/trace.c b/server/trace.c index 555e697657..83db655d3e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -221,7 +221,7 @@ static void dump_apc_call( const char *prefix, const apc_call_t *call ) dump_uint64( ",arg=", &call->create_thread.arg ); dump_uint64( ",reserve=", &call->create_thread.reserve ); dump_uint64( ",commit=", &call->create_thread.commit ); - fprintf( stderr, ",suspend=%u", call->create_thread.suspend ); + fprintf( stderr, ",flags=%x", call->create_thread.flags ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS" ); @@ -302,9 +302,9 @@ static void dump_apc_result( const char *prefix, const apc_result_t *result ) get_status_name( result->unmap_view.status ) ); break; case APC_CREATE_THREAD: - fprintf( stderr, "APC_CREATE_THREAD,status=%s,tid=%04x,handle=%04x", + fprintf( stderr, "APC_CREATE_THREAD,status=%s,pid=%04x,tid=%04x,handle=%04x", get_status_name( result->create_thread.status ), - result->create_thread.tid, result->create_thread.handle ); + result->create_thread.pid, result->create_thread.tid, result->create_thread.handle ); break; case APC_BREAK_PROCESS: fprintf( stderr, "APC_BREAK_PROCESS,status=%s", get_status_name( result->break_process.status ) );

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020