From 992cb88f71bc6bd5484509f04e68520eb4e7af62 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Mon, 6 Sep 2010 22:18:54 +0200
Subject: [PATCH] wined3d: Rename "pDesc" to "desc".

---
 dlls/wined3d/surface_base.c    | 29 +++++++++++++----------------
 dlls/wined3d/volume.c          | 26 ++++++++++++--------------
 dlls/wined3d/wined3d_private.h |  2 +-
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index f35d6be1d29..eb64804793e 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -146,24 +146,21 @@ void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface)
     return ((IWineD3DSurfaceImpl *)iface)->resource.parent;
 }
 
-/* ******************************************************
-   IWineD3DSurface IWineD3DSurface parts follow
-   ****************************************************** */
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc)
+{
+    IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface;
 
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) {
-    IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
+    TRACE("iface %p, desc %p.\n", iface, desc);
 
-    TRACE("(%p) : copying into %p\n", This, pDesc);
-
-    pDesc->format = This->resource.format->id;
-    pDesc->resource_type = This->resource.resourceType;
-    pDesc->usage = This->resource.usage;
-    pDesc->pool = This->resource.pool;
-    pDesc->size = This->resource.size; /* dx8 only */
-    pDesc->multisample_type = This->currentDesc.MultiSampleType;
-    pDesc->multisample_quality = This->currentDesc.MultiSampleQuality;
-    pDesc->width = This->currentDesc.Width;
-    pDesc->height = This->currentDesc.Height;
+    desc->format = surface->resource.format->id;
+    desc->resource_type = surface->resource.resourceType;
+    desc->usage = surface->resource.usage;
+    desc->pool = surface->resource.pool;
+    desc->size = surface->resource.size; /* dx8 only */
+    desc->multisample_type = surface->currentDesc.MultiSampleType;
+    desc->multisample_quality = surface->currentDesc.MultiSampleQuality;
+    desc->width = surface->currentDesc.Width;
+    desc->height = surface->currentDesc.Height;
 
     return WINED3D_OK;
 }
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 7a7eb324859..94ea3194015 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -187,22 +187,20 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
     return resource_get_type((IWineD3DResource *)iface);
 }
 
-/* *******************************************
-   IWineD3DVolume parts follow
-   ******************************************* */
-static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *pDesc)
+static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc)
 {
-    IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface;
-    TRACE("(%p) : copying into %p\n", This, pDesc);
+    IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface;
 
-    pDesc->Format = This->resource.format->id;
-    pDesc->Type = This->resource.resourceType;
-    pDesc->Usage = This->resource.usage;
-    pDesc->Pool = This->resource.pool;
-    pDesc->Size = This->resource.size; /* dx8 only */
-    pDesc->Width = This->currentDesc.Width;
-    pDesc->Height = This->currentDesc.Height;
-    pDesc->Depth = This->currentDesc.Depth;
+    TRACE("iface %p, desc %p.\n", iface, desc);
+
+    desc->Format = volume->resource.format->id;
+    desc->Type = volume->resource.resourceType;
+    desc->Usage = volume->resource.usage;
+    desc->Pool = volume->resource.pool;
+    desc->Size = volume->resource.size; /* dx8 only */
+    desc->Width = volume->currentDesc.Width;
+    desc->Height = volume->currentDesc.Height;
+    desc->Depth = volume->currentDesc.Depth;
 
     return WINED3D_OK;
 }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 28d448d6477..ec989fd5733 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2150,7 +2150,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, R
 DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) DECLSPEC_HIDDEN;
 DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
 WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) DECLSPEC_HIDDEN;
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *desc) DECLSPEC_HIDDEN;
 HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
 HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) DECLSPEC_HIDDEN;
 HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN;