Aric Stewart : msctf: Correct return value from GetValue.

[Alexandre Julliard]

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

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Jul  9 08:16:14 2009 -0500

msctf: Correct return value from GetValue.

---

 dlls/msctf/compartmentmgr.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c
index 3afcfda..06a691d 100644
--- a/dlls/msctf/compartmentmgr.c
+++ b/dlls/msctf/compartmentmgr.c
@@ -530,17 +530,15 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface,
 static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface,
     VARIANT *pvarValue)
 {
-    HRESULT hr = S_OK;
     Compartment *This = (Compartment *)iface;
     TRACE("(%p) %p\n",This, pvarValue);
 
     if (!pvarValue)
         return E_INVALIDARG;
 
-    pvarValue->n1.n2.vt = VT_EMPTY;
-    if (!This->variant.n1.n2.vt == VT_EMPTY)
-        hr = VariantCopy(pvarValue,&This->variant);
-    return hr;
+    VariantInit(pvarValue);
+    if (V_VT(&This->variant) == VT_EMPTY) return S_FALSE;
+    return VariantCopy(pvarValue,&This->variant);
 }
 
 static const ITfCompartmentVtbl ITfCompartment_Vtbl ={