December 2022 - Wine-Commits

Eric Pouech : wined3d: Reduce usage of long integral types in shader.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: e382812cda421202e32f6bf0e3205b66009d7116 URL: https://gitlab.winehq.org/wine/wine/-/commit/e382812cda421202e32f6bf0e3205b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:43:16 2022 +0100 wined3d: Reduce usage of long integral types in shader.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/shader.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 86a771389a0..897fc3d552d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1884,7 +1884,7 @@ unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_map return wined3d_log2i(map); } -static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD global_flags) +static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, uint32_t global_flags) { if (global_flags & WINED3DSGF_REFACTORING_ALLOWED) { @@ -1912,7 +1912,7 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD shader_addline(buffer, "unknown_flags(%#x)", global_flags); } -static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) +static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, uint32_t sync_flags) { if (sync_flags & WINED3DSSF_GLOBAL_UAV) { @@ -1951,7 +1951,7 @@ static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, uint shader_addline(buffer, "]"); } -static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD uav_flags) +static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, uint32_t uav_flags) { if (uav_flags & WINED3DSUF_GLOBALLY_COHERENT) { @@ -2652,7 +2652,7 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d static void shader_dump_ins_modifiers(struct wined3d_string_buffer *buffer, const struct wined3d_shader_dst_param *dst) { - DWORD mmask = dst->modifiers; + uint32_t mmask = dst->modifiers; switch (dst->shift) { @@ -3981,18 +3981,18 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 { for (i = 0; i < shader->limits->sampler; ++i) { - DWORD flags = state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS]; + uint32_t flags = state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS]; if (flags & WINED3D_TTFF_PROJECTED) { - DWORD tex_transform = flags & ~WINED3D_TTFF_PROJECTED; + uint32_t tex_transform = flags & ~WINED3D_TTFF_PROJECTED; if (!state->shader[WINED3D_SHADER_TYPE_VERTEX]) { enum wined3d_shader_resource_type resource_type = shader->reg_maps.resource_info[i].type; unsigned int j; unsigned int index = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; - DWORD max_valid = WINED3D_TTFF_COUNT4; + uint32_t max_valid = WINED3D_TTFF_COUNT4; for (j = 0; j < state->vertex_declaration->element_count; ++j) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f456d56db31..8df6816b1f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1138,7 +1138,7 @@ struct wined3d_shader_sampler_map struct wined3d_shader_immediate_constant_buffer { unsigned int vec4_count; - DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; + uint32_t data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; }; struct wined3d_shader_indexable_temp @@ -1266,9 +1266,9 @@ struct wined3d_shader_register struct wined3d_shader_dst_param { struct wined3d_shader_register reg; - DWORD write_mask; - DWORD modifiers; - DWORD shift; + uint32_t write_mask; + uint32_t modifiers; + unsigned int shift; }; struct wined3d_shader_src_param

1 0

Eric Pouech : wined3d: Enable long types in shader.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 4de630e97b09e0d008dde377ef01ae12f5885f3f URL: https://gitlab.winehq.org/wine/wine/-/commit/4de630e97b09e0d008dde377ef01ae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:43:18 2022 +0100 wined3d: Enable long types in shader.c. --- dlls/wined3d/shader.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 897fc3d552d..a156d27e7ac 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -21,7 +21,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> #include <string.h> @@ -3893,7 +3892,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, if (FAILED(hr = geometry_shader_init_so_desc(&shader->u.gs, shader->device, so_desc))) { - WARN("Failed to initialise stream output description, hr %#x.\n", hr); + WARN("Failed to initialise stream output description, hr %#lx.\n", hr); return hr; } @@ -4332,7 +4331,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { - WARN("Failed to initialize compute shader, hr %#x.\n", hr); + WARN("Failed to initialize compute shader, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -4366,7 +4365,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { - WARN("Failed to initialize domain shader, hr %#x.\n", hr); + WARN("Failed to initialize domain shader, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -4401,7 +4400,7 @@ HRESULT CDECL wined3d_shader_create_gs(struct wined3d_device *device, const stru if (FAILED(hr = geometry_shader_init(object, device, desc, so_desc, parent, parent_ops))) { - WARN("Failed to initialize geometry shader, hr %#x.\n", hr); + WARN("Failed to initialize geometry shader, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -4428,7 +4427,7 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops))) { - WARN("Failed to initialize hull shader, hr %#x.\n", hr); + WARN("Failed to initialize hull shader, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -4462,7 +4461,7 @@ HRESULT CDECL wined3d_shader_create_ps(struct wined3d_device *device, const stru if (FAILED(hr = pixel_shader_init(object, device, desc, parent, parent_ops))) { - WARN("Failed to initialize pixel shader, hr %#x.\n", hr); + WARN("Failed to initialize pixel shader, hr %#lx.\n", hr); heap_free(object); return hr; } @@ -4489,7 +4488,7 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const stru if (FAILED(hr = vertex_shader_init(object, device, desc, parent, parent_ops))) { - WARN("Failed to initialize vertex shader, hr %#x.\n", hr); + WARN("Failed to initialize vertex shader, hr %#lx.\n", hr); heap_free(object); return hr; }

1 0

Gabriel Ivăncescu : jscript: Create the source function's 'prototype' prop object on demand.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 27ceb62ebdf7ad707d93a73882e91ee4e4594b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/27ceb62ebdf7ad707d93a73882e91e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:51 2022 +0200 jscript: Create the source function's 'prototype' prop object on demand. The 'prototype' prop of a source function is, by default, an empty object with a 'constructor' prop pointing back to the function. Currently, every source function is created in this fashion, which makes it a circular reference and thus prevents it from being freed until the Garbage Collector kicks in. The performance impact comes from the function keeping a ref to the enclosing scope, and since the scope is being held by it, the engine will detach the scope, believing it to be used for the time being (until the GC cleans it). This can cause substantial performance issues for such a common case. The FFXIV Launcher, for example, leaks a large amount of such short-lived functions and the enclosing scopes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/function.c | 67 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 8aa20b44876..5f210a04050 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -756,6 +756,55 @@ HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_pro return S_OK; } +/* + * Create the actual prototype on demand, since it is a circular ref, which prevents the vast + * majority of functions from being released quickly, leading to unnecessary scope detach. + */ +static HRESULT InterpretedFunction_get_prototype(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + jsdisp_t *prototype; + HRESULT hres; + + hres = create_object(ctx, NULL, &prototype); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(jsthis, L"prototype", PROPF_WRITABLE, jsval_obj(prototype)); + if(SUCCEEDED(hres)) + hres = set_constructor_prop(ctx, jsthis, prototype); + if(FAILED(hres)) { + jsdisp_release(prototype); + return hres; + } + + *r = jsval_obj(prototype); + return S_OK; +} + +static HRESULT InterpretedFunction_set_prototype(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) +{ + return jsdisp_define_data_property(jsthis, L"prototype", PROPF_WRITABLE, value); +} + +static const builtin_prop_t InterpretedFunction_props[] = { + {L"arguments", NULL, 0, Function_get_arguments}, + {L"length", NULL, 0, Function_get_length}, + {L"prototype", NULL, 0, InterpretedFunction_get_prototype, InterpretedFunction_set_prototype} +}; + +static const builtin_info_t InterpretedFunction_info = { + JSCLASS_FUNCTION, + Function_value, + ARRAY_SIZE(InterpretedFunction_props), + InterpretedFunction_props, + Function_destructor, + NULL, + NULL, + NULL, + NULL, + Function_gc_traverse +}; + static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *func, jsval_t vthis, unsigned flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -838,24 +887,10 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod scope_chain_t *scope_chain, jsdisp_t **ret) { InterpretedFunction *function; - jsdisp_t *prototype; HRESULT hres; - hres = create_object(ctx, NULL, &prototype); - if(FAILED(hres)) - return hres; - - hres = create_function(ctx, NULL, &InterpretedFunctionVtbl, sizeof(InterpretedFunction), PROPF_CONSTR, - FALSE, NULL, (void**)&function); - if(SUCCEEDED(hres)) { - hres = jsdisp_define_data_property(&function->function.dispex, L"prototype", PROPF_WRITABLE, - jsval_obj(prototype)); - if(SUCCEEDED(hres)) - hres = set_constructor_prop(ctx, &function->function.dispex, prototype); - if(FAILED(hres)) - jsdisp_release(&function->function.dispex); - } - jsdisp_release(prototype); + hres = create_function(ctx, &InterpretedFunction_info, &InterpretedFunctionVtbl, sizeof(InterpretedFunction), + PROPF_CONSTR, FALSE, NULL, (void**)&function); if(FAILED(hres)) return hres;

1 0

Eric Pouech : wined3d: Enable long types in utils.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 4bf5e48c13a91bdba6b0840c68a5be3f74e1e439 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bf5e48c13a91bdba6b0840c68a5be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:42:28 2022 +0100 wined3d: Enable long types in utils.c. --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b93722296f2..fb350acf56f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -23,7 +23,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ #include <stdio.h> @@ -7043,7 +7042,7 @@ void wined3d_release_dc(HWND window, HDC dc) if (WindowFromDC(dc) != window) WARN("DC %p does not belong to window %p.\n", dc, window); else if (!ReleaseDC(window, dc)) - ERR("Failed to release device context %p, last error %#x.\n", dc, GetLastError()); + ERR("Failed to release device context %p, last error %#lx.\n", dc, GetLastError()); } BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other)

1 0

Eric Pouech : wined3d: Reduce usage of long integral types in utils.c.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: a01f00bed7a1f63a02e2548c37c1391b7869bf0c URL: https://gitlab.winehq.org/wine/wine/-/commit/a01f00bed7a1f63a02e2548c37c139… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 8 10:42:27 2022 +0100 wined3d: Reduce usage of long integral types in utils.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 21 +++++++++++---------- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 57f452111a2..ad9f29b72f9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1642,7 +1642,7 @@ HRESULT CDECL wined3d_stateblock_get_light(const struct wined3d_stateblock *stat return WINED3D_OK; } -static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) +static void init_default_render_states(unsigned int rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 16f660a9d71..b93722296f2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2599,7 +2599,8 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for && format->format != GL_LUMINANCE && format->format != GL_LUMINANCE_ALPHA && (format->f.red_size || format->f.alpha_size)) { - DWORD readback[16 * 16 * 16], color = 0, r_range, a_range; + uint32_t readback[16 * 16 * 16], color = 0; + unsigned int r_range, a_range; BYTE r, a; BOOL match = TRUE; GLuint rb; @@ -3309,7 +3310,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) { static const DWORD data[] = {0x00000000, 0xffffffff}; GLuint tex, fbo, buffer; - DWORD readback[16 * 1]; + uint32_t readback[16 * 1]; BOOL ret = FALSE; /* Render a filtered texture and see what happens. This is intended to detect the lack of @@ -3887,7 +3888,7 @@ BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx const struct wined3d_gl_info *gl_info = ctx->gl_info; static const float offset = -63.0f / 128.0f; GLuint texture, fbo; - DWORD readback[4]; + uint32_t readback[4]; unsigned int i; gl_info->gl_ops.gl.p_glGenTextures(1, &texture); @@ -3934,7 +3935,7 @@ bool wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx const struct wined3d_gl_info *gl_info = ctx->gl_info; unsigned int x, y, clear = 0, draw = 0; GLuint texture, fbo; - DWORD readback[8][8]; + uint32_t readback[8][8]; /* This is a very simple test to find out how GL handles polygon edges: * Draw a 1x1 quad exactly through 4 adjacent pixel centers in an 8x8 @@ -4028,7 +4029,7 @@ static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *c static const struct wined3d_color blue = {0.0f, 0.0f, 1.0f, 1.0f}; GLuint fbo, color, depth; unsigned int low = 0, high = 32, cur; - DWORD readback[256]; + uint32_t readback[256]; static const struct wined3d_vec3 geometry[] = { {-1.0f, -1.0f, -1.0f}, @@ -4864,7 +4865,7 @@ static void debug_append(struct debug_buffer *buffer, const char *str, const cha buffer->size -= size; } -const char *wined3d_debug_resource_access(DWORD access) +const char *wined3d_debug_resource_access(uint32_t access) { struct debug_buffer buffer; @@ -4881,7 +4882,7 @@ const char *wined3d_debug_resource_access(DWORD access) return wine_dbg_sprintf("%s", buffer.str); } -const char *wined3d_debug_bind_flags(DWORD bind_flags) +const char *wined3d_debug_bind_flags(uint32_t bind_flags) { struct debug_buffer buffer; @@ -5365,14 +5366,14 @@ const char *debug_shader_type(enum wined3d_shader_type type) } } -const char *debug_d3dstate(DWORD state) +const char *debug_d3dstate(uint32_t state) { if (STATE_IS_RENDER(state)) return wine_dbg_sprintf("STATE_RENDER(%s)", debug_d3drenderstate(state - STATE_RENDER(0))); if (STATE_IS_TEXTURESTAGE(state)) { - DWORD texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - DWORD texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); + unsigned int texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + uint32_t texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); return wine_dbg_sprintf("STATE_TEXTURESTAGE(%#x, %s)", texture_stage, debug_d3dtexturestate(texture_state)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f291201fa31..f456d56db31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3910,7 +3910,7 @@ struct wined3d_state struct wined3d_light_state light_state; - DWORD render_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int render_states[WINEHIGHEST_RENDER_STATE + 1]; struct wined3d_blend_state *blend_state; struct wined3d_color blend_factor; unsigned int sample_mask; @@ -4342,8 +4342,8 @@ static inline float wined3d_alpha_ref(const struct wined3d_state *state) return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f; } -const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; -const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; +const char *wined3d_debug_resource_access(uint32_t access) DECLSPEC_HIDDEN; +const char *wined3d_debug_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; @@ -5770,7 +5770,7 @@ const char *debug_d3dinput_classification(enum wined3d_input_classification clas const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(enum wined3d_sampler_state state) DECLSPEC_HIDDEN; -const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3dstate(uint32_t state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : jscript: Implement CollectGarbage().
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 809a91b82f4e2506ccda106b7ea624d78769343e URL: https://gitlab.winehq.org/wine/wine/-/commit/809a91b82f4e2506ccda106b7ea624… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:51 2022 +0200 jscript: Implement CollectGarbage(). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/global.c | 5 +---- dlls/jscript/tests/run.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c0ed954230b..9dd969aa334 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -549,10 +549,7 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, jsval_t vthi static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - static int once = 0; - if (!once++) - FIXME(": stub\n"); - return S_OK; + return gc_run(ctx); } static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 7955f345281..21f09474fee 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3452,6 +3452,7 @@ static void test_destructors(void) "a.ref = { 'ref': Math, 'a': a }; b.ref = Math.ref;\n" "a.self = a; b.self = b; c.self = c;\n" "})(), true"; + IActiveScriptParse *parser; IActiveScript *script; VARIANT v; HRESULT hres; @@ -3479,6 +3480,25 @@ static void test_destructors(void) CHECK_CALLED(testdestrobj); IActiveScript_Release(script); + + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(cyclic_refs, &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08lx\n", hres); + + SET_EXPECT(testdestrobj); + V_VT(&v) = VT_EMPTY; + hres = IActiveScriptParse_ParseScriptText(parser, L"Math.ref = undefined, CollectGarbage(), true", + NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &v, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + IActiveScriptParse_Release(parser); + CHECK_CALLED(testdestrobj); + + IActiveScript_Release(script); } static void test_eval(void)

1 0

Gabriel Ivăncescu : jscript: Run the garbage collector every 30 seconds on a new object allocation.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: d192aa102f69ff80d1d449431d695216ca52b7df URL: https://gitlab.winehq.org/wine/wine/-/commit/d192aa102f69ff80d1d449431d6952… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:51 2022 +0200 jscript: Run the garbage collector every 30 seconds on a new object allocation. Better heuristics can be used in the future. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/jscript.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index bc6c18bd7ec..04632f4c755 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -945,6 +945,7 @@ HRESULT gc_run(script_ctx_t *ctx) } ctx->gc_is_unlinking = FALSE; + ctx->gc_last_tick = GetTickCount(); return S_OK; } @@ -2145,6 +2146,10 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b { unsigned i; + /* FIXME: Use better heuristics to decide when to run the GC */ + if(GetTickCount() - ctx->gc_last_tick > 30000) + gc_run(ctx); + TRACE("%p (%p)\n", dispex, prototype); dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 66a4258306b..b633f390508 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -379,6 +379,7 @@ struct _script_ctx_t { heap_pool_t tmp_heap; BOOL gc_is_unlinking; + DWORD gc_last_tick; jsval_t *stack; unsigned stack_top;

1 0

Gabriel Ivăncescu : jscript: Implement a Garbage Collector to deal with circular references.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: e8ee6ddae8077873c4a06530fd793a1c8c942428 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8ee6ddae8077873c4a06530fd793a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:50 2022 +0200 jscript: Implement a Garbage Collector to deal with circular references. Implement a basic GC based on the mark-and-sweep algorithm, without requiring manually specifying "roots", which vastly simplifies the code. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 324 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 28 ++++ dlls/jscript/enumerator.c | 11 +- dlls/jscript/function.c | 88 +++++++++++-- dlls/jscript/jscript.c | 3 + dlls/jscript/jscript.h | 20 ++- dlls/jscript/jsregexp.c | 17 ++- dlls/jscript/set.c | 37 +++++- dlls/jscript/tests/run.c | 18 +++ 9 files changed, 532 insertions(+), 14 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Use a jsdisp to hold refs for scopes.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: b0db79d7694a8fe45273c5916f2002458af84c87 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0db79d7694a8fe45273c5916f2002… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Dec 8 17:02:50 2022 +0200 jscript: Use a jsdisp to hold refs for scopes. So the garbage collector can traverse it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 56 +++++++++++++++++++++++++++++++-------------------- dlls/jscript/engine.h | 11 ++++++---- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6c5fe36d29f..bb43df3d4f2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -422,15 +422,40 @@ static inline void clear_acc(script_ctx_t *ctx) ctx->acc = jsval_undefined(); } -static HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) +static void scope_destructor(jsdisp_t *dispex) +{ + scope_chain_t *scope = CONTAINING_RECORD(dispex, scope_chain_t, dispex); + + if(scope->next) + scope_release(scope->next); + + if(scope->obj) + IDispatch_Release(scope->obj); + free(scope); +} + +static const builtin_info_t scope_info = { + JSCLASS_NONE, + NULL, + 0, + NULL, + scope_destructor, +}; + +static HRESULT scope_push(script_ctx_t *ctx, scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope; + HRESULT hres; - new_scope = malloc(sizeof(scope_chain_t)); + new_scope = calloc(1, sizeof(scope_chain_t)); if(!new_scope) return E_OUTOFMEMORY; - new_scope->ref = 1; + hres = init_dispex(&new_scope->dispex, ctx, &scope_info, NULL); + if(FAILED(hres)) { + free(new_scope); + return hres; + } if (obj) IDispatch_AddRef(obj); @@ -453,19 +478,6 @@ static void scope_pop(scope_chain_t **scope) scope_release(tmp); } -void scope_release(scope_chain_t *scope) -{ - if(--scope->ref) - return; - - if(scope->next) - scope_release(scope->next); - - if (scope->obj) - IDispatch_Release(scope->obj); - free(scope); -} - static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) { IDispatchEx *dispex; @@ -975,7 +987,7 @@ static HRESULT interp_push_with_scope(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = scope_push(ctx->call_ctx->scope, to_jsdisp(disp), disp, &ctx->call_ctx->scope); + hres = scope_push(ctx, ctx->call_ctx->scope, to_jsdisp(disp), disp, &ctx->call_ctx->scope); IDispatch_Release(disp); return hres; } @@ -989,7 +1001,7 @@ static HRESULT interp_push_block_scope(script_ctx_t *ctx) TRACE("scope_index %u.\n", scope_index); - hres = scope_push(ctx->call_ctx->scope, NULL, NULL, &frame->scope); + hres = scope_push(ctx, ctx->call_ctx->scope, NULL, NULL, &frame->scope); if (FAILED(hres) || !scope_index) return hres; @@ -1004,7 +1016,7 @@ static HRESULT interp_pop_scope(script_ctx_t *ctx) { TRACE("\n"); - if(ctx->call_ctx->scope->ref > 1) { + if(ctx->call_ctx->scope->dispex.ref > 1) { HRESULT hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) ERR("Failed to detach variable object: %08lx\n", hres); @@ -1201,7 +1213,7 @@ static HRESULT interp_enter_catch(script_ctx_t *ctx) hres = jsdisp_propput_name(scope_obj, ident, v); jsval_release(v); if(SUCCEEDED(hres)) - hres = scope_push(ctx->call_ctx->scope, scope_obj, to_disp(scope_obj), &ctx->call_ctx->scope); + hres = scope_push(ctx, ctx->call_ctx->scope, scope_obj, to_disp(scope_obj), &ctx->call_ctx->scope); jsdisp_release(scope_obj); return hres; } @@ -2919,7 +2931,7 @@ static void pop_call_frame(script_ctx_t *ctx) assert(frame->scope == frame->base_scope); /* If current scope will be kept alive, we need to transfer local variables to its variable object. */ - if(frame->scope && frame->scope->ref > 1) { + if(frame->scope && frame->scope->dispex.ref > 1) { HRESULT hres = detach_variable_object(ctx, frame, TRUE); if(FAILED(hres)) ERR("Failed to detach variable object: %08lx\n", hres); @@ -3191,7 +3203,7 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t frame->pop_variables = i; - hres = scope_push(scope_chain, variable_object, to_disp(variable_object), &scope); + hres = scope_push(ctx, scope_chain, variable_object, to_disp(variable_object), &scope); if(FAILED(hres)) { stack_popn(ctx, ctx->stack_top - orig_stack); return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 194e5244f12..f8046cbaafb 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -222,7 +222,7 @@ static inline bytecode_t *bytecode_addref(bytecode_t *code) } typedef struct _scope_chain_t { - LONG ref; + jsdisp_t dispex; /* FIXME: don't wrap it in a jsdisp (it holds ref and traverse for the garbage collector) */ jsdisp_t *jsobj; IDispatch *obj; unsigned int scope_index; @@ -230,14 +230,17 @@ typedef struct _scope_chain_t { struct _scope_chain_t *next; } scope_chain_t; -void scope_release(scope_chain_t*) DECLSPEC_HIDDEN; - static inline scope_chain_t *scope_addref(scope_chain_t *scope) { - scope->ref++; + jsdisp_addref(&scope->dispex); return scope; } +static inline void scope_release(scope_chain_t *scope) +{ + jsdisp_release(&scope->dispex); +} + struct _jsexcept_t { HRESULT error;

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.237.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 07761336d63be474069ec5114977ac9c13a35783 URL: https://gitlab.winehq.org/wine/wine/-/commit/07761336d63be474069ec5114977ac… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Dec 8 18:48:48 2022 +0100 winevulkan: Update to VK spec version 1.3.237. --- dlls/winevulkan/loader_thunks.c | 12 ++ dlls/winevulkan/loader_thunks.h | 8 + dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 384 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 123 ++++++++++++- 7 files changed, 523 insertions(+), 11 deletions(-)

1 0