From 5e6016e2a7d42bd8a40f3eed61bc4ab0af8f21ec Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Thu, 11 Apr 2013 13:54:55 +0200
Subject: [PATCH] oleaut32: Don't add stdole2 import when
 TYPEFLAG_FDISPATCHABLE is set.

---
 dlls/oleaut32/typelib2.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index 97f61a4938..a7815a925f 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))
-- 
2.32.0.93.g670b81a890