Matteo Bruni : d3d8: Forbid setting a viewport larger than the render target.
Alexandre Julliard
julliard at winehq.org
Tue Jun 26 04:44:27 CDT 2018
Module: wine
Branch: stable
Commit: 7ecb72caa62976b9589a09eda7f514c56e0e0368
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ecb72caa62976b9589a09eda7f514c56e0e0368
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Thu Mar 22 21:43:09 2018 +0100
d3d8: Forbid setting a viewport larger than the render target.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit aa5fa7080631d9135dff10fdf96e21487e21e4f8)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/d3d8/device.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 506961a..caa3da5 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1473,10 +1473,30 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface,
static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport)
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
+ struct wined3d_sub_resource_desc rt_desc;
+ struct wined3d_rendertarget_view *rtv;
+ struct d3d8_surface *surface;
struct wined3d_viewport vp;
TRACE("iface %p, viewport %p.\n", iface, viewport);
+ wined3d_mutex_lock();
+ if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0)))
+ {
+ wined3d_mutex_unlock();
+ return D3DERR_NOTFOUND;
+ }
+ surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv);
+ wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc);
+
+ if (viewport->X > rt_desc.width || viewport->Width > rt_desc.width - viewport->X
+ || viewport->Y > rt_desc.height || viewport->Height > rt_desc.height - viewport->Y)
+ {
+ WARN("Invalid viewport, returning D3DERR_INVALIDCALL.\n");
+ wined3d_mutex_unlock();
+ return D3DERR_INVALIDCALL;
+ }
+
vp.x = viewport->X;
vp.y = viewport->Y;
vp.width = viewport->Width;
@@ -1484,7 +1504,6 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D
vp.min_z = viewport->MinZ;
vp.max_z = viewport->MaxZ;
- wined3d_mutex_lock();
wined3d_device_set_viewport(device->wined3d_device, &vp);
wined3d_mutex_unlock();
More information about the wine-cvs
mailing list