Vincent Povirk : oleaut32: Use DISPATCH_HREF_MASK even for non-dual dispatch types.
Alexandre Julliard
julliard at winehq.org
Wed Sep 16 16:01:34 CDT 2009
Module: wine
Branch: master
Commit: 03683b25309a0da31ef26b62e5d4ed26eae820ce
URL: http://source.winehq.org/git/wine.git/?a=commit;h=03683b25309a0da31ef26b62e5d4ed26eae820ce
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Wed Sep 16 14:05:39 2009 -0500
oleaut32: Use DISPATCH_HREF_MASK even for non-dual dispatch types.
---
dlls/oleaut32/tests/typelib.c | 2 +-
dlls/oleaut32/typelib.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index e447440..1fdd458 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -923,7 +923,7 @@ if(use_midl_tlb) {
href = U(pFD->lprgelemdescParam[0].tdesc).hreftype;
ok((href & 0xff000000) == 0x04000000, "href 0x%08x\n", href);
hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p);
- todo_wine ok(SUCCEEDED(hr), "hr %08x\n", hr);
+ ok(SUCCEEDED(hr), "hr %08x\n", hr);
if (SUCCEEDED(hr)) ITypeInfo_Release(pTI_p);
ITypeInfo_ReleaseFuncDesc(pTI, pFD);
}
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 1484a00..8fe6ce9 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -6722,8 +6722,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo(
result = S_OK;
} else if ((hRefType != -1) && (hRefType & DISPATCH_HREF_MASK) &&
- (This->TypeAttr.typekind == TKIND_DISPATCH) &&
- (This->TypeAttr.wTypeFlags & TYPEFLAG_FDUAL))
+ (This->TypeAttr.typekind == TKIND_DISPATCH))
{
HREFTYPE href_dispatch = hRefType;
result = ITypeInfoImpl_GetDispatchRefTypeInfo((ITypeInfo *)iface, &href_dispatch, ppTInfo);
More information about the wine-cvs
mailing list