[PATCH 4/5] wined3d: Get rid of the WINED3DCLIPSTATUS typedef.

[Henri Verbeet]

---
 dlls/d3d8/device.c     |    6 +++---
 dlls/d3d9/device.c     |    4 ++--
 dlls/wined3d/device.c  |    6 ++++--
 include/wine/wined3d.h |   14 ++++++++------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index eb398ab..c003993 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -1648,10 +1648,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(IDirect3DDevice8 *iface
     HRESULT hr;
 
     TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
-/* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */
+    /* FIXME: Verify that D3DCLIPSTATUS8 ~= struct wined3d_clip_status. */
 
     wined3d_mutex_lock();
-    hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus);
+    hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus);
     wined3d_mutex_unlock();
 
     return hr;
@@ -1666,7 +1666,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(IDirect3DDevice8 *iface
     TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus);
+    hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus);
     wined3d_mutex_unlock();
 
     return hr;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 32215c5..49a3215 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1580,7 +1580,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(IDirect3DDevice9Ex *ifa
     TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_set_clip_status(This->wined3d_device, (const WINED3DCLIPSTATUS *)pClipStatus);
+    hr = wined3d_device_set_clip_status(This->wined3d_device, (const struct wined3d_clip_status *)pClipStatus);
     wined3d_mutex_unlock();
 
     return hr;
@@ -1595,7 +1595,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(IDirect3DDevice9Ex *ifa
     TRACE("iface %p, clip_status %p.\n", iface, pClipStatus);
 
     wined3d_mutex_lock();
-    hr = wined3d_device_get_clip_status(This->wined3d_device, (WINED3DCLIPSTATUS *)pClipStatus);
+    hr = wined3d_device_get_clip_status(This->wined3d_device, (struct wined3d_clip_status *)pClipStatus);
     wined3d_mutex_unlock();
 
     return hr;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index e12f48a..6e35c0a 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2260,7 +2260,8 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device,
     return WINED3D_OK;
 }
 
-HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status)
+HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device,
+        const struct wined3d_clip_status *clip_status)
 {
     FIXME("device %p, clip_status %p stub!\n", device, clip_status);
 
@@ -2270,7 +2271,8 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons
     return WINED3D_OK;
 }
 
-HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status)
+HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device,
+        struct wined3d_clip_status *clip_status)
 {
     FIXME("device %p, clip_status %p stub!\n", device, clip_status);
 
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 5bcc35b..a68e0d3 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1667,11 +1667,11 @@ struct wined3d_resource_desc
     UINT size;
 };
 
-typedef struct _WINED3DCLIPSTATUS
+struct wined3d_clip_status
 {
-   DWORD ClipUnion;
-   DWORD ClipIntersection;
-} WINED3DCLIPSTATUS;
+   DWORD clip_union;
+   DWORD clip_intersection;
+};
 
 typedef struct _WINED3DVERTEXELEMENT
 {
@@ -2200,7 +2200,8 @@ HRESULT __cdecl wined3d_device_get_back_buffer(const struct wined3d_device *devi
         UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer);
 INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane);
-HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status);
+HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device,
+        struct wined3d_clip_status *clip_status);
 HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device,
         WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters);
 HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device,
@@ -2280,7 +2281,8 @@ HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device,
 void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window);
 HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);
 HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane);
-HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const WINED3DCLIPSTATUS *clip_status);
+HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device,
+        const struct wined3d_clip_status *clip_status);
 void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device,
         int x_screen_space, int y_screen_space, DWORD flags);
 HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,
-- 
1.7.3.4