August 2021 - Wine-Commits - list.winehq.org

Conor McCarthy : tests: Add a test for the shader DFMA instruction.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: vkd3d Branch: master Commit: ca82a379f51a38e9545abaf2ed8b864fe270980b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ca82a379f51a38e9545abaf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:30 2021 +1000 tests: Add a test for the shader DFMA 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> --- tests/d3d12.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 12dab50..9854af3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9157,6 +9157,29 @@ static void test_shader_instructions(void) 0x30494653, 0x00000008, 0x00000001, 0x00000000, }; static struct named_shader ps_dmin_dmax = {"dmin_dmax", ps_dmin_dmax_code, sizeof(ps_dmin_dmax_code)}; + static const DWORD ps_dfma_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(fma(src0.x, src0.y, 1.0000002433080226l), dst.x, dst.y); + dst.zw = 0; + } +#endif + 0x43425844, 0xde5b55c7, 0x2660b48d, 0x52b1761e, 0x50319c4d, 0x00000001, 0x0000012c, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x0000011c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a0, 0x00000050, + 0x00000028, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0e0000d3, 0x00100032, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x00005002, 0x41500000, 0x3ff00000, 0x00000000, + 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_dfma = {"dfma", ps_dfma_code, sizeof(ps_dfma_code)}; static const DWORD ps_dmovc_code[] = { #if 0 @@ -9936,6 +9959,8 @@ 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}, + {&ps_dfma, {.d = {{1.0000002433080226, 2.000000481493771}}}, + {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, true, 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

Zebediah Figura : build: Make the default symbol visibility "hidden".
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

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

Zebediah Figura : build: Use dllimport/dllexport on Win32 targets.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

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

Conor McCarthy : vkd3d-shader: Implement DFMA instruction.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

Module: vkd3d Branch: master Commit: 242261bc5238f6be27ccde646349dc4f1d2bc3be URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=242261bc5238f6be27ccde6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Aug 10 01:12:31 2021 +1000 vkd3d-shader: Implement DFMA 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 f9be52d..de55d78 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -809,6 +809,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, + {VKD3D_SM5_OP_DFMA, VKD3DSIH_DFMA, "d", "ddd"}, }; static const enum vkd3d_shader_register_type register_type_table[] = diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index c9a389e..d9f6189 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -328,6 +328,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, + VKD3D_SM5_OP_DFMA = 0xd3, }; enum vkd3d_sm4_instruction_modifier diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1b0051e..08709e4 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_DFMA, GLSLstd450Fma}, {VKD3DSIH_DMAX, GLSLstd450NMax}, {VKD3DSIH_DMIN, GLSLstd450NMin}, {VKD3DSIH_EXP, GLSLstd450Exp2}, @@ -9534,6 +9535,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_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: case VKD3DSIH_EXP: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index b0a2298..d0aaa0f 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFB */ "defb", /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", + /* VKD3DSIH_DFMA */ "dfma", /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DLT */ "dlt", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f3aadfc..b64c4b1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -194,6 +194,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFB, VKD3DSIH_DEFI, VKD3DSIH_DEQ, + VKD3DSIH_DFMA, VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DLT, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9854af3..aaf4bfc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9960,7 +9960,7 @@ static void test_shader_instructions(void) {&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}, {&ps_dfma, {.d = {{1.0000002433080226, 2.000000481493771}}}, - {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, true, true}, + {.d = {1.0000002433080226 * 2.000000481493771 + 1.0000002433080226}}, 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

Francois Gouget : winetest/build-patterns: Use JavaScript to hide the WineTest reruns.
by Alexandre Julliard Aug. 9, 2021

Aug. 9, 2021

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 Aug. 6, 2021

Aug. 6, 2021

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 Aug. 6, 2021

Aug. 6, 2021

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

Jan Sikorski : wined3d: Don't try to reset query pools if we don't have a command buffer.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 9b9f07ca84e8059dab4551eac9821c1beca8f37e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9f07ca84e8059dab4551ea… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Aug 4 17:25:00 2021 +0200 wined3d: Don't try to reset query pools if we don't have a command buffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51419 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index eac4eacff5a..8df416851f2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1314,12 +1314,15 @@ void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *conte context_vk->vk_framebuffer = VK_NULL_HANDLE; } - LIST_FOR_EACH_ENTRY_SAFE(pool_vk, pool_vk_next, &context_vk->completed_query_pools, - struct wined3d_query_pool_vk, completed_entry) + if (vk_command_buffer) { - list_remove(&pool_vk->completed_entry); - list_init(&pool_vk->completed_entry); - wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + LIST_FOR_EACH_ENTRY_SAFE(pool_vk, pool_vk_next, &context_vk->completed_query_pools, + struct wined3d_query_pool_vk, completed_entry) + { + list_remove(&pool_vk->completed_entry); + list_init(&pool_vk->completed_entry); + wined3d_query_pool_vk_reset(pool_vk, context_vk, vk_command_buffer); + } } }

1 0

Paul Gofman : jscript: Avoid use after free in JSON_parse().
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 6b22f2bd6003ccc1849900dad0c356cb295d3469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b22f2bd6003ccc1849900da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 6 16:56:49 2021 +0200 jscript: Avoid use after free in JSON_parse(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/json.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index a8014f95b4f..f2fbb80dc09 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -291,16 +291,14 @@ static HRESULT JSON_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign parse_ctx.end = buf + jsstr_length(str); parse_ctx.ctx = ctx; hres = parse_json_value(&parse_ctx, &ret); + if(SUCCEEDED(hres) && skip_spaces(&parse_ctx)) { + FIXME("syntax error\n"); + hres = E_FAIL; + } jsstr_release(str); if(FAILED(hres)) return hres; - if(skip_spaces(&parse_ctx)) { - FIXME("syntax error\n"); - jsval_release(ret); - return E_FAIL; - } - if(r) *r = ret; else

1 0

Jacek Caban : gdi32: Support StockFlag in GDI_HANDLE_ENTRY.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 6d28f3029cff9c7ead5a06e81b28b8e5a3cddbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d28f3029cff9c7ead5a06e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 6 15:59:07 2021 +0100 gdi32: Support StockFlag in GDI_HANDLE_ENTRY. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 1 - include/ntgdi.h | 5 +++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16a7b897e30..326414372e6 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -613,6 +613,16 @@ static void set_gdi_shared(void) NtCurrentTeb()->Peb->GdiSharedHandleTable = &gdi_shared; } +static HGDIOBJ make_stock_object( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry; + + if (!(entry = handle_entry( obj ))) return 0; + entry_obj( entry )->system = TRUE; + entry->StockFlag = 1; + return entry_to_handle( entry ); +} + /*********************************************************************** * DllMain * @@ -668,8 +678,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) { - if (stock_objects[i]) __wine_make_gdi_object_system( stock_objects[i], TRUE ); - if (scaled_stock_objects[i]) __wine_make_gdi_object_system( scaled_stock_objects[i], TRUE ); + stock_objects[i] = make_stock_object( stock_objects[i] ); + scaled_stock_objects[i] = make_stock_object( scaled_stock_objects[i] ); } return TRUE; } diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 789c9ecb0f8..64d37e39ab6 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -396,7 +396,6 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st todo_wine ok(entry->ExtType == NTGDI_OBJ_DC, "ExtType = %x, expected NTGDI_OBJ_DC\n", entry->ExtType); } - todo_wine_if(is_stock) ok(entry->StockFlag == is_stock, "StockFlag = %x\n", entry->StockFlag); ok(entry->Type == (type & 0x1f), "Type = %x, expected %x\n", entry->Type, type & 0x1f); ok(entry->Object, "Object = NULL\n"); diff --git a/include/ntgdi.h b/include/ntgdi.h index d023d10bfc6..d6d7a5572d1 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -67,8 +67,9 @@ typedef struct _GDI_HANDLE_ENTRY /* Wine extension, native uses NTGDI_OBJ_DC */ #define NTGDI_OBJ_MEMDC 0x41 -#define NTGDI_HANDLE_TYPE_SHIFT 16 -#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_TYPE_SHIFT 16 +#define NTGDI_HANDLE_TYPE_MASK 0x007f0000 +#define NTGDI_HANDLE_STOCK_OBJECT 0x00800000 typedef struct _GDI_SHARED_MEMORY {

1 0