Henri Verbeet : ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface .

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Mar 30 01:08:36 2012 +0200

ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface.

---

 dlls/ddraw/surface.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 2178064..202eb4d 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -142,8 +142,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
     if(!riid)
         return DDERR_INVALIDPARAMS;
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-     || IsEqualGUID(riid, &IID_IDirectDrawSurface7) )
+    if (IsEqualGUID(riid, &IID_IDirectDrawSurface7))
     {
         IDirectDrawSurface7_AddRef(iface);
         *obj = iface;
@@ -175,7 +174,8 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
         return S_OK;
     }
 
-    if (IsEqualGUID(riid, &IID_IDirectDrawSurface))
+    if (IsEqualGUID(riid, &IID_IDirectDrawSurface)
+            || IsEqualGUID(riid, &IID_IUnknown))
     {
         IDirectDrawSurface_AddRef(&This->IDirectDrawSurface_iface);
         *obj = &This->IDirectDrawSurface_iface;