March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : d3dcompiler: Pass a struct source_location to add_func_parameter().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 3048fb906485e174b5d6327fb9a41e05c1bce642 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3048fb906485e174b5d6327f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:48 2020 -0600 d3dcompiler: Pass a struct source_location to add_func_parameter(). 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 | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 593090ed35..e91c2a08eb 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -826,7 +826,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis return TRUE; } -static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) +static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location loc) { struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); @@ -836,7 +836,7 @@ static BOOL add_func_parameter(struct list *list, struct parse_parameter *param, return FALSE; } decl->data_type = param->type; - decl->loc = *loc; + decl->loc = loc; decl->name = param->name; decl->semantic = param->semantic; decl->reg_reservation = param->reg_reservation; @@ -1411,12 +1411,9 @@ parameters: scope_start param_list: parameter { - struct source_location loc; - $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); - loc = get_location(&@1); - if (!add_func_parameter($$, &$1, &loc)) + if (!add_func_parameter($$, &$1, get_location(&@1))) { ERR("Error adding function parameter %s.\n", $1.name); set_parse_status(&hlsl_ctx.status, PARSE_ERR); @@ -1425,13 +1422,10 @@ param_list: parameter } | param_list ',' parameter { - struct source_location loc; - $$ = $1; - loc = get_location(&@3); - if (!add_func_parameter($$, &$3, &loc)) + if (!add_func_parameter($$, &$3, get_location(&@3))) { - hlsl_report_message(loc, HLSL_LEVEL_ERROR, + hlsl_report_message(get_location(&@3), HLSL_LEVEL_ERROR, "duplicate parameter %s", $3.name); YYABORT; }

1 0

Zebediah Figura : d3dcompiler: Clarify error messages related to misplaced type modifiers.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 0d47e9bde44721df4f8d6b44baaeb210be0f883a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d47e9bde44721df4f8d6b44… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:49 2020 -0600 d3dcompiler: Clarify error messages related to misplaced type modifiers. 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 | 52 +++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e91c2a08eb..4bf5599e52 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -178,16 +178,6 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); -static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) -{ - if (modifiers & ~HLSL_TYPE_MODIFIERS_MASK) - { - hlsl_report_message(*loc, HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); - return FALSE; - } - return TRUE; -} - static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) @@ -781,21 +771,12 @@ static struct hlsl_type *new_struct_type(const char *name, DWORD modifiers, stru return type; } -static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list, - struct source_location *loc) +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list) { BOOL ret; struct hlsl_type *type; struct parse_variable_def *v, *v_next; - if (!check_type_modifiers(modifiers, loc)) - { - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) - d3dcompiler_free(v); - d3dcompiler_free(list); - return FALSE; - } - LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) { if (v->array_size) @@ -1208,17 +1189,18 @@ preproc_directive: PRE_LINE STRING struct_declaration: struct_spec variables_def_optional ';' { - struct source_location loc; - - loc = get_location(&@3); if (!$2) { if (!$1->name) { - hlsl_report_message(loc, HLSL_LEVEL_ERROR, + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, "anonymous struct declaration with no variables"); } - check_type_modifiers($1->modifiers, &loc); + if ($1->modifiers) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "modifier not allowed on struct type declaration"); + } } $$ = declare_vars($1, 0, $2); } @@ -1582,18 +1564,22 @@ declaration_statement: declaration typedef: KW_TYPEDEF var_modifiers type type_specs ';' { - struct source_location loc; - - loc = get_location(&@1); - if (!add_typedef($2, $3, $4, &loc)) + if ($2 & ~HLSL_TYPE_MODIFIERS_MASK) + { + struct parse_variable_def *v, *v_next; + hlsl_report_message(get_location(&@1), + HLSL_LEVEL_ERROR, "modifier not allowed on typedefs"); + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $4, struct parse_variable_def, entry) + d3dcompiler_free(v); + d3dcompiler_free($4); + YYABORT; + } + if (!add_typedef($2, $3, $4)) YYABORT; } | KW_TYPEDEF struct_spec type_specs ';' { - struct source_location loc; - - loc = get_location(&@1); - if (!add_typedef(0, $2, $3, &loc)) + if (!add_typedef(0, $2, $3)) YYABORT; }

1 0

Zebediah Figura : d3dcompiler: Pass a struct source_location to check_invalid_matrix_modifiers().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 55a3fb90d08e34edb90f51e74e534426516333ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a3fb90d08e34edb90f51e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:50 2020 -0600 d3dcompiler: Pass a struct source_location to check_invalid_matrix_modifiers(). 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 | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4bf5599e52..8f66deb90d 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -115,11 +115,11 @@ static void debug_dump_decl(struct hlsl_type *type, DWORD modifiers, const char TRACE("%s %s;\n", debug_hlsl_type(type), declname); } -static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_location *loc) +static void check_invalid_matrix_modifiers(DWORD modifiers, struct source_location loc) { if (modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)) { - hlsl_report_message(*loc, HLSL_LEVEL_ERROR, + hlsl_report_message(loc, HLSL_LEVEL_ERROR, "'row_major' or 'column_major' modifiers are only allowed for matrices"); } } @@ -138,7 +138,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) } } else - check_invalid_matrix_modifiers(decl->modifiers, &decl->loc); + check_invalid_matrix_modifiers(decl->modifiers, decl->loc); if (local) { @@ -793,7 +793,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis type->modifiers |= modifiers; if (type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(type->modifiers, &v->loc); + check_invalid_matrix_modifiers(type->modifiers, v->loc); ret = add_type_to_scope(hlsl_ctx.cur_scope, type); if (!ret) @@ -1211,11 +1211,9 @@ struct_spec: named_struct_spec named_struct_spec: var_modifiers KW_STRUCT any_identifier '{' fields_list '}' { BOOL ret; - struct source_location loc; TRACE("Structure %s declaration.\n", debugstr_a($3)); - loc = get_location(&@1); - check_invalid_matrix_modifiers($1, &loc); + check_invalid_matrix_modifiers($1, get_location(&@1)); $$ = new_struct_type($3, $1, $5); if (get_variable(hlsl_ctx.cur_scope, $3)) @@ -1236,11 +1234,8 @@ named_struct_spec: var_modifiers KW_STRUCT any_identifier '{' fields_list unnamed_struct_spec: var_modifiers KW_STRUCT '{' fields_list '}' { - struct source_location loc; - TRACE("Anonymous structure declaration.\n"); - loc = get_location(&@1); - check_invalid_matrix_modifiers($1, &loc); + check_invalid_matrix_modifiers($1, get_location(&@1)); $$ = new_struct_type(NULL, $1, $4); }

1 0

Zebediah Figura : d3dcompiler: Pass a struct source_location to create_loop().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: eb63713f606d81dee75d7fdbc5685cc3862bc63f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb63713f606d81dee75d7fdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 3 20:29:51 2020 -0600 d3dcompiler: Pass a struct source_location to create_loop(). 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 | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 8f66deb90d..e46bdbade3 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -301,7 +301,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct list *iter, struct list *body, struct source_location *loc) + struct list *iter, struct list *body, struct source_location loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -319,7 +319,7 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l if (!loop) goto oom; loop->node.type = HLSL_IR_LOOP; - loop->node.loc = *loc; + loop->node.loc = loc; list_add_tail(list, &loop->node.entry); loop->body = d3dcompiler_alloc(sizeof(*loop->body)); if (!loop->body) @@ -1826,33 +1826,23 @@ if_body: statement loop_statement: KW_WHILE '(' expr ')' statement { - struct source_location loc; - loc = get_location(&@1); - $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, &loc); + $$ = create_loop(LOOP_WHILE, NULL, $3, NULL, $5, get_location(&@1)); } | KW_DO statement KW_WHILE '(' expr ')' ';' { - struct source_location loc; - loc = get_location(&@1); - $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, &loc); + $$ = create_loop(LOOP_DO_WHILE, NULL, $5, NULL, $2, get_location(&@1)); } | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { - struct source_location loc; - - loc = get_location(&@1); - $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); pop_scope(&hlsl_ctx); } | KW_FOR '(' scope_start declaration expr_statement expr ')' statement { - struct source_location loc; - - loc = get_location(&@1); if (!$4) - hlsl_report_message(loc, HLSL_LEVEL_WARNING, + hlsl_report_message(get_location(&@4), HLSL_LEVEL_WARNING, "no expressions in for loop initializer"); - $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, get_location(&@1)); pop_scope(&hlsl_ctx); }

1 0

Zebediah Figura : wined3d: Move the depth bias scale to wined3d_rasterizer_state.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: bdb2ead58d4282ecb9f65d558347730c4d45f6ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb2ead58d4282ecb9f65d55… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 5 19:28:11 2020 -0600 wined3d: Move the depth bias scale to wined3d_rasterizer_state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 5 +---- dlls/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/state.c | 14 +++++++------- include/wine/wined3d.h | 1 + 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 63d7f1dc2b..0e46816246 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -933,7 +933,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -941,7 +941,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon if (!(rasterizer_state_impl = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, 0); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); @@ -953,9 +952,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_device_set_rasterizer_state(device->wined3d_device, rasterizer_state_impl->wined3d_state); desc = &rasterizer_state_impl->desc; - scale_bias.f = desc->SlopeScaledDepthBias; const_bias.f = desc->DepthBias; - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SLOPESCALEDEPTHBIAS, scale_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, const_bias.d); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, desc->ScissorEnable); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, desc->MultisampleEnable); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 47d42fd6c5..4d56f7dc75 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1079,8 +1079,9 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str wined3d_desc.fill_mode = desc->FillMode; wined3d_desc.cull_mode = desc->CullMode; wined3d_desc.front_ccw = desc->FrontCounterClockwise; - wined3d_desc.depth_clip = desc->DepthClipEnable; wined3d_desc.depth_bias_clamp = desc->DepthBiasClamp; + wined3d_desc.scale_bias = desc->SlopeScaledDepthBias; + wined3d_desc.depth_clip = desc->DepthClipEnable; /* We cannot fail after creating a wined3d_rasterizer_state object. It * would lead to double free. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34482d8ea2..03c32ec6f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3600,6 +3600,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_FILLMODE: case WINED3D_RS_CULLMODE: + case WINED3D_RS_SLOPESCALEDEPTHBIAS: set_rasterizer_state = TRUE; break; @@ -3615,11 +3616,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_rasterizer_state *rasterizer_state; struct wined3d_rasterizer_state_desc desc; struct wine_rb_entry *entry; + union + { + DWORD d; + float f; + } bias; desc.fill_mode = state->rs[WINED3D_RS_FILLMODE]; desc.cull_mode = state->rs[WINED3D_RS_CULLMODE]; desc.front_ccw = FALSE; desc.depth_bias_clamp = 0.0f; + bias.d = state->rs[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + desc.scale_bias = bias.f; desc.depth_clip = TRUE; if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5cf425f0a5..85bd1e24a3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1755,9 +1755,10 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; + const struct wined3d_rasterizer_state *r = state->rasterizer_state; + float scale_bias = r ? r->desc.scale_bias : 0.0f; - if (state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS] - || state->render_states[WINED3D_RS_DEPTHBIAS]) + if (scale_bias || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; float factor, units, scale, clamp; @@ -1766,10 +1767,9 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { DWORD d; float f; - } scale_bias, const_bias; + } const_bias; - clamp = state->rasterizer_state ? state->rasterizer_state->desc.depth_bias_clamp : 0.0f; - scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; + clamp = r ? r->desc.depth_bias_clamp : 0.0f; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) @@ -1792,7 +1792,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale = 0.0f; } - factor = scale_bias.f; + factor = scale_bias; units = const_bias.f * scale; } @@ -4663,7 +4663,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), state_colorwrite1 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE2), state_colorwrite2 }, EXT_DRAW_BUFFERS2 }, @@ -5436,6 +5435,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 61, 127}, {149, 150}, {169, 169}, + {175, 175}, {177, 177}, {193, 193}, {196, 197}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bfdd1b9ca3..3b7b837d3e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2037,6 +2037,7 @@ struct wined3d_rasterizer_state_desc enum wined3d_cull cull_mode; BOOL front_ccw; float depth_bias_clamp; + float scale_bias; BOOL depth_clip; };

1 0

Matteo Bruni : d3d9: Store primary stateblock state pointer in the device.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: a9125eed376bf7ea2370ebe5560684d290a95211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9125eed376bf7ea2370ebe5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:12 2020 +0100 d3d9: Store primary stateblock state pointer in the device. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 66 +++++++++++++++++++++++------------------------- dlls/d3d9/stateblock.c | 2 +- 3 files changed, 34 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9125eed376bf7ea2370…

1 0

Matteo Bruni : d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply().
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: acaf1204e0892eb5b97078472446d4db6de53887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acaf1204e0892eb5b9707847… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:13 2020 +0100 d3d9: Retrieve state from the stateblock in d3d9_stateblock_Apply(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/stateblock.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index a1ce3d5856..3c1e323009 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -118,11 +118,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) struct wined3d_texture *wined3d_texture; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; - enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; - HRESULT hr; + unsigned int i; TRACE("iface %p.\n", iface); @@ -138,15 +136,14 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->sysmem_vb = 0; for (i = 0; i < D3D9_MAX_STREAMS; ++i) { - if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, - i, &wined3d_buffer, &offset, &stride))) + if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer)) continue; - if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; if (buffer->draw_buffer) device->sysmem_vb |= 1u << i; } - device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) + device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i)

1 0

Matteo Bruni : d3d8: Store primary stateblock state pointer in the device.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 417c36ccb7bdc78d3a98035d0bf420c5c1c4669a URL: https://source.winehq.org/git/wine.git/?a=commit;h=417c36ccb7bdc78d3a98035d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:14 2020 +0100 d3d8: Store primary stateblock state pointer in the device. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417c36ccb7bdc78d3a98…

1 0

Matteo Bruni : d3d8: Range-check GetPixelShaderConstant() indices to the d3d8 limit.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 9d764892ee713a689402a515e5e723a6a5b94ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d764892ee713a689402a515… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 6 12:33:15 2020 +0100 d3d8: Range-check GetPixelShaderConstant() indices to the d3d8 limit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f67841b4b1..488035c7f8 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -40,6 +40,7 @@ #define D3DPRESENTFLAGS_MASK 0x00000fffu #define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 +#define D3D8_MAX_PIXEL_SHADER_CONSTANTF 8 #define D3D8_MAX_STREAMS 16 #define D3DFMT_RESZ MAKEFOURCC('R','E','S','Z') diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 45b158314e..d6253a4a2b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3295,7 +3295,8 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + if (!constants || start_idx >= D3D8_MAX_PIXEL_SHADER_CONSTANTF + || count > D3D8_MAX_PIXEL_SHADER_CONSTANTF - start_idx) return WINED3DERR_INVALIDCALL; wined3d_mutex_lock();

1 0

Dmitry Timoshkov : dnsapi/tests: Add some DnsQuery tests.
by Alexandre Julliard 06 Mar '20

06 Mar '20

Module: wine Branch: master Commit: 8dc3e01d5186c8a4be47a435b3a7e5835d05c01a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc3e01d5186c8a4be47a435… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 6 20:28:35 2020 +0800 dnsapi/tests: Add some DnsQuery tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/tests/Makefile.in | 3 +- dlls/dnsapi/tests/query.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in index 14c8f30fd1..f476103b09 100644 --- a/dlls/dnsapi/tests/Makefile.in +++ b/dlls/dnsapi/tests/Makefile.in @@ -1,7 +1,8 @@ TESTDLL = dnsapi.dll -IMPORTS = dnsapi +IMPORTS = dnsapi ws2_32 C_SRCS = \ cache.c \ name.c \ + query.c \ record.c diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c new file mode 100644 index 0000000000..5ec5181bd0 --- /dev/null +++ b/dlls/dnsapi/tests/query.c @@ -0,0 +1,115 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "windns.h" +#include "winsock2.h" +#include "ws2ipdef.h" + +#include "wine/test.h" + +#define NS_MAXDNAME 1025 + +static void test_DnsQuery(void) +{ + WCHAR domain[MAX_PATH]; + WCHAR name[NS_MAXDNAME]; + DWORD ret, size; + DNS_RECORDW *rec; + DNS_STATUS status; + + wcscpy(domain, L"_ldap._tcp.deadbeef"); + status = DnsQuery_W(L"", DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == DNS_ERROR_RCODE_NAME_ERROR || status == DNS_INFO_NO_RECORDS || status == ERROR_INVALID_NAME /* XP */, "got %u\n", status); + + wcscpy(domain, L"_ldap._tcp.dc._msdcs."); + size = ARRAY_SIZE(domain) - wcslen(domain); + ret = GetComputerNameExW(ComputerNameDnsDomain, domain + wcslen(domain), &size); + ok(ret, "GetComputerNameEx error %u\n", GetLastError()); + if (!size) + { + skip("computer is not in a domain\n"); + return; + } + + status = DnsQuery_W(domain, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); + trace("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), status); + if (status != ERROR_SUCCESS) + { + skip("domain %s doesn't have an SRV entry\n", wine_dbgstr_w(domain)); + return; + } + + trace("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); + + wcsncpy(name, rec->Data.Srv.pNameTarget, ARRAY_SIZE(name)); + DnsRecordListFree(rec, DnsFreeRecordList); + + /* IPv4 */ + status = DnsQuery_W(name, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN addr; + WCHAR buf[IP4_ADDRESS_STRING_LENGTH]; + + addr.sin_family = AF_INET; + addr.sin_port = 0; + addr.sin_addr.s_addr = rec->Data.A.IpAddress; + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } + + /* IPv6 */ + status = DnsQuery_W(name, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); + ok(status == ERROR_SUCCESS || status == DNS_ERROR_RCODE_NAME_ERROR, "DnsQuery_W(%s) => %d\n", wine_dbgstr_w(name), status); + if (status == ERROR_SUCCESS) + { + SOCKADDR_IN6 addr; + WCHAR buf[IP6_ADDRESS_STRING_LENGTH]; + + addr.sin6_family = AF_INET6; + addr.sin6_port = 0; + addr.sin6_scope_id = 0; + memcpy(addr.sin6_addr.s6_addr, &rec->Data.AAAA.Ip6Address, sizeof(rec->Data.AAAA.Ip6Address)); + size = sizeof(buf); + ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, buf, &size); + ok(!ret, "WSAAddressToStringW error %d\n", ret); + trace("WSAAddressToStringW => %s\n", wine_dbgstr_w(buf)); + + DnsRecordListFree(rec, DnsFreeRecordList); + } +} + +START_TEST(query) +{ + WSADATA data; + + WSAStartup(MAKEWORD(2, 2), &data); + + test_DnsQuery(); +}

1 0