Henri Verbeet : ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC().

Alexandre Julliard julliard at winehq.org
Mon Mar 29 09:57:59 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Mar 29 13:31:08 2010 +0200

ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC().

---

 dlls/ddrawex/ddraw.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c
index 4c757ec..8c6b937 100644
--- a/dlls/ddrawex/ddraw.c
+++ b/dlls/ddrawex/ddraw.c
@@ -1320,20 +1320,9 @@ IDirectDraw4Impl_GetSurfaceFromDC(IDirectDraw4 *iface,
                                   IDirectDrawSurface4 **Surface)
 {
     IDirectDrawImpl *This = impl_from_dd4(iface);
-    IDirectDrawSurface4 *inner;
     HRESULT hr;
     TRACE("(%p)->(%p, %p)\n", This, hdc, Surface);
-    hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, &inner);
-    if(SUCCEEDED(hr))
-    {
-        *Surface = dds_get_outer(inner);
-        IDirectDrawSurface4_AddRef(*Surface);
-        IDirectDrawSurface4_Release(inner);
-    }
-    else
-    {
-        *Surface = NULL;
-    }
+    hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, Surface);
 
     return hr;
 }




More information about the wine-cvs mailing list