mshtml: Return failure in IHTMLDocument2::frames for detached documents.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Return failure in IHTMLDocument2::frames for detached documents.
2e77a62f · Gabriel Ivăncescu · Alexandre Julliard · ffb7ace4 · 2e77a62f · 2e77a62f
Commit 2e77a62f authored Dec 05, 2023 by Gabriel Ivăncescu Committed by Alexandre Julliard Dec 06, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

htmldoc.c dlls/mshtml/htmldoc.c +4 -2

navigation.js dlls/mshtml/tests/navigation.js +1 -0

No files found.
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -914,11 +914,13 @@ static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFrames

    TRACE("(%p)->(%p)\n", This, p);

-    if(!This->outer_window) {
+    if(!This->window) {
        /* Not implemented by IE */
        return E_NOTIMPL;
    }
-    return IHTMLWindow2_get_frames(&This->outer_window->base.IHTMLWindow2_iface, p);
+    if(!This->window->base.outer_window)
+        return E_FAIL;
+    return IHTMLWindow2_get_frames(&This->window->base.outer_window->base.IHTMLWindow2_iface, p);
 }

 static HRESULT WINAPI HTMLDocument_get_embeds(IHTMLDocument2 *iface, IHTMLElementCollection **p)

--- a/dlls/mshtml/tests/navigation.js
+++ b/dlls/mshtml/tests/navigation.js
@@ -119,6 +119,7 @@ function detached_iframe_doc() {
            expect_exception(function() { origDoc.onclick; }, true);
            expect_exception(function() { origDoc.toString; }, true);
            expect_exception(function() { origDoc.toString(); }, true);
+            expect_exception(function() { origDoc.frames; });
            expect_exception(function() { origDoc.readyState; }, true);
            expect_exception(function() { origDoc.URL; });
            expect_exception(function() { origDoc.URL = "blank.html"; });