mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 04:30:57 +00:00
ddrawex: Correctly retrieve the "outer" surface in IDirectDraw3Impl_GetSurfaceFromDC().
This commit is contained in:
parent
6ae96807c0
commit
d38f535c05
|
@ -1333,17 +1333,30 @@ IDirectDraw3Impl_GetSurfaceFromDC(IDirectDraw3 *iface,
|
|||
IDirectDrawSurface **Surface)
|
||||
{
|
||||
IDirectDrawImpl *This = impl_from_dd3(iface);
|
||||
IDirectDrawSurface4 *surf4;
|
||||
IDirectDrawSurface4 *surf4, *outer;
|
||||
IDirectDrawSurface *inner;
|
||||
HRESULT hr;
|
||||
TRACE("(%p)->(%p, %p): Thunking to IDirectDraw4\n", This, hdc, Surface);
|
||||
|
||||
hr = IDirectDraw4_GetSurfaceFromDC(dd4_from_impl(This), hdc, &surf4);
|
||||
if (!Surface) return E_POINTER;
|
||||
|
||||
hr = IDirectDraw4_GetSurfaceFromDC(This->parent, hdc, (IDirectDrawSurface4 **)&inner);
|
||||
if(FAILED(hr))
|
||||
{
|
||||
*Surface = NULL;
|
||||
return hr;
|
||||
}
|
||||
IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **) Surface);
|
||||
|
||||
hr = IDirectDrawSurface_QueryInterface(inner, &IID_IDirectDrawSurface4, (void **)&surf4);
|
||||
IDirectDrawSurface_Release(inner);
|
||||
if (FAILED(hr))
|
||||
{
|
||||
*Surface = NULL;
|
||||
return hr;
|
||||
}
|
||||
|
||||
outer = dds_get_outer(surf4);
|
||||
hr = IDirectDrawSurface4_QueryInterface(outer, &IID_IDirectDrawSurface, (void **)Surface);
|
||||
IDirectDrawSurface4_Release(surf4);
|
||||
return hr;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue