diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 127a8aa51f6..aa1eee357c5 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -152,8 +152,10 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite V_VT(&var) = VT_I4; V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, 0, &var, NULL); - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, 0, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Release(cmdtrg); } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c66c452aaf3..9f814bd48bc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -977,6 +977,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if(!pguidCmdGroup) { + ok(nCmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); @@ -1008,7 +1010,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return S_OK; case OLECMDID_UPDATECOMMANDS: CHECK_EXPECT(Exec_UPDATECOMMANDS); - /* TODO */ + ok(pvaIn == NULL, "pvaIn=%p\n", pvaIn); + ok(pvaOut == NULL, "pvaOut=%p\n", pvaOut); return S_OK; case OLECMDID_SETTITLE: CHECK_EXPECT2(Exec_SETTITLE); @@ -1025,6 +1028,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case 37: CHECK_EXPECT2(Exec_ShellDocView_37); @@ -1042,6 +1047,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + ok(nCmdexecopt == 0, "nCmdexecopts=%08lx\n", nCmdexecopt); + switch(nCmdID) { case 2315: CHECK_EXPECT(Exec_MSHTML_2315); diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 3302f5f56af..dc7a74fd2d7 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -245,8 +245,10 @@ static HRESULT activate_window(HTMLDocument *This) V_VT(&var) = VT_I4; V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, 0, &var, NULL); - IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, 0, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSMAX, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); + IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); IOleCommandTarget_Release(cmdtrg); }