July 2024 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Allow objects to have their own addref and release implementation.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 7fedf3a147c52242d4d37ab49117160661a104d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7fedf3a147c52242d4d37ab4911716… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 7 23:03:30 2024 +0200 jscript: Allow objects to have their own addref and release implementation. --- dlls/jscript/dispex.c | 138 +++++++++++++++++++++++++------------------------ dlls/jscript/jscript.h | 29 ++--------- 2 files changed, 74 insertions(+), 93 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8813f6bb71a..440cfc6aaac 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -877,6 +877,11 @@ HRESULT gc_run(script_ctx_t *ctx) chunk->ref[chunk_idx++] = obj->ref; } LIST_FOR_EACH_ENTRY(obj, &thread_data->objects, jsdisp_t, entry) { + /* Skip objects with external reference counter */ + if(obj->builtin_info->addref) { + obj->gc_marked = FALSE; + continue; + } for(prop = obj->props, props_end = prop + obj->prop_cnt; prop < props_end; prop++) { switch(prop->type) { case PROP_JSVAL: @@ -1763,6 +1768,69 @@ static const ITypeCompVtbl ScriptTypeCompVtbl = { ScriptTypeComp_BindType }; +static void jsdisp_free(jsdisp_t *obj) +{ + dispex_prop_t *prop; + + list_remove(&obj->entry); + + TRACE("(%p)\n", obj); + + if(obj->has_weak_refs) { + struct list *list = &RB_ENTRY_VALUE(rb_get(&obj->ctx->thread_data->weak_refs, obj), struct weak_refs_entry, entry)->list; + do { + remove_weakmap_entry(LIST_ENTRY(list->next, struct weakmap_entry, weak_refs_entry)); + } while(obj->has_weak_refs); + } + + for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { + switch(prop->type) { + case PROP_JSVAL: + jsval_release(prop->u.val); + break; + case PROP_ACCESSOR: + if(prop->u.accessor.getter) + jsdisp_release(prop->u.accessor.getter); + if(prop->u.accessor.setter) + jsdisp_release(prop->u.accessor.setter); + break; + default: + break; + }; + free(prop->name); + } + free(obj->props); + script_release(obj->ctx); + if(obj->prototype) + jsdisp_release(obj->prototype); + + if(obj->builtin_info->destructor) + obj->builtin_info->destructor(obj); + free(obj); +} + +jsdisp_t *jsdisp_addref(jsdisp_t *obj) +{ + if(obj->builtin_info->addref) + obj->builtin_info->addref(obj); + else + ++obj->ref; + return obj; +} + +ULONG jsdisp_release(jsdisp_t *obj) +{ + ULONG ref; + + if(obj->builtin_info->release) + return obj->builtin_info->release(obj); + + ref = --obj->ref; + if(!ref) + jsdisp_free(obj); + return ref; +} + static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); @@ -1794,6 +1862,8 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); + if(This->builtin_info->addref) + return This->builtin_info->addref(This); jsdisp_addref(This); return This->ref; } @@ -1801,11 +1871,7 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); - ULONG ref = --This->ref; - TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) - jsdisp_free(This); - return ref; + return jsdisp_release(This); } static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) @@ -2285,68 +2351,6 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return S_OK; } -void jsdisp_free(jsdisp_t *obj) -{ - dispex_prop_t *prop; - - list_remove(&obj->entry); - - TRACE("(%p)\n", obj); - - if(obj->has_weak_refs) { - struct list *list = &RB_ENTRY_VALUE(rb_get(&obj->ctx->thread_data->weak_refs, obj), struct weak_refs_entry, entry)->list; - do { - remove_weakmap_entry(LIST_ENTRY(list->next, struct weakmap_entry, weak_refs_entry)); - } while(obj->has_weak_refs); - } - - for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { - switch(prop->type) { - case PROP_JSVAL: - jsval_release(prop->u.val); - break; - case PROP_ACCESSOR: - if(prop->u.accessor.getter) - jsdisp_release(prop->u.accessor.getter); - if(prop->u.accessor.setter) - jsdisp_release(prop->u.accessor.setter); - break; - default: - break; - }; - free(prop->name); - } - free(obj->props); - script_release(obj->ctx); - if(obj->prototype) - jsdisp_release(obj->prototype); - - if(obj->builtin_info->destructor) - obj->builtin_info->destructor(obj); - free(obj); -} - -#ifdef TRACE_REFCNT - -jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) -{ - ULONG ref = ++jsdisp->ref; - TRACE("(%p) ref=%ld\n", jsdisp, ref); - return jsdisp; -} - -void jsdisp_release(jsdisp_t *jsdisp) -{ - ULONG ref = --jsdisp->ref; - - TRACE("(%p) ref=%ld\n", jsdisp, ref); - - if(!ref) - jsdisp_free(jsdisp); -} - -#endif - HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *constr) { jsdisp_t *prot = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index e091e7acd90..b6248ac6e39 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -190,6 +190,8 @@ typedef struct { DWORD props_cnt; const builtin_prop_t *props; void (*destructor)(jsdisp_t*); + ULONG (*addref)(jsdisp_t*); + ULONG (*release)(jsdisp_t*); void (*on_put)(jsdisp_t*,const WCHAR*); HRESULT (*lookup_prop)(jsdisp_t*,const WCHAR*,struct property_info*); HRESULT (*next_prop)(jsdisp_t*,unsigned,struct property_info*); @@ -230,34 +232,9 @@ static inline IDispatchEx *to_dispex(jsdisp_t *jsdisp) jsdisp_t *as_jsdisp(IDispatch*); jsdisp_t *to_jsdisp(IDispatch*); -void jsdisp_free(jsdisp_t*); - -#ifndef TRACE_REFCNT - -/* - * We do a lot of refcount calls during script execution, so having an inline - * version is a nice perf win. Define TRACE_REFCNT macro when debugging - * refcount bugs to have traces. Also, since jsdisp_t is not thread safe anyways, - * there is no point in using atomic operations. - */ -static inline jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) -{ - jsdisp->ref++; - return jsdisp; -} - -static inline void jsdisp_release(jsdisp_t *jsdisp) -{ - if(!--jsdisp->ref) - jsdisp_free(jsdisp); -} - -#else jsdisp_t *jsdisp_addref(jsdisp_t*); -void jsdisp_release(jsdisp_t*); - -#endif +ULONG jsdisp_release(jsdisp_t*); enum jsdisp_enum_type { JSDISP_ENUM_ALL,

1 0

Jacek Caban : jscript: Introduce HostObject implementation.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 909943a6ccc2e20e3925b91388a97e39a839117b URL: https://gitlab.winehq.org/wine/wine/-/commit/909943a6ccc2e20e3925b91388a97e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 20:38:18 2024 +0200 jscript: Introduce HostObject implementation. --- dlls/jscript/dispex.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.c | 42 ++++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript_main.c | 1 + dlls/jscript/jsdisp.idl | 25 +++++++++++ 5 files changed, 173 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 911b3ab1d73..b684b9edd99 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -3273,3 +3273,107 @@ HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) *r = jsstr_alloc(prop->name); return *r ? S_OK : E_OUTOFMEMORY; } + +typedef struct { + jsdisp_t jsdisp; + IWineJSDispatchHost *host_iface; +} HostObject; + +static inline HostObject *HostObject_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, HostObject, jsdisp); +} + +static ULONG HostObject_addref(jsdisp_t *jsdisp) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + return IWineJSDispatchHost_AddRef(This->host_iface); +} + +static ULONG HostObject_release(jsdisp_t *jsdisp) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + return IWineJSDispatchHost_Release(This->host_iface); +} + +static HRESULT HostObject_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + + return IWineJSDispatchHost_LookupProperty(This->host_iface, name, flags, desc); +} + +static HRESULT HostObject_prop_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + EXCEPINFO ei = { 0 }; + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_EMPTY; + hres = IWineJSDispatchHost_GetProperty(This->host_iface, idx, jsdisp->ctx->lcid, &v, &ei, + &jsdisp->ctx->jscaller->IServiceProvider_iface); + if(hres == DISP_E_EXCEPTION) + handle_dispatch_exception(jsdisp->ctx, &ei); + if(FAILED(hres)) + return hres; + + hres = variant_to_jsval(jsdisp->ctx, &v, r); + VariantClear(&v); + return hres; +} + +static HRESULT HostObject_prop_put(jsdisp_t *jsdisp, unsigned idx, jsval_t v) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + EXCEPINFO ei = { 0 }; + VARIANT var; + HRESULT hres; + + hres = jsval_to_variant(v, &var); + if(FAILED(hres)) + return hres; + + hres = IWineJSDispatchHost_SetProperty(This->host_iface, idx, jsdisp->ctx->lcid, &var, &ei, + &jsdisp->ctx->jscaller->IServiceProvider_iface); + if(hres == DISP_E_EXCEPTION) + handle_dispatch_exception(jsdisp->ctx, &ei); + VariantClear(&var); + return hres; +} + +static HRESULT HostObject_next_prop(jsdisp_t *jsdisp, unsigned id, struct property_info *desc) +{ + HostObject *This = HostObject_from_jsdisp(jsdisp); + + return IWineJSDispatchHost_NextProperty(This->host_iface, id, desc); +} + +static const builtin_info_t HostObject_info = { + .class = JSCLASS_OBJECT, + .addref = HostObject_addref, + .release = HostObject_release, + .lookup_prop = HostObject_lookup_prop, + .prop_get = HostObject_prop_get, + .prop_put = HostObject_prop_put, + .next_prop = HostObject_next_prop, +}; + +HRESULT init_host_object(script_ctx_t *ctx, IWineJSDispatchHost *host_iface, IWineJSDispatch **ret) +{ + HostObject *host_obj; + HRESULT hres; + + if(!(host_obj = calloc(1, sizeof(*host_obj)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&host_obj->jsdisp, ctx, &HostObject_info, ctx->object_prototype); + if(FAILED(hres)) { + free(host_obj); + return hres; + } + + host_obj->host_iface = host_iface; + *ret = &host_obj->jsdisp.IWineJSDispatch_iface; + return S_OK; +} diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index fc07c818edf..4d53e8a6832 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -47,6 +47,7 @@ typedef struct { IActiveScriptProperty IActiveScriptProperty_iface; IObjectSafety IObjectSafety_iface; IVariantChangeType IVariantChangeType_iface; + IWineJScript IWineJScript_iface; LONG ref; @@ -669,6 +670,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IVariantChangeType)) { TRACE("(%p)->(IID_IVariantChangeType %p)\n", This, ppv); *ppv = &This->IVariantChangeType_iface; + }else if(IsEqualGUID(riid, &IID_IWineJScript)) { + TRACE("(%p)->(IID_IWineJScript %p)\n", This, ppv); + *ppv = &This->IWineJScript_iface; } if(*ppv) { @@ -1424,6 +1428,43 @@ static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { VariantChangeType_ChangeType }; +static inline JScript *impl_from_IWineJScript(IWineJScript *iface) +{ + return CONTAINING_RECORD(iface, JScript, IWineJScript_iface); +} + +static HRESULT WINAPI WineJScript_QueryInterface(IWineJScript *iface, REFIID riid, void **ppv) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI WineJScript_AddRef(IWineJScript *iface) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI WineJScript_Release(IWineJScript *iface) +{ + JScript *This = impl_from_IWineJScript(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI WineJScript_InitHostObject(IWineJScript *iface, IWineJSDispatchHost *host_obj, + IWineJSDispatch **ret) +{ + JScript *This = impl_from_IWineJScript(iface); + return init_host_object(This->ctx, host_obj, ret); +} + +static const IWineJScriptVtbl WineJScriptVtbl = { + WineJScript_QueryInterface, + WineJScript_AddRef, + WineJScript_Release, + WineJScript_InitHostObject, +}; + HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) { JScript *ret; @@ -1441,6 +1482,7 @@ HRESULT create_jscript_object(BOOL is_encode, REFIID riid, void **ppv) ret->IActiveScriptProperty_iface.lpVtbl = &JScriptPropertyVtbl; ret->IObjectSafety_iface.lpVtbl = &JScriptSafetyVtbl; ret->IVariantChangeType_iface.lpVtbl = &VariantChangeTypeVtbl; + ret->IWineJScript_iface.lpVtbl = &WineJScriptVtbl; ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX; ret->is_encode = is_encode; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9454d9e3beb..29dec3297ca 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -237,6 +237,7 @@ enum jsdisp_enum_type { HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**); HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*); HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*); +HRESULT init_host_object(script_ctx_t*,IWineJSDispatchHost*,IWineJSDispatch**); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*); HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*); diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index ecbb5a713ab..6ccab362051 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -27,6 +27,7 @@ #include "mshtmhst.h" #include "rpcproxy.h" #include "jscript_classes.h" +#include "jsdisp.h" #include "wine/debug.h" diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index f053149c144..a794dbebe67 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -42,3 +42,28 @@ interface IWineJSDispatch : IDispatchEx { void Free(); } + +[ + object, + uuid(b1ebc544-6644-40c6-97f6-ccd9cc32bfba), + local +] +interface IWineJSDispatchHost : IDispatchEx +{ + HRESULT GetJSDispatch(IWineJSDispatch **ret); + HRESULT LookupProperty(const WCHAR *name, DWORD flags, struct property_info *desc); + HRESULT NextProperty(DISPID id, struct property_info *desc); + HRESULT GetProperty(DISPID id, LCID lcid, VARIANT *r, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT SetProperty(DISPID id, LCID lcid, VARIANT *v, EXCEPINFO *ei, IServiceProvider *caller); + HRESULT CallFunction(DISPID id, UINT32 iid, DISPPARAMS *dp, VARIANT *ret, EXCEPINFO *ei, IServiceProvider *caller); +} + +[ + object, + uuid(d359f2fe-5531-741b-a41a-5cf92edc971d), + local +] +interface IWineJScript : IUnknown +{ + HRESULT InitHostObject(IWineJSDispatchHost *host_obj, IWineJSDispatch **ret); +}

1 0

Jacek Caban : jscript: Introduce IWineJSDispatch insterface.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 6e240977c65a7f2ed93652263654772d3de9ef40 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e240977c65a7f2ed9365226365477… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 19:56:24 2024 +0200 jscript: Introduce IWineJSDispatch insterface. Based on patch by Gabriel Ivăncescu. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/dispex.c | 94 +++++++++++++++++++++++++++--------------------- dlls/jscript/jscript.h | 16 +++------ dlls/jscript/jsdisp.idl | 42 ++++++++++++++++++++++ 4 files changed, 100 insertions(+), 53 deletions(-)

1 0

Jacek Caban : mshtml: Allow external properties to have arbitrary names.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 321526713442f94afab1a9d72f47b69ab106cdf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/321526713442f94afab1a9d72f47b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 8 11:54:59 2024 +0200 mshtml: Allow external properties to have arbitrary names. --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsdisp.idl | 2 ++ dlls/jscript/string.c | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 895e72e041d..911b3ab1d73 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -276,12 +276,13 @@ static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_i struct property_info desc; HRESULT hres; - hres = This->builtin_info->lookup_prop(This, name, &desc); + hres = This->builtin_info->lookup_prop(This, name, + case_insens ? fdexNameCaseInsensitive : fdexNameCaseSensitive, &desc); if(hres != DISP_E_UNKNOWNNAME) { if(FAILED(hres)) return hres; - prop = alloc_prop(This, name, PROP_EXTERN, desc.flags); + prop = alloc_prop(This, desc.name ? desc.name : name, PROP_EXTERN, desc.flags); if(!prop) return E_OUTOFMEMORY; @@ -424,6 +425,8 @@ HRESULT jsdisp_index_lookup(jsdisp_t *obj, const WCHAR *name, unsigned length, s desc->flags = PROPF_ENUMERABLE; if(obj->builtin_info->prop_put) desc->flags |= PROPF_WRITABLE; + desc->name = NULL; + desc->index = idx; return S_OK; } @@ -435,6 +438,8 @@ HRESULT jsdisp_next_index(jsdisp_t *obj, unsigned length, unsigned id, struct pr desc->flags = PROPF_ENUMERABLE; if(obj->builtin_info->prop_put) desc->flags |= PROPF_WRITABLE; + desc->name = NULL; + desc->index = desc->id; return S_OK; } @@ -664,7 +669,7 @@ static HRESULT fill_props(jsdisp_t *obj) if(obj->builtin_info->next_prop) { struct property_info desc; unsigned id = ~0; - WCHAR name[12]; + WCHAR buf[12]; for(;;) { hres = obj->builtin_info->next_prop(obj, id, &desc); @@ -673,11 +678,14 @@ static HRESULT fill_props(jsdisp_t *obj) if(hres == S_FALSE) break; - swprintf(name, ARRAYSIZE(name), L"%u", desc.id); + if(!desc.name) { + swprintf(buf, ARRAYSIZE(buf), L"%u", desc.index); + desc.name = buf; + } - prop = lookup_dispex_prop(obj, string_hash(name), name, FALSE); + prop = lookup_dispex_prop(obj, string_hash(desc.name), desc.name, FALSE); if(!prop) { - prop = alloc_prop(obj, name, PROP_EXTERN, desc.flags); + prop = alloc_prop(obj, desc.name, PROP_EXTERN, desc.flags); if(!prop) return E_OUTOFMEMORY; prop->u.id = desc.id; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e84d2f9b2d8..2be22a9b526 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -478,7 +478,7 @@ static void scope_destructor(jsdisp_t *dispex) IDispatch_Release(scope->obj); } -static HRESULT scope_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT scope_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { scope_chain_t *scope = scope_from_dispex(jsdisp); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 654bf12c7e9..27678fc167c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -117,7 +117,7 @@ static void Arguments_destructor(jsdisp_t *jsdisp) scope_release(arguments->scope); } -static HRESULT Arguments_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT Arguments_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); return jsdisp_index_lookup(&arguments->jsdisp, name, arguments->argc, desc); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3113c0d5a8c..9454d9e3beb 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -185,7 +185,7 @@ typedef struct { ULONG (*addref)(jsdisp_t*); ULONG (*release)(jsdisp_t*); void (*on_put)(jsdisp_t*,const WCHAR*); - HRESULT (*lookup_prop)(jsdisp_t*,const WCHAR*,struct property_info*); + HRESULT (*lookup_prop)(jsdisp_t*,const WCHAR*,unsigned,struct property_info*); HRESULT (*next_prop)(jsdisp_t*,unsigned,struct property_info*); HRESULT (*prop_get)(jsdisp_t*,unsigned,jsval_t*); HRESULT (*prop_put)(jsdisp_t*,unsigned,jsval_t); diff --git a/dlls/jscript/jsdisp.idl b/dlls/jscript/jsdisp.idl index b7cb27a585b..f053149c144 100644 --- a/dlls/jscript/jsdisp.idl +++ b/dlls/jscript/jsdisp.idl @@ -25,6 +25,8 @@ struct property_info { UINT32 id; UINT32 flags; + const WCHAR *name; + UINT32 index; }; const unsigned int PROPF_ENUMERABLE = 0x0400; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3cad5c55a79..968b74f9602 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1501,7 +1501,7 @@ static void String_destructor(jsdisp_t *dispex) jsstr_release(This->str); } -static HRESULT String_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, struct property_info *desc) +static HRESULT String_lookup_prop(jsdisp_t *jsdisp, const WCHAR *name, unsigned flags, struct property_info *desc) { StringInstance *string = string_from_jsdisp(jsdisp);

1 0

Eric Pouech : cmd: Set success/failure return code for PAUSE command.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: d6de4dc6ac06003002dff37eb1ce07c9d8f5da28 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6de4dc6ac06003002dff37eb1ce07… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Jun 30 10:44:09 2024 +0200 cmd: Set success/failure return code for PAUSE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 7 +++++-- programs/cmd/tests/test_builtins.cmd.exp | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 368722ee1f0..bd0d94f00e8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2087,8 +2087,9 @@ RETURN_CODE WCMD_move(void) * Suspend execution of a batch script until a key is typed */ -void WCMD_pause (void) +RETURN_CODE WCMD_pause(void) { + RETURN_CODE return_code = NO_ERROR; DWORD oldmode; BOOL have_console; DWORD count; @@ -2100,9 +2101,11 @@ void WCMD_pause (void) SetConsoleMode(hIn, 0); WCMD_output_asis(anykey); - WCMD_ReadFile(hIn, &key, 1, &count); + if (!WCMD_ReadFile(hIn, &key, 1, &count) || !count) + return_code = ERROR_INVALID_FUNCTION; if (have_console) SetConsoleMode(hIn, oldmode); + return return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 18a7fecbcb7..4b162af9a8e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -619,7 +619,7 @@ foo(a)space@ SUCCESS 0 --- success/failure for PAUSE command -(a)todo_wine@FAILURE 1 +FAILURE 1 --- ------------ Testing 'set' ------------ 1 diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 181e3ed1c2e..6c76070338c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -188,7 +188,7 @@ void WINAPIV WCMD_output (const WCHAR *format, ...); void WINAPIV WCMD_output_stderr (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); void WCMD_output_asis_stderr (const WCHAR *message); -void WCMD_pause (void); +RETURN_CODE WCMD_pause(void); RETURN_CODE WCMD_popd(void); void WCMD_print_error (void); RETURN_CODE WCMD_pushd(const WCHAR *args); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 27723347966..8380207e5d2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1861,7 +1861,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_path(parms_start); break; case WCMD_PAUSE: - WCMD_pause (); + return_code = WCMD_pause(); break; case WCMD_PROMPT: return_code = WCMD_setshow_prompt();

1 0

Eric Pouech : cmd: Set success/failure return code for MORE command.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: ea838ccb95d3df74f3e8647b17fb3773e2178a6d URL: https://gitlab.winehq.org/wine/wine/-/commit/ea838ccb95d3df74f3e8647b17fb37… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:52:33 2024 +0200 cmd: Set success/failure return code for MORE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 11 +++++------ programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index caa76547734..368722ee1f0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3605,17 +3605,17 @@ RETURN_CODE WCMD_type(WCHAR *args) * Output either a file or stdin to screen in pages */ -void WCMD_more (WCHAR *args) { - +RETURN_CODE WCMD_more(WCHAR *args) +{ int argno = 0; WCHAR *argN = args; WCHAR moreStr[100]; WCHAR moreStrPage[100]; WCHAR buffer[512]; DWORD count; + RETURN_CODE return_code = NO_ERROR; /* Prefix the NLS more with '-- ', then load the text */ - errorlevel = NO_ERROR; lstrcpyW(moreStr, L"-- "); LoadStringW(hinst, WCMD_MORESTR, &moreStr[3], ARRAY_SIZE(moreStr)-3); @@ -3647,8 +3647,7 @@ void WCMD_more (WCHAR *args) { /* Restore stdin to what it was */ SetStdHandle(STD_INPUT_HANDLE, hstdin); CloseHandle(hConIn); - - return; + WCMD_output_asis (L"\r\n"); } else { BOOL needsPause = FALSE; @@ -3679,7 +3678,6 @@ void WCMD_more (WCHAR *args) { if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); - errorlevel = ERROR_INVALID_FUNCTION; } else { ULONG64 curPos = 0; ULONG64 fileLen = 0; @@ -3706,6 +3704,7 @@ void WCMD_more (WCHAR *args) { WCMD_leave_paged_mode(); } + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a949693025c..18a7fecbcb7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -614,11 +614,11 @@ FAILURE 2 FAILURE 1 --- success/failure for MORE command SUCCESS 0 -(a)todo_wine@SUCCESS 0 +SUCCESS 0 foo(a)space@ -(a)todo_wine@ -(a)todo_wine@SUCCESS 0 -(a)todo_wine@--- success/failure for PAUSE command + +SUCCESS 0 +--- success/failure for PAUSE command @todo_wine(a)FAILURE 1 --- ------------ Testing 'set' ------------ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index ae8f69166c2..181e3ed1c2e 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -181,7 +181,7 @@ RETURN_CODE WCMD_give_help(WCHAR *args); RETURN_CODE WCMD_goto(void); RETURN_CODE WCMD_label(void); void WCMD_leave_paged_mode(void); -void WCMD_more (WCHAR *); +RETURN_CODE WCMD_more(WCHAR *); RETURN_CODE WCMD_move (void); WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...); void WINAPIV WCMD_output (const WCHAR *format, ...); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4aa5a992218..27723347966 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1925,7 +1925,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_assoc(parms_start, FALSE); break; case WCMD_MORE: - WCMD_more(parms_start); + return_code = WCMD_more(parms_start); break; case WCMD_CHOICE: return_code = WCMD_choice(parms_start);

1 0

Hans Leidekker : msi: Handle failure from MSI_RecordGetInteger().
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 15d1a1933c60064f2994bbdf36a697b54767518f URL: https://gitlab.winehq.org/wine/wine/-/commit/15d1a1933c60064f2994bbdf36a697… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 9 14:45:48 2024 +0200 msi: Handle failure from MSI_RecordGetInteger(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56952 --- dlls/msi/appsearch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 070f31c5227..5813549bdb5 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -953,7 +953,9 @@ static UINT load_drlocator( MSIRECORD *row, void *param ) locator->Parent = msi_dup_record_field( row, 2 ); locator->Path = msi_dup_record_field( row, 3 ); - locator->Depth = MSI_RecordGetInteger( row,4 ); + locator->Depth = MSI_RecordGetInteger( row, 4 ); + if (locator->Depth == MSI_NULL_INTEGER) locator->Depth = 0; + list_add_tail( &package->drlocators, &locator->entry ); return ERROR_SUCCESS; }

1 0

Eric Pouech : cmd: Set success/failure return code for CHOICE command.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 66ed3ea1f06cf6886ce5560de2fc5318741a090a URL: https://gitlab.winehq.org/wine/wine/-/commit/66ed3ea1f06cf6886ce5560de2fc53… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jul 1 14:50:09 2024 +0200 cmd: Set success/failure return code for CHOICE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 24 +++++++++++++----------- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c4a387dc823..caa76547734 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -291,7 +291,8 @@ void WCMD_change_tty (void) { * */ -void WCMD_choice (const WCHAR * args) { +RETURN_CODE WCMD_choice (const WCHAR * args) +{ WCHAR answer[16]; WCHAR buffer[16]; WCHAR *ptr = NULL; @@ -306,11 +307,12 @@ void WCMD_choice (const WCHAR * args) { BOOL opt_s = FALSE; have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); - errorlevel = NO_ERROR; - my_command = xstrdupW(WCMD_skip_leading_spaces((WCHAR*)args)); - ptr = WCMD_skip_leading_spaces(my_command); + ptr = my_command; + /* syntax errors are reported with ERRORLEVEL=1, which doesn't allow to + * discriminate from a choosen option! + */ while (*ptr == '/') { switch (towupper(ptr[1])) { case 'C': @@ -322,7 +324,7 @@ void WCMD_choice (const WCHAR * args) { if (!*ptr || iswspace(*ptr)) { WINE_FIXME("bad parameter %s for /C\n", wine_dbgstr_w(ptr)); free(my_command); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } /* remember the allowed keys (overwrite previous /C option) */ @@ -359,7 +361,7 @@ void WCMD_choice (const WCHAR * args) { if (!opt_default || (*ptr != ',')) { WINE_FIXME("bad option %s for /T\n", opt_default ? wine_dbgstr_w(ptr) : ""); free(my_command); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } ptr++; @@ -378,7 +380,7 @@ void WCMD_choice (const WCHAR * args) { default: WINE_FIXME("bad parameter: %s\n", wine_dbgstr_w(ptr)); free(my_command); - return; + return errorlevel = ERROR_INVALID_FUNCTION; } } @@ -422,11 +424,11 @@ void WCMD_choice (const WCHAR * args) { /* FIXME: Add support for option /T */ answer[1] = 0; /* terminate single character string */ - if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count)) + if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count) || !count) { free(my_command); - errorlevel = NO_ERROR; - return; + /* FIXME: is this choice 1 or ERROR_INVALID_FUNCTION? */ + return errorlevel = 1; } if (!opt_s) @@ -442,7 +444,7 @@ void WCMD_choice (const WCHAR * args) { errorlevel = (ptr - opt_c) + 1; TRACE("answer: %d\n", errorlevel); free(my_command); - return; + return errorlevel; } else { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d9757751bd1..b43848575fc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -693,7 +693,6 @@ call :setError 666 & (echo foo | more &&echo SUCCESS !errorlevel!||echo FAILURE echo --- success/failure for PAUSE command call :setError 666 & (pause < NUL > NUL 2>&1 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) rem TODO: pause is harder to test when fd 1 is a console handle as we don't control output - echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 86e9d22b0ce..a949693025c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -608,11 +608,11 @@ FAILURE 1 SUCCESS 666 SUCCESS 666 --- success/failure for CHOICE command -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 1 -(a)todo_wine@FAILURE 2 -(a)todo_wine@FAILURE 1 -(a)todo_wine@--- success/failure for MORE command +FAILURE 1 +FAILURE 1 +FAILURE 2 +FAILURE 1 +--- success/failure for MORE command SUCCESS 0 @todo_wine(a)SUCCESS 0 foo(a)space@ @@ -659,7 +659,7 @@ I'm here!@space@ I'm here!@space@ ------------ Testing 'choice' ------------ @todo_wine(a)Example message [A,B,C]?A(a)or_broken@choice unavailable -(a)todo_wine@1(a)or_broken@9009 +1(a)or_broken@9009 @todo_wine(a)Example message [A,B,C]?B(a)or_broken@choice unavailable @todo_wine(a)2@or_broken(a)9009 @todo_wine@[D,E,F]?F(a)or_broken@choice unavailable diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 36de66215bd..ae8f69166c2 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -165,7 +165,7 @@ RETURN_CODE WCMD_assoc(const WCHAR *, BOOL); RETURN_CODE WCMD_batch(const WCHAR *, WCHAR *, const WCHAR *, HANDLE); RETURN_CODE WCMD_call(WCHAR *command); void WCMD_change_tty (void); -void WCMD_choice (const WCHAR *); +RETURN_CODE WCMD_choice(const WCHAR *); RETURN_CODE WCMD_clear_screen(void); RETURN_CODE WCMD_color(void); RETURN_CODE WCMD_copy(WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 72df7f2567c..4aa5a992218 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1928,7 +1928,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) WCMD_more(parms_start); break; case WCMD_CHOICE: - WCMD_choice(parms_start); + return_code = WCMD_choice(parms_start); break; case WCMD_MKLINK: WCMD_mklink(parms_start);

1 0

Eric Pouech : cmd: Use the correct output handle in pipe command.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: cec2fd60d2f72138a6749d6d89fd02c6efea18ea URL: https://gitlab.winehq.org/wine/wine/-/commit/cec2fd60d2f72138a6749d6d89fd02… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jul 9 11:01:50 2024 +0200 cmd: Use the correct output handle in pipe command. For commands like '(lhs_command | rhs_command) > foo' run the rhs_command with the expected output handle. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b7aec31ee2f..72df7f2567c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -3728,6 +3728,7 @@ RETURN_CODE node_execute(CMD_NODE *node) WCHAR temp_path[MAX_PATH]; WCHAR filename[MAX_PATH]; CMD_REDIRECTION *output; + HANDLE saved_output; /* FIXME: a real pipe instead of writing to an intermediate file would be * better. @@ -3742,6 +3743,7 @@ RETURN_CODE node_execute(CMD_NODE *node) GetTempFileNameW(temp_path, L"CMD", 0, filename); TRACE("Using temporary file of %ls\n", filename); + saved_output = GetStdHandle(STD_OUTPUT_HANDLE); /* set output for left hand side command */ output = redirection_create_file(REDIR_WRITE_TO, 1, filename); if (set_std_redirections(output)) @@ -3750,7 +3752,7 @@ RETURN_CODE node_execute(CMD_NODE *node) return_code = NO_ERROR; CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); - SetStdHandle(STD_OUTPUT_HANDLE, old_stdhandles[1]); + SetStdHandle(STD_OUTPUT_HANDLE, saved_output); return_code = temp_fixup_return_code(node->left, return_code, NO_ERROR); if (return_code == NO_ERROR)

1 0

Eric Pouech : cmd: Set success/failure return code for TITLE command.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 06038747815015b56d175445ca48cca5057ffc4f URL: https://gitlab.winehq.org/wine/wine/-/commit/06038747815015b56d175445ca48cc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 4 10:24:44 2024 +0200 cmd: Set success/failure return code for TITLE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 6 ++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e5cc69c1461..c4a387dc823 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3538,8 +3538,10 @@ void WCMD_start(WCHAR *args) * * Set the console title */ -void WCMD_title (const WCHAR *args) { - SetConsoleTitleW(args); +RETURN_CODE WCMD_title(const WCHAR *args) +{ + SetConsoleTitleW(args); + return NO_ERROR; } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e1d4d2bc431..36de66215bd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -204,7 +204,7 @@ RETURN_CODE WCMD_setshow_prompt(void); RETURN_CODE WCMD_setshow_time(void); RETURN_CODE WCMD_shift(const WCHAR *args); void WCMD_start (WCHAR *args); -void WCMD_title (const WCHAR *); +RETURN_CODE WCMD_title(const WCHAR *); RETURN_CODE WCMD_type(WCHAR *); RETURN_CODE WCMD_verify(void); RETURN_CODE WCMD_version(void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1411f0f193e..b7aec31ee2f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1895,8 +1895,7 @@ static RETURN_CODE execute_single_command(const WCHAR *command) return_code = WCMD_setshow_time(); break; case WCMD_TITLE: - if (lstrlenW(&whichcmd[count]) > 0) - WCMD_title(&whichcmd[count+1]); + return_code = WCMD_title(parms_start); break; case WCMD_TYPE: return_code = WCMD_type(parms_start);

1 0