Christian Costa : d3dxof: Do not print an error for interfaces that can be queried to retrieve the type of the object .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab3bf16e1dc0c53153aef5fcaa0dfb92a11522e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ab3bf16e1dc0c53153aef5fcaa...

Author: Christian Costa 
Date:   Tue Sep 23 23:25:48 2008 +0200

d3dxof: Do not print an error for interfaces that can be queried to retrieve the type of the object.

---

dlls/d3dxof/d3dxof.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c
index d5a1569..706662d 100644
--- a/dlls/d3dxof/d3dxof.c
+++ b/dlls/d3dxof/d3dxof.c
@@ -1177,7 +1177,11 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary*
     return S_OK;
   }

-  ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+  /* Do not print an error for interfaces that can be queried to retrieve the type of the object */
+  if (!IsEqualGUID(riid, &IID_IDirectXFileData)
+      && !IsEqualGUID(riid, &IID_IDirectXFileDataReference))
+    ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+
   return E_NOINTERFACE;
 }

@@ -1296,7 +1300,11 @@ static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* ifac
     return S_OK;
   }

-  ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+  /* Do not print an error for interfaces that can be queried to retreive the type of the object */
+  if (!IsEqualGUID(riid, &IID_IDirectXFileBinary)
+      && !IsEqualGUID(riid, &IID_IDirectXFileDataReference))
+    ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+
   return E_NOINTERFACE;
 }

@@ -1488,7 +1496,11 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileD
     return S_OK;
   }

-  ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+  /* Do not print an error for interfaces that can be queried to retreive the type of the object */
+  if (!IsEqualGUID(riid, &IID_IDirectXFileData)
+      && !IsEqualGUID(riid, &IID_IDirectXFileBinary))
+    ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject);
+
   return E_NOINTERFACE;
 }