Jacek Caban : mshtml: Fixed tests on IE7.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef221478f02a18fa867dd2fa07e87fcfd90054eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ef221478f02a18fa867dd2fa07...

Author: Jacek Caban 
Date:   Wed Sep 17 03:24:25 2008 +0200

mshtml: Fixed tests on IE7.

---

dlls/mshtml/navigate.c      |    5 +++++
 dlls/mshtml/tests/htmldoc.c |    6 ++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 78ae19d..d019e29 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -344,6 +344,8 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac

TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError));

+    /* NOTE: IE7 calls GetBindResult here */
+
     if(This->binding) {
         IBinding_Release(This->binding);
         This->binding = NULL;
@@ -687,6 +689,9 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx)
     HRESULT hres;

bscallback->doc = doc;
+
+    /* NOTE: IE7 calls IsSystemMoniker here*/
+
     call_docview_84(doc);

if(bctx) {
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 5e95448..00d682c 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -1009,8 +1009,10 @@ static HRESULT WINAPI Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMon
             BINDSTATUS_ENDDOWNLOADDATA, NULL);
     ok(hres == S_OK, "OnProgress(BINDSTATUS_ENDDOWNLOADDATA) failed: %08x\n", hres);

+    SET_EXPECT(GetBindResult);
     hres = IBindStatusCallback_OnStopBinding(callback, S_OK, NULL);
     ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres);
+    SET_CALLED(GetBindResult); /* IE7 */

IBindStatusCallback_Release(callback);

@@ -2637,6 +2639,7 @@ static void test_Load(IPersistMoniker *persist)
     }
     SET_EXPECT(OnChanged_READYSTATE);
     SET_EXPECT(Exec_ShellDocView_84);
+    SET_EXPECT(IsSystemMoniker);
     SET_EXPECT(BindToStorage);
     SET_EXPECT(SetActiveObject);
     if(set_clientsite) {
@@ -2674,6 +2677,7 @@ static void test_Load(IPersistMoniker *persist)
         container_locked = TRUE;
     }
     CHECK_CALLED(OnChanged_READYSTATE);
+    SET_CALLED(IsSystemMoniker); /* IE7 */
     SET_CALLED(Exec_ShellDocView_84);
     CHECK_CALLED(BindToStorage);
     SET_CALLED(SetActiveObject); /* FIXME */
@@ -3046,6 +3050,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded)
     SET_EXPECT(Invoke_AMBIENT_SILENT);
     SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
     SET_EXPECT(OnChanged_READYSTATE);
+    SET_EXPECT(IsSystemMoniker);
     SET_EXPECT(Exec_ShellDocView_84);
     if(loaded)
         SET_EXPECT(BindToStorage);
@@ -3071,6 +3076,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded)
     CHECK_CALLED(Invoke_AMBIENT_SILENT);
     CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED);
     CHECK_CALLED(OnChanged_READYSTATE);
+    SET_CALLED(IsSystemMoniker); /* IE7 */
     SET_CALLED(Exec_ShellDocView_84);
     if(loaded)
         CHECK_CALLED(BindToStorage);