wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Conor McCarthy : vkd3d-shader: Implement DMIN instruction.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: 74a9a0b1671e216360c11ebc0cfe7cb1f4ddf28f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74a9a0b1671e216360c11eb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:29 2021 +1000 vkd3d-shader: Implement DMIN instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 584ece9..f9be52d 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -799,6 +799,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = shader_sm5_read_sync}, {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, {VKD3D_SM5_OP_DMAX, VKD3DSIH_DMAX, "d", "dd"}, + {VKD3D_SM5_OP_DMIN, VKD3DSIH_DMIN, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index e4d2146..c9a389e 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -319,6 +319,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DADD = 0xbf, VKD3D_SM5_OP_DMAX = 0xc0, + VKD3D_SM5_OP_DMIN = 0xc1, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DLT = 0xc5, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a94a38a..1b0051e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6844,6 +6844,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( glsl_insts[] = { {VKD3DSIH_DMAX, GLSLstd450NMax}, + {VKD3DSIH_DMIN, GLSLstd450NMin}, {VKD3DSIH_EXP, GLSLstd450Exp2}, {VKD3DSIH_FIRSTBIT_HI, GLSLstd450FindUMsb}, {VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb}, @@ -9534,6 +9535,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction); break; case VKD3DSIH_DMAX: + case VKD3DSIH_DMIN: case VKD3DSIH_EXP: case VKD3DSIH_FIRSTBIT_HI: case VKD3DSIH_FIRSTBIT_LO: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 0da29a8..b0a2298 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", /* VKD3DSIH_DMAX */ "dmax", + /* VKD3DSIH_DMIN */ "dmin", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DNE */ "dne", /* VKD3DSIH_DP2 */ "dp2", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 96e8fb3..f3aadfc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -198,6 +198,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DIV, VKD3DSIH_DLT, VKD3DSIH_DMAX, + VKD3DSIH_DMIN, VKD3DSIH_DMOV, VKD3DSIH_DNE, VKD3DSIH_DP2, diff --git a/tests/d3d12.c b/tests/d3d12.c index b2a338d..12dab50 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9935,7 +9935,7 @@ static void test_shader_instructions(void) {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true}, - {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true}, + {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true}, {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true}, {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true},

1 0

Conor McCarthy : vkd3d-shader: Implement DMAX instruction.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: 44a3ebb77cb52a2d7bd1d033974466576d7d8a22 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44a3ebb77cb52a2d7bd1d03… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:28 2021 +1000 vkd3d-shader: Implement DMAX instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9da89a4..584ece9 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -798,6 +798,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, + {VKD3D_SM5_OP_DMAX, VKD3DSIH_DMAX, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index c94a73d..e4d2146 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -318,6 +318,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DADD = 0xbf, + VKD3D_SM5_OP_DMAX = 0xc0, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DLT = 0xc5, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a1f196..a94a38a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6843,6 +6843,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction( } glsl_insts[] = { + {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_EXP, GLSLstd450Exp2}, {VKD3DSIH_FIRSTBIT_HI, GLSLstd450FindUMsb}, {VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb}, @@ -9532,6 +9533,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_XOR: vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_DMAX: case VKD3DSIH_EXP: case VKD3DSIH_FIRSTBIT_HI: case VKD3DSIH_FIRSTBIT_LO: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d9306d6..0da29a8 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -108,6 +108,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", + /* VKD3DSIH_DMAX */ "dmax", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DNE */ "dne", /* VKD3DSIH_DP2 */ "dp2", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cd3cd49..96e8fb3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -197,6 +197,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DLT, + VKD3DSIH_DMAX, VKD3DSIH_DMOV, VKD3DSIH_DNE, VKD3DSIH_DP2,

1 0

Zebediah Figura : build: Use dllimport/dllexport on Win32 targets.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: cdb9c5808e92d7793baf5200e3c7e4c4eb4ec654 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cdb9c5808e92d7793baf520… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 9 01:11:50 2021 -0500 build: Use dllimport/dllexport on Win32 targets. Tested with x86_64-w64-mingw32-gcc. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 4 +++- include/vkd3d.h | 6 +++--- include/vkd3d_shader.h | 6 +++--- include/vkd3d_types.h | 11 +++++++++++ include/vkd3d_utils.h | 6 +++--- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1946af3..07d5af9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -179,7 +179,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h -libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ +libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT @@ -207,6 +207,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vulkan_procs.h +libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT @@ -218,6 +219,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h +libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT diff --git a/include/vkd3d.h b/include/vkd3d.h index 1bb87b4..61ccf6c 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -153,10 +153,10 @@ struct vkd3d_image_resource_create_info D3D12_RESOURCE_STATES present_state; }; -#if defined(__GNUC__) && !defined(__MINGW32__) -# define VKD3D_API __attribute__((visibility("default"))) +#ifdef LIBVKD3D_SOURCE +# define VKD3D_API VKD3D_EXPORT #else -# define VKD3D_API +# define VKD3D_API VKD3D_IMPORT #endif #ifndef VKD3D_NO_PROTOTYPES diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 24f99fb..5092fac 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1340,10 +1340,10 @@ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_com | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3)); } -#if defined(__GNUC__) && !defined(__MINGW32__) -# define VKD3D_SHADER_API __attribute__((visibility("default"))) +#ifdef LIBVKD3D_SHADER_SOURCE +# define VKD3D_SHADER_API VKD3D_EXPORT #else -# define VKD3D_SHADER_API +# define VKD3D_SHADER_API VKD3D_IMPORT #endif #ifndef VKD3D_SHADER_NO_PROTOTYPES diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 020eb24..7014f4c 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -53,6 +53,17 @@ enum vkd3d_result VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; +#ifdef _WIN32 +# define VKD3D_IMPORT __declspec(dllimport) +# define VKD3D_EXPORT __declspec(dllexport) +#elif defined(__GNUC__) +# define VKD3D_IMPORT +# define VKD3D_EXPORT __attribute__((visibility("default"))) +#else +# define VKD3D_IMPORT +# define VKD3D_EXPORT +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index ea310a0..a81f229 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -34,10 +34,10 @@ extern "C" { #define VKD3D_WAIT_FAILED (~0u) #define VKD3D_INFINITE (~0u) -#if defined(__GNUC__) && !defined(__MINGW32__) -# define VKD3D_UTILS_API __attribute__((visibility("default"))) +#ifdef LIBVKD3D_UTILS_SOURCE +# define VKD3D_UTILS_API VKD3D_EXPORT #else -# define VKD3D_UTILS_API +# define VKD3D_UTILS_API VKD3D_IMPORT #endif /* 1.0 */

1 0

Zebediah Figura : build: Make the default symbol visibility "hidden".
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: vkd3d Branch: master Commit: d27fee64ab51c60078215f461a797edd32bc8871 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d27fee64ab51c60078215f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 9 01:11:49 2021 -0500 build: Make the default symbol visibility "hidden". We tag far fewer symbols this way. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 1 + include/private/vkd3d_blob.h | 2 +- include/private/vkd3d_common.h | 2 +- include/private/vkd3d_debug.h | 19 ++- include/private/vkd3d_memory.h | 3 +- include/private/vkd3d_utf8.h | 2 +- include/vkd3d.h | 48 ++++--- include/vkd3d_shader.h | 41 +++--- include/vkd3d_utils.h | 35 +++-- include/vkd3d_windows.h | 17 +-- libs/vkd3d-common/debug.c | 2 +- libs/vkd3d-shader/hlsl.h | 111 ++++++++-------- libs/vkd3d-shader/preproc.h | 12 +- libs/vkd3d-shader/vkd3d_shader_private.h | 80 ++++++------ libs/vkd3d/vkd3d_private.h | 216 ++++++++++++++----------------- 15 files changed, 286 insertions(+), 305 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=d27fee64ab51c600782…

1 0

Francois Gouget : winetest/build-patterns: Use JavaScript to hide the WineTest reruns.
by Alexandre Julliard 09 Aug '21

09 Aug '21

Module: tools Branch: master Commit: 0f1d2ee4221be776388cdd8cb01f7bafd8584680 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0f1d2ee4221be776388cdd8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 9 02:19:33 2021 +0200 winetest/build-patterns: Use JavaScript to hide the WineTest reruns. They are now included on all pages since they will not mess up the patterns. Also reruns are now right next to the first run which makes it easier to compare them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 16 +++++----------- winetest/patterns.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- winetest/report.css | 3 +++ 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index a1691db..474fa1f 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -436,8 +436,7 @@ sub cmpreports { my $ra = $reports{$a}; my $rb = $reports{$b}; - return $ra->{is_rerun} <=> $rb->{is_rerun} || - ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || + return ($platform_order{$ra->{platform}} || 0) <=> ($platform_order{$rb->{platform}} || 0) || $ra->{tag} cmp $rb->{tag} || ($ra->{num} || 0) <=> ($rb->{num} || 0); } @@ -1465,7 +1464,8 @@ EOF if (!$nolist) { my @table = ("<details><summary>Page cutomization</summary> -<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p>"); +<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p> +<label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label><br>"); if (!$subpage or $subpage eq "-tb-win") { push @table, "<label><input id='tbwin' class='groupcb' type='checkbox' checked> Show the TestBot Windows reports</label><br>"; @@ -1498,7 +1498,8 @@ EOF my $reportdir = $sortedreports[$reportindex] || ""; my $report = $reports{$reportdir}; my $group = " data-group='". ($report->{tag} =~ /^newtb-/ ? "tb" : "") . ($report->{is_wine} ? "wine" : "win") ."'"; - push @table, "<td><label><input class='reportcb'$group type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + my $rerun = $report->{is_rerun} ? " data-rerun='1'" : ""; + push @table, "<td><label><input class='reportcb'$group$rerun type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; } push @table, "</tr>"; } @@ -1546,13 +1547,6 @@ my %tbreports; foreach my $report (values %reports) { next if ($report->{tag} !~ /^newtb-/); # ignore non-TestBot reports - if ($report->{is_rerun}) - { - # Skip reruns because they are infrequent and thus usually do not - # meaningfully contribute to the patterns. - # They can still be checked on the 'all reports' page. - next; - } # Windows and Wine have different failure modes so put them on separate # pages. my $page = $report->{is_wine} ? "wine" : "win"; diff --git a/winetest/patterns.js b/winetest/patterns.js index 80ac4b8..4876113 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -18,14 +18,42 @@ */ "use strict"; +var hide_reruns; +var groups; var cbs; -function refreshPage(changes) +function refreshPage(changes, rerun_checked) { + if (rerun_checked != undefined && rerun_checked != hide_reruns) + { + for (let key in cbs) + { + const cb = cbs[key]; + if (!cb.rerun) continue; + + cb.dom.disabled = rerun_checked; + if (rerun_checked) + { + cb.dom.parentNode.classList.add("disabled"); + cb.dom.parentNode.title = "Reruns are hidden"; + changes[key] = false; + } + else + { + cb.dom.parentNode.classList.remove("disabled"); + cb.dom.parentNode.title = undefined; + changes[key] = groups[cb.group].checked; + } + cb.dom.checked = changes[key]; + } + hide_reruns = rerun_checked; + } + for (let key in changes) { const cb = cbs[key]; if (cb.checked == changes[key]) continue; + if (cb.dom.parentNode.disabled) continue; if (changes[key]) { @@ -50,16 +78,22 @@ function refreshPage(changes) } } +function toggledRerunCB(e) +{ + refreshPage({}, e.target.checked); +} + function toggledGroupCB(e) { const group = e.target.id; const checked = e.target.checked; + groups[group].checked = checked; const changes = {}; for (let key in cbs) { const cb = cbs[key]; - if (cb.group == group) + if (cb.group == group && !cb.dom.disabled) { cb.dom.checked = checked; changes[key] = checked; @@ -78,7 +112,15 @@ function toggledReportCB(e) function init() { + hide_reruns = false; /* reruns are shown by default */ + const domreruns = document.getElementById("reruns"); + domreruns.addEventListener('click', toggledRerunCB); + + groups = {}; document.querySelectorAll("input.groupcb").forEach(domcb => { + groups[domcb.id] = { dom: domcb, + checked: domcb.checked + }; domcb.addEventListener('click', toggledGroupCB); }); @@ -89,6 +131,7 @@ function init() checked: true, /* all reports are shown by default */ display: domcb.style.display, group: domcb.getAttribute("data-group"), + rerun: domcb.getAttribute("data-rerun"), patlines: [] }; changes[domcb.id] = domcb.checked; @@ -118,7 +161,7 @@ function init() /* When reloading a page the browser may preserve the checkbox state * so reapply them to the rest of the page. */ - refreshPage(changes); + refreshPage(changes, domreruns.checked); } window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index f193bc3..d42e05d 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -75,6 +75,9 @@ table.output td { padding: 0 5px 5px; border: 1px solid #601919; } +.disabled { + color: grey; +} .pattern { display: inline-block;

1 0

Gijs Vermeulen : tbs: Add Tbsi_GetDeviceInfo stub.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 2cc98b72846f67ae98bce1882278fce42a02a7fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc98b72846f67ae98bce188… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Aug 6 21:02:26 2021 +0200 tbs: Add Tbsi_GetDeviceInfo stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51560 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tbs/tbs.c | 6 ++++++ dlls/tbs/tbs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c index 452a3890e68..cb18d01fa2c 100644 --- a/dlls/tbs/tbs.c +++ b/dlls/tbs/tbs.c @@ -29,3 +29,9 @@ TBS_RESULT WINAPI Tbsi_Context_Create(const TBS_CONTEXT_PARAMS *params, TBS_HCON FIXME("(%p, %p) stub\n", params, out); return TBS_E_TPM_NOT_FOUND; } + +TBS_RESULT WINAPI Tbsi_GetDeviceInfo(UINT32 size, void *info) +{ + FIXME("(%u, %p) stub\n", size, info); + return TBS_E_TPM_NOT_FOUND; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 151ea1c6478..5fa68007254 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -6,7 +6,7 @@ @ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key @ stub Tbsi_FilterLog -@ stub Tbsi_GetDeviceInfo +@ stdcall Tbsi_GetDeviceInfo(long ptr) @ stub Tbsi_Get_OwnerAuth @ stub Tbsi_Get_TCG_Log @ stub Tbsi_Get_TCG_Log_Ex

1 0

Rémi Bernon : xinput1_3: Move enabled flag to struct xinput_controller.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 419909f4187d66032f167800585a038b5e7b656f URL: https://source.winehq.org/git/wine.git/?a=commit;h=419909f4187d66032f167800… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 17:08:59 2021 +0200 xinput1_3: Move enabled flag to struct xinput_controller. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index d5ddc1f38c8..248f8f796e5 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -56,6 +56,7 @@ struct xinput_controller XINPUT_STATE state; XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; + BOOL enabled; }; /* xinput_crit guards controllers array */ @@ -115,7 +116,6 @@ struct hid_platform_private HANDLE device; WCHAR device_path[MAX_PATH]; - BOOL enabled; char *input_report_buf[2]; char *output_report_buf; @@ -251,7 +251,7 @@ static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *s device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; - if (private->enabled) + if (device->enabled) { memset(output_report_buf, 0, output_report_len); output_report_buf[0] = /* report id */ 0; @@ -274,22 +274,20 @@ static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *s static void controller_enable(struct xinput_controller *controller) { - struct hid_platform_private *private = controller->platform_private; XINPUT_VIBRATION state = controller->vibration; - if (private->enabled) return; + if (controller->enabled) return; if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); - private->enabled = TRUE; + controller->enabled = TRUE; } static void controller_disable(struct xinput_controller *controller) { - struct hid_platform_private *private = controller->platform_private; XINPUT_VIBRATION state = {0}; - if (!private->enabled) return; + if (!controller->enabled) return; if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); - private->enabled = FALSE; + controller->enabled = FALSE; } static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, @@ -309,10 +307,10 @@ static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSE if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; lstrcpynW(private->device_path, device_path, MAX_PATH); - private->enabled = FALSE; memset(&controller->state, 0, sizeof(controller->state)); memset(&controller->vibration, 0, sizeof(controller->vibration)); + controller->enabled = FALSE; EnterCriticalSection(&controller->crit); controller->platform_private = private; @@ -447,7 +445,7 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta ULONG button_length, hat_value; LONG value; - if (!private->enabled) return; + if (!device->enabled) return; if (!HidD_GetInputReport(private->device, report_buf[0], report_len)) {

1 0

Rémi Bernon : xinput1_3: Enable controller on init, disable on remove.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 927ae12abd1c052318d44b5f933d44d15326e356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=927ae12abd1c052318d44b5f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 17:08:58 2021 +0200 xinput1_3: Enable controller on init, disable on remove. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 115 ++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 7f4bb329c75..d5ddc1f38c8 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -240,6 +240,58 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *x return TRUE; } +static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *state) +{ + struct hid_platform_private *private = device->platform_private; + char *output_report_buf = private->output_report_buf; + ULONG output_report_len = private->caps.OutputReportByteLength; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { + device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; + + if (private->enabled) + { + memset(output_report_buf, 0, output_report_len); + output_report_buf[0] = /* report id */ 0; + output_report_buf[1] = 0x8; + output_report_buf[3] = (BYTE)(state->wLeftMotorSpeed / 256); + output_report_buf[4] = (BYTE)(state->wRightMotorSpeed / 256); + + if (!HidD_SetOutputReport(private->device, output_report_buf, output_report_len)) + { + WARN("unable to set output report, HidD_SetOutputReport failed with error %u\n", GetLastError()); + return GetLastError(); + } + + return ERROR_SUCCESS; + } + } + + return ERROR_SUCCESS; +} + +static void controller_enable(struct xinput_controller *controller) +{ + struct hid_platform_private *private = controller->platform_private; + XINPUT_VIBRATION state = controller->vibration; + + if (private->enabled) return; + if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); + private->enabled = TRUE; +} + +static void controller_disable(struct xinput_controller *controller) +{ + struct hid_platform_private *private = controller->platform_private; + XINPUT_VIBRATION state = {0}; + + if (!private->enabled) return; + if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); + private->enabled = FALSE; +} + static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { @@ -257,12 +309,15 @@ static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSE if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; lstrcpynW(private->device_path, device_path, MAX_PATH); - private->enabled = TRUE; + private->enabled = FALSE; memset(&controller->state, 0, sizeof(controller->state)); memset(&controller->vibration, 0, sizeof(controller->vibration)); + EnterCriticalSection(&controller->crit); controller->platform_private = private; + controller_enable(controller); + LeaveCriticalSection(&controller->crit); return TRUE; failed: @@ -350,6 +405,7 @@ static void remove_gamepad(struct xinput_controller *device) { struct hid_platform_private *private = device->platform_private; + controller_disable(device); device->platform_private = NULL; CloseHandle(private->device); @@ -499,60 +555,6 @@ static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *sta memcpy(state, &device->state, sizeof(*state)); } -static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *state) -{ - struct hid_platform_private *private = device->platform_private; - char *output_report_buf = private->output_report_buf; - ULONG output_report_len = private->caps.OutputReportByteLength; - - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) - { - device->vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; - device->vibration.wRightMotorSpeed = state->wRightMotorSpeed; - - if (private->enabled) - { - memset(output_report_buf, 0, output_report_len); - output_report_buf[0] = /* report id */ 0; - output_report_buf[1] = 0x8; - output_report_buf[3] = (BYTE)(state->wLeftMotorSpeed / 256); - output_report_buf[4] = (BYTE)(state->wRightMotorSpeed / 256); - - if (!HidD_SetOutputReport(private->device, output_report_buf, output_report_len)) - { - WARN("unable to set output report, HidD_SetOutputReport failed with error %u\n", GetLastError()); - return GetLastError(); - } - - return ERROR_SUCCESS; - } - } - - return ERROR_SUCCESS; -} - -static void HID_enable(struct xinput_controller *device, BOOL enable) -{ - struct hid_platform_private *private = device->platform_private; - - if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) - { - if (private->enabled && !enable) - { - XINPUT_VIBRATION state; - state.wLeftMotorSpeed = 0; - state.wRightMotorSpeed = 0; - HID_set_state(device, &state); - } - else if (!private->enabled && enable) - { - HID_set_state(device, &device->vibration); - } - } - - private->enabled = enable; -} - static BOOL verify_and_lock_device(struct xinput_controller *device) { if (!device->platform_private) return FALSE; @@ -603,7 +605,8 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) for (index = 0; index < XUSER_MAX_COUNT; index++) { if (!verify_and_lock_device(&controllers[index])) continue; - HID_enable(&controllers[index], enable); + if (enable) controller_enable(&controllers[index]); + else controller_disable(&controllers[index]); unlock_device(&controllers[index]); } }

1 0

Rémi Bernon : xinput1_3: Use a fixed size array for HID device_path.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: ebf95a0785b5b838ade4be30e53c5887ad64102f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf95a0785b5b838ade4be30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 17:08:57 2021 +0200 xinput1_3: Use a fixed size array for HID device_path. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 9c33d705f41..7f4bb329c75 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -114,7 +114,7 @@ struct hid_platform_private HIDP_CAPS caps; HANDLE device; - WCHAR *device_path; + WCHAR device_path[MAX_PATH]; BOOL enabled; char *input_report_buf[2]; @@ -243,7 +243,6 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *x static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { - size_t size; struct hid_platform_private *private; if (!(private = calloc(1, sizeof(struct hid_platform_private)))) return FALSE; @@ -257,9 +256,7 @@ static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSE if (!(private->input_report_buf[0] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->input_report_buf[1] = calloc(1, private->caps.InputReportByteLength))) goto failed; if (!(private->output_report_buf = calloc(1, private->caps.OutputReportByteLength))) goto failed; - size = (lstrlenW(device_path) + 1) * sizeof(WCHAR); - if (!(private->device_path = malloc(size))) goto failed; - memcpy(private->device_path, device_path, size); + lstrcpynW(private->device_path, device_path, MAX_PATH); private->enabled = TRUE; memset(&controller->state, 0, sizeof(controller->state)); @@ -269,7 +266,6 @@ static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSE return TRUE; failed: - free(private->device_path); free(private->input_report_buf[0]); free(private->input_report_buf[1]); free(private->output_report_buf); @@ -360,7 +356,6 @@ static void remove_gamepad(struct xinput_controller *device) free(private->input_report_buf[0]); free(private->input_report_buf[1]); free(private->output_report_buf); - free(private->device_path); HidD_FreePreparsedData(private->preparsed); free(private); }

1 0

Rémi Bernon : xinput1_3: Rename xinput_controller to struct xinput_controller.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 4b9146527a9d44d4cfdb5cfa7bc53224e61e39d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b9146527a9d44d4cfdb5cfa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 6 17:08:56 2021 +0200 xinput1_3: Rename xinput_controller to struct xinput_controller. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 6badd74851c..9c33d705f41 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xinput); -typedef struct _xinput_controller +struct xinput_controller { CRITICAL_SECTION crit; XINPUT_CAPABILITIES caps; @@ -56,7 +56,7 @@ typedef struct _xinput_controller XINPUT_STATE state; XINPUT_GAMEPAD last_keystroke; XINPUT_VIBRATION vibration; -} xinput_controller; +}; /* xinput_crit guards controllers array */ static CRITICAL_SECTION xinput_crit; @@ -68,7 +68,7 @@ static CRITICAL_SECTION_DEBUG xinput_critsect_debug = }; static CRITICAL_SECTION xinput_crit = { &xinput_critsect_debug, -1, 0, 0, 0, 0 }; -static xinput_controller controllers[XUSER_MAX_COUNT]; +static struct xinput_controller controllers[XUSER_MAX_COUNT]; static CRITICAL_SECTION_DEBUG controller_critsect_debug[XUSER_MAX_COUNT] = { { @@ -93,7 +93,7 @@ static CRITICAL_SECTION_DEBUG controller_critsect_debug[XUSER_MAX_COUNT] = }, }; -static xinput_controller controllers[XUSER_MAX_COUNT] = +static struct xinput_controller controllers[XUSER_MAX_COUNT] = { {{ &controller_critsect_debug[0], -1, 0, 0, 0, 0 }}, {{ &controller_critsect_debug[1], -1, 0, 0, 0, 0 }}, @@ -240,7 +240,7 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA preparsed, XINPUT_CAPABILITIES *x return TRUE; } -static BOOL init_controller(xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, +static BOOL init_controller(struct xinput_controller *controller, PHIDP_PREPARSED_DATA preparsed, HIDP_CAPS *caps, HANDLE device, WCHAR *device_path) { size_t size; @@ -346,7 +346,7 @@ static void HID_find_gamepads(void) LeaveCriticalSection(&xinput_crit); } -static void remove_gamepad(xinput_controller *device) +static void remove_gamepad(struct xinput_controller *device) { EnterCriticalSection(&device->crit); @@ -384,7 +384,7 @@ static BYTE scale_byte(LONG value, const struct axis_info *axis) return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; } -static void HID_update_state(xinput_controller *device, XINPUT_STATE *state) +static void HID_update_state(struct xinput_controller *device, XINPUT_STATE *state) { struct hid_platform_private *private = device->platform_private; int i; @@ -504,7 +504,7 @@ static void HID_update_state(xinput_controller *device, XINPUT_STATE *state) memcpy(state, &device->state, sizeof(*state)); } -static DWORD HID_set_state(xinput_controller *device, XINPUT_VIBRATION *state) +static DWORD HID_set_state(struct xinput_controller *device, XINPUT_VIBRATION *state) { struct hid_platform_private *private = device->platform_private; char *output_report_buf = private->output_report_buf; @@ -536,7 +536,7 @@ static DWORD HID_set_state(xinput_controller *device, XINPUT_VIBRATION *state) return ERROR_SUCCESS; } -static void HID_enable(xinput_controller *device, BOOL enable) +static void HID_enable(struct xinput_controller *device, BOOL enable) { struct hid_platform_private *private = device->platform_private; @@ -558,7 +558,7 @@ static void HID_enable(xinput_controller *device, BOOL enable) private->enabled = enable; } -static BOOL verify_and_lock_device(xinput_controller *device) +static BOOL verify_and_lock_device(struct xinput_controller *device) { if (!device->platform_private) return FALSE; @@ -573,7 +573,7 @@ static BOOL verify_and_lock_device(xinput_controller *device) return TRUE; } -static void unlock_device(xinput_controller *device) +static void unlock_device(struct xinput_controller *device) { LeaveCriticalSection(&device->crit); } @@ -772,7 +772,7 @@ static BOOL trigger_is_on(const BYTE value) static DWORD check_for_keystroke(const DWORD index, XINPUT_KEYSTROKE *keystroke) { - xinput_controller *device = &controllers[index]; + struct xinput_controller *device = &controllers[index]; const XINPUT_GAMEPAD *cur; DWORD ret = ERROR_EMPTY; int i;

1 0

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 August 2021