gdi32: Indentation fix
Andrew Talbot
andrew.talbot at talbotville.com
Mon May 26 10:23:48 CDT 2008
Changelog:
gdi32: Indentation fix.
diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c
index 01f69a8..6dba627 100644
--- a/dlls/gdi32/brush.c
+++ b/dlls/gdi32/brush.c
@@ -470,6 +470,6 @@ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor )
res = TRUE;
}
- GDI_ReleaseObj( HBRUSH_32(hBrush) );
- return res;
+ GDI_ReleaseObj( HBRUSH_32(hBrush) );
+ return res;
}
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 1bfd97a..2e28e45 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -1931,7 +1931,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
glyphs, span, deltas ? deltas + count - span : NULL);
SelectObject(hdc, orig_font);
HeapFree(GetProcessHeap(), 0, offsets);
- }
+ }
}
}
else
@@ -2775,50 +2775,51 @@ 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);
+ 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( lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
- nSet, lpResults->lpOrder );
- }
+ 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( lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString,
+ nSet, lpResults->lpOrder );
+ }
+
+ /* 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))
{
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 7400b12..68b90ae 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4384,8 +4384,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
ft_bitmap.pixel_mode = ft_pixel_mode_mono;
ft_bitmap.buffer = buf;
- if(needsTransform) {
- pFT_Outline_Transform(&ft_face->glyph->outline, &transMat);
+ if(needsTransform) {
+ pFT_Outline_Transform(&ft_face->glyph->outline, &transMat);
}
pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );
diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index 1b6a966..4e1a771 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -247,7 +247,7 @@ HPALETTE WINAPI CreateHalftonePalette(
}
}
- for (i=13; i <= 18; i++)
+ for (i=13; i <= 18; i++)
{
Palette.aEntries[i].peRed=(i%2)?0xff:0;
Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0;
diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c
index 1e953cb..a02a363 100644
--- a/dlls/gdi32/path.c
+++ b/dlls/gdi32/path.c
@@ -285,11 +285,11 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes,
/* Convert the points to logical coordinates */
if(!DPtoLP(hdc, pPoints, pPath->numEntriesUsed))
{
- /* FIXME: Is this the correct value? */
+ /* FIXME: Is this the correct value? */
SetLastError(ERROR_CAN_NOT_COMPLETE);
- goto done;
+ goto done;
}
- else ret = pPath->numEntriesUsed;
+ else ret = pPath->numEntriesUsed;
}
done:
release_dc_ptr( dc );
@@ -315,7 +315,7 @@ HRGN WINAPI PathToRegion(HDC hdc)
/* Get pointer to path */
if(!dc) return 0;
- pPath = &dc->path;
+ pPath = &dc->path;
/* Check that path is closed */
if(pPath->state!=PATH_Closed) SetLastError(ERROR_CAN_NOT_COMPLETE);
More information about the wine-patches
mailing list