Module: wine Branch: master Commit: 45b944ed51fc49a89f939c25e37f995d686b8fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b944ed51fc49a89f939c25e3...
Author: Austin English austinenglish@gmail.com Date: Tue Mar 25 12:35:45 2008 -0500
gdi32: Spelling fixes.
---
dlls/gdi32/dc.c | 2 +- dlls/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 10 +++++----- dlls/gdi32/metafile.c | 6 +++--- dlls/gdi32/mfdrv/bitblt.c | 2 +- dlls/gdi32/pen.c | 2 +- dlls/gdi32/printdrv16.c | 2 +- dlls/gdi32/region.c | 4 ++-- dlls/gdi32/tests/pen.c | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3c3f4ce..ffd6a1b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1500,7 +1500,7 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) */ INT WINAPI SetICMMode(HDC hdc, INT iEnableICM) { -/*FIXME Asuming that ICM is always off, and cannot be turned on */ +/*FIXME: Assume that ICM is always off, and cannot be turned on */ if (iEnableICM == ICM_OFF) return ICM_OFF; if (iEnableICM == ICM_ON) return 0; if (iEnableICM == ICM_QUERY) return ICM_OFF; diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index c118da5..0be0948 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -158,7 +158,7 @@ static BOOL EMFDRV_BitBlockTransfer( device colors are important. */ lpBmiH->biClrImportant = 0;
- /* Initiliaze bitmap bits */ + /* Initialize bitmap bits */ if (GetDIBits(physDevSrc->hdc, hBitmap, 0, (UINT)lpBmiH->biHeight, (BYTE*)pEMR + pEMR->offBitsSrc, (LPBITMAPINFO)lpBmiH, DIB_RGB_COLORS)) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index de82e70..952e720 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2751,7 +2751,7 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, * BUGS * * All flags except GCP_REORDER are not yet implemented. - * Reordering is not 100% complient to the Windows BiDi method. + * Reordering is not 100% compliant to the Windows BiDi method. * Caret positioning is not yet implemented for BiDi. * Classes are not yet implemented. * diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 820da77..04db3ae 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -224,7 +224,7 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif
-/* This is bascially a copy of FT_Bitmap_Size with an extra element added */ +/* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; FT_Short width; @@ -483,7 +483,7 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, * FONTS.FON System * OEMFONT.FON Terminal * LogPixels Current dpi set by the display control panel applet - * (HKLM\Software\Microsft\Windows NT\CurrentVersion\FontDPI + * (HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontDPI * also has a LogPixels value that appears to mirror this) * * On my system these values have data: vgafix.fon, vgasys.fon, vga850.fon and 96 respectively @@ -2216,7 +2216,7 @@ static void update_font_info(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp );
- /* Setup DefaultFallback usage */ + /* Setup Default_Fallback usage */ if (ansi_cp == 932) use_default_fallback = TRUE;
@@ -3188,7 +3188,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont)
/* * Check for a leading '@' this signals that the font is being - * requested in tategaki mode (vertical writing subtitution) but + * requested in tategaki mode (vertical writing substitution) but * does not affect the fontface that is to be selected. */ if (lf.lfFaceName[0]=='@') @@ -5264,7 +5264,7 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, else len = cbData;
- if(table) { /* MS tags differ in endidness from FT ones */ + if(table) { /* MS tags differ in endianness from FT ones */ table = table >> 24 | table << 24 | (table >> 8 & 0xff00) | (table << 8 & 0xff0000); } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 57add72..57ace68 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -31,7 +31,7 @@ * * Memory-based metafiles are just stored as a continuous block of memory with * a METAHEADER at the head with METARECORDs appended to it. mtType is - * METAFILE_MEMORY (1). Note this is indentical to the disk image of a + * METAFILE_MEMORY (1). Note this is identical to the disk image of a * disk-based metafile - even mtType is METAFILE_MEMORY. * 16bit HMETAFILE16s are global handles to this block * 32bit HMETAFILEs are GDI handles METAFILEOBJs, which contains a ptr to @@ -1270,7 +1270,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) }
if (mr->rdSize == len / 2) - dxx = NULL; /* determine if array present */ + dxx = NULL; /* determine if array is present */ else if (mr->rdSize == (len + s1 * sizeof(INT16)) / 2) { @@ -1282,7 +1282,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) TRACE("%s len: %d\n", sot, mr->rdSize); WARN("Please report: ExtTextOut len=%d slen=%d rdSize=%d opt=%04x\n", len, s1, mr->rdSize, mr->rdParm[3]); - dxx = NULL; /* should't happen -- but if, we continue with NULL */ + dxx = NULL; /* shouldn't happen -- but if, we continue with NULL */ } ExtTextOutA( hdc, (SHORT)mr->rdParm[1], /* X position */ diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index 578366d..c1b443e 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -49,7 +49,7 @@ BOOL MFDRV_BitBlt( PHYSDEV devDst, INT xDst, INT yDst, INT width, INT height,
/*********************************************************************** * MFDRV_StretchBlt - * this function contains TWO ways for procesing StretchBlt in metafiles, + * this function contains TWO ways for processing StretchBlt in metafiles, * decide between rdFunction values META_STRETCHBLT or META_DIBSTRETCHBLT * via #define STRETCH_VIA_DIB */ diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index a047c65..6fe39af 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -182,7 +182,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, } else { - /* PS_INSIDEFRAME is applicable only for gemetric pens */ + /* PS_INSIDEFRAME is applicable only for geometric pens */ if ((style & PS_STYLE_MASK) == PS_INSIDEFRAME || width != 1) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index d97261f..bcf2065 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -375,7 +375,7 @@ static int CreateSpoolFile(LPCSTR pszOutput)
/** * The file name can be dos based, we have to find its - * Unix correspondant file name + * corresponding Unix file name. */ MultiByteToWideChar(CP_ACP, 0, psCmdP, -1, psCmdPW, MAX_PATH); if ((buffer = wine_get_unix_file_name(psCmdPW))) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 6494840..d0d8580 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -993,7 +993,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) * PARAMS * lpXform [I] World-space to logical-space transformation data. * dwCount [I] Size of the data pointed to by rgndata, in bytes. - * rgndata [I] Data that specifes the region. + * rgndata [I] Data that specifies the region. * * RETURNS * Success: Handle to region. @@ -1239,7 +1239,7 @@ BOOL REGION_FrameRgn( HRGN hDest, HRGN hSrc, INT x, INT y ) /*********************************************************************** * CombineRgn (GDI32.@) * - * Combines two regions with the specifed operation and stores the result + * Combines two regions with the specified operation and stores the result * in the specified destination region. * * PARAMS diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index ada892b..fcd79e6 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -195,7 +195,7 @@ static void test_logpen(void) } if (pen[i].style == PS_INSIDEFRAME) { - /* This style is applicable only for gemetric pens */ + /* This style is applicable only for geometric pens */ ok(hpen == 0, "ExtCreatePen should fail\n"); goto test_geometric_pens; } @@ -347,7 +347,7 @@ test_geometric_pens: memset(&lp, 0xb0, sizeof(lp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(lp), &lp); - /* for some reason XP differenciates PS_NULL here */ + /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) { ok(size == sizeof(LOGPEN), "GetObject returned %d, error %d\n", size, GetLastError()); @@ -404,7 +404,7 @@ test_geometric_pens: break; }
- /* for some reason XP differenciates PS_NULL here */ + /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) ok(ext_pen.elp.elpPenStyle == pen[i].ret_style, "expected %x, got %x\n", pen[i].ret_style, ext_pen.elp.elpPenStyle); else