[PATCH v2 05/10] mshtml: Return failure in IHTMLDocument2::open() for detached documents.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmldoc.c           | 6 +++---
 dlls/mshtml/tests/navigation.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index e7ff2771050..ebdb887fd64 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1463,7 +1463,7 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT

*pomWindowResult = NULL;

-    if(!This->outer_window)
+    if(!This->window || !This->window->base.outer_window)
         return E_FAIL;

if(!This->dom_document) {
@@ -1490,8 +1490,8 @@ static HRESULT WINAPI HTMLDocument_open(IHTMLDocument2 *iface, BSTR url, VARIANT
     if(tmp)
         nsISupports_Release(tmp);

-    *pomWindowResult = (IDispatch*)&This->outer_window->base.IHTMLWindow2_iface;
-    IHTMLWindow2_AddRef(&This->outer_window->base.IHTMLWindow2_iface);
+    *pomWindowResult = (IDispatch*)&This->window->base.outer_window->base.IHTMLWindow2_iface;
+    IHTMLWindow2_AddRef(&This->window->base.outer_window->base.IHTMLWindow2_iface);
     return S_OK;
 }

diff --git a/dlls/mshtml/tests/navigation.js b/dlls/mshtml/tests/navigation.js
index bc24fa646d3..23bca192f2d 100644
--- a/dlls/mshtml/tests/navigation.js
+++ b/dlls/mshtml/tests/navigation.js
@@ -126,6 +126,7 @@ function detached_iframe_doc() {
             expect_exception(function() { origDoc.readyState; }, true);
             expect_exception(function() { origDoc.URL; });
             expect_exception(function() { origDoc.URL = "blank.html"; });
+            expect_exception(function() { origDoc.open("blank.html", "_self"); });

next_test();
         });