[PATCH 6/6] dxgi: Rename remaining "This" variables.

Józef Kucia jkucia at codeweavers.com
Wed Aug 29 05:53:39 CDT 2018


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 dlls/dxgi/device.c  | 14 +++++++-------
 dlls/dxgi/surface.c | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c
index 5607c380f1ff..67cadd5a3f89 100644
--- a/dlls/dxgi/device.c
+++ b/dlls/dxgi/device.c
@@ -33,7 +33,7 @@ static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *ifa
 
 static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *iface, REFIID riid, void **object)
 {
-    struct dxgi_device *This = impl_from_IWineDXGIDevice(iface);
+    struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
 
     TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
 
@@ -49,10 +49,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa
         return S_OK;
     }
 
-    if (This->child_layer)
+    if (device->child_layer)
     {
-        TRACE("forwarding to child layer %p.\n", This->child_layer);
-        return IUnknown_QueryInterface(This->child_layer, riid, object);
+        TRACE("Forwarding to child layer %p.\n", device->child_layer);
+        return IUnknown_QueryInterface(device->child_layer, riid, object);
     }
 
     WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
@@ -63,10 +63,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa
 
 static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface)
 {
-    struct dxgi_device *This = impl_from_IWineDXGIDevice(iface);
-    ULONG refcount = InterlockedIncrement(&This->refcount);
+    struct dxgi_device *device = impl_from_IWineDXGIDevice(iface);
+    ULONG refcount = InterlockedIncrement(&device->refcount);
 
-    TRACE("%p increasing refcount to %u\n", This, refcount);
+    TRACE("%p increasing refcount to %u\n", device, refcount);
 
     return refcount;
 }
diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c
index ad72a2c73613..1f53b25a9124 100644
--- a/dlls/dxgi/surface.c
+++ b/dlls/dxgi/surface.c
@@ -90,23 +90,23 @@ static inline struct dxgi_surface *impl_from_IDXGISurface1(IDXGISurface1 *iface)
 static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface1 *iface, REFIID riid,
         void **object)
 {
-    struct dxgi_surface *This = impl_from_IDXGISurface1(iface);
+    struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
     TRACE("Forwarding to outer IUnknown\n");
-    return IUnknown_QueryInterface(This->outer_unknown, riid, object);
+    return IUnknown_QueryInterface(surface->outer_unknown, riid, object);
 }
 
 static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface1 *iface)
 {
-    struct dxgi_surface *This = impl_from_IDXGISurface1(iface);
+    struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
     TRACE("Forwarding to outer IUnknown\n");
-    return IUnknown_AddRef(This->outer_unknown);
+    return IUnknown_AddRef(surface->outer_unknown);
 }
 
 static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface1 *iface)
 {
-    struct dxgi_surface *This = impl_from_IDXGISurface1(iface);
+    struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
     TRACE("Forwarding to outer IUnknown\n");
-    return IUnknown_Release(This->outer_unknown);
+    return IUnknown_Release(surface->outer_unknown);
 }
 
 /* IDXGIObject methods */
@@ -143,22 +143,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface1 *ifac
 
 static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface1 *iface, REFIID riid, void **parent)
 {
-    struct dxgi_surface *This = impl_from_IDXGISurface1(iface);
+    struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
 
     TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent);
 
-    return IDXGIDevice_QueryInterface(This->device, riid, parent);
+    return IDXGIDevice_QueryInterface(surface->device, riid, parent);
 }
 
 /* IDXGIDeviceSubObject methods */
 
 static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface1 *iface, REFIID riid, void **device)
 {
-    struct dxgi_surface *This = impl_from_IDXGISurface1(iface);
+    struct dxgi_surface *surface = impl_from_IDXGISurface1(iface);
 
     TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device);
 
-    return IDXGIDevice_QueryInterface(This->device, riid, device);
+    return IDXGIDevice_QueryInterface(surface->device, riid, device);
 }
 
 /* IDXGISurface methods */
-- 
2.16.4




More information about the wine-devel mailing list