Piotr Caban : oleaut32: Don' t add stdole2 import when TYPEFLAG_FDISPATCHABLE is set.
Alexandre Julliard
julliard at winehq.org
Thu Apr 11 13:32:20 CDT 2013
Module: wine
Branch: master
Commit: 5e6016e2a7d42bd8a40f3eed61bc4ab0af8f21ec
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6016e2a7d42bd8a40f3eed61bc4ab0af8f21ec
Author: Piotr Caban <piotr at codeweavers.com>
Date: Thu Apr 11 13:54:55 2013 +0200
oleaut32: Don't add stdole2 import when TYPEFLAG_FDISPATCHABLE is set.
---
dlls/oleaut32/typelib2.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index 97f61a4..a7815a9 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -1688,6 +1688,12 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U
TRACE("(%p,0x%x)\n", iface, uTypeFlags);
if(uTypeFlags & TYPEFLAG_FDUAL) {
+ static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 };
+ ITypeLib *stdole;
+ ITypeInfo *dispatch;
+ HREFTYPE hreftype;
+ HRESULT hres;
+
This->typeinfo->typekind |= 0x10;
This->typeinfo->typekind &= ~0x0f;
This->typeinfo->typekind |= TKIND_DISPATCH;
@@ -1719,14 +1725,6 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, U
}
} else
iface = &This->dual->ICreateTypeInfo2_iface;
- }
-
- if (uTypeFlags & (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL)) {
- static const WCHAR stdole2tlb[] = { 's','t','d','o','l','e','2','.','t','l','b',0 };
- ITypeLib *stdole;
- ITypeInfo *dispatch;
- HREFTYPE hreftype;
- HRESULT hres;
hres = LoadTypeLib(stdole2tlb, &stdole);
if(FAILED(hres))
More information about the wine-cvs
mailing list