From fba3ba90179cea34ab25987aebd2c3b9173255c2 Mon Sep 17 00:00:00 2001
From: Hans Leidekker <hans@codeweavers.com>
Date: Tue, 31 Jul 2012 12:25:21 +0200
Subject: [PATCH] fusion: Use inline wrappers for calling COM methods.

---
 dlls/fusion/Makefile.in       | 1 +
 dlls/fusion/asmcache.c        | 4 ++--
 dlls/fusion/asmenum.c         | 2 +-
 dlls/fusion/asmname.c         | 2 +-
 dlls/fusion/tests/Makefile.in | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 63b1b7398f9..2fe64928392 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = fusion.dll
 IMPORTS   = advapi32 dbghelp shlwapi version user32
+EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	asmcache.c \
diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c
index 485a56c95b7..91256555a82 100644
--- a/dlls/fusion/asmcache.c
+++ b/dlls/fusion/asmcache.c
@@ -165,7 +165,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryInterface(IAssemblyCache *iface,
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IAssemblyCache))
     {
-        IUnknown_AddRef(iface);
+        IAssemblyCache_AddRef(iface);
         *ppobj = This;
         return S_OK;
     }
@@ -583,7 +583,7 @@ static HRESULT WINAPI IAssemblyCacheItemImpl_QueryInterface(IAssemblyCacheItem *
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IAssemblyCacheItem))
     {
-        IUnknown_AddRef(iface);
+        IAssemblyCacheItem_AddRef(iface);
         *ppobj = This;
         return S_OK;
     }
diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c
index 76a2bce8b9c..76de1bfac74 100644
--- a/dlls/fusion/asmenum.c
+++ b/dlls/fusion/asmenum.c
@@ -71,7 +71,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface,
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IAssemblyEnum))
     {
-        IUnknown_AddRef(iface);
+        IAssemblyEnum_AddRef(iface);
         *ppobj = This;
         return S_OK;
     }
diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c
index d108a4da3d8..78bc9789854 100644
--- a/dlls/fusion/asmname.c
+++ b/dlls/fusion/asmname.c
@@ -84,7 +84,7 @@ static HRESULT WINAPI IAssemblyNameImpl_QueryInterface(IAssemblyName *iface,
     if (IsEqualIID(riid, &IID_IUnknown) ||
         IsEqualIID(riid, &IID_IAssemblyName))
     {
-        IUnknown_AddRef(iface);
+        IAssemblyName_AddRef(iface);
         *ppobj = This;
         return S_OK;
     }
diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in
index 0542f0d590b..ac360bb4995 100644
--- a/dlls/fusion/tests/Makefile.in
+++ b/dlls/fusion/tests/Makefile.in
@@ -1,5 +1,6 @@
 TESTDLL   = fusion.dll
 IMPORTS   = user32
+EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	asmcache.c \
-- 
2.11.4.GIT