mshtml: Hold a ref to the location on the window side.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mshtml: Hold a ref to the location on the window side.
0be2db2e · Gabriel Ivăncescu · Alexandre Julliard · 3a196ef6 · 0be2db2e · 0be2db2e
Commit 0be2db2e authored Nov 04, 2021 by Gabriel Ivăncescu Committed by Alexandre Julliard Nov 05, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

htmlwindow.c dlls/mshtml/htmlwindow.c +2 -3

dom.c dlls/mshtml/tests/dom.c +1 -3

No files found.
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -68,9 +68,7 @@ static inline BOOL is_outer_window(HTMLWindow *window)
 static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret)
 {
-    if(This->location) {
+    if(!This->location) {
-        IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface);
-    }else {
        HRESULT hres;
        hres = HTMLLocation_Create(This, &This->location);
@@ -78,6 +76,7 @@ static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret)
            return hres;
    }
+    IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface);
    *ret = This->location;
    return S_OK;
 }

--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -6015,7 +6015,6 @@ static void test_location(IHTMLDocument2 *doc)
    IHTMLLocation *location, *location2;
    IHTMLWindow2 *window;
    BSTR str;
-    ULONG ref;
    HRESULT hres;
    hres = IHTMLDocument2_get_location(doc, &location);
@@ -6051,8 +6050,7 @@ static void test_location(IHTMLDocument2 *doc)
    ok(!lstrcmpW(str, L"about:blank"), "unexpected href %s\n", wine_dbgstr_w(str));
    SysFreeString(str);
-    ref = IHTMLLocation_Release(location);
+    IHTMLLocation_Release(location);
-    ok(!ref, "location should be destroyed here\n");
 }
 static void test_plugins_col(IHTMLDocument2 *doc)