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

6ae96807 · Henri Verbeet · Alexandre Julliard · 7bfe6c43 · 6ae96807
Commit 6ae96807 authored Mar 29, 2010 by Henri Verbeet Committed by Alexandre Julliard Mar 29, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 12 deletions

ddraw.c dlls/ddrawex/ddraw.c +1 -12

No files found.
--- 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);
+    hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, Surface);
-    if(SUCCEEDED(hr))
-    {
-        *Surface = dds_get_outer(inner);
-        IDirectDrawSurface4_AddRef(*Surface);
-        IDirectDrawSurface4_Release(inner);
-    }
-    else
-    {
-        *Surface = NULL;
-    }
    return hr;
 }