From 3cb4ab588d865cd3e8b10d110866a9155928980c Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Tue, 31 Mar 2009 17:02:32 +0100
Subject: [PATCH] ole32: Rename a few variables and remove a couple of
 meaningless comments.

---
 dlls/ole32/clipboard.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index f01adbdd517..1517d206859 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -539,31 +539,30 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt)
 }
 
 /***********************************************************************
- * OLEClipbrd_RenderFormat(LPFORMATETC)
+ *                render_format
+ *
  * Render the clipboard data. Note that this call will delegate to the
  * source data object.
  * Note: This function assumes it is passed an HGLOBAL format to render.
  */
-static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pFormatetc)
+static HRESULT render_format(IDataObject *data, LPFORMATETC fmt)
 {
     STGMEDIUM std;
     HGLOBAL hDup;
     HRESULT hr;
 
     /* Embed source hack */
-    if(pFormatetc->cfFormat == embed_source_clipboard_format)
+    if(fmt->cfFormat == embed_source_clipboard_format)
     {
-        return render_embed_source_hack(pIDataObject, pFormatetc);
+        return render_embed_source_hack(data, fmt);
     }
 
-    if (FAILED(hr = IDataObject_GetData(pIDataObject, pFormatetc, &std)))
+    if (FAILED(hr = IDataObject_GetData(data, fmt, &std)))
     {
         WARN("() : IDataObject_GetData failed to render clipboard data! (%x)\n", hr);
         return hr;
     }
 
-    /* To put a copy back on the clipboard */
-
     if(std.tymed != TYMED_HGLOBAL)
     {
         FIXME("got tymed %x\n", std.tymed);
@@ -571,17 +570,13 @@ static HRESULT OLEClipbrd_RenderFormat(IDataObject *pIDataObject, LPFORMATETC pF
         goto end;
     }
 
-  /*
-   *  Put a copy of the rendered data back on the clipboard
-   */
-
     if ( !(hDup = OLEClipbrd_GlobalDupMem(std.u.hGlobal)) )
     {
         hr = E_OUTOFMEMORY;
         goto end;
     }
 
-    if ( !SetClipboardData( pFormatetc->cfFormat, hDup ) )
+    if ( !SetClipboardData( fmt->cfFormat, hDup ) )
     {
         WARN("() : Failed to set rendered clipboard data into clipboard!\n");
         GlobalFree(hDup);
@@ -638,7 +633,7 @@ static LRESULT CALLBACK OLEClipbrd_WndProc
        * Render the clipboard data.
        * (We must have a source data object or we wouldn't be in this WndProc)
        */
-      OLEClipbrd_RenderFormat( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt );
+      render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt );
 
       break;
     }
@@ -678,7 +673,7 @@ static LRESULT CALLBACK OLEClipbrd_WndProc
           /*
            * Render the clipboard data.
            */
-          if ( FAILED(OLEClipbrd_RenderFormat( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt )) )
+          if ( FAILED(render_format( (IDataObject*)&(theOleClipboard->lpvtbl), &rgelt )) )
             continue;
 
           TRACE("(): WM_RENDERALLFORMATS(cfFormat=%d)\n", rgelt.cfFormat);
@@ -1512,7 +1507,7 @@ HRESULT WINAPI OleFlushClipboard(void)
             GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1)
               ? szFmtName : "");
 
-      if ( FAILED(OLEClipbrd_RenderFormat( theOleClipboard->pIDataObjectSrc, &rgelt )) )
+      if ( FAILED(render_format( theOleClipboard->pIDataObjectSrc, &rgelt )) )
         continue;
     }
   }