Jacek Caban : mshtml: Added more Exec tests and fixes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3c71c7cc46e0f68c680625af5df655938618b955
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=3c71c7cc46e0f68c680625af...

Author: Jacek Caban 
Date:   Fri Aug 18 14:53:25 2006 +0200

mshtml: Added more Exec tests and fixes.

---

dlls/mshtml/oleobj.c        |    6 ++++--
 dlls/mshtml/tests/htmldoc.c |    9 ++++++++-
 dlls/mshtml/view.c          |    6 ++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index 127a8aa..aa1eee3 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -152,8 +152,10 @@ static HRESULT WINAPI OleObject_SetClien

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 c66c452..9f814bd 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -977,6 +977,8 @@ static HRESULT WINAPI OleCommandTarget_E
         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_E
             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_E
     }

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_E
     }

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 3302f5f..dc7a74f 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -245,8 +245,10 @@ static HRESULT activate_window(HTMLDocum

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);
     }