mshtml: Adder _parent target support to navigate_anchor.

31faed57 · Jacek Caban · Alexandre Julliard · d6bb86e8 · 31faed57 · 31faed57
Commit 31faed57 authored Mar 11, 2014 by Jacek Caban Committed by Alexandre Julliard Mar 11, 2014
5 changed files
--- a/dlls/mshtml/htmlanchor.c
+++ b/dlls/mshtml/htmlanchor.c
@@ -77,7 +77,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This)
    nsresult nsres;
    HRESULT hres = E_FAIL;

-    static const WCHAR _parentW[] = {'p','a','r','e','n','t',0};
+    static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0};
    static const WCHAR _selfW[] = {'_','s','e','l','f',0};
    static const WCHAR _topW[] = {'_','t','o','p',0};

@@ -93,9 +93,13 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This)
                TRACE("target _top\n");
                get_top_window(This->element.node.doc->basedoc.window, &window);
            }else if(!strcmpiW(target, _parentW)) {
-                FIXME("Navigating to target _parent is not implemented\n");
-                nsAString_Finish(&target_str);
-                return S_OK;
+                window = This->element.node.doc->basedoc.window;
+                if(!window->parent) {
+                    WARN("Window has no parent\n");
+                    nsAString_Finish(&target_str);
+                    return S_OK;
+                }
+                window = window->parent;
            }else {
                HTMLOuterWindow *top_window;


--- a/dlls/mshtml/tests/blank.html
+++ b/dlls/mshtml/tests/blank.html
+<html></html>
--- a/dlls/mshtml/tests/nav_test.html
+++ b/dlls/mshtml/tests/nav_test.html
+<html>
+<head>
+<script>
+function ok(b,m) {
+    return external.ok(b, m);
+}
+
+function nav_back_test() {
+    external.trace("Running _parent navigation tests...");
+
+    var iframe = document.getElementById("testframe");
+    var subframe = iframe.contentWindow.document.createElement("iframe");
+
+    subframe.onload = function() {
+        var doc = subframe.contentWindow.document;
+        doc.body.innerHTML = '<a href="blank2.html" id="aid" target="_parent">test</a>';
+        doc.getElementById("aid").click();
+    }
+
+    iframe.onload = function() {
+        var href = iframe.contentWindow.location.href;
+	ok(/.*blank2.html/.test(href), "Unexpected href " + href);
+	next_test();
+    }
+
+    iframe.contentWindow.document.body.appendChild(subframe);
+    subframe.src = "blank.html";
+}
+
+var tests = [
+    nav_back_test,
+    function() { external.reportSuccess(); }
+];
+
+function next_test() {
+   window.setTimeout(tests.shift(), 0);
+}
+</script>
+<body onload="next_test()">
+<iframe src="about:blank" id="testframe"></iframe>
+</body>
+</html>
--- a/dlls/mshtml/tests/rsrc.rc
+++ b/dlls/mshtml/tests/rsrc.rc
@@ -31,6 +31,15 @@ events.html HTML "events.html"
 /* @makedep: externscr.js */
 externscr.js HTML "externscr.js"

+/* @makedep: nav_test.html */
+nav_test.html HTML "nav_test.html"
+
+/* @makedep: blank.html */
+blank.html HTML "blank.html"
+
+/* @makedep: blank.html */
+blank2.html HTML "blank.html"
+
 /* @makedep: test_tlb.tlb */
 1 TYPELIB test_tlb.tlb


--- a/dlls/mshtml/tests/script.c
+++ b/dlls/mshtml/tests/script.c
@@ -2831,6 +2831,7 @@ static void run_js_tests(void)
    run_js_script("exectest.html");
    run_js_script("vbtest.html");
    run_js_script("events.html");
+    run_js_script("nav_test.html");
 }

 static BOOL init_registry(BOOL init)