Jacek Caban : shdocvw: Fixed tests on IE7.

Alexandre Julliard julliard at winehq.org
Fri Jan 23 10:06:52 CST 2009


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Jan 23 02:06:09 2009 +0100

shdocvw: Fixed tests on IE7.

---

 dlls/shdocvw/tests/webbrowser.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index 76dfbf7..dc8b6b2 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -582,7 +582,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
         break;
 
     case DISPID_SETSECURELOCKICON:
-        CHECK_EXPECT(Invoke_SETSECURELOCKICON);
+        CHECK_EXPECT2(Invoke_SETSECURELOCKICON);
 
         ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n");
         ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs);
@@ -1081,10 +1081,10 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface
 
 static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo)
 {
-    CHECK_EXPECT(GetHostInfo);
+    CHECK_EXPECT2(GetHostInfo);
     ok(pInfo != NULL, "pInfo=NULL\n");
     if(pInfo) {
-        ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u\n", pInfo->cbSize);
+        ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO) || broken(!pInfo->cbSize), "pInfo->cbSize=%u\n", pInfo->cbSize);
         ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags);
         ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick);
         ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss);




More information about the wine-cvs mailing list