wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Jacek Caban : vbscript: Factor out detach_global_objects.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 43dbf3a60eaf5356f3f38959edd05850e164fe8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dbf3a60eaf5356f3f38959… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:27 2019 +0200 vbscript: Factor out detach_global_objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 21 +++++++++++++++++++++ dlls/vbscript/vbscript.c | 19 +------------------ dlls/vbscript/vbscript.h | 1 + 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 902dd74e83..f0bdfc4efa 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2592,6 +2592,27 @@ static const builtin_prop_t err_props[] = { {DISPID_ERR_RAISE, Err_Raise, 0, 1, 5}, }; +void detach_global_objects(script_ctx_t *ctx) +{ + if(ctx->err_obj) { + IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface); + ctx->err_obj = NULL; + } + + if(ctx->global_obj) { + IDispatchEx_Release(&ctx->global_obj->IDispatchEx_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) { HRESULT hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 98f28ca814..760a7a3256 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -189,24 +189,7 @@ static void release_script(script_ctx_t *ctx) ctx->site = NULL; } - if(ctx->err_obj) { - IDispatchEx_Release(&ctx->err_obj->IDispatchEx_iface); - ctx->err_obj = NULL; - } - - if(ctx->global_obj) { - IDispatchEx_Release(&ctx->global_obj->IDispatchEx_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); - } - + detach_global_objects(ctx); heap_pool_free(&ctx->heap); heap_pool_init(&ctx->heap); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5dfe7b59a9..41e3b7983f 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -363,6 +363,7 @@ void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; +void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Jacek Caban : vbscript: Introduce new type for object with builtin functions.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: ace3279a26b6aa5d147f69dbc58a79935514d8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace3279a26b6aa5d147f69db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:25 2019 +0200 vbscript: Introduce new type for object with builtin functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 232 +++++++++++++++++++++++------------------------ dlls/vbscript/vbscript.h | 6 +- 2 files changed, 120 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace3279a26b6aa5d147f…

1 0

Jacek Caban : vbscript: Create class description for procedure object in compiler.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 581a8adf1f6eeee9c92edfc7ee5143b99a69c2c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=581a8adf1f6eeee9c92edfc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:20 2019 +0200 vbscript: Create class description for procedure object in compiler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 26 ++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 39 --------------------------------------- dlls/vbscript/vbscript.c | 12 +++++++++--- dlls/vbscript/vbscript.h | 2 +- 4 files changed, 36 insertions(+), 43 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b2be38d71b..c129f3670d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1926,3 +1926,29 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli *ret = code; return S_OK; } + +HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, class_desc_t **ret) +{ + class_desc_t *desc; + vbscode_t *code; + HRESULT hres; + + hres = compile_script(script, src, delimiter, flags, &code); + if(FAILED(hres)) + return hres; + + if(!(desc = compiler_alloc_zero(code, sizeof(*desc)))) + return E_OUTOFMEMORY; + if(!(desc->funcs = compiler_alloc_zero(code, sizeof(*desc->funcs)))) + return E_OUTOFMEMORY; + + desc->ctx = script; + desc->func_cnt = 1; + desc->funcs->entries[VBDISP_CALLGET] = &code->main_code; + + desc->next = script->procs; + script->procs = desc; + + *ret = desc; + return S_OK; +} diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 1c0911a637..68af6233ed 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -627,45 +627,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } -static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - script_ctx_t *ctx = This->desc->ctx; - TRACE("\n"); - return exec_script(ctx, TRUE, This->desc->value_func, NULL, NULL, res); -} - -static const builtin_prop_t procedure_props[] = { - {DISPID_VALUE, Procedure_invoke, 0} -}; - -HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **ret) -{ - class_desc_t *desc; - vbdisp_t *vbdisp; - HRESULT hres; - - desc = heap_alloc_zero(sizeof(*desc)); - if(!desc) - return E_OUTOFMEMORY; - - desc->ctx = ctx; - desc->builtin_prop_cnt = ARRAY_SIZE(procedure_props); - desc->builtin_props = procedure_props; - desc->value_func = &code->main_code; - - hres = create_vbdisp(desc, &vbdisp); - if(FAILED(hres)) { - heap_free(desc); - return hres; - } - - desc->next = ctx->procs; - ctx->procs = desc; - - *ret = (IDispatch*)&vbdisp->IDispatchEx_iface; - return S_OK; -} - struct _ident_map_t { const WCHAR *name; BOOL is_var; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 3d76e5e6b9..98f28ca814 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -884,7 +884,8 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); - vbscode_t *code; + class_desc_t *desc; + vbdisp_t *vbdisp; HRESULT hres; TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), @@ -894,11 +895,16 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); + hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwFlags, &desc); + if(FAILED(hres)) + return hres; + + hres = create_vbdisp(desc, &vbdisp); if(FAILED(hres)) return hres; - return create_procedure_disp(This->ctx, code, ppdisp); + *ppdisp = (IDispatch*)&vbdisp->IDispatchEx_iface; + return S_OK; } static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1d9353ac77..4c2a20aa66 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -154,7 +154,6 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN; @@ -356,6 +355,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Don't use IDispatchEx for internal calls.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: be253c1dc9cbf9e48c2413ae73012feb27eaf280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be253c1dc9cbf9e48c2413ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:17 2019 +0200 vbscript: Don't use IDispatchEx for internal calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 2 -- dlls/vbscript/vbdisp.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 2791244ac7..f323a1ec85 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1610,9 +1610,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, memset(&ei, 0, sizeof(ei)); hres = IDispatchEx_InvokeEx(dispex, id, 0, DISPATCH_METHOD, &dp, &v, &ei, pspCaller); ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); - todo_wine CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(OnLeaveScript); ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 60ca5c8b0e..1c0911a637 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -266,7 +266,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, FALSE, func, This, params, res); + return exec_script(This->desc->ctx, extern_caller, func, This, params, res); case DISPATCH_METHOD: case DISPATCH_METHOD|DISPATCH_PROPERTYGET: @@ -276,7 +276,8 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, FALSE, func, This, params, res); + return exec_script(This->desc->ctx, extern_caller, func, This, params, res); + case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { @@ -301,7 +302,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern return DISP_E_MEMBERNOTFOUND; } - hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) VariantClear(&put_val); return hres; @@ -1078,6 +1079,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, { const WORD flags = DISPATCH_METHOD|(retv ? DISPATCH_PROPERTYGET : 0); IDispatchEx *dispex; + vbdisp_t *vbdisp; EXCEPINFO ei; HRESULT hres; @@ -1085,6 +1087,10 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, if(retv) V_VT(retv) = VT_EMPTY; + vbdisp = unsafe_impl_from_IDispatch(disp); + if(vbdisp && vbdisp->desc && vbdisp->desc->ctx == ctx) + return invoke_vbdisp(vbdisp, id, flags, FALSE, dp, retv); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { UINT err = 0; @@ -1107,9 +1113,14 @@ HRESULT get_disp_value(script_ctx_t *ctx, IDispatch *disp, VARIANT *v) HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp) { IDispatchEx *dispex; + vbdisp_t *vbdisp; EXCEPINFO ei = {0}; HRESULT hres; + vbdisp = unsafe_impl_from_IDispatch(disp); + if(vbdisp && vbdisp->desc && vbdisp->desc->ctx == ctx) + return invoke_vbdisp(vbdisp, id, flags, FALSE, dp, NULL); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */);

1 0

Jacek Caban : vbscript: Factor out invoke_vbdisp.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 6d55197ee0bf0ac81fac1ea1dbffc44e62561b6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d55197ee0bf0ac81fac1ea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:12 2019 +0200 vbscript: Factor out invoke_vbdisp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 164 ++++++++++++++++++++++++++----------------------- 1 file changed, 86 insertions(+), 78 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index fb646e7187..60ca5c8b0e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -248,6 +248,91 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return prop->proc(This, args, dp->cArgs, res); } +static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern_caller, DISPPARAMS *params, VARIANT *res) +{ + if(id < 0) + return DISP_E_MEMBERNOTFOUND; + + if(is_func_id(This, id)) { + function_t *func; + + TRACE("%p->%s\n", This, debugstr_w(This->desc->funcs[id].name)); + + switch(flags) { + case DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + WARN("no getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, FALSE, func, This, params, res); + + case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + func = This->desc->funcs[id].entries[VBDISP_CALLGET]; + if(!func) { + FIXME("no invoke/getter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, FALSE, func, This, params, res); + case DISPATCH_PROPERTYPUT: + case DISPATCH_PROPERTYPUTREF: + case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { + DISPPARAMS dp = {NULL, NULL, 1, 0}; + BOOL needs_release; + VARIANT put_val; + HRESULT hres; + + if(arg_cnt(params)) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); + if(FAILED(hres)) + return hres; + + dp.rgvarg = &put_val; + func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + if(!func) { + FIXME("no letter/setter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); + if(needs_release) + VariantClear(&put_val); + return hres; + } + default: + FIXME("flags %x\n", flags); + return DISP_E_MEMBERNOTFOUND; + } + } + + if(id >= This->desc->prop_cnt + This->desc->func_cnt) { + if(This->desc->builtin_prop_cnt) { + unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; + + while(min <= max) { + i = (min+max)/2; + if(This->desc->builtin_props[i].id == id) + return invoke_builtin(This, This->desc->builtin_props+i, flags, params, res); + if(This->desc->builtin_props[i].id < id) + min = i+1; + else + max = i-1; + } + } + return DISP_E_MEMBERNOTFOUND; + } + + TRACE("%p->%s\n", This, debugstr_w(This->desc->props[id - This->desc->func_cnt].name)); + return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), flags, params, res); +} + static BOOL run_terminator(vbdisp_t *This) { DISPPARAMS dp = {0}; @@ -412,84 +497,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(pvarRes) V_VT(pvarRes) = VT_EMPTY; - if(id < 0) - return DISP_E_MEMBERNOTFOUND; - - if(is_func_id(This, id)) { - function_t *func; - - switch(wFlags) { - case DISPATCH_PROPERTYGET: - func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { - WARN("no getter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); - - case DISPATCH_METHOD: - case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func) { - FIXME("no invoke/getter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - return exec_script(This->desc->ctx, FALSE, func, This, pdp, pvarRes); - case DISPATCH_PROPERTYPUT: - case DISPATCH_PROPERTYPUTREF: - case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - DISPPARAMS dp = {NULL, NULL, 1, 0}; - BOOL needs_release; - VARIANT put_val; - HRESULT hres; - - if(arg_cnt(pdp)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; - } - - hres = get_propput_arg(This->desc->ctx, pdp, wFlags, &put_val, &needs_release); - if(FAILED(hres)) - return hres; - - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; - if(!func) { - FIXME("no letter/setter\n"); - return DISP_E_MEMBERNOTFOUND; - } - - hres = exec_script(This->desc->ctx, FALSE, func, This, &dp, NULL); - if(needs_release) - VariantClear(&put_val); - return hres; - } - default: - FIXME("flags %x\n", wFlags); - return DISP_E_MEMBERNOTFOUND; - } - } - - if(id < This->desc->prop_cnt + This->desc->func_cnt) - return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); - - if(This->desc->builtin_prop_cnt) { - unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; - - while(min <= max) { - i = (min+max)/2; - if(This->desc->builtin_props[i].id == id) - return invoke_builtin(This, This->desc->builtin_props+i, wFlags, pdp, pvarRes); - if(This->desc->builtin_props[i].id < id) - min = i+1; - else - max = i-1; - } - } - - return DISP_E_MEMBERNOTFOUND; + return invoke_vbdisp(This, id, wFlags, TRUE, pdp, pvarRes); } static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Alistair Leslie-Hughes : include: Added sapiaut.idl.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: b2448805aec65ff309c2b4c76c4d70a0eb0faa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2448805aec65ff309c2b4c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 23:37:19 2019 +0000 include: Added sapiaut.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sapi.idl | 2 + include/sapiaut.idl | 2007 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2010 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2448805aec65ff309c2…

1 0

Joseph Kogut : iphlpapi: Report success in NotifyIpInterfaceChange.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 713f4568e6d0467e585775828bd725caa0f4faa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=713f4568e6d0467e58577582… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Mon Oct 14 19:25:39 2019 -0700 iphlpapi: Report success in NotifyIpInterfaceChange. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47935 Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1f823b401d..8c7c9018c4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2758,7 +2758,7 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; - return ERROR_NOT_SUPPORTED; + return NO_ERROR; }

1 0

Alex Henrie : winex11: Copy icon color table in 256-color mode (Valgrind).
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 7dd3abe69f6c48eb57391cc88932da49c02caac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd3abe69f6c48eb57391cc8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 15 19:00:59 2019 -0600 winex11: Copy icon color table in 256-color mode (Valgrind). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4eec3288e2..973af40c33 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) XFree( bits->ptr ); } -/* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { if (info->bmiHeader.biCompression == BI_BITFIELDS) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); if (coloruse == DIB_PAL_COLORS) return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8) + return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] ); return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); }

1 0

Jacek Caban : kernelbase: Update SetNamedPipeHandleState debug trace.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 293dae8fdcf7e812145621af5ab76dd8d495168c URL: https://source.winehq.org/git/wine.git/?a=commit;h=293dae8fdcf7e812145621af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 15:17:47 2019 +0200 kernelbase: Update SetNamedPipeHandleState debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index d2cd346270..781a729ae9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1255,9 +1255,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetNamedPipeHandleState( HANDLE pipe, LPDWORD mode IO_STATUS_BLOCK iosb; NTSTATUS status = STATUS_SUCCESS; - /* should be a fixme, but this function is called a lot by the RPC - * runtime, and it slows down InstallShield a fair bit. */ - WARN( "semi-stub: %p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + TRACE( "%p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + if (count || timeout) FIXME( "Unsupported arguments\n" ); if (mode) {

1 0

Jacek Caban : kernel32/tests: Add message mode non-blocking pipe test.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: c0724e56ac6b8ad46b86707dd202a1a5439366d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0724e56ac6b8ad46b86707d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 15:17:35 2019 +0200 kernel32/tests: Add message mode non-blocking pipe test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a192779e1d..d8d5726f1a 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3887,7 +3887,7 @@ static void test_wait_pipe(void) CloseHandle(ov.hEvent); } -static void test_nowait(void) +static void test_nowait(DWORD pipe_type) { HANDLE piperead, pipewrite, file; OVERLAPPED ol, ol2; @@ -3897,7 +3897,7 @@ static void test_nowait(void) /* CreateNamedPipe with PIPE_NOWAIT, and read from empty pipe */ piperead = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -3925,7 +3925,7 @@ static void test_nowait(void) /* create write side with PIPE_NOWAIT, read side PIPE_WAIT, and test writes */ pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -3994,9 +3994,23 @@ static void test_nowait(void) ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); ok(WriteFile(pipewrite, readbuf, 514, &write, &ol), "WriteFile should succeed\n"); - ok(write == 1, "got %d, write should be %d\n", write, 1); - ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); - ok(read == 1, "got %d, read should be %d\n", read, 1); + if (pipe_type == PIPE_TYPE_MESSAGE) + { + todo_wine + ok(write == 0, "got %d\n", write); + todo_wine + ok(!GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should fail\n"); + todo_wine + ok(GetLastError() == ERROR_IO_INCOMPLETE, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine + ok(read == 0, "got %d, read should be %d\n", read, 1); + } + else + { + ok(write == 1, "got %d\n", write); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should fail\n"); + ok(read == 1, "got %d, read should be %d\n", read, 1); + } if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) CancelIo(piperead); @@ -4015,7 +4029,7 @@ static void test_nowait(void) /* CreateNamedPipe with PIPE_NOWAIT, test ConnectNamedPipe */ pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, - /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* dwPipeMode */ pipe_type | PIPE_NOWAIT, /* nMaxInstances */ 1, /* nOutBufSize */ 512, /* nInBufSize */ 512, @@ -4118,5 +4132,6 @@ START_TEST(pipe) test_namedpipe_session_id(); test_multiple_instances(); test_wait_pipe(); - test_nowait(); + test_nowait(PIPE_TYPE_BYTE); + test_nowait(PIPE_TYPE_MESSAGE); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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