Module: wine Branch: master Commit: c7b85c893ef061ca4edb4efdc44b57151fe7eea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b85c893ef061ca4edb4efdc4...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Dec 1 18:24:21 2015 +0100
exdisp.idl: Added new DWebBrowserEvents2 members declarations.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ieframe/tests/webbrowser.c | 12 ++++++------ include/exdisp.idl | 11 +++++++++++ include/exdispid.h | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1617dcb..3584647 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -114,7 +114,7 @@ DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); DEFINE_EXPECT(Invoke_WINDOWCLOSING); -DEFINE_EXPECT(Invoke_282); +DEFINE_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); DEFINE_EXPECT(GetHostInfo); @@ -1017,11 +1017,11 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe return S_OK; }
- case 282: /* FIXME */ - CHECK_EXPECT2(Invoke_282); + case DISPID_SETPHISHINGFILTERSTATUS: /* FIXME */ + CHECK_EXPECT2(Invoke_SETPHISHINGFILTERSTATUS); break;
- case 290: /* FIXME: IE10 */ + case DISPID_BEFORESCRIPTEXECUTE: /* FIXME: IE10 */ break;
default: @@ -2891,7 +2891,7 @@ static void test_download(DWORD flags) SET_EXPECT(DocHost_EnableModeless_FALSE); SET_EXPECT(DocHost_EnableModeless_TRUE); SET_EXPECT(Invoke_SETSECURELOCKICON); - SET_EXPECT(Invoke_282); + SET_EXPECT(Invoke_SETPHISHINGFILTERSTATUS); SET_EXPECT(EnableModeless_FALSE);
if(!(flags & DWL_REFRESH)) { @@ -2960,7 +2960,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); - CLEAR_CALLED(Invoke_282); /* IE 7 */ + CLEAR_CALLED(Invoke_SETPHISHINGFILTERSTATUS); /* IE 7 */ if(is_first_load) todo_wine CHECK_CALLED(EnableModeless_FALSE); else diff --git a/include/exdisp.idl b/include/exdisp.idl index 7b5d921..5ee9960 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -476,6 +476,17 @@ dispinterface DWebBrowserEvents2 [in] VARIANT *RedirectURL, [in] VARIANT *Frame, [in] VARIANT *StatusCode); + + [id(DISPID_BEFORESCRIPTEXECUTE)] + void BeforeScriptExecute([in] IDispatch *pDispWindow); + + [id(DISPID_WEBWORKERSTARTED)] + void WebWorkerStarted( + [in] DWORD dwUniqueID, + [in] BSTR bstrWorkerLabel); + + [id(DISPID_WEBWORKERFINISHED)] + void WebWorkerFinsihed([in] DWORD dwUniqueID); }
[ diff --git a/include/exdispid.h b/include/exdispid.h index 012f704..6902f99 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -70,6 +70,9 @@ #define DISPID_NEWPROCESS 284 #define DISPID_THIRDPARTYURLBLOCKED 285 #define DISPID_REDIRECTXDOMAINBLOCKED 286 +#define DISPID_WEBWORKERSTARTED 288 +#define DISPID_WEBWORKERFINISHED 289 +#define DISPID_BEFORESCRIPTEXECUTE 290
#define DISPID_PRINTTEMPLATEINSTANTIATION 225 #define DISPID_PRINTTEMPLATETEARDOWN 226