mshtml: Fixed DISPATCH_PROPERTYGET|DISPATCH_METHOD support in invoke_builtin_prop.

156e2127 · Jacek Caban · Alexandre Julliard · 0ec75b1a · 156e2127
Commit 156e2127 authored Aug 13, 2012 by Jacek Caban Committed by Alexandre Julliard Aug 13, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

dispex.c dlls/mshtml/dispex.c +8 -3

No files found.
--- 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));
+            }
        }
    }