Skip to content

W
wine-winehq
Commit 6a276eba authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

ddraw: Thunk to surface1, not surface7 in flip.

Signed-off-by: 's avatarStefan Dösinger <stefan@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6b5ea569
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 30 deletions
dlls/ddraw/surface.c
View file @ 6a276eba
...@@ -1270,16 +1270,18 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags) ...@@ -1270,16 +1270,18 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags)
} }
} }
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, /* FRAPS hooks IDirectDrawSurface::Flip and expects the version 1 method to be called when the
IDirectDrawSurface7 *src, DWORD flags) * game uses later interfaces. */
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface,
IDirectDrawSurface *src, DWORD flags)
{ {
struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src);
struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture;
struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv;
DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; DDSCAPS caps = {DDSCAPS_FLIP};
struct wined3d_texture *texture; struct wined3d_texture *texture;
IDirectDrawSurface7 *current; IDirectDrawSurface *current;
void *texture_memory; void *texture_memory;
HRESULT hr; HRESULT hr;
...@@ -1313,13 +1315,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 ...@@ -1313,13 +1315,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
{ {
for (current = iface; current != src;) for (current = iface; current != src;)
{ {
if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, &current))) if (FAILED(hr = ddraw_surface1_GetAttachedSurface(current, &caps, &current)))
{ {
WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return DDERR_NOTFLIPPABLE; return DDERR_NOTFLIPPABLE;
} }
ddraw_surface7_Release(current); ddraw_surface1_Release(current);
if (current == iface) if (current == iface)
{ {
WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface); WARN("Surface %p is not on the same flip chain as surface %p.\n", src, iface);
...@@ -1346,20 +1348,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 ...@@ -1346,20 +1348,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
{ {
for (current = iface;;) for (current = iface;;)
{ {
if (FAILED(hr = ddraw_surface7_GetAttachedSurface(current, &caps, &current))) if (FAILED(hr = ddraw_surface1_GetAttachedSurface(current, &caps, &current)))
{ {
ERR("Can't find a flip target\n"); ERR("Can't find a flip target\n");
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return DDERR_NOTFLIPPABLE; /* Unchecked */ return DDERR_NOTFLIPPABLE; /* Unchecked */
} }
ddraw_surface7_Release(current); ddraw_surface1_Release(current);
if (current == iface) if (current == iface)
{ {
dst_impl = impl_from_IDirectDrawSurface7(iface); dst_impl = impl_from_IDirectDrawSurface(iface);
break; break;
} }
src_impl = impl_from_IDirectDrawSurface7(current); src_impl = impl_from_IDirectDrawSurface(current);
src_rtv = ddraw_surface_get_rendertarget_view(src_impl); src_rtv = ddraw_surface_get_rendertarget_view(src_impl);
if (rtv == dst_impl->wined3d_rtv) if (rtv == dst_impl->wined3d_rtv)
wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE); wined3d_device_set_rendertarget_view(dst_impl->ddraw->wined3d_device, 0, src_rtv, FALSE);
...@@ -1407,6 +1409,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 ...@@ -1407,6 +1409,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7
return hr; return hr;
} }
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface,
IDirectDrawSurface7 *src, DWORD flags)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
}
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface,
IDirectDrawSurface4 *src, DWORD flags) IDirectDrawSurface4 *src, DWORD flags)
{ {
...@@ -1415,8 +1429,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 ...@@ -1415,8 +1429,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
} }
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface,
...@@ -1427,8 +1441,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 ...@@ -1427,8 +1441,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
} }
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface,
...@@ -1439,20 +1453,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 ...@@ -1439,20 +1453,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, return ddraw_surface1_Flip(&surface->IDirectDrawSurface_iface,
src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); src_impl ? &src_impl->IDirectDrawSurface_iface : NULL, flags);
}
static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface,
IDirectDrawSurface *src, DWORD flags)
{
struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface);
struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src);
TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags);
return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface,
src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags);
} }
static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT *dst_rect, static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT *dst_rect,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment