Module: wine Branch: master Commit: 6034d9dc684c54ad34f59d0e5a16f846cd341de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6034d9dc684c54ad34f59d0e5a...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue May 22 11:37:38 2012 +0200
mshtml/tests: Check the correct variables.
---
dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/htmldoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4dc55db..b40fe5d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4414,7 +4414,7 @@ static void test_default_body(IHTMLBodyElement *body) hres = IHTMLBodyElement_get_text(body, &v); ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR got %d\n", V_VT(&v)); - ok(bstr == NULL, "bstr != NULL\n"); + ok(V_BSTR(&v) == NULL, "bstr != NULL\n");
/* get_text - Invalid Text */ V_VT(&v) = VT_BSTR; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a486f3f..5240f2e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2161,8 +2161,8 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres);
if(activeobj) { - IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); - ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); }