November 2019 - Wine-devel - list.winehq.org

[PATCH v2 01/10] vbscript: Move the global lists to the script dispatch object.
by Gabriel Ivăncescu 15 Nov '19

15 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Note that we have to move the non-persistent vbscode from the context's list, so it can be freed by the dispatch object only when it is released. This is needed for the TypeInfo (and named contexts). dlls/vbscript/compile.c | 15 ++++---- dlls/vbscript/interp.c | 39 +++++++++++---------- dlls/vbscript/vbdisp.c | 38 +++++++++++++++----- dlls/vbscript/vbscript.c | 75 +++++++++++++++------------------------- dlls/vbscript/vbscript.h | 43 ++++++++++++----------- 5 files changed, 107 insertions(+), 103 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index bc00209..9ddfacf 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1758,21 +1758,22 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { + ScriptDisp *obj = script->script_obj; class_desc_t *class; vbscode_t *code; unsigned i; - for(i = 0; i < script->global_vars_cnt; i++) { - if(!wcsicmp(script->global_vars[i]->name, identifier)) + for(i = 0; i < obj->global_vars_cnt; i++) { + if(!wcsicmp(obj->global_vars[i]->name, identifier)) return TRUE; } - for(i = 0; i < script->global_funcs_cnt; i++) { - if(!wcsicmp(script->global_funcs[i]->name, identifier)) + for(i = 0; i < obj->global_funcs_cnt; i++) { + if(!wcsicmp(obj->global_funcs[i]->name, identifier)) return TRUE; } - for(class = script->classes; class; class = class->next) { + for(class = obj->classes; class; class = class->next) { if(!wcsicmp(class->name, identifier)) return TRUE; } @@ -1977,8 +1978,8 @@ HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *d desc->func_cnt = 1; desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; - desc->next = script->procs; - script->procs = desc; + desc->next = script->script_obj->procs; + script->script_obj->procs = desc; *ret = desc; return S_OK; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d15a1b5..66ad206 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,7 +94,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } -static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +static BOOL lookup_global_vars(ScriptDisp *script, const WCHAR *name, ref_t *ref) { dynamic_var_t **vars = script->global_vars; size_t i, cnt = script->global_vars_cnt; @@ -112,6 +112,7 @@ static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *r static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { + ScriptDisp *script_obj = ctx->script->script_obj; named_item_t *item; IDispatch *disp; unsigned i; @@ -175,11 +176,11 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_global_vars(ctx->script, name, ref)) + if(lookup_global_vars(script_obj, name, ref)) return S_OK; - for(i = 0; i < ctx->script->global_funcs_cnt; i++) { - function_t *func = ctx->script->global_funcs[i]; + for(i = 0; i < script_obj->global_funcs_cnt; i++) { + function_t *func = script_obj->global_funcs[i]; if(!wcsicmp(func->name, name)) { ref->type = REF_FUNC; ref->u.f = func; @@ -221,12 +222,13 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT **out_var) { + ScriptDisp *script_obj = ctx->script->script_obj; dynamic_var_t *new_var; heap_pool_t *heap; WCHAR *str; unsigned size; - heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; + heap = ctx->func->type == FUNC_GLOBAL ? &script_obj->heap : &ctx->heap; new_var = heap_pool_alloc(heap, sizeof(*new_var)); if(!new_var) @@ -243,19 +245,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - size_t cnt = ctx->script->global_vars_cnt + 1; - if(cnt > ctx->script->global_vars_size) { + size_t cnt = script_obj->global_vars_cnt + 1; + if(cnt > script_obj->global_vars_size) { dynamic_var_t **new_vars; - if(ctx->script->global_vars) - new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + if(script_obj->global_vars) + new_vars = heap_realloc(script_obj->global_vars, cnt * 2 * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); if(!new_vars) return E_OUTOFMEMORY; - ctx->script->global_vars = new_vars; - ctx->script->global_vars_size = cnt * 2; + script_obj->global_vars = new_vars; + script_obj->global_vars_size = cnt * 2; } - ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; + script_obj->global_vars[script_obj->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; @@ -1113,7 +1115,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) return stack_push(ctx, &v); } - for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { + for(class_desc = ctx->script->script_obj->classes; class_desc; class_desc = class_desc->next) { if(!wcsicmp(class_desc->name, arg)) break; } @@ -1133,6 +1135,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) static HRESULT interp_dim(exec_ctx_t *ctx) { + ScriptDisp *script_obj = ctx->script->script_obj; const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; const array_desc_t *array_desc; @@ -1146,13 +1149,13 @@ static HRESULT interp_dim(exec_ctx_t *ctx) if(ctx->func->type == FUNC_GLOBAL) { unsigned i; - for(i = 0; i < ctx->script->global_vars_cnt; i++) { - if(!wcsicmp(ctx->script->global_vars[i]->name, ident)) + for(i = 0; i < script_obj->global_vars_cnt; i++) { + if(!wcsicmp(script_obj->global_vars[i]->name, ident)) break; } - assert(i < ctx->script->global_vars_cnt); - v = &ctx->script->global_vars[i]->v; - array_ref = &ctx->script->global_vars[i]->array; + assert(i < script_obj->global_vars_cnt); + v = &script_obj->global_vars[i]->v; + array_ref = &script_obj->global_vars[i]->array; }else { ref_t ref; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 12626e0..8bb2b68 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -569,11 +569,29 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref); + unsigned i; TRACE("(%p) ref=%d\n", This, ref); if(!ref) { assert(!This->ctx); + + while (This->procs) + { + class_desc_t *class_desc = This->procs; + This->procs = class_desc->next; + heap_free(class_desc); + } + + for (i = 0; i < This->global_vars_cnt; i++) + release_dynamic_var(This->global_vars[i]); + + while (!list_empty(&This->code_list)) + release_vbscode(LIST_ENTRY(list_head(&This->code_list), vbscode_t, entry)); + + heap_pool_free(&This->heap); + heap_free(This->global_vars); + heap_free(This->global_funcs); heap_free(This); } @@ -639,15 +657,15 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(i = 0; i < This->ctx->global_vars_cnt; i++) { - if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) { + for(i = 0; i < This->global_vars_cnt; i++) { + if(!wcsicmp(This->global_vars[i]->name, bstrName)) { *pid = i + 1; return S_OK; } } - for(i = 0; i < This->ctx->global_funcs_cnt; i++) { - if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) { + for(i = 0; i < This->global_funcs_cnt; i++) { + if(!wcsicmp(This->global_funcs[i]->name, bstrName)) { *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } @@ -668,14 +686,14 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if (id & DISPID_FUNCTION_MASK) { id &= ~DISPID_FUNCTION_MASK; - if (id > This->ctx->global_funcs_cnt) + if (id > This->global_funcs_cnt) return DISP_E_MEMBERNOTFOUND; switch (wFlags) { case DISPATCH_METHOD: case DISPATCH_METHOD | DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + hres = exec_script(This->ctx, TRUE, This->global_funcs[id - 1], NULL, pdp, pvarRes); break; default: FIXME("Unsupported flags %x\n", wFlags); @@ -685,16 +703,16 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return hres; } - if (id > This->ctx->global_vars_cnt) + if (id > This->global_vars_cnt) return DISP_E_MEMBERNOTFOUND; - if (This->ctx->global_vars[id - 1]->is_const) + if (This->global_vars[id - 1]->is_const) { FIXME("const not supported\n"); return E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); + return invoke_variant_prop(This->ctx, &This->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) @@ -768,6 +786,8 @@ HRESULT create_script_disp(script_ctx_t *ctx, ScriptDisp **ret) script_disp->IDispatchEx_iface.lpVtbl = &ScriptDispVtbl; script_disp->ref = 1; script_disp->ctx = ctx; + heap_pool_init(&script_disp->heap); + list_init(&script_disp->code_list); *ret = script_disp; return S_OK; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index fdade9f..9d20433 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -82,41 +82,42 @@ static inline BOOL is_started(VBScript *This) static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res) { + ScriptDisp *obj = ctx->script_obj; function_t *func_iter, **new_funcs; dynamic_var_t *var, **new_vars; size_t cnt, i; - cnt = ctx->global_vars_cnt + code->main_code.var_cnt; - if (cnt > ctx->global_vars_size) + cnt = obj->global_vars_cnt + code->main_code.var_cnt; + if (cnt > obj->global_vars_size) { - if (ctx->global_vars) - new_vars = heap_realloc(ctx->global_vars, cnt * sizeof(*new_vars)); + if (obj->global_vars) + new_vars = heap_realloc(obj->global_vars, cnt * sizeof(*new_vars)); else new_vars = heap_alloc(cnt * sizeof(*new_vars)); if (!new_vars) return E_OUTOFMEMORY; - ctx->global_vars = new_vars; - ctx->global_vars_size = cnt; + obj->global_vars = new_vars; + obj->global_vars_size = cnt; } - cnt = ctx->global_funcs_cnt; + cnt = obj->global_funcs_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) cnt++; - if (cnt > ctx->global_funcs_size) + if (cnt > obj->global_funcs_size) { - if (ctx->global_funcs) - new_funcs = heap_realloc(ctx->global_funcs, cnt * sizeof(*new_funcs)); + if (obj->global_funcs) + new_funcs = heap_realloc(obj->global_funcs, cnt * sizeof(*new_funcs)); else new_funcs = heap_alloc(cnt * sizeof(*new_funcs)); if (!new_funcs) return E_OUTOFMEMORY; - ctx->global_funcs = new_funcs; - ctx->global_funcs_size = cnt; + obj->global_funcs = new_funcs; + obj->global_funcs_size = cnt; } for (i = 0; i < code->main_code.var_cnt; i++) { - if (!(var = heap_pool_alloc(&ctx->heap, sizeof(*var)))) + if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var)))) return E_OUTOFMEMORY; var->name = code->main_code.vars[i].name; @@ -124,24 +125,24 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res var->is_const = FALSE; var->array = NULL; - ctx->global_vars[ctx->global_vars_cnt + i] = var; + obj->global_vars[obj->global_vars_cnt + i] = var; } - ctx->global_vars_cnt += code->main_code.var_cnt; + obj->global_vars_cnt += code->main_code.var_cnt; for (func_iter = code->funcs; func_iter; func_iter = func_iter->next) { - for (i = 0; i < ctx->global_funcs_cnt; i++) + for (i = 0; i < obj->global_funcs_cnt; i++) { - if (!wcsicmp(ctx->global_funcs[i]->name, func_iter->name)) + if (!wcsicmp(obj->global_funcs[i]->name, func_iter->name)) { /* global function already exists, replace it */ - ctx->global_funcs[i] = func_iter; + obj->global_funcs[i] = func_iter; break; } } - if (i == ctx->global_funcs_cnt) - ctx->global_funcs[ctx->global_funcs_cnt++] = func_iter; + if (i == obj->global_funcs_cnt) + obj->global_funcs[obj->global_funcs_cnt++] = func_iter; } if (code->classes) @@ -156,8 +157,8 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res class = class->next; } - class->next = ctx->classes; - ctx->classes = code->classes; + class->next = obj->classes; + obj->classes = code->classes; code->last_class = class; } @@ -210,24 +211,10 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { vbscode_t *code, *code_next; - class_desc_t *class_desc; - unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - for(i = 0; i < ctx->global_vars_cnt; i++) - release_dynamic_var(ctx->global_vars[i]); - - heap_free(ctx->global_vars); - heap_free(ctx->global_funcs); - ctx->global_vars = NULL; - ctx->global_vars_cnt = 0; - ctx->global_vars_size = 0; - ctx->global_funcs = NULL; - ctx->global_funcs_cnt = 0; - ctx->global_funcs_size = 0; - LIST_FOR_EACH_ENTRY_SAFE(code, code_next, &ctx->code_list, vbscode_t, entry) { if(code->is_persistent) @@ -236,7 +223,10 @@ static void release_script(script_ctx_t *ctx) if(code->last_class) code->last_class->next = NULL; } else - release_vbscode(code); + { + list_remove(&code->entry); + list_add_tail(&ctx->script_obj->code_list, &code->entry); + } } while(!list_empty(&ctx->named_items)) { @@ -249,13 +239,6 @@ static void release_script(script_ctx_t *ctx) heap_free(iter); } - while(ctx->procs) { - class_desc = ctx->procs; - ctx->procs = class_desc->next; - - heap_free(class_desc); - } - if(ctx->host_global) { IDispatch_Release(ctx->host_global); ctx->host_global = NULL; @@ -278,9 +261,6 @@ static void release_script(script_ctx_t *ctx) script_obj->ctx = NULL; IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - - heap_pool_free(&ctx->heap); - heap_pool_init(&ctx->heap); } static void release_code_list(script_ctx_t *ctx) @@ -1054,7 +1034,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU } ctx->safeopt = INTERFACE_USES_DISPEX; - heap_pool_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1cc36fd..58db0b5 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -120,11 +120,33 @@ struct _vbdisp_t { VARIANT props[1]; }; +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; + BOOL is_const; + SAFEARRAY *array; +} dynamic_var_t; + typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + + function_t **global_funcs; + size_t global_funcs_cnt; + size_t global_funcs_size; + + class_desc_t *classes; + class_desc_t *procs; + script_ctx_t *ctx; + heap_pool_t heap; + + struct list code_list; } ScriptDisp; typedef struct _builtin_prop_t builtin_prop_t; @@ -158,14 +180,6 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) return dp->rgvarg + dp->cArgs-i-1; } -typedef struct _dynamic_var_t { - struct _dynamic_var_t *next; - VARIANT v; - const WCHAR *name; - BOOL is_const; - SAFEARRAY *array; -} dynamic_var_t; - struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -182,19 +196,6 @@ struct _script_ctx_t { EXCEPINFO ei; - dynamic_var_t **global_vars; - size_t global_vars_cnt; - size_t global_vars_size; - - function_t **global_funcs; - size_t global_funcs_cnt; - size_t global_funcs_size; - - class_desc_t *classes; - class_desc_t *procs; - - heap_pool_t heap; - struct list objects; struct list code_list; struct list named_items; -- 2.21.0

2 12

[PATCH 1/2] winetest/dissect: Pids are always present so simplify the regexes.
by Francois Gouget 15 Nov '19

15 Nov '19

Nowadays the tests themselves always put the pid on the unhandled exception and test summary lines. And both WineTest and TestLauncher always put it on the done lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 1bbd78ef2..9cd3f9d60 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -670,9 +670,9 @@ while ($line = <IN>) { get_source_link($l_unit, $l_num) .": ". escapeHTML($l_text)); } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + elsif ($line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($units_re): unhandled exception [0-9a-fA-F]{8} at /)) + $line =~ /([0-9a-f]+):($units_re): unhandled exception [0-9a-fA-F]{8} at /)) { my ($l_pid, $l_unit) = ($1, $2); if ($units{$l_unit}) @@ -685,9 +685,9 @@ while ($line = <IN>) { check_unit($l_unit, "unhandled exception"); $failures++; } - elsif ($line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or + elsif ($line =~ /^([0-9a-f]+):([_a-z0-9]+): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($unit ne "" and - $line =~ /(?:([0-9a-f]+):)?($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + $line =~ /([0-9a-f]+):($unit): (\d+) tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { my ($l_pid, $l_unit, $l_total, $l_todo, $l_failures, $l_skipped) = ($1, $2, $3, $4, $5, $6); @@ -709,9 +709,9 @@ while ($line = <IN>) { check_unit($l_unit, "test summary") if ($class ne "result"); } } - elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or + elsif ($line =~ /^([_.a-z0-9-]+):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or ($dll ne "" and - $line =~ /(\Q$dll\E):([_a-z0-9]+)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/)) + $line =~ /(\Q$dll\E):([_a-z0-9]+):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/)) { my ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4); -- 2.20.1

1 1

[PATCH 1/2] testbot/LogUtils: Pids are always present so simplify the regexes.
by Francois Gouget 15 Nov '19

15 Nov '19

Nowadays the tests themselves always put the pid on the unhandled exception and test summary lines. And both WineTest and TestLauncher always put it on the done lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 99b1568e1..5e5af0e2c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -414,9 +414,9 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or + elsif ($Line =~ /^([0-9a-f]+):([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) + $Line =~ /([0-9a-f]+):($Cur->{UnitsRE}): unhandled exception [0-9a-fA-F]{8} at /)) { my ($Pid, $Unit) = ($1, $2); @@ -429,9 +429,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or + elsif ($Line =~ /^([0-9a-f]+):([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($Cur->{Unit} ne "" and - $Line =~ /(?:([0-9a-f]+):)?($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) + $Line =~ /([0-9a-f]+):($Cur->{Unit}): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); @@ -451,9 +451,9 @@ sub ParseWineTestReport($$$) _CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures); } } - elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or + elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/ or ($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/)) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done $(-?\d+)$(?:\r?$| in)/)) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); @@ -766,7 +766,7 @@ sub GetLogErrors($) next if ($GetCategory->($Line) !~ /error/); - if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + if ($Line =~ m/^[^:]+:([^:]*):[0-9a-f]+ done $258$/) { my $Unit = $1; $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; -- 2.20.1

1 1

[PATCH] winetest/dissect: Simplify a couple of $units_re initializations.
by Francois Gouget 15 Nov '19

15 Nov '19

There is no need for a join() when there is no subtest, yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 13e258e61..6c6c59427 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -603,7 +603,7 @@ while ($line = <IN>) { ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, $l_source, $l_rev); %units = ($unit => 1); - $units_re = join("|", keys %units); + $units_re = $unit; $testbox = create_test_unit_box(); if ($l_type eq "skipped") @@ -728,7 +728,7 @@ while ($line = <IN>) { # and that its results may be inconsistent. ($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-"); %units = ($unit => 1); - $units_re = join("|", keys %units); + $units_re = $unit; $testbox = create_test_unit_box(); add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)"); -- 2.20.1

1 0

[PATCH] comctl32: Bump version to 6.0.
by Dmitry Timoshkov 15 Nov '19

15 Nov '19

An application that I have here checks comctl32.dll version information and refuses to run, changing DLL version to 6.0 makes it run. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/comctl32.h | 2 +- dlls/comctl32/comctl32.rc | 2 +- include/commctrl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index f3e889c4bd..ca1738085a 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -192,7 +192,7 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen) DECLSPEC_HIDDEN; BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; -#define COMCTL32_VERSION_MINOR 81 +#define COMCTL32_VERSION_MINOR 0 /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc index c9aa1ba625..be6e242519 100644 --- a/dlls/comctl32/comctl32.rc +++ b/dlls/comctl32/comctl32.rc @@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine Common Controls" #define WINE_FILENAME_STR "comctl32.dll" #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSION_STR "5.81" +#define WINE_FILEVERSION_STR "6.00.4704.1100" #define WINE_PRODUCTVERSION WINE_FILEVERSION #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR diff --git a/include/commctrl.h b/include/commctrl.h index 700b335fbb..029a4b4545 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -51,7 +51,7 @@ enum _LI_METRIC HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *); HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *); -#define COMCTL32_VERSION 5 /* dll version */ +#define COMCTL32_VERSION 6 /* dll version */ #ifndef _WIN32_IE #define _WIN32_IE 0x0400 -- 2.20.1

6 13

Re: [PATCH v5 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam 15 Nov '19

15 Nov '19

Hello. No news about these patches? Regards. David Le ven. 1 nov. 2019 à 21:49, Marvin <testbot(a)winehq.org> a écrit : > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. >

1 0

[PATCH v2 1/2] ddraw/tests: Expand test_coop_level_d3d_state().
by Zebediah Figura 15 Nov '19

15 Nov '19

As a regression test for bug 48072. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw4.c | 28 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e3146ca45d0..a29dec02d93 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1117,6 +1117,19 @@ static void test_coop_level_d3d_state(void) HWND window; HRESULT hr; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{-1.0f, 1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0x800000ff}, + }; + window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) { @@ -1127,6 +1140,11 @@ static void test_coop_level_d3d_state(void) viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); @@ -1169,6 +1187,16 @@ static void test_coop_level_d3d_state(void) color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2cd3b516f14..2e06844ed55 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1002,6 +1002,19 @@ static void test_coop_level_d3d_state(void) HWND window; HRESULT hr; + static struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{-1.0f, 1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, -1.0f, 0.0f}, 0x800000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0x800000ff}, + }; + window = create_window(); if (!(device = create_device(window, DDSCL_NORMAL))) { @@ -1010,6 +1023,13 @@ static void test_coop_level_d3d_state(void) return; } + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_DESTBLEND, D3DBLEND_DESTALPHA); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); @@ -1071,6 +1091,16 @@ static void test_coop_level_d3d_state(void) color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, ARRAY_SIZE(quad), 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + todo_wine ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(rt); IDirect3DDevice7_Release(device); -- 2.23.0

2 3

[PATCH vkd3d v2] vkd3d: Properly check for program_invocation_name.
by Henri Verbeet 15 Nov '19

15 Nov '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 173750. configure.ac | 2 ++ libs/vkd3d/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 819e768..355aaab 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V # include "vulkan/spirv.h" #endif]) +AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 1fc0e9d..cf0448d 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } -#ifdef _GNU_SOURCE +#if HAVE_DECL_PROGRAM_INVOCATION_NAME bool vkd3d_get_program_name(char program_name[PATH_MAX]) { @@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) return false; } -#endif /* _GNU_SOURCE */ +#endif /* HAVE_DECL_PROGRAM_INVOCATION_NAME */ static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) -- 2.11.0

2 1

[PATCH vkd3d] vkd3d: Properly check for program_invocation_name.
by Henri Verbeet 15 Nov '19

15 Nov '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure.ac | 2 ++ libs/vkd3d/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 819e768..355aaab 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V # include "vulkan/spirv.h" #endif]) +AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 1fc0e9d..1cb8599 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -828,7 +828,7 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } -#ifdef _GNU_SOURCE +#ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME bool vkd3d_get_program_name(char program_name[PATH_MAX]) { @@ -870,7 +870,7 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) return false; } -#endif /* _GNU_SOURCE */ +#endif /* HAVE_DECL_PROGRAM_INVOCATION_NAME */ static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) -- 2.11.0

3 2

[PATCH v2 0/8] Fix spurious rawinput mouse motion.
by Rémi Bernon 15 Nov '19

15 Nov '19

v2: * Add some tests to exhibit broken behavior, then fix it. * Add some tests for foreground/background behavior, and fixed the assumptions made about it. * Removed the dinput8 patches for now, they can be added later. * Renamed the SEND_HWMSG_* flags. Rémi Bernon (8): user32/tests: Add rawinput test for ClipCursor interactions. user32/tests: Add rawinput test for cross-thread interactions. user32/tests: Add rawinput test for cross-process interactions. server: Add send_hardware_message flags for rawinput translation. server: Broadcast rawinput message if request flag is SEND_HWMSG_RAWINPUT. user32: Add __wine_send_input flags to hint raw input translation. winex11.drv: Advertise XInput2 version 2.1 support. winex11.drv: Listen to RawMotion and RawButton* events in the desktop thread. dlls/user32/input.c | 8 +- dlls/user32/tests/input.c | 335 ++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- dlls/wineandroid.drv/keyboard.c | 2 +- dlls/wineandroid.drv/window.c | 4 +- dlls/winemac.drv/ime.c | 4 +- dlls/winemac.drv/keyboard.c | 2 +- dlls/winemac.drv/mouse.c | 2 +- dlls/winex11.drv/event.c | 10 +- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 128 +++++++----- dlls/winex11.drv/x11drv.h | 6 +- dlls/winex11.drv/x11drv_main.c | 4 + include/winuser.h | 2 +- server/protocol.def | 2 + server/queue.c | 110 ++++++++--- 16 files changed, 528 insertions(+), 95 deletions(-) -- 2.24.0.rc2

2 13