Jacek Caban : mshtml: Return NULL in window object's GetNameSpaceParent.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9157c6d68ac2ccaaf06ca6440ffeab0afa10f211
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9157c6d68ac2ccaaf06ca6440f...

Author: Jacek Caban 
Date:   Mon Jun 30 21:40:09 2008 +0200

mshtml: Return NULL in window object's GetNameSpaceParent.

---

dlls/mshtml/htmlwindow.c   |    3 ++-
 dlls/mshtml/tests/script.c |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index b79067a..45c6cb7 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -1127,7 +1127,8 @@ static HRESULT WINAPI WindowDispEx_GetNameSpaceParent(IDispatchEx *iface, IUnkno

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

-    return IDispatchEx_GetNameSpaceParent(DISPATCHEX(&This->dispex), ppunk);
+    *ppunk = NULL;
+    return S_OK;
 }

#undef DISPEX_THIS
diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c
index 8b4ddbf..89e17fe 100644
--- a/dlls/mshtml/tests/script.c
+++ b/dlls/mshtml/tests/script.c
@@ -439,6 +439,7 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
         DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo)
 {
     IDispatchEx *document;
+    IUnknown *unk;
     VARIANT var;
     DISPPARAMS dp;
     EXCEPINFO ei;
@@ -510,6 +511,12 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac
     ok(V_I4(&var) == 100, "V_I4(&var) == NULL\n");

IDispatchEx_Release(document);
+
+    unk = (void*)0xdeadbeef;
+    hres = IDispatchEx_GetNameSpaceParent(window_dispex, &unk);
+    ok(hres == S_OK, "GetNameSpaceParent failed: %08x\n", hres);
+    ok(!unk, "unk=%p, expected NULL\n", unk);
+
     return S_OK;
 }