From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Mon, 16 Apr 2012 19:48:59 +0000 (+0100)
Subject: Fix querying an external derived interface.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=828bf10ab4697c15808ef383e5b74a3efa2242ee;p=apitrace

Fix querying an external derived interface.
---

diff --git a/wrappers/trace.py b/wrappers/trace.py
index 0064d86..18839bb 100644
--- a/wrappers/trace.py
+++ b/wrappers/trace.py
@@ -626,11 +626,9 @@ class Tracer:
         else_ = ''
         if self.interface is not None:
             functionName = self.interface.name + '::' + functionName
-            print r'        %sif (*%s == m_pInstance) {' % (else_, out.name,)
+            print r'        if (*%s == m_pInstance &&' % (out.name,)
+            print r'            (%s)) {' % ' || '.join('%s == IID_%s' % (riid.name, iface.name) for iface in self.interface.iterBases())
             print r'            *%s = this;' % (out.name,)
-            print r'            if (%s) {' % ' && '.join('%s != IID_%s' % (riid.name, iface.name) for iface in self.interface.iterBases()) 
-            print r'                warnIID("%s", %s, "unexpected");' % (functionName, riid.name)
-            print r'            }'
             print r'        }'
             else_ = 'else '
         print r'        %s{' % else_