From 156e212715991e52d7d5fc3e28ecb537ec9abcec Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 13 Aug 2012 11:03:13 +0200 Subject: [PATCH] mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop. --- dlls/mshtml/dispex.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b2f5b81245c..a3ac623486d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -985,9 +985,14 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD return E_FAIL; } - hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); - - IDispatch_Release(V_DISPATCH(&v)); + if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) { + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); + IDispatch_Release(V_DISPATCH(&v)); + }else if(res) { + *res = v; + }else { + IDispatch_Release(V_DISPATCH(&v)); + } } }