From 1ec21e323ba19165fd720dbdeb83e3bfb2219d3b Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Fri, 20 Jan 2012 00:36:29 +0100
Subject: [PATCH] wined3d: Rename WineD3DRectPatch to wined3d_rect_patch.

---
 dlls/wined3d/device.c          | 16 +++++++++-------
 dlls/wined3d/drawprim.c        |  2 +-
 dlls/wined3d/wined3d_private.h |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6847f8191aa..f56d0276527 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1443,12 +1443,14 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
     }
 
     TRACE("Deleting high order patches\n");
-    for(i = 0; i < PATCHMAP_SIZE; i++) {
+    for (i = 0; i < PATCHMAP_SIZE; ++i)
+    {
+        struct wined3d_rect_patch *patch;
         struct list *e1, *e2;
-        struct WineD3DRectPatch *patch;
+
         LIST_FOR_EACH_SAFE(e1, e2, &device->patches[i])
         {
-            patch = LIST_ENTRY(e1, struct WineD3DRectPatch, entry);
+            patch = LIST_ENTRY(e1, struct wined3d_rect_patch, entry);
             wined3d_device_delete_patch(device, patch->Handle);
         }
     }
@@ -4633,7 +4635,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device,
 HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle,
         const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info)
 {
-    struct WineD3DRectPatch *patch;
+    struct wined3d_rect_patch *patch;
     GLenum old_primitive_type;
     unsigned int i;
     struct list *e;
@@ -4655,7 +4657,7 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT
         found = FALSE;
         LIST_FOR_EACH(e, &device->patches[i])
         {
-            patch = LIST_ENTRY(e, struct WineD3DRectPatch, entry);
+            patch = LIST_ENTRY(e, struct wined3d_rect_patch, entry);
             if (patch->Handle == handle)
             {
                 found = TRUE;
@@ -4739,7 +4741,7 @@ HRESULT CDECL wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT
 
 HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT handle)
 {
-    struct WineD3DRectPatch *patch;
+    struct wined3d_rect_patch *patch;
     struct list *e;
     int i;
 
@@ -4748,7 +4750,7 @@ HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT ha
     i = PATCHMAP_HASHFUNC(handle);
     LIST_FOR_EACH(e, &device->patches[i])
     {
-        patch = LIST_ENTRY(e, struct WineD3DRectPatch, entry);
+        patch = LIST_ENTRY(e, struct wined3d_rect_patch, entry);
         if (patch->Handle == handle)
         {
             TRACE("Deleting patch %p\n", patch);
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index a5e81db0aa6..6c67ada1712 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -788,7 +788,7 @@ static void normalize_normal(float *n) {
  * responsible of taking care that either the gl states are restored, or the context activated
  * for drawing to reset the lastWasBlit flag.
  */
-HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch *patch)
+HRESULT tesselate_rectpatch(struct wined3d_device *This, struct wined3d_rect_patch *patch)
 {
     unsigned int i, j, num_quads, out_vertex_size, buffer_size, d3d_out_vertex_size;
     const struct wined3d_rect_patch_info *info = &patch->rect_patch_info;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 2682f7e284d..b218ca7f1f4 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1577,7 +1577,7 @@ extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HID
 /*****************************************************************************
  * High order patch management
  */
-struct WineD3DRectPatch
+struct wined3d_rect_patch
 {
     UINT                            Handle;
     float                          *mem;
@@ -1588,7 +1588,7 @@ struct WineD3DRectPatch
     struct list                     entry;
 };
 
-HRESULT tesselate_rectpatch(struct wined3d_device *device, struct WineD3DRectPatch *patch) DECLSPEC_HIDDEN;
+HRESULT tesselate_rectpatch(struct wined3d_device *device, struct wined3d_rect_patch *patch) DECLSPEC_HIDDEN;
 
 enum projection_types
 {