wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Zebediah Figura : vkd3d-shader: Store variables with external linkage in a dedicated list.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: vkd3d Branch: master Commit: 8f26986615aaef68869a8868273c5b4fc21bdfd4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8f26986615aaef68869a886… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 15 19:03:44 2021 -0500 vkd3d-shader: Store variables with external linkage in a dedicated list. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 10105ea..50b40d6 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1578,6 +1578,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * rb_init(&ctx->functions, compare_function_rb); list_init(&ctx->static_initializers); + list_init(&ctx->extern_vars); return true; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8493f74..3a0bf38 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -213,7 +213,7 @@ struct hlsl_ir_var const char *name; const char *semantic; const struct hlsl_reg_reservation *reg_reservation; - struct list scope_entry, param_entry; + struct list scope_entry, param_entry, extern_entry; unsigned int first_write, last_read; struct hlsl_reg reg; @@ -418,6 +418,7 @@ struct hlsl_ctx struct hlsl_scope *cur_scope; struct hlsl_scope *globals; struct list scopes; + struct list extern_vars; struct list types; struct rb_tree functions; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9ebd149..12d5988 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -45,7 +45,8 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru return; } vkd3d_string_buffer_release(&ctx->string_buffers, name); - list_add_head(&ctx->globals->vars, &const_var->scope_entry); + list_add_before(&var->scope_entry, &const_var->scope_entry); + list_add_tail(&ctx->extern_vars, &const_var->extern_entry); var->is_uniform = 0; const_var->is_uniform = 1; @@ -87,7 +88,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } vkd3d_string_buffer_release(&ctx->string_buffers, name); varying->is_input_varying = 1; - list_add_head(&ctx->globals->vars, &varying->scope_entry); + list_add_before(&var->scope_entry, &varying->scope_entry); + list_add_tail(&ctx->extern_vars, &varying->extern_entry); if (!(load = hlsl_new_var_load(varying, var->loc))) { @@ -164,7 +166,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct } vkd3d_string_buffer_release(&ctx->string_buffers, name); varying->is_output_varying = 1; - list_add_head(&ctx->globals->vars, &varying->scope_entry); + list_add_before(&var->scope_entry, &varying->scope_entry); + list_add_tail(&ctx->extern_vars, &varying->extern_entry); if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) { @@ -593,7 +596,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl var->first_write = var->last_read = 0; } - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform || var->is_input_varying) var->first_write = 1; @@ -601,11 +604,6 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl var->last_read = UINT_MAX; } - LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) - { - var->first_write = 1; - } - if (entry_func->return_var) entry_func->return_var->last_read = UINT_MAX; @@ -846,7 +844,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct liveness liveness = {0}; struct hlsl_ir_var *var; - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform && var->last_read) { @@ -928,12 +926,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { + if (var->data_type->type == HLSL_CLASS_OBJECT) + list_add_tail(&ctx->extern_vars, &var->extern_entry); if (var->is_uniform) prepend_uniform_copy(ctx, entry_func->body, var); } LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { + if (var->data_type->type == HLSL_CLASS_OBJECT) + list_add_tail(&ctx->extern_vars, &var->extern_entry); if (var->is_uniform) prepend_uniform_copy(ctx, entry_func->body, var); if (var->is_input_varying)

1 0

Zebediah Figura : vkd3d-shader: Write empty SM1 shaders.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: vkd3d Branch: master Commit: 44816403f18d974fec9088028816671c86fd3557 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44816403f18d974fec90880… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 15 19:03:43 2021 -0500 vkd3d-shader: Write empty SM1 shaders. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 1 + include/vkd3d_d3d9types.h | 121 +++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 3 +- libs/vkd3d-shader/hlsl_codegen.c | 55 +++++++++++++++++- 5 files changed, 178 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index a79ad02..2ab2233 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ vkd3d_public_headers = \ include/vkd3d.h \ include/vkd3d_d3d12.h \ include/vkd3d_d3d12sdklayers.h \ + include/vkd3d_d3d9types.h \ include/vkd3d_d3dcommon.h \ include/vkd3d_d3dcompiler.h \ include/vkd3d_dxgibase.h \ diff --git a/include/vkd3d_d3d9types.h b/include/vkd3d_d3d9types.h new file mode 100644 index 0000000..de2ba47 --- /dev/null +++ b/include/vkd3d_d3d9types.h @@ -0,0 +1,121 @@ +/* + * Copyright 2002-2003 Jason Edmeades + * Copyright 2002-2003 Raphael Junqueira + * + * 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 + */ + +#ifndef __VKD3D_D3D9TYPES_H +#define __VKD3D_D3D9TYPES_H +#ifndef _d3d9TYPES_H_ + +#define D3DPS_VERSION(major, minor) (0xffff0000 | ((major) << 8) | (minor)) +#define D3DVS_VERSION(major, minor) (0xfffe0000 | ((major) << 8) | (minor)) + +typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE +{ + D3DSIO_NOP = 0x00, + D3DSIO_MOV = 0x01, + D3DSIO_ADD = 0x02, + D3DSIO_SUB = 0x03, + D3DSIO_MAD = 0x04, + D3DSIO_MUL = 0x05, + D3DSIO_RCP = 0x06, + D3DSIO_RSQ = 0x07, + D3DSIO_DP3 = 0x08, + D3DSIO_DP4 = 0x09, + D3DSIO_MIN = 0x0a, + D3DSIO_MAX = 0x0b, + D3DSIO_SLT = 0x0c, + D3DSIO_SGE = 0x0d, + D3DSIO_EXP = 0x0e, + D3DSIO_LOG = 0x0f, + D3DSIO_LIT = 0x10, + D3DSIO_DST = 0x11, + D3DSIO_LRP = 0x12, + D3DSIO_FRC = 0x13, + D3DSIO_M4x4 = 0x14, + D3DSIO_M4x3 = 0x15, + D3DSIO_M3x4 = 0x16, + D3DSIO_M3x3 = 0x17, + D3DSIO_M3x2 = 0x18, + D3DSIO_CALL = 0x19, + D3DSIO_CALLNZ = 0x1a, + D3DSIO_LOOP = 0x1b, + D3DSIO_RET = 0x1c, + D3DSIO_ENDLOOP = 0x1d, + D3DSIO_LABEL = 0x1e, + D3DSIO_DCL = 0x1f, + D3DSIO_POW = 0x20, + D3DSIO_CRS = 0x21, + D3DSIO_SGN = 0x22, + D3DSIO_ABS = 0x23, + D3DSIO_NRM = 0x24, + D3DSIO_SINCOS = 0x25, + D3DSIO_REP = 0x26, + D3DSIO_ENDREP = 0x27, + D3DSIO_IF = 0x28, + D3DSIO_IFC = 0x29, + D3DSIO_ELSE = 0x2a, + D3DSIO_ENDIF = 0x2b, + D3DSIO_BREAK = 0x2c, + D3DSIO_BREAKC = 0x2d, + D3DSIO_MOVA = 0x2e, + D3DSIO_DEFB = 0x2f, + D3DSIO_DEFI = 0x30, + + D3DSIO_TEXCOORD = 0x40, + D3DSIO_TEXKILL = 0x41, + D3DSIO_TEX = 0x42, + D3DSIO_TEXBEM = 0x43, + D3DSIO_TEXBEML = 0x44, + D3DSIO_TEXREG2AR = 0x45, + D3DSIO_TEXREG2GB = 0x46, + D3DSIO_TEXM3x2PAD = 0x47, + D3DSIO_TEXM3x2TEX = 0x48, + D3DSIO_TEXM3x3PAD = 0x49, + D3DSIO_TEXM3x3TEX = 0x4a, + D3DSIO_TEXM3x3DIFF = 0x4b, + D3DSIO_TEXM3x3SPEC = 0x4c, + D3DSIO_TEXM3x3VSPEC = 0x4d, + D3DSIO_EXPP = 0x4e, + D3DSIO_LOGP = 0x4f, + D3DSIO_CND = 0x50, + D3DSIO_DEF = 0x51, + D3DSIO_TEXREG2RGB = 0x52, + D3DSIO_TEXDP3TEX = 0x53, + D3DSIO_TEXM3x2DEPTH = 0x54, + D3DSIO_TEXDP3 = 0x55, + D3DSIO_TEXM3x3 = 0x56, + D3DSIO_TEXDEPTH = 0x57, + D3DSIO_CMP = 0x58, + D3DSIO_BEM = 0x59, + D3DSIO_DP2ADD = 0x5a, + D3DSIO_DSX = 0x5b, + D3DSIO_DSY = 0x5c, + D3DSIO_TEXLDD = 0x5d, + D3DSIO_SETP = 0x5e, + D3DSIO_TEXLDL = 0x5f, + D3DSIO_BREAKP = 0x60, + + D3DSIO_PHASE = 0xfffd, + D3DSIO_COMMENT = 0xfffe, + D3DSIO_END = 0xffff, + + D3DSIO_FORCE_DWORD = 0x7fffffff, +} D3DSHADER_INSTRUCTION_OPCODE_TYPE; + +#endif /* _d3d9TYPES_H_ */ +#endif /* __VKD3D_D3D9TYPES_H */ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index d797aa1..10105ea 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1671,7 +1671,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d hlsl_error(&ctx, entry_func->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_SEMANTIC, "Entry point \"%s\" is missing a return value semantic.", entry_point); - ret = hlsl_emit_dxbc(&ctx, entry_func); + ret = hlsl_emit_dxbc(&ctx, entry_func, dxbc); hlsl_ctx_cleanup(&ctx); return ret; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 923eff5..8493f74 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,7 +530,8 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var void hlsl_dump_function(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) DECLSPEC_HIDDEN; +int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void hlsl_free_instr(struct hlsl_ir_node *node) DECLSPEC_HIDDEN; void hlsl_free_instr_list(struct list *list) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 81e6010..9ebd149 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -20,6 +20,7 @@ #include "hlsl.h" #include <stdio.h> +#include "vkd3d_d3d9types.h" /* Split uniforms into two variables representing the constant and temp * registers, and copy the former to the latter, so that writes to uniforms @@ -873,7 +874,53 @@ static void allocate_temp_registers(struct hlsl_ir_function_decl *entry_func) allocate_temp_registers_recurse(entry_func->body, &liveness); } -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) +struct bytecode_buffer +{ + uint32_t *data; + size_t count, size; + int status; +}; + +static void put_dword(struct bytecode_buffer *buffer, uint32_t value) +{ + if (buffer->status) + return; + + if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->size, buffer->count + 1, sizeof(*buffer->data))) + { + buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; + return; + } + buffer->data[buffer->count++] = value; +} + +static uint32_t sm1_version(enum vkd3d_shader_type type, unsigned int major, unsigned int minor) +{ + if (type == VKD3D_SHADER_TYPE_VERTEX) + return D3DVS_VERSION(major, minor); + else + return D3DPS_VERSION(major, minor); +} + +static int write_sm1_shader(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + struct vkd3d_shader_code *out) +{ + struct bytecode_buffer buffer = {0}; + int ret; + + put_dword(&buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); + + put_dword(&buffer, D3DSIO_END); + + if (!(ret = buffer.status)) + { + out->code = buffer.data; + out->size = buffer.count * sizeof(uint32_t); + } + return ret; +} + +int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct hlsl_ir_var *var; @@ -916,5 +963,9 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; - return VKD3D_ERROR_NOT_IMPLEMENTED; + + if (ctx->profile->major_version < 4) + return write_sm1_shader(ctx, entry_func, out); + else + return VKD3D_ERROR_NOT_IMPLEMENTED; }

1 0

Zebediah Figura : vkd3d-shader: "reg_size" is tracked in whole registers.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: vkd3d Branch: master Commit: 12b297b8cca346fafe736af3d54d4684c467db30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12b297b8cca346fafe736af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 15 19:03:42 2021 -0500 vkd3d-shader: "reg_size" is tracked in whole registers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e254ced..81e6010 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -717,7 +717,7 @@ static struct hlsl_reg allocate_range(struct liveness *liveness, static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 4) + if (type->reg_size > 1) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, reg.id + type->reg_size - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask));

1 0

Francois Gouget : testbot/reporttest: Update the tests to match the current Wine.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: tools Branch: master Commit: 906b5f1004b9484969cb520e25a18468ae208820 URL: https://source.winehq.org/git/tools.git/?a=commit;h=906b5f1004b9484969cb520… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:52:22 2021 +0200 testbot/reporttest: Update the tests to match the current Wine. Specifically, match Wine's test renames and deletions. This avoids puzzling results in the index pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index f1dbfd6..6af2ff5 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -423,20 +423,20 @@ comctl32:button skipped dlls/comctl32/tests/button.c ----- Skipping a test unit by user request ----- Expected assessement: Skipped by user -comctl32:comboex start dlls/comctl32/tests/comboex.c +comctl32:combo start dlls/comctl32/tests/combo.c ----- WTBS Simple success in a todo test ----- WTBS Simple trace, ok, todo, skip sampler ----- A test unit with a subprocess and failed, todo and skipped tests in the ----- main process. ----- Expected assessement: 2 failures, 1 todo, 1 skip -comboex.c:40: Test failed: A failure in the main process -comboex.c:41: Test succeeded inside todo block: Success in the main process -comboex.c:42: Test marked todo: Fixme in the main process -comboex.c:43: Tests skipped: Skipped in the main process +combo.c:40: Test failed: A failure in the main process +combo.c:41: Test succeeded inside todo block: Success in the main process +combo.c:42: Test marked todo: Fixme in the main process +combo.c:43: Tests skipped: Skipped in the main process This line says nothing is wrong because it's from the subprocess -1234:comboex: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. -0c9c:comboex: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. -comctl32:comboex:0c9c done (2) in 0s +1234:combo: 116 tests executed (0 marked as todo, 0 failures), 0 skipped. +0c9c:combo: 116 tests executed (1 marked as todo, 2 failures), 1 skipped. +comctl32:combo:0c9c done (2) in 0s comctl32:datetime start dlls/comctl32/tests/datetime.c ----- A test unit reporting a failure but with no test failed line @@ -874,7 +874,6 @@ stub msvcrt:data stub msvcrt:dir stub msvcrt:environ stub msvcrt:file -stub msvcrt:headers stub msvcrt:heap stub msvcrt:locale stub msvcrt:misc @@ -962,17 +961,16 @@ stub qmgr:enum_jobs stub qmgr:file stub qmgr:job stub qmgr:qmgr -stub quartz:avisplitter +stub quartz:avisplit stub quartz:dsoundrender stub quartz:filtergraph stub quartz:filtermapper stub quartz:memallocator -stub quartz:misc stub quartz:mpegsplit -stub quartz:referenceclock +stub quartz:systemclock stub quartz:videorenderer stub rasapi32:rasapi -stub reg.exe:reg +stub reg.exe:add stub regedit.exe:regedit stub riched20:editor stub riched20:richole

1 0

Francois Gouget : winetest/dissect: Fix handling of skipped test unit.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: tools Branch: master Commit: 42f389faf327f4634d9b1f147d9462062b5eb64c URL: https://source.winehq.org/git/tools.git/?a=commit;h=42f389faf327f4634d9b1f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:50:09 2021 +0200 winetest/dissect: Fix handling of skipped test unit. close_test_unit() adds an entry in summary.txt for every test unit. So the report parser must set $summary instead of manually adding a redundant summary.txt entry. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index c58e47f..ce3329e 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -627,7 +627,7 @@ while ($line = <IN>) { if ($l_type eq "skipped") { add_test_line("skipped", "Skipped by user request"); - print SUM "- $dll $unit skipped - - - $source\n"; + $summary = "skipped - - -"; mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$skipped_units > $maxuserskips; $rc = 0; }

1 0

Francois Gouget : winetest: Position the up/down arrows with CSS instead of a table.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: tools Branch: master Commit: b01d24020d48917def3cfb6feb5b3eb0d26669df URL: https://source.winehq.org/git/tools.git/?a=commit;h=b01d24020d48917def3cfb6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:47:45 2021 +0200 winetest: Position the up/down arrows with CSS instead of a table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 8 ++++---- winetest/report.css | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2d0e9c2..c58e47f 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -929,10 +929,10 @@ print REPORT "</div>\n"; for (my $i = 0; $i <= $#boxes; $i++) { printf REPORT "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class}; - printf REPORT "<div class=\"updownbar\"><table><tr><td width=\"100%%\">%s</td>\n", $boxes[$i]->{title}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↑</a></td>\n", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; - printf REPORT "<td class=\"arrow\"><a href=\"#%s\">↓</a></td>\n", $boxes[$i]->{next} if defined $boxes[$i]->{next}; - print REPORT "</tr></table></div>\n"; + printf REPORT "<div class=\"updownbar\">%s<div class='ralign'>", $boxes[$i]->{title}; + printf REPORT "<a href=\"#%s\">↑</a>", $boxes[$i]->{prev} if defined $boxes[$i]->{prev}; + printf REPORT "<a href=\"#%s\">↓</a>", $boxes[$i]->{next} if defined $boxes[$i]->{next}; + print REPORT "</div></div>\n"; print REPORT $boxes[$i]->{data}, "</div>\n"; } print REPORT end_html(); diff --git a/winetest/report.css b/winetest/report.css index eafbe42..41b0b04 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -62,3 +62,8 @@ table.output td { td.arrow :link { color: #ffffff; text-decoration: none; } td.arrow :visited { color: #ffffff; text-decoration: none; } td.arrow :hover { color: #ffffff; text-decoration: underline; } + +.ralign { + display: inline-block; + float: right; +}

1 0

Francois Gouget : winetest/css: Fix the color of links on index page titles.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: tools Branch: master Commit: 3e0d8b17e7054f119b695e46a5df10ca717ffcc8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e0d8b17e7054f119b695e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:46:33 2021 +0200 winetest/css: Fix the color of links on index page titles. The color and decorations must be specified for the hover and visited cases too. Also add support for putting links in h2 titles. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/summary.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/winetest/summary.css b/winetest/summary.css index 2bc9b44..9793cdf 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -27,9 +27,10 @@ h1, h2 { padding: 4px; margin: 0; } -h1 :link { - color: #ffe0e0; -} +h1 :link, h2 :link { color: #ffe0e0; } +h1 a:visited, h2 a:visited { color: #ffe0e0; } +h1 a:hover, h2 a:hover { color: #ffe0e0; text-decoration: underline; } + div.main, div.group { margin: 10px 0 0 0; background-color: white;

1 0

Francois Gouget : winetest/css: Fix the div.updownbar index pages' CSS style.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: tools Branch: master Commit: 69da6842b440e867486afd2b07103b33a9fd0fa1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=69da6842b440e867486afd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 20 16:42:36 2021 +0200 winetest/css: Fix the div.updownbar index pages' CSS style. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/report.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/report.css b/winetest/report.css index 3cb2e98..eafbe42 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -29,8 +29,7 @@ div.output, div.test { } div.updownbar { - padding: 10px - margin-top: 10px; + padding: 4px; margin-bottom: 5px; font-size: large; background-color: #601919;

1 0

Zebediah Figura : hidclass.sys: Set PhysicalDeviceObject to the bus PDO.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: 06ab0677587fbbb83ef73efa7ed22bf85dcb6836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06ab0677587fbbb83ef73efa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 19:43:27 2021 -0500 hidclass.sys: Set PhysicalDeviceObject to the bus PDO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b9208d146e6..7b365d267ed 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -135,7 +135,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b ext = fdo->DeviceExtension; ext->is_fdo = TRUE; ext->u.fdo.hid_ext.MiniDeviceExtension = ext + 1; - ext->u.fdo.hid_ext.PhysicalDeviceObject = fdo; + ext->u.fdo.hid_ext.PhysicalDeviceObject = bus_pdo; ext->u.fdo.hid_ext.NextDeviceObject = bus_pdo; swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), L"HID\\%s", wcsrchr(device_id, '\\') + 1); wcscpy(ext->instance_id, instance_id); diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 7ddf49f4dcc..92637f9d0bc 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -215,7 +215,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *f /* We should be given the FDO, not the PDO. */ ok(!!ext->PhysicalDeviceObject, "expected non-NULL pdo\n"); - todo_wine ok(ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", + ok(ext->NextDeviceObject == ext->PhysicalDeviceObject, "got pdo %p, next %p\n", ext->PhysicalDeviceObject, ext->NextDeviceObject); todo_wine ok(ext->NextDeviceObject->AttachedDevice == fdo, "wrong attached device\n");

1 0

Zebediah Figura : hidclass.sys: Stop creating a setupapi device.
by Alexandre Julliard 19 Apr '21

19 Apr '21

Module: wine Branch: master Commit: a17367291104e46c573b7213ee94a0f537563ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17367291104e46c573b7213… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 17 19:43:26 2021 -0500 hidclass.sys: Stop creating a setupapi device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 1 - dlls/hidclass.sys/device.c | 64 ------------------------------------------- dlls/hidclass.sys/hid.h | 1 - dlls/hidclass.sys/pnp.c | 21 +++++++++++++- 4 files changed, 20 insertions(+), 67 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 58bb2b5088f..4b1e9338eb4 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass IMPORTS = hal ntoskrnl -DELAYIMPORTS = setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ec34b6b8068..35cc40c01ea 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -25,7 +25,6 @@ #include "hid.h" #include "winreg.h" #include "winuser.h" -#include "setupapi.h" #include "wine/debug.h" #include "ddk/hidsdi.h" @@ -37,69 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); WINE_DECLARE_DEBUG_CHANNEL(hid_report); -/* user32 reserves 1 & 2 for winemouse and winekeyboard, - * keep this in sync with user_private.h */ -#define WINE_MOUSE_HANDLE 1 -#define WINE_KEYBOARD_HANDLE 2 - -static UINT32 alloc_rawinput_handle(void) -{ - static LONG counter = WINE_KEYBOARD_HANDLE + 1; - return InterlockedIncrement(&counter); -} - -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) -{ - WCHAR device_instance_id[MAX_DEVICE_ID_LEN]; - SP_DEVINFO_DATA Data; - HDEVINFO devinfo; - BASE_DEVICE_EXTENSION *ext; - USAGE usage, page; - - ext = device->DeviceExtension; - page = ext->u.pdo.preparsed_data->caps.UsagePage; - usage = ext->u.pdo.preparsed_data->caps.Usage; - - lstrcpyW(device_instance_id, ext->device_id); - lstrcatW(device_instance_id, L"\\"); - lstrcatW(device_instance_id, ext->instance_id); - - devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_HIDCLASS, NULL); - if (devinfo == INVALID_HANDLE_VALUE) - { - FIXME( "failed to get ClassDevs %x\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - Data.cbSize = sizeof(Data); - if (SetupDiCreateDeviceInfoW(devinfo, device_instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) - { - if (!SetupDiRegisterDeviceInfo(devinfo, &Data, 0, NULL, NULL, NULL)) - { - FIXME( "failed to register device info %x\n", GetLastError()); - goto error; - } - } - else if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) - { - FIXME( "failed to create device info %x\n", GetLastError()); - goto error; - } - SetupDiDestroyDeviceInfoList(devinfo); - - if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_MOUSE) - ext->u.pdo.rawinput_handle = WINE_MOUSE_HANDLE; - else if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_KEYBOARD) - ext->u.pdo.rawinput_handle = WINE_KEYBOARD_HANDLE; - else - ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); - - return STATUS_SUCCESS; - -error: - SetupDiDestroyDeviceInfoList(devinfo); - return STATUS_UNSUCCESSFUL; -} - IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) { LIST_ENTRY *entry; diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 2a5636121be..9e829332bdc 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -106,7 +106,6 @@ typedef struct _minidriver NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; /* Internal device functions */ -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; IRP *pop_irp_from_queue(BASE_DEVICE_EXTENSION *ext) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5134cb3569a..b9208d146e6 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -86,6 +86,17 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH return irp_status.u.Status; } +/* user32 reserves 1 & 2 for winemouse and winekeyboard, + * keep this in sync with user_private.h */ +#define WINE_MOUSE_HANDLE 1 +#define WINE_KEYBOARD_HANDLE 2 + +static UINT32 alloc_rawinput_handle(void) +{ + static LONG counter = WINE_KEYBOARD_HANDLE + 1; + return InterlockedIncrement(&counter); +} + static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *bus_pdo) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN], pdo_name[255]; @@ -93,6 +104,7 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b HID_DEVICE_ATTRIBUTES attr = {0}; DEVICE_OBJECT *fdo, *child_pdo; UNICODE_STRING string; + USAGE page, usage; NTSTATUS status; minidriver *minidriver; HID_DESCRIPTOR descriptor; @@ -214,7 +226,14 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b IoInvalidateDeviceRelations(bus_pdo, BusRelations); - HID_LinkDevice(child_pdo); + page = pdo_ext->u.pdo.preparsed_data->caps.UsagePage; + usage = pdo_ext->u.pdo.preparsed_data->caps.Usage; + if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_MOUSE) + pdo_ext->u.pdo.rawinput_handle = WINE_MOUSE_HANDLE; + else if (page == HID_USAGE_PAGE_GENERIC && usage == HID_USAGE_GENERIC_KEYBOARD) + pdo_ext->u.pdo.rawinput_handle = WINE_KEYBOARD_HANDLE; + else + pdo_ext->u.pdo.rawinput_handle = alloc_rawinput_handle(); pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
87
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 April 2021