Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- The memcpy(vp, ..., size) is present on the else branch too. The memsets where introduced with: f4865564ec7c ddraw: Do not return unset viewport from GetViewport().
dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e6f862156e..78a2fde6f3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -274,7 +274,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock();
size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_1) { memcpy(vp, &viewport->viewports.vp1, size); @@ -927,7 +926,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI
wined3d_mutex_lock(); size = vp->dwSize; - memset(vp, 0, size); if (viewport->version == DDRAW_VIEWPORT_VERSION_2) { memcpy(vp, &viewport->viewports.vp2, size);