ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Check if value is function only when it needs to be in invoke_builtin_prop.

Browse Source
This commit is contained in:
Jacek Caban 2012-09-10 10:35:05 +02:00 committed by Alexandre Julliard
parent 156e94429d
commit a4869de7fa
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/dispex.c
View File

@ -979,13 +979,13 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) {
if(V_VT(&v) != VT_DISPATCH) { if(V_VT(&v) != VT_DISPATCH) {
FIXME("Not a function %s\n", debugstr_variant(&v)); FIXME("Not a function %s\n", debugstr_variant(&v));
VariantClear(&v); VariantClear(&v);
return E_FAIL; return E_FAIL;
} }
if(flags != (DISPATCH_PROPERTYGET|DISPATCH_METHOD)) {
hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller);
IDispatch_Release(V_DISPATCH(&v)); IDispatch_Release(V_DISPATCH(&v));
}else if(res) { }else if(res) {

1
dlls/mshtml/tests/vbtest.html
View File

@ -31,6 +31,7 @@ If true then counter = counter+1
Sub runTest() Sub runTest()
Call ok(counter = 6, "counter = " & counter) Call ok(counter = 6, "counter = " & counter)
Call ok(isNull(document.onkeyup), "document.onkeyup is not null")
Call external.reportSuccess() Call external.reportSuccess()
End Sub End Sub
</script> </script>