Henri Verbeet : wined3d: wined3d_device_get_transform() never fails.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Sep 12 11:30:53 2012 +0200

wined3d: wined3d_device_get_transform() never fails.

---

 dlls/d3d8/device.c     |    5 ++---
 dlls/d3d9/device.c     |    5 ++---
 dlls/ddraw/device.c    |    5 ++---
 dlls/wined3d/device.c  |    4 +---
 include/wine/wined3d.h |    2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 20c5fe3..1ccaf2d 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1276,16 +1276,15 @@ static HRESULT WINAPI d3d8_device_GetTransform(IDirect3DDevice8 *iface,
         D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
 {
     struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
-    HRESULT hr;
 
     TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
 
     /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
     wined3d_mutex_lock();
-    hr = wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix);
+    wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix);
     wined3d_mutex_unlock();
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface,
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 0811ddc..d50961a 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1342,16 +1342,15 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface,
         D3DTRANSFORMSTATETYPE state, D3DMATRIX *matrix)
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
-    HRESULT hr;
 
     TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
 
     /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
     wined3d_mutex_lock();
-    hr = wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix);
+    wined3d_device_get_transform(device->wined3d_device, state, (struct wined3d_matrix *)matrix);
     wined3d_mutex_unlock();
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface,
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 813f4b3..f321374 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3194,7 +3194,6 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface,
 {
     struct d3d_device *device = impl_from_IDirect3DDevice7(iface);
     enum wined3d_transform_state wined3d_state;
-    HRESULT hr;
 
     TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix);
 
@@ -3221,10 +3220,10 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface,
 
     /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
     wined3d_mutex_lock();
-    hr = wined3d_device_get_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix);
+    wined3d_device_get_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix);
     wined3d_mutex_unlock();
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI d3d_device7_GetTransform_FPUSetup(IDirect3DDevice7 *iface,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d3bf10d..b0ce4c4 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1755,14 +1755,12 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device,
         device_invalidate_state(device, STATE_TRANSFORM(d3dts));
 }
 
-HRESULT CDECL wined3d_device_get_transform(const struct wined3d_device *device,
+void CDECL wined3d_device_get_transform(const struct wined3d_device *device,
         enum wined3d_transform_state state, struct wined3d_matrix *matrix)
 {
     TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix);
 
     *matrix = device->stateBlock->state.transforms[state];
-
-    return WINED3D_OK;
 }
 
 HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device,
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 5d80f1d..15aeb57 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2162,7 +2162,7 @@ HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device,
         UINT stage, struct wined3d_texture **texture);
 HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device,
         UINT stage, enum wined3d_texture_stage_state state, DWORD *value);
-HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device,
+void __cdecl wined3d_device_get_transform(const struct wined3d_device *device,
         enum wined3d_transform_state state, struct wined3d_matrix *matrix);
 HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device,
         struct wined3d_vertex_declaration **declaration);