Henri Verbeet : wined3d: wined3d_device_get_scissor_rect() never fails.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: de1ae1eb8a39b08944378bce89a567a34207776b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=de1ae1eb8a39b08944378bce89a567a34207776b

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Sep 19 21:50:22 2012 +0200

wined3d: wined3d_device_get_scissor_rect() never fails.

---

 dlls/d3d9/device.c     |    5 ++---
 dlls/wined3d/device.c  |    4 +---
 include/wine/wined3d.h |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 40bc169..06988f7 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1878,15 +1878,14 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons
 static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT *rect)
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
-    HRESULT hr;
 
     TRACE("iface %p, rect %p.\n", iface, rect);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_get_scissor_rect(device->wined3d_device, rect);
+    wined3d_device_get_scissor_rect(device->wined3d_device, rect);
     wined3d_mutex_unlock();
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6d85ff5..9daeb60 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2403,14 +2403,12 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const
     device_invalidate_state(device, STATE_SCISSORRECT);
 }
 
-HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect)
+void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect)
 {
     TRACE("device %p, rect %p.\n", device, rect);
 
     *rect = device->updateStateBlock->state.scissor_rect;
     TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect));
-
-    return WINED3D_OK;
 }
 
 HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device,
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index af88163..0d84adc 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2147,7 +2147,7 @@ HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *de
         UINT render_target_idx, struct wined3d_surface **render_target);
 DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device,
         UINT sampler_idx, enum wined3d_sampler_state state);
-HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect);
+void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect);
 BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device,
         UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride);