=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw: device:: GetCurrentViewport returns an error if no viewport is set.
Alexandre Julliard
julliard at winehq.org
Tue Jan 29 12:35:41 CST 2013
Module: wine
Branch: master
Commit: 9a0b2a510046309708a629acfd51e2ce6be13e08
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b2a510046309708a629acfd51e2ce6be13e08
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sat Jan 26 13:39:42 2013 +0100
ddraw: device::GetCurrentViewport returns an error if no viewport is set.
---
dlls/ddraw/device.c | 14 ++++++++------
dlls/ddraw/viewport.c | 18 ++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 5d30994..c604c6a 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -1758,16 +1758,18 @@ static HRESULT WINAPI d3d_device3_GetCurrentViewport(IDirect3DDevice3 *iface, ID
return DDERR_INVALIDPARAMS;
wined3d_mutex_lock();
- *viewport = &device->current_viewport->IDirect3DViewport3_iface;
+ if (!device->current_viewport)
+ {
+ wined3d_mutex_unlock();
+ WARN("No current viewport, returning D3DERR_NOCURRENTVIEWPORT\n");
+ return D3DERR_NOCURRENTVIEWPORT;
+ }
- /* AddRef the returned viewport */
- if (*viewport)
- IDirect3DViewport3_AddRef(*viewport);
+ *viewport = &device->current_viewport->IDirect3DViewport3_iface;
+ IDirect3DViewport3_AddRef(*viewport);
TRACE("Returning interface %p.\n", *viewport);
-
wined3d_mutex_unlock();
-
return D3D_OK;
}
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 9231c19..f9eddda 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -342,10 +342,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE
This->viewports.vp1.dvMinZ = 0.0;
This->viewports.vp1.dvMaxZ = 1.0;
- if (This->active_device) {
+ if (This->active_device)
+ {
IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface;
- IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport);
- if (current_viewport)
+ if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport)))
{
if (current_viewport == iface) viewport_activate(This, FALSE);
IDirect3DViewport3_Release(current_viewport);
@@ -705,8 +705,7 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface,
hr = IDirect3DDevice7_Clear(&This->active_device->IDirect3DDevice7_iface, rect_count, rects,
flags & (D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET), color, 1.0, 0x00000000);
- IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport);
- if (current_viewport)
+ if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport)))
{
struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport);
viewport_activate(vp, TRUE);
@@ -979,10 +978,10 @@ static HRESULT WINAPI d3d_viewport_SetViewport2(IDirect3DViewport3 *iface, D3DVI
memset(&(This->viewports.vp2), 0, sizeof(This->viewports.vp2));
memcpy(&(This->viewports.vp2), lpData, lpData->dwSize);
- if (This->active_device) {
+ if (This->active_device)
+ {
IDirect3DDevice3 *d3d_device3 = &This->active_device->IDirect3DDevice3_iface;
- IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport);
- if (current_viewport)
+ if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport)))
{
if (current_viewport == iface) viewport_activate(This, FALSE);
IDirect3DViewport3_Release(current_viewport);
@@ -1087,8 +1086,7 @@ static HRESULT WINAPI d3d_viewport_Clear2(IDirect3DViewport3 *iface, DWORD rect_
hr = IDirect3DDevice7_Clear(&viewport->active_device->IDirect3DDevice7_iface,
rect_count, rects, flags, color, depth, stencil);
- IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport);
- if (current_viewport)
+ if (SUCCEEDED(IDirect3DDevice3_GetCurrentViewport(d3d_device3, ¤t_viewport)))
{
struct d3d_viewport *vp = impl_from_IDirect3DViewport3(current_viewport);
viewport_activate(vp, TRUE);
More information about the wine-cvs
mailing list