Andrew Talbot : gdi32: Indentation fix.

Alexandre Julliard julliard at winehq.org
Mon Dec 17 13:58:22 CST 2012


Module: wine
Branch: master
Commit: 0653f7a64d7c5c26b8b3ed255d9169ae208a58c4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0653f7a64d7c5c26b8b3ed255d9169ae208a58c4

Author: Andrew Talbot <andrew.talbot at talbotville.com>
Date:   Sat Dec 15 18:55:12 2012 +0000

gdi32: Indentation fix.

---

 dlls/gdi32/font.c |  101 +++++++++++++++++++++++++++-------------------------
 1 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 33e603c..6574761 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -3127,13 +3127,13 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount,
  */
 DWORD WINAPI
 GetCharacterPlacementW(
-		HDC hdc,		/* [in] Device context for which the rendering is to be done */
-		LPCWSTR lpString,	/* [in] The string for which information is to be returned */
-		INT uCount,		/* [in] Number of WORDS in string. */
-		INT nMaxExtent,		/* [in] Maximum extent the string is to take (in HDC logical units) */
-		GCP_RESULTSW *lpResults,/* [in/out] A pointer to a GCP_RESULTSW struct */
-		DWORD dwFlags 		/* [in] Flags specifying how to process the string */
-		)
+        HDC hdc,                    /* [in] Device context for which the rendering is to be done */
+        LPCWSTR lpString,           /* [in] The string for which information is to be returned */
+        INT uCount,                 /* [in] Number of WORDS in string. */
+        INT nMaxExtent,             /* [in] Maximum extent the string is to take (in HDC logical units) */
+        GCP_RESULTSW *lpResults,    /* [in/out] A pointer to a GCP_RESULTSW struct */
+        DWORD dwFlags               /* [in] Flags specifying how to process the string */
+        )
 {
     DWORD ret=0;
     SIZE size;
@@ -3144,66 +3144,69 @@ GetCharacterPlacementW(
 
     TRACE("lStructSize=%d, lpOutString=%p, lpOrder=%p, lpDx=%p, lpCaretPos=%p\n"
           "lpClass=%p, lpGlyphs=%p, nGlyphs=%u, nMaxFit=%d\n",
-	    lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder,
-	    lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass,
-	    lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit);
-
-    if(dwFlags&(~GCP_REORDER))			FIXME("flags 0x%08x ignored\n", dwFlags);
-    if(lpResults->lpClass)	FIXME("classes not implemented\n");
+          lpResults->lStructSize, lpResults->lpOutString, lpResults->lpOrder,
+          lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass,
+          lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit);
+
+    if(dwFlags&(~GCP_REORDER))
+        FIXME("flags 0x%08x ignored\n", dwFlags);
+    if(lpResults->lpClass)
+        FIXME("classes not implemented\n");
     if (lpResults->lpCaretPos && (dwFlags & GCP_REORDER))
         FIXME("Caret positions for complex scripts not implemented\n");
 
-	nSet = (UINT)uCount;
-	if(nSet > lpResults->nGlyphs)
-		nSet = lpResults->nGlyphs;
+    nSet = (UINT)uCount;
+    if(nSet > lpResults->nGlyphs)
+        nSet = lpResults->nGlyphs;
 
-	/* return number of initialized fields */
-	lpResults->nGlyphs = nSet;
+    /* return number of initialized fields */
+    lpResults->nGlyphs = nSet;
 
-	if((dwFlags&GCP_REORDER)==0 )
-	{
-		/* Treat the case where no special handling was requested in a fastpath way */
-		/* copy will do if the GCP_REORDER flag is not set */
-		if(lpResults->lpOutString)
-                    memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR));
-
-		if(lpResults->lpOrder)
-		{
-			for(i = 0; i < nSet; i++)
-				lpResults->lpOrder[i] = i;
-		}
-	} else
-	{
-            BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
-                          nSet, lpResults->lpOrder, NULL, NULL );
-	}
+    if((dwFlags&GCP_REORDER)==0 )
+    {
+        /* Treat the case where no special handling was requested in a fastpath way */
+        /* copy will do if the GCP_REORDER flag is not set */
+        if(lpResults->lpOutString)
+            memcpy( lpResults->lpOutString, lpString, nSet * sizeof(WCHAR));
 
-	/* FIXME: Will use the placement chars */
-	if (lpResults->lpDx)
-	{
-		int c;
-		for (i = 0; i < nSet; i++)
-		{
-			if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c))
-				lpResults->lpDx[i]= c;
-		}
-	}
+        if(lpResults->lpOrder)
+        {
+            for(i = 0; i < nSet; i++)
+                lpResults->lpOrder[i] = i;
+        }
+    }
+    else
+    {
+        BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
+                     nSet, lpResults->lpOrder, NULL, NULL );
+    }
+
+    /* FIXME: Will use the placement chars */
+    if (lpResults->lpDx)
+    {
+        int c;
+        for (i = 0; i < nSet; i++)
+        {
+            if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c))
+                lpResults->lpDx[i]= c;
+        }
+    }
 
     if (lpResults->lpCaretPos && !(dwFlags & GCP_REORDER))
     {
         int pos = 0;
-       
+
         lpResults->lpCaretPos[0] = 0;
         for (i = 1; i < nSet; i++)
             if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size))
                 lpResults->lpCaretPos[i] = (pos += size.cx);
     }
-   
+
     if(lpResults->lpGlyphs)
-	GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);
+        GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);
 
     if (GetTextExtentPoint32W(hdc, lpString, uCount, &size))
-      ret = MAKELONG(size.cx, size.cy);
+        ret = MAKELONG(size.cx, size.cy);
 
     return ret;
 }




More information about the wine-cvs mailing list