Andrew Eikum : hlink: Site data should only be set if the hlink has an HlinkSite.

[Alexandre Julliard]

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

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Mon Nov  1 12:06:08 2010 -0500

hlink: Site data should only be set if the hlink has an HlinkSite.

---

 dlls/hlink/link.c           |    5 +++--
 dlls/hlink/tests/hlink.c    |    2 +-
 dlls/mshtml/tests/htmldoc.c |    1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c
index 3e22c47..b0d99aa 100644
--- a/dlls/hlink/link.c
+++ b/dlls/hlink/link.c
@@ -211,10 +211,11 @@ static HRESULT WINAPI IHlink_fnGetHlinkSite( IHlink* iface,
     TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData);
 
     *ppihlSite = This->Site;
-    *pdwSiteData = This->SiteData;
 
-    if (This->Site)
+    if (This->Site) {
         IHlinkSite_AddRef(This->Site);
+        *pdwSiteData = This->SiteData;
+    }
 
     return S_OK;
 }
diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c
index 21422bc..3cb6db4 100644
--- a/dlls/hlink/tests/hlink.c
+++ b/dlls/hlink/tests/hlink.c
@@ -1788,7 +1788,7 @@ static void test_HlinkClone(void)
     hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data);
     ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres);
     ok(fnd_site == NULL, "Expected NULL site\n");
-    todo_wine ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data);
+    ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data);
 
     IHlink_Release(cloned);
     IHlink_Release(hl);
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 641153b..80f137b 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -708,7 +708,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
         hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data);
         ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres);
         ok(site == NULL, "site = %p\n, expected NULL\n", site);
-        todo_wine
         ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data);
     }