October 2019 - Wine-Commits

Jacek Caban : vbscript: Factor out detach_global_objects.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

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/tests: Added Err object IDispatch tests.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 0fe003435e90dc32dd405a62af8fbcc20afc925d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe003435e90dc32dd405a62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:47:07 2019 +0200 vbscript/tests: Added Err object IDispatch tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 5 +++ dlls/vbscript/tests/run.c | 86 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12e9f475f5..49dd4959f7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1607,6 +1607,11 @@ sub testErrRaise() call ok(err.description = "", "err.description = " & err.description) call ok(err.helpfile = "", "err.helpfile = " & err.helpfile) call ok(err.helpcontext = 0, "err.helpcontext = " & err.helpcontext) + + dim e + e = err + call ok(getVT(e) = "VT_I4*", "getVT(e) = " & getVT(e)) + call ok(e = 0, "e = " & e) end sub call testErrRaise() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index f323a1ec85..2d34a8c80f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -105,6 +105,7 @@ DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_propargput1_d); DEFINE_EXPECT(global_propargput1_i); DEFINE_EXPECT(global_testoptionalarg_i); +DEFINE_EXPECT(global_testerrorobject_i); DEFINE_EXPECT(collectionobj_newenum_i); DEFINE_EXPECT(Next); DEFINE_EXPECT(GetWindow); @@ -136,7 +137,8 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_GLOBAL_TODO_WINE_OK 1020 #define DISPID_GLOBAL_WEEKSTARTDAY 1021 -#define DISPID_GLOBAL_GLOBALCALLBACK 1022 +#define DISPID_GLOBAL_GLOBALCALLBACK 1022 +#define DISPID_GLOBAL_TESTERROROBJECT 1023 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1197,6 +1199,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOPTIONALARG; return S_OK; } + if(!strcmp_wa(bstrName, "testErrorObject")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTERROROBJECT; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -1620,6 +1627,70 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, SET_EXPECT(OnLeaveScript); return S_OK; } + case DISPID_GLOBAL_TESTERROROBJECT: { + ITypeInfo *typeinfo; + IDispatchEx *dispex; + DISPPARAMS dp; + VARIANT v, r; + EXCEPINFO ei; + IDispatch *disp; + WCHAR *names[1]; + UINT count, i; + DISPID id; + HRESULT hres; + + static WCHAR props[][32] = { L"clear", L"description", L"helpcontext", L"helpFILE", L"number", L"raise", L"source" }; + + CHECK_EXPECT(global_testerrorobject_i); + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + disp = V_DISPATCH(pdp->rgvarg); + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == E_NOINTERFACE, "Could not get IDispatchEx iface: %08x\n", hres); + + hres = IDispatch_GetTypeInfoCount(disp, &count); + ok(hres == S_OK, "GetTypeInfoCount returned: %08x\n", hres); + ok(count == 0, "count = %u\n", count); + + hres = IDispatch_GetTypeInfo(disp, 0, 0, &typeinfo); + ok(hres == DISP_E_BADINDEX, "GetTypeInfo returned: %08x\n", hres); + + for(i = 0; i < ARRAY_SIZE(props); i++) { + names[0] = props[i]; + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, names, 1, 0, &id); + ok(hres == S_OK, "GetIDsOfNames failed: %08x\n", hres); + ok(id == i + 1, "%s id = %u\n", wine_dbgstr_w(props[i]), id); + } + + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + V_VT(&v) = VT_ERROR; + hres = IDispatch_Invoke(disp, 5, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 1, "V_I4(v) = %d\n", V_I4(&v)); + + dp.rgvarg = &v; + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + V_VT(&r) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 6, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dp, &r, &ei, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + return S_OK; + } } ok(0, "unexpected call %d\n", id); @@ -2279,6 +2350,19 @@ static void test_callbacks(void) CHECK_CALLED(OnLeaveScript); CHECK_CALLED(OnScriptError); + SET_EXPECT(OnEnterScript); + SET_EXPECT(global_testerrorobject_i); + SET_EXPECT(OnLeaveScript); + hres = IActiveScriptParse_ParseScriptText(parser, + L"on error resume next\n" + L"err.raise 1\n" + L"testErrorObject err\n", + NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(global_testerrorobject_i); + CHECK_CALLED(OnLeaveScript); + IDispatchEx_Release(dispex); IActiveScriptParse_Release(parser);

1 0

Jacek Caban : vbscript: Get rid of no longer needed ITypeInfo in BuiltinDisp.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 1a1292833e9deec0462c1d68701a499d621a9cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a1292833e9deec0462c1d68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:59 2019 +0200 vbscript: Get rid of no longer needed ITypeInfo in BuiltinDisp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 17 +++--------- dlls/vbscript/vbscript.h | 13 --------- dlls/vbscript/vbscript_main.c | 61 ------------------------------------------- 3 files changed, 3 insertions(+), 88 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 45787f52af..50f54f38a6 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -268,8 +268,7 @@ static const IDispatchVtbl BuiltinDispVtbl = { Builtin_Invoke }; -static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t *members, size_t member_cnt, - ITypeInfo *typeinfo, BuiltinDisp **ret) +static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t *members, size_t member_cnt, BuiltinDisp **ret) { BuiltinDisp *disp; @@ -281,7 +280,6 @@ static HRESULT create_builtin_dispatch(script_ctx_t *ctx, const builtin_prop_t * disp->members = members; disp->member_cnt = member_cnt; disp->ctx = ctx; - disp->typeinfo = typeinfo; *ret = disp; return S_OK; @@ -2858,14 +2856,9 @@ void detach_global_objects(script_ctx_t *ctx) HRESULT init_global(script_ctx_t *ctx) { - ITypeInfo *typeinfo; HRESULT hres; - hres = get_typeinfo(GlobalObj_tid, &typeinfo); - if(FAILED(hres)) - return hres; - - hres = create_builtin_dispatch(ctx, global_props, ARRAY_SIZE(global_props), typeinfo, &ctx->global_obj); + hres = create_builtin_dispatch(ctx, global_props, ARRAY_SIZE(global_props), &ctx->global_obj); if(FAILED(hres)) return hres; @@ -2873,9 +2866,5 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = get_typeinfo(ErrObj_tid, &typeinfo); - if(FAILED(hres)) - return hres; - - return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), typeinfo, &ctx->err_obj); + return create_builtin_dispatch(ctx, err_props, ARRAY_SIZE(err_props), &ctx->err_obj); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c17084d4ea..71f42aaff9 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -141,7 +141,6 @@ typedef struct { size_t member_cnt; const builtin_prop_t *members; script_ctx_t *ctx; - ITypeInfo *typeinfo; } BuiltinDisp; HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; @@ -358,18 +357,6 @@ HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; -#define TID_LIST \ - XDIID(ErrObj) \ - XDIID(GlobalObj) - -typedef enum { -#define XDIID(iface) iface ## _tid, -TID_LIST -#undef XDIID - LAST_tid -} tid_t; - -HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; void release_regexp_typelib(void) DECLSPEC_HIDDEN; static inline BOOL is_int32(double d) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 3a8019a30d..6e6f386755 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -35,66 +35,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; -static ITypeLib *typelib; -static ITypeInfo *typeinfos[LAST_tid]; - -static REFIID tid_ids[] = { -#define XDIID(iface) &DIID_ ## iface, -TID_LIST -#undef XDIID -}; - -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) -{ - HRESULT hres; - - if (!typelib) { - ITypeLib *tl; - - static const WCHAR vbscript_dll1W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','1',0}; - - hres = LoadTypeLib(vbscript_dll1W, &tl); - if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) - ITypeLib_Release(tl); - } - - if(!typeinfos[tid]) { - ITypeInfo *ti; - - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); - if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); - return hres; - } - - if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) - ITypeInfo_Release(ti); - } - - *typeinfo = typeinfos[tid]; - return S_OK; -} - -static void release_typelib(void) -{ - unsigned i; - - if(!typelib) - return; - - for(i = 0; i < ARRAY_SIZE(typeinfos); i++) { - if(typeinfos[i]) - ITypeInfo_Release(typeinfos[i]); - } - - ITypeLib_Release(typelib); -} - BSTR get_vbscript_string(int id) { WCHAR buf[512]; @@ -316,7 +256,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: if (lpv) break; - release_typelib(); release_regexp_typelib(); }

1 0

Jacek Caban : vbscript: Don't use ITypeInfo for builtin function dispids.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 4a30e699e80e0dab2788d63b39a51896b35e7877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a30e699e80e0dab2788d63b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 22:46:52 2019 +0200 vbscript: Don't use ITypeInfo for builtin function dispids. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 439 +++++++++++++++++++++++++------------------------ 1 file changed, 220 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4a30e699e80e0dab2788…

1 0

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

Oct. 17, 2019

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

Alistair Leslie-Hughes : include: Added sapiaut.idl.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

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

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

Oct. 17, 2019

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

Nikolay Sivov : include: Add some more MF reader/writer API definitions.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: db080b0c7fd19944e7474a18ca7bad64af859cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db080b0c7fd19944e7474a18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 08:40:40 2019 +0300 include: Add some more MF reader/writer API definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index cbfeef812c..93920a2d38 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -46,6 +46,13 @@ typedef [v1_enum] enum MF_SOURCE_READER_FLAG MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; +enum +{ + MF_SINK_WRITER_INVALID_STREAM_INDEX = 0xffffffff, + MF_SINK_WRITER_ALL_STREAMS = 0xfffffffe, + MF_SINK_WRITER_MEDIASINK = 0xffffffff, +}; + typedef struct _MF_SINK_WRITER_STATISTICS { DWORD cb; @@ -116,6 +123,20 @@ interface IMFSourceReaderCallback : IUnknown [in] IMFMediaEvent *event); } +[ + object, + uuid(cf839fe6-8c2a-4dd2-b6ea-c22d6961af05), + local +] +interface IMFSourceReaderCallback2 : IMFSourceReaderCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + interface IMFMediaSource; [ @@ -138,6 +159,32 @@ interface IMFSourceReader : IUnknown HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); } +[ + object, + uuid(7b981cf0-560e-4116-9875-b099895f23d7), + local +] +interface IMFSourceReaderEx : IMFSourceReader +{ + HRESULT SetNativeMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [out] DWORD *stream_flags); + + HRESULT AddTransformForStream( + [in] DWORD stream_index, + [in] IUnknown *transform); + + HRESULT RemoveAllTransformsForStream( + [in] DWORD stream_index); + + HRESULT GetTransformForStream( + [in] DWORD stream_index, + [in] DWORD transform_index, + [out] GUID *category, + [out] IMFTransform **transform); +} + [ object, uuid(3137f1cd-fe5e-4805-a5d8-fb477448cb3d), @@ -169,6 +216,52 @@ interface IMFSinkWriterEx : IMFSinkWriter [out] IMFTransform **transform); } +[ + object, + uuid(17c3779e-3cde-4ede-8c60-3899f5f53ad6), + local +] +interface IMFSinkWriterEncoderConfig : IUnknown +{ + HRESULT SetTargetMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [in] IMFAttributes *encoding_parameters); + + HRESULT PlaceEncodingParameters( + [in] DWORD stream_index, + [in] IMFAttributes *encoding_parameters); +} + +[ + object, + uuid(666f76de-33d2-41b9-a458-29ed0a972c58), + local +] +interface IMFSinkWriterCallback : IUnknown +{ + HRESULT OnFinalize( + [in] HRESULT status); + + HRESULT OnMarker( + [in] DWORD stream_index, + [in] void *context); +} + +[ + object, + uuid(2456bd58-c067-4513-84fe-8d0c88ffdc61), + local +] +interface IMFSinkWriterCallback2 : IMFSinkWriterCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + [ object, uuid(e7fe2e12-661c-40da-92f9-4f002ab67627),

1 0

Zebediah Figura : strmbase: Get rid of the unused "hInstance" field of the BaseWindow structure.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: f3a766bfe4465c373ae0ecb0e6b0eccb0ec9918e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a766bfe4465c373ae0ecb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:49 2019 -0500 strmbase: Get rid of the unused "hInstance" field of the BaseWindow structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 3 +-- include/wine/strmbase.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 82bb814827..c99a529fa2 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,7 +110,6 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) winclass.lpfnWndProc = WndProcW; winclass.cbWndExtra = sizeof(BaseWindow*); - winclass.hInstance = This->hInstance; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) @@ -121,7 +120,7 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, This->hInstance, NULL); + NULL, NULL, NULL, NULL); if (!This->hWnd) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 13544f414b..cc06e70447 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -359,7 +359,6 @@ typedef struct tagBaseWindow HWND hWnd; LONG Width; LONG Height; - HINSTANCE hInstance; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable;

1 0

Zebediah Figura : strmbase: Get rid of the "pfnGetClassWindowStyles" callback.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: b0b2c7d69980eb35c1f69eada273e9f2278aa985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2c7d69980eb35c1f69ead… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:47 2019 -0500 strmbase: Get rid of the "pfnGetClassWindowStyles" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ++++-------------- dlls/quartz/vmr9.c | 12 ------------ dlls/strmbase/window.c | 22 ++++++---------------- include/wine/strmbase.h | 6 ------ 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87491d8851..a16a422e2d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -53,6 +53,8 @@ typedef struct VideoRendererImpl LONG VideoWidth; LONG VideoHeight; LONG FullScreenMode; + + DWORD saved_style; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -392,17 +394,6 @@ static void video_renderer_start_stream(BaseRenderer *iface) } } -static LPWSTR WINAPI VideoRenderer_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static const WCHAR classnameW[] = { 'W','i','n','e',' ','A','c','t','i','v','e','M','o','v','i','e',' ','C','l','a','s','s',0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return (LPWSTR)classnameW; -} - static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) { VideoRendererImpl *This = impl_from_BaseWindow(iface); @@ -441,7 +432,6 @@ static const BaseRendererFuncTable BaseFuncTable = }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, VideoRenderer_OnSize }; @@ -674,7 +664,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); if (FullScreenMode) { - This->baseControlWindow.baseWindow.WindowStyles = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); + This->saved_style = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, 0); SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, WS_POPUP); @@ -684,7 +674,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, } else { ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, This->baseControlWindow.hwndOwner); - SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->baseControlWindow.baseWindow.WindowStyles); + SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->saved_style); GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->DestRect); SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d3fdfb13a3..536703fbff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -568,17 +568,6 @@ static const BaseRendererFuncTable BaseFuncTable = .renderer_pin_query_interface = vmr_pin_query_interface, }; -static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static WCHAR classnameW[] = { 'I','V','M','R','9',' ','C','l','a','s','s', 0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return classnameW; -} - static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This) { struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); @@ -604,7 +593,6 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) } static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, VMR9_OnSize, }; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index fbf0edc78c..142336bc19 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,33 +110,24 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) { - WNDCLASSW winclass; + static const WCHAR class_nameW[] = {'w','i','n','e','_','s','t','r','m','b','a','s','e','_','w','i','n','d','o','w',0}; static const WCHAR windownameW[] = { 'A','c','t','i','v','e','M','o','v','i','e',' ','W','i','n','d','o','w',0 }; + WNDCLASSW winclass = {0}; - This->pClassName = This->pFuncsTable->pfnGetClassWindowStyles(This, &This->ClassStyles, &This->WindowStyles, &This->WindowStylesEx); - - winclass.style = This->ClassStyles; winclass.lpfnWndProc = WndProcW; - winclass.cbClsExtra = 0; winclass.cbWndExtra = sizeof(BaseWindow*); winclass.hInstance = This->hInstance; - winclass.hIcon = NULL; - winclass.hCursor = NULL; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); - winclass.lpszMenuName = NULL; - winclass.lpszClassName = This->pClassName; + winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) { ERR("Unable to register window class: %u\n", GetLastError()); return E_FAIL; } - This->hWnd = CreateWindowExW(This->WindowStylesEx, - This->pClassName, windownameW, - This->WindowStyles, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, This->hInstance, - NULL); + This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, This->hInstance, NULL); if (!This->hWnd) { @@ -305,7 +296,6 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); - This->baseWindow.WindowStyles = WindowStyle; return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 34a558ab8e..11397170ed 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -360,23 +360,17 @@ typedef struct tagBaseWindow LONG Width; LONG Height; HINSTANCE hInstance; - LPWSTR pClassName; - DWORD ClassStyles; - DWORD WindowStyles; - DWORD WindowStylesEx; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable; } BaseWindow; -typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); typedef struct BaseWindowFuncTable { /* Required */ - BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ BaseWindow_OnSize pfnOnSize;

1 0