wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Jacek Caban : vbscript: Move create_script_disp call to SetScriptSite.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 229a583c543499f4fcb565fd39206c393124f15d URL: https://source.winehq.org/git/wine.git/?a=commit;h=229a583c543499f4fcb565fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:34 2019 +0200 vbscript: Move create_script_disp call to SetScriptSite. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 12 ------------ dlls/vbscript/vbscript.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0f85f66bad..364ff0c02c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2860,14 +2860,6 @@ void detach_global_objects(script_ctx_t *ctx) IDispatch_Release(&ctx->global_obj->IDispatch_iface); ctx->global_obj = NULL; } - - if(ctx->script_obj) { - ScriptDisp *script_obj = ctx->script_obj; - - ctx->script_obj = NULL; - script_obj->ctx = NULL; - IDispatchEx_Release(&script_obj->IDispatchEx_iface); - } } HRESULT init_global(script_ctx_t *ctx) @@ -2878,9 +2870,5 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = create_script_disp(ctx, &ctx->script_obj); - if(FAILED(hres)) - return hres; - return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), &ctx->err_obj); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ad5dea5498..8b81b7a5e3 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -182,6 +182,14 @@ static void release_script(script_ctx_t *ctx) ctx->site = NULL; } + if(ctx->script_obj) { + ScriptDisp *script_obj = ctx->script_obj; + + ctx->script_obj = NULL; + script_obj->ctx = NULL; + IDispatchEx_Release(&script_obj->IDispatchEx_iface); + } + detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); @@ -415,6 +423,10 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; + hres = create_script_disp(This->ctx, &This->ctx->script_obj); + if(FAILED(hres)) + return hres; + This->ctx->site = pass; IActiveScriptSite_AddRef(This->ctx->site); @@ -514,7 +526,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + if(This->thread_id != GetCurrentThreadId() || !This->ctx->site) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) {

1 0

Jacek Caban : vbscript: Store script site only in script context.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: cbf620491b31b06ee9304dfad19c479ee4e230fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbf620491b31b06ee9304dfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:27 2019 +0200 vbscript: Store script site only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 02407594e8..ad5dea5498 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -52,7 +52,6 @@ struct VBScript { LONG ref; SCRIPTSTATE state; - IActiveScriptSite *site; script_ctx_t *ctx; LONG thread_id; BOOL is_initialized; @@ -70,8 +69,8 @@ static void change_state(VBScript *This, SCRIPTSTATE state) return; This->state = state; - if(This->site) - IActiveScriptSite_OnStateChange(This->site, state); + if(This->ctx->site) + IActiveScriptSite_OnStateChange(This->ctx->site, state); } static inline BOOL is_started(VBScript *This) @@ -137,9 +136,6 @@ static HRESULT set_ctx_site(VBScript *This) if(FAILED(hres)) return hres; - IActiveScriptSite_AddRef(This->site); - This->ctx->site = This->site; - change_state(This, SCRIPTSTATE_INITIALIZED); return S_OK; } @@ -218,12 +214,6 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) case SCRIPTSTATE_INITIALIZED: case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); - - if(This->site) { - IActiveScriptSite_Release(This->site); - This->site = NULL; - } - release_script(This->ctx); This->thread_id = 0; break; @@ -402,8 +392,6 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); destroy_script(This->ctx); - if(This->site) - IActiveScriptSite_Release(This->site); heap_free(This); } @@ -421,16 +409,16 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(!pass) return E_POINTER; - if(This->site) + if(This->ctx->site) return E_UNEXPECTED; if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) return E_UNEXPECTED; - This->site = pass; - IActiveScriptSite_AddRef(This->site); + This->ctx->site = pass; + IActiveScriptSite_AddRef(This->ctx->site); - hres = IActiveScriptSite_GetLCID(This->site, &lcid); + hres = IActiveScriptSite_GetLCID(This->ctx->site, &lcid); if(hres == S_OK) This->ctx->lcid = lcid; @@ -532,7 +520,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(This->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(This->ctx->site, pstrName, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); return hres; @@ -748,7 +736,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - return This->site ? set_ctx_site(This) : S_OK; + return This->ctx->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface,

1 0

Jacek Caban : vbscript: Store lcid only in script context.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 7665051d67b82c4df4d0fbf50aa46d6cc4e16a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7665051d67b82c4df4d0fbf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:23 2019 +0200 vbscript: Store lcid only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index ae36e91588..02407594e8 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -55,7 +55,6 @@ struct VBScript { IActiveScriptSite *site; script_ctx_t *ctx; LONG thread_id; - LCID lcid; BOOL is_initialized; }; @@ -134,8 +133,6 @@ static HRESULT set_ctx_site(VBScript *This) { HRESULT hres; - This->ctx->lcid = This->lcid; - hres = init_global(This->ctx); if(FAILED(hres)) return hres; @@ -435,7 +432,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript hres = IActiveScriptSite_GetLCID(This->site, &lcid); if(hres == S_OK) - This->lcid = lcid; + This->ctx->lcid = lcid; return This->is_initialized ? set_ctx_site(This) : S_OK; }

1 0

Jacek Caban : vbscript: Store safety options only in script context.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: ad8917c6b709572b442b25a09fb48b6b99cdfb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8917c6b709572b442b25a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:18 2019 +0200 vbscript: Store safety options only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 976e751919..ae36e91588 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -51,7 +51,6 @@ struct VBScript { LONG ref; - DWORD safeopt; SCRIPTSTATE state; IActiveScriptSite *site; script_ctx_t *ctx; @@ -752,7 +751,6 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -914,7 +912,7 @@ static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *if return E_POINTER; *pdwSupportedOptions = SUPPORTED_OPTIONS; - *pdwEnabledOptions = This->safeopt; + *pdwEnabledOptions = This->ctx->safeopt; return S_OK; } @@ -928,7 +926,7 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if if(dwOptionSetMask & ~SUPPORTED_OPTIONS) return E_FAIL; - This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; + This->ctx->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->ctx->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; return S_OK; } @@ -960,7 +958,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; - ret->safeopt = INTERFACE_USES_DISPEX; ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); if(!ctx) {

1 0

Jacek Caban : vbscript: Create script context in CreateInstance.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 271819e7501686f9376f7643a614b9385acec30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=271819e7501686f9376f7643… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:14 2019 +0200 vbscript: Create script context in CreateInstance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 54 +++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 760a7a3256..976e751919 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -57,6 +57,7 @@ struct VBScript { script_ctx_t *ctx; LONG thread_id; LCID lcid; + BOOL is_initialized; }; typedef struct { @@ -227,9 +228,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) This->site = NULL; } - if(This->ctx) - release_script(This->ctx); - + release_script(This->ctx); This->thread_id = 0; break; case SCRIPTSTATE_CLOSED: @@ -405,11 +404,8 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) TRACE("(%p) ref=%d\n", iface, ref); if(!ref) { - if(This->ctx) { - decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); - This->ctx = NULL; - } + decrease_state(This, SCRIPTSTATE_CLOSED); + destroy_script(This->ctx); if(This->site) IActiveScriptSite_Release(This->site); heap_free(This); @@ -442,7 +438,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->lcid = lcid; - return This->ctx ? set_ctx_site(This) : S_OK; + return This->is_initialized ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -470,7 +466,7 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE return S_OK; } - if(!This->ctx) + if(!This->is_initialized) return E_UNEXPECTED; switch(ss) { @@ -534,7 +530,7 @@ static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstr TRACE("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->state == SCRIPTSTATE_CLOSED) + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { @@ -597,7 +593,7 @@ static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR if(!ppdisp) return E_POINTER; - if(This->thread_id != GetCurrentThreadId() || !This->ctx || !This->ctx->script_obj) { + if(This->thread_id != GetCurrentThreadId() || !This->ctx->script_obj) { *ppdisp = NULL; return E_UNEXPECTED; } @@ -749,29 +745,14 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - script_ctx_t *ctx, *old_ctx; TRACE("(%p)\n", This); - if(This->ctx) - return E_UNEXPECTED; - - ctx = heap_alloc_zero(sizeof(script_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->safeopt = This->safeopt; - heap_pool_init(&ctx->heap); - list_init(&ctx->objects); - list_init(&ctx->code_list); - list_init(&ctx->named_items); - - old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(old_ctx) { - destroy_script(ctx); + if(This->is_initialized) return E_UNEXPECTED; - } + This->is_initialized = TRUE; + This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -961,6 +942,7 @@ static const IObjectSafetyVtbl VBScriptSafetyVtbl = { HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { + script_ctx_t *ctx; VBScript *ret; HRESULT hres; @@ -980,6 +962,18 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->state = SCRIPTSTATE_UNINITIALIZED; ret->safeopt = INTERFACE_USES_DISPEX; + ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); + if(!ctx) { + heap_free(ret); + return E_OUTOFMEMORY; + } + + ctx->safeopt = INTERFACE_USES_DISPEX; + heap_pool_init(&ctx->heap); + list_init(&ctx->objects); + list_init(&ctx->code_list); + list_init(&ctx->named_items); + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); return hres;

1 0

Jacek Caban : vbscript: Fix NULL IDispatch handling in get_disp_value.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 79f39c2a8c450ece6f128a27182373971ef1246d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f39c2a8c450ece6f128a27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:09 2019 +0200 vbscript: Fix NULL IDispatch handling in get_disp_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 23 ++++++++++++++--------- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 ++ dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 251fd785cf..80ecc41699 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -319,7 +319,7 @@ static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) HRESULT hres; hres = get_disp_value(ctx->script, V_DISPATCH(r->v), &r->store); - if(r->owned) + if(r->owned && V_DISPATCH(r->v)) IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) return hres; @@ -350,7 +350,8 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) disp = V_DISPATCH(v); hres = get_disp_value(ctx->script, disp, v); - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; } @@ -688,23 +689,27 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD flags) { + VARIANT value; HRESULT hres; - hres = VariantCopyInd(dst, src); + V_VT(&value) = VT_EMPTY; + hres = VariantCopyInd(&value, src); if(FAILED(hres)) return hres; - if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { - VARIANT value; + if(V_VT(&value) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { + IDispatch *disp = V_DISPATCH(&value); - hres = get_disp_value(ctx->script, V_DISPATCH(dst), &value); - IDispatch_Release(V_DISPATCH(dst)); + V_VT(&value) = VT_EMPTY; + hres = get_disp_value(ctx->script, disp, &value); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; - - *dst = value; } + VariantClear(dst); + *dst = value; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d9fb80617..6ddb2e79f5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1354,6 +1354,28 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_nothing_errors + dim x + on error resume next + + x = 1 + err.clear + x = nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = not nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = "" & nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) +end sub +call test_nothing_errors() + sub test_identifiers ' test keywords that can also be a declared identifier Dim default diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index cb902b9bc5..1dd6d4ed05 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -967,6 +967,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, HRESULT get_disp_value(script_ctx_t *ctx, IDispatch *disp, VARIANT *v) { DISPPARAMS dp = {NULL}; + if(!disp) + return MAKE_VBSERROR(VBSE_OBJECT_VARIABLE_NOT_SET); return disp_call(ctx, disp, DISPID_VALUE, &dp, v); } diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index e1d84501ba..360b1006d6 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -37,6 +37,7 @@ STRINGTABLE VBSE_PERMISSION_DENIED "Permission denied" VBSE_PATH_FILE_ACCESS "Path/File access error" VBSE_PATH_NOT_FOUND "Path not found" + VBSE_OBJECT_VARIABLE_NOT_SET "Object variable not set" VBSE_ILLEGAL_NULL_USE "Invalid use of Null" VBSE_CANT_CREATE_TMP_FILE "Can't create necessary temporary file" VBSE_CANT_CREATE_OBJECT "ActiveX component can't create object" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 42c1ff5786..44f005b640 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -250,6 +250,7 @@ #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_OBJECT_VARIABLE_NOT_SET 91 #define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_CANT_CREATE_TMP_FILE 322 #define VBSE_CANT_CREATE_OBJECT 429

1 0

Jacek Caban : vbscript: Use global object property to expose Err object.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 087adea7dc503dadf55046622adf05d43555e822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087adea7dc503dadf5504662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:03 2019 +0200 vbscript: Use global object property to expose Err object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 16 ++++++++++++++++ dlls/vbscript/interp.c | 8 -------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 50f54f38a6..0f85f66bad 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2486,6 +2486,21 @@ static HRESULT Global_GetRef(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } +static HRESULT Global_Err(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +{ + TRACE("\n"); + + if(args_cnt) { + FIXME("Setter not supported\n"); + return E_NOTIMPL; + } + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = &This->ctx->err_obj->IDispatch_iface; + IDispatch_AddRef(V_DISPATCH(res)); + return S_OK; +} + static const string_constant_t vbCr = {1, {'\r'}}; static const string_constant_t vbCrLf = {2, {'\r','\n'}}; static const string_constant_t vbNewLine = {2, {'\r','\n'}}; @@ -2526,6 +2541,7 @@ static const builtin_prop_t global_props[] = { {L"DateValue", Global_DateValue, 0, 1}, {L"Day", Global_Day, 0, 1}, {L"Erase", Global_Erase, 0, 1}, + {L"Err", Global_Err, BP_GETPUT}, {L"Escape", Global_Escape, 0, 1}, {L"Eval", Global_Eval, 0, 1}, {L"Execute", Global_Execute, 0, 1}, diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45dcb45303..251fd785cf 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,8 +104,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - static const WCHAR errW[] = {'e','r','r',0}; - if(invoke_type == VBDISP_LET && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !wcsicmp(name, ctx->func->name)) { @@ -175,12 +173,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(!wcsicmp(name, errW)) { - ref->type = REF_OBJ; - ref->u.obj = &ctx->script->err_obj->IDispatch_iface; - return S_OK; - } - hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP;

1 0

Alistair Leslie-Hughes : include: Add COM_DECLSPEC_NOTHROW define.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 2ef00173e1d770b336597f9618f8272cefec727b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef00173e1d770b336597f96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 18 02:48:15 2019 +0000 include: Add COM_DECLSPEC_NOTHROW define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 11 +++++++++-- include/objbase.h | 14 ++++++++++---- include/winnt.h | 10 ++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 94875334b0..82b25b7a17 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -40,9 +40,16 @@ #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE #if defined(__cplusplus) && !defined(CINTERFACE) + +#ifdef COM_STDMETHOD_CAN_THROW +# define COM_DECLSPEC_NOTHROW +#else +# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW +#endif + # define interface struct -# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m -# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m +# define STDMETHOD(m) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m +# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m # define PURE =0 # define THIS_ # define THIS void diff --git a/include/objbase.h b/include/objbase.h index a241b71199..78ec6d366d 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -172,12 +172,18 @@ #if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef COM_STDMETHOD_CAN_THROW +# define COM_DECLSPEC_NOTHROW +#else +# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW +#endif + /* C++ interface */ -#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method -#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method -#define STDMETHODV(method) virtual HRESULT STDMETHODVCALLTYPE method -#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method +#define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method +#define STDMETHOD_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method +#define STDMETHODV(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method +#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method #define PURE = 0 #define THIS_ diff --git a/include/winnt.h b/include/winnt.h index 3f59bd9f30..9c39eb7e4d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -76,6 +76,16 @@ extern "C" { # endif #endif +#ifndef DECLSPEC_NOTHROW +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NOTHROW __declspec(nothrow) +# elif defined(__GNUC__) +# define DECLSPEC_NOTHROW __attribute__((nothrow)) +# else +# define DECLSPEC_NOTHROW +# endif +#endif + #ifndef DECLSPEC_CACHEALIGN # define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128) #endif

1 0

Sven Baars : kernel32/tests: Remove a test that shows inconsistent results.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: aaaaec86426c8a51fe242dad96a3457bac76d942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaaaec86426c8a51fe242dad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 18 14:38:38 2019 +0200 kernel32/tests: Remove a test that shows inconsistent results. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index cba0a3f281..f181536e7a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2455,11 +2455,6 @@ static void test_IsProcessInJob(void) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); - out = TRUE; - ret = pIsProcessInJob(pi.hProcess, NULL, &out); - ok(ret, "IsProcessInJob error %u\n", GetLastError()); - ok(!out, "IsProcessInJob returned out=%u\n", out); - ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());

1 0

Vijay Kiran Kamuju : msvcrt: Implement %u format for strftime.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 679cdc4010e8ab7d500b43d19a4a1d04e392c0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=679cdc4010e8ab7d500b43d1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 18 11:58:59 2019 +0200 msvcrt: Implement %u format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 5 +++++ dlls/ucrtbase/tests/misc.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0eecfd6796..cf79e5971e 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -653,6 +653,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%u", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b299976d3f..588f724cf7 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,6 +1264,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; + case 'u': + tmp = mstm->tm_wday ? mstm->tm_wday : 7; + if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) + return 0; + break; #endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fe59e30062..da2e7d34ca 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -901,6 +901,7 @@ static void test_asctime(void) static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; @@ -948,6 +949,10 @@ static void test_strftime(void) ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%u", &tm1); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "7"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019