Henri Verbeet : ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface ().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Apr  2 22:42:20 2012 +0200

ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface().

---

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

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index f2c707a..d5b57c0 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -239,6 +239,9 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
 
     WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
 
+    if (This->version != 7)
+        return E_INVALIDARG;
+
     return E_NOINTERFACE;
 }