Wine-Devel

By thread

wine-devel@list.winehq.org

May 2022

77 participants
2907 messages

[tools] testbot/build: Run make depend before rebuilding the tests.

by Francois Gouget

'make buildtest' only generates the headers needed by the tests. So it's possible for a patch to introduce a dependency on a header that was not build by Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 ++-- testbot/lib/Build/Utils.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 23ab68587..8502f212d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -167,8 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or - !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests")) + !BuildWine($TaskMissions, 0, "exe32", undef, ["depend", "buildtests"]) or + !BuildWine($TaskMissions, 0, "exe64", undef, ["depend", "buildtests"])) { exit(1); } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9e73cba59..8a84f5e6a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -330,7 +330,7 @@ our $TRY_WERROR = 2; sub BuildWine($$$$;$) { my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_; - $Targets ||= ""; + $Targets ||= [""]; return 1 if (!$TaskMissions->{Builds}->{$Build}); # Rebuild from scratch to make sure cruft will not accumulate @@ -344,14 +344,14 @@ sub BuildWine($$$$;$) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". "time ../wine/configure $Configure --enable-werror && ". - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); } if ($Rc) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". (defined $Configure ? "time ../wine/configure $Configure && " : ""). - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); } if ($Rc) { -- 2.30.2

May 31, 2022

Re: [PATCH 0/5] MR162: explorer: Move clipboard manager thread from display driver. - approved

by Huw Davies (＠huw)

This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/162

May 31, 2022

Re: [PATCH v3 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero. - approved

by Zebediah Figura (＠zfigura)

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/109

May 31, 2022

Re: [PATCH vkd3d 2/6] tests/shader_runner: Use the common resource_readback structure in d3d9 and d3d11 readback structures.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

Re: [PATCH vkd3d 3/6] tests/shader_runner: Use the resource_readback structure in the Vulkan shader runner.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

Re: [PATCH vkd3d 1/6] tests: Separate generic and d3d12-specific readback fields.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

Re: [PATCH vkd3d 6/6] tests/shader_runner: Allow probing a single component.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

Re: [PATCH vkd3d 5/6] tests/shader_runner: Move the check_readback_data_vec4() call to shader_runner.c.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

Re: [PATCH vkd3d 4/6] tests: Move check_readback_data_vec4() to utils.h.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

May 31, 2022

[PATCH v2 3/3] jscript: Release all globals when the script ctx is destroyed or re-initialized.

by Gabriel Ivăncescu

Most of these globals were leaking before as they were never freed at all. Also, they have to be freed during script ctx destruction because an unintialized script might still make use of them (e.g. retrieving a builtin function via PROPERTYGET requires ctx->function_constr to be available). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The previous patch already has tests for that builtin PROPERTYGET thing (with the DISPID obtained before setting it to uninitialized). dlls/jscript/global.c | 1 + dlls/jscript/jscript.c | 27 +++++++++++------------ dlls/jscript/jscript.h | 49 ++++++++++++++++++++++++------------------ 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c0ed954..1fe68b2 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1085,6 +1085,7 @@ HRESULT init_global(script_ctx_t *ctx) if(ctx->global) return S_OK; + script_globals_release(ctx); hres = create_dispex(ctx, &JSGlobal_info, NULL, &ctx->global); if(FAILED(hres)) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index d6028e6..3189528 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -71,11 +71,23 @@ typedef struct { jsexcept_t ei; } JScriptError; +void script_globals_release(script_ctx_t *ctx) +{ + unsigned i; + for(i = 0; i < ARRAY_SIZE(ctx->global_objects); i++) { + if(ctx->global_objects[i]) { + jsdisp_release(ctx->global_objects[i]); + ctx->global_objects[i] = NULL; + } + } +} + void script_release(script_ctx_t *ctx) { if(--ctx->ref) return; + script_globals_release(ctx); jsval_release(ctx->acc); if(ctx->cc) release_cc(ctx->cc); @@ -483,21 +495,6 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) This->ctx->site = NULL; } - if(This->ctx->map_prototype) { - jsdisp_release(This->ctx->map_prototype); - This->ctx->map_prototype = NULL; - } - - if(This->ctx->set_prototype) { - jsdisp_release(This->ctx->set_prototype); - This->ctx->set_prototype = NULL; - } - - if(This->ctx->object_prototype) { - jsdisp_release(This->ctx->object_prototype); - This->ctx->object_prototype = NULL; - } - if(This->ctx->global) { jsdisp_release(This->ctx->global); This->ctx->global = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 000bcc2..c5c9043 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -388,29 +388,36 @@ struct _script_ctx_t { DWORD last_match_length; jsdisp_t *global; - jsdisp_t *function_constr; - jsdisp_t *array_constr; - jsdisp_t *bool_constr; - jsdisp_t *date_constr; - jsdisp_t *enumerator_constr; - jsdisp_t *error_constr; - jsdisp_t *eval_error_constr; - jsdisp_t *range_error_constr; - jsdisp_t *reference_error_constr; - jsdisp_t *regexp_error_constr; - jsdisp_t *syntax_error_constr; - jsdisp_t *type_error_constr; - jsdisp_t *uri_error_constr; - jsdisp_t *number_constr; - jsdisp_t *object_constr; - jsdisp_t *object_prototype; - jsdisp_t *regexp_constr; - jsdisp_t *string_constr; - jsdisp_t *vbarray_constr; - jsdisp_t *map_prototype; - jsdisp_t *set_prototype; + union { + struct { + jsdisp_t *function_constr; + jsdisp_t *array_constr; + jsdisp_t *bool_constr; + jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; + jsdisp_t *error_constr; + jsdisp_t *eval_error_constr; + jsdisp_t *range_error_constr; + jsdisp_t *reference_error_constr; + jsdisp_t *regexp_error_constr; + jsdisp_t *syntax_error_constr; + jsdisp_t *type_error_constr; + jsdisp_t *uri_error_constr; + jsdisp_t *number_constr; + jsdisp_t *object_constr; + jsdisp_t *object_prototype; + jsdisp_t *regexp_constr; + jsdisp_t *string_constr; + jsdisp_t *vbarray_constr; + jsdisp_t *map_prototype; + jsdisp_t *set_prototype; + }; + jsdisp_t *global_objects[21]; + }; }; +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, set_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); +void script_globals_release(script_ctx_t *ctx) DECLSPEC_HIDDEN; void script_release(script_ctx_t*) DECLSPEC_HIDDEN; static inline void script_addref(script_ctx_t *ctx) -- 2.34.1

May 31, 2022

Jump to page: