Jacek Caban : mshtml: Added IHTMLLocation::toString implementation.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Oct 22 11:59:27 2012 +0200

mshtml: Added IHTMLLocation::toString implementation.

---

 dlls/mshtml/htmllocation.c       |    6 ++++--
 dlls/mshtml/tests/htmllocation.c |    6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c
index 3ce0978..3a978b5 100644
--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@@ -583,8 +583,10 @@ static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr)
 static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String)
 {
     HTMLLocation *This = impl_from_IHTMLLocation(iface);
-    FIXME("(%p)->(%p)\n", This, String);
-    return E_NOTIMPL;
+
+    TRACE("(%p)->(%p)\n", This, String);
+
+    return IHTMLLocation_get_href(&This->IHTMLLocation_iface, String);
 }
 
 static const IHTMLLocationVtbl HTMLLocationVtbl = {
diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c
index d314a13..8bf5517 100644
--- a/dlls/mshtml/tests/htmllocation.c
+++ b/dlls/mshtml/tests/htmllocation.c
@@ -129,6 +129,12 @@ static void test_href(IHTMLLocation *loc, const struct location_test *test)
                 "%s: expected retrieved href to be L\"%s\", was: %s\n",
                 test->name, test->href, wine_dbgstr_w(str));
     SysFreeString(str);
+
+    hres = IHTMLLocation_toString(loc, &str);
+    ok(hres == S_OK, "%s: toString failed: 0x%08x\n", test->name, hres);
+    ok(str_eq_wa(str, test->href), "%s: toString returned %s, expected %s\n",
+       test->name, wine_dbgstr_w(str), test->href);
+    SysFreeString(str);
 }
 
 static void test_protocol(IHTMLLocation *loc, const struct location_test *test)