Robert Shearman : OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Dec 3 12:31:12 CST 2005


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

Author: Robert Shearman <rob at codeweavers.com>
Date:   Sat Dec  3 18:03:29 2005 +0100

OLE: fix handling of INVOKE_PROPERTYGET flag in ITypeComp_fnBind.

The INVOKE_PROPERTYGET flag shouldn't affect binding to variables; it
should just affect which of a pair of [propget] and [propput]
functions should be returned.

---

 dlls/oleaut32/typelib.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 09c6fd7..32c2780 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -6370,18 +6370,15 @@ static HRESULT WINAPI ITypeComp_fnBind(
         ITypeInfo_AddRef(*ppTInfo);
         return S_OK;
     } else {
-        if (!(wFlags & ~(INVOKE_PROPERTYGET)))
-        {
-            for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) {
-                if (!strcmpW(pVDesc->Name, szName)) {
-                    HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc);
-                    if (FAILED(hr))
-                        return hr;
-                    *pDescKind = DESCKIND_VARDESC;
-                    *ppTInfo = (ITypeInfo *)&This->lpVtbl;
-                    ITypeInfo_AddRef(*ppTInfo);
-                    return S_OK;
-                }
+        for(pVDesc = This->varlist; pVDesc; pVDesc = pVDesc->next) {
+            if (!strcmpW(pVDesc->Name, szName)) {
+                HRESULT hr = TLB_AllocAndInitVarDesc(&pVDesc->vardesc, &pBindPtr->lpvardesc);
+                if (FAILED(hr))
+                    return hr;
+                *pDescKind = DESCKIND_VARDESC;
+                *ppTInfo = (ITypeInfo *)&This->lpVtbl;
+                ITypeInfo_AddRef(*ppTInfo);
+                return S_OK;
             }
         }
     }




More information about the wine-cvs mailing list