From 8889ae3b63b47161968565372f3f38462a659e81 Mon Sep 17 00:00:00 2001 From: Austin English Date: Tue, 15 Jan 2008 19:28:45 -0600 Subject: [PATCH] tools: spelling fixes --- tools/widl/typegen.c | 2 +- tools/widl/typelib_struct.h | 14 +++++++------- tools/winebuild/relay.c | 2 +- tools/winedump/debug.c | 4 ++-- tools/winedump/msmangle.c | 10 +++++----- tools/winedump/symbol.c | 4 ++-- tools/winegcc/winegcc.c | 2 +- tools/wmc/mcl.c | 4 ++-- tools/wrc/genres.c | 10 +++++----- tools/wrc/newstruc.c | 2 +- tools/wrc/parser.h | 2 +- tools/wrc/wrc.c | 4 ++-- tools/wrc/writeres.c | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 041e183..4fdc84f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2126,7 +2126,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); ptr_type = get_attrv(var->attrs, ATTR_POINTERTYPE); /* Top level pointers to conformant arrays may be handled specially - since we can bypass the pointer, but if the array is burried + since we can bypass the pointer, but if the array is buried beneath another pointer (e.g., "[size_is(,n)] int **p" then we always need to write the pointer. */ if (!ptr_type && var->type != type) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index e16387c..89bbfd8 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -92,16 +92,16 @@ typedef struct tagMSFT_pSeg { /* layout of the main segment directory */ typedef struct tagMSFT_SegDir { -/*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */ +/*1*/MSFT_pSeg pTypeInfoTab; /* each typeinfo gets an entry of 0x64 bytes */ /* (25 ints) */ /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ -/*3*/MSFT_pSeg pImpFiles; /* import libaries */ +/*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ /*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */ /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */ +/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ /* purpose largely unknown */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ @@ -119,10 +119,10 @@ typedef struct tagMSFT_SegDir { /* base type info data */ typedef struct tagMSFT_TypeInfoBase { /*000*/ INT typekind; /* it is the TKIND_xxx */ - /* some byte alignment stuf */ + /* some byte alignment stuff */ INT memoffset; /* points past the file, if no elements */ INT res2; /* zero if no element, N*0x40 */ - INT res3; /* -1 if no lement, (N-1)*0x38 */ + INT res3; /* -1 if no element, (N-1)*0x38 */ /*010*/ INT res4; /* always? 3 */ INT res5; /* always? zero */ INT cElement; /* counts elements, HI=cVars, LO=cFuncs */ @@ -171,7 +171,7 @@ typedef struct tagMSFT_ImpInfo { /* function description data */ typedef struct { -/* INT recsize; record size including some xtra stuff */ +/* INT recsize; record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -227,7 +227,7 @@ typedef struct { /* Variable description data */ typedef struct { -/* INT recsize; // record size including some xtra stuff */ +/* INT recsize; // record size including some extra stuff */ INT DataType; /* data type of the variable */ INT Flags; /* VarFlags (LOWORD) */ #ifdef WORDS_BIGENDIAN diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 0ddcc55..227efa7 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -383,7 +383,7 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) * All routines expect that the 16-bit stack contents (arguments) and the * return address (segptr to CallTo16_Ret) were already set up by the * caller; nb_args must contain the number of bytes to be conserved. The - * 16-bit SS:SP will be set accordinly. + * 16-bit SS:SP will be set accordingly. * * All other registers are either taken from the CONTEXT86 structure * or else set to default values. The target routine address is either diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 4f26c2b..b492be7 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -193,7 +193,7 @@ static int dump_cv_sst_global_types(const OMFDirEntry* omfde) /* doc says: * - for NB07 & NB08 (that we don't support yet), offsets are from types * - for NB09, offsets are from data - * For now, we only support the later + * For now, we only support the latter */ codeview_dump_types_from_offsets(data, (const DWORD*)(types + 1), types->cTypes); @@ -278,7 +278,7 @@ static int dump_cv_sst_src_module(const OMFDirEntry* omfde) /* the OMFSourceFile is quite unpleasant to use: * we have first: * unsigned short number of segments - * unsigned short reservered + * unsigned short reserved * unsigned long baseSrcLn[# segments] * unsigned long offset[2 * #segments] * odd indices are start offsets diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index ddb0c21..161bcc7 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -594,17 +594,17 @@ static char *demangle_datatype (char **str, compound_type *ct, /* Constraints: - * There are two conventions for specifying data type constaints. I + * There are two conventions for specifying data type constants. I * don't know how the compiler chooses between them, but I suspect it * is based on ensuring that linker names are unique. * Convention 1. The data type modifier is given first, followed * by the data type it operates on. '?' means passed by value, * 'A' means passed by reference. Note neither of these characters * is a valid base data type. This is then followed by a character - * specifying constness or volatilty. + * specifying constness or volatility. * Convention 2. The base data type (which is never '?' or 'A') is * given first. The character modifier is optionally given after - * the base type character. If a valid character mofifier is present, + * the base type character. If a valid character modifier is present, * then it only applies to the current data type if the character * after that is not 'A' 'B' or 'C' (Because this makes a convention 1 * constraint for the next data type). @@ -612,9 +612,9 @@ static char *demangle_datatype (char **str, compound_type *ct, * The conventions are usually mixed within the same symbol. * Since 'C' is both a qualifier and a data type, I suspect that * convention 1 allows specifying e.g. 'volatile signed char*'. In - * convention 2 this would be 'CC' which is ambigious (i.e. Is it two + * convention 2 this would be 'CC' which is ambiguous (i.e. Is it two * pointers, or a single pointer + modifier?). In convention 1 it - * is encoded as '?CC' which is not ambigious. This probably + * is encoded as '?CC' which is not ambiguous. This probably * holds true for some other types as well. */ diff --git a/tools/winedump/symbol.c b/tools/winedump/symbol.c index f584c5d..13725e5 100644 --- a/tools/winedump/symbol.c +++ b/tools/winedump/symbol.c @@ -38,7 +38,7 @@ static const char * const swap_after[] = " ,", ",", "( ", "(", " )", ")", - "wchar_t", "WCHAR", /* Help with Unicode compliles */ + "wchar_t", "WCHAR", /* Help with Unicode compiles */ "wctype_t", "WCHAR", "wint_t", "WCHAR", NULL, NULL @@ -166,7 +166,7 @@ const char *symbol_get_call_convention(const parsed_symbol *sym) /******************************************************************* * symbol_get_spec_type * - * Get the .spec file text for a symbols argument + * Get the .spec file text for a symbol's argument */ const char *symbol_get_spec_type (const parsed_symbol *sym, size_t arg) { diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 38a1f5e..2c63ae5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -987,7 +987,7 @@ int main(int argc, char **argv) case 'x': lang = strmake("-x%s", option_arg); strarray_add(opts.files, lang); - /* we'll pass these flags ourselves, explicitely */ + /* we'll pass these flags ourselves, explicitly */ raw_compiler_arg = raw_linker_arg = 0; break; case '-': diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 380c06c..be01691 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -33,7 +33,7 @@ #include "mcy.tab.h" /* - * Keywords are case insenitive. All normal input is treated as + * Keywords are case insensitive. All normal input is treated as * being in codepage iso-8859-1 for ascii input files (unicode * page 0) and as equivalent unicode if unicode input is selected. * All normal input, which is not part of a message text, is @@ -205,7 +205,7 @@ try_again: if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) - goto try_again; /* Should not hapen */ + goto try_again; /* Should not happen */ n--; /* Strip added conversion '\0' from input length */ /* * FIXME: diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index f90d93f..7281ed9 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -716,7 +716,7 @@ static res_t *dialogex2res(name_id_t *name, dialogex_t *dlgex) { restag = put_res_header(res, WRC_RT_DIALOG, NULL, name, dlgex->memopt, &(dlgex->lvc)); - /* FIXME: MS doc says thet the first word must contain 0xffff + /* FIXME: MS doc says that the first word must contain 0xffff * and the second 0x0001 to signal a DLGTEMPLATEEX. Borland's * compiler reverses the two words. * I don't know which one to choose, but I write it as Mr. B @@ -749,8 +749,8 @@ static res_t *dialogex2res(name_id_t *name, dialogex_t *dlgex) { put_word(res, dlgex->font->size); put_word(res, dlgex->font->weight); - /* FIXME: ? TRUE should be sufficient to say that its - * italic, but Borland's compiler says its 0x0101. + /* FIXME: ? TRUE should be sufficient to say that it's + * italic, but Borland's compiler says it's 0x0101. * I just copy it here, and hope for the best. */ put_word(res, dlgex->font->italic ? 0x0101 : 0); @@ -1020,7 +1020,7 @@ static res_t *cursorgroup2res(name_id_t *name, cursor_group_t *curg) put_word(res, cur->planes); put_word(res, cur->bits); /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I cound not find this in the documentation. + * However, I could not find this in the documentation. * The hotspot bytes must either be included or MS * doesn't care. */ @@ -1057,7 +1057,7 @@ static res_t *cursorgroup2res(name_id_t *name, cursor_group_t *curg) put_word(res, cur->planes); put_word(res, cur->bits); /* FIXME: The +4 is the hotspot in the cursor resource. - * However, I cound not find this in the documentation. + * However, I could not find this in the documentation. * The hotspot bytes must either be included or MS * doesn't care. */ diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 07a8209..c49a294 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -794,7 +794,7 @@ static void handle_ani_list(riff_tag_t *lst, enum res_e type, int isswapped) } else if(!memcmp(rtp->tag, iart, sizeof(iart))) { - /* Ignore the author's name; its a string */ + /* Ignore the author's name; it's a string */ rtp = NEXT_TAG(rtp); } else if(!memcmp(rtp->tag, fram, sizeof(fram))) diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h index 8be2269..b0813d8 100644 --- a/tools/wrc/parser.h +++ b/tools/wrc/parser.h @@ -23,7 +23,7 @@ /* From parser.y */ extern int parser_debug; -extern int want_nl; /* Set when getting line-numers */ +extern int want_nl; /* Set when getting line-numbers */ extern int want_id; /* Set when getting the resource name */ int parser_parse(void); diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index f28a45c..15f30a3 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -1,6 +1,6 @@ /* * Copyright 1994 Martin von Loewis - * Copyrignt 1998 Bertho A. Stultiens (BS) + * Copyright 1998 Bertho A. Stultiens (BS) * Copyright 2003 Dimitrie O. Paun * * This library is free software; you can redistribute it and/or @@ -114,7 +114,7 @@ int win32 = 1; /* * debuglevel == DEBUGLEVEL_NONE Don't bother - * debuglevel & DEBUGLEVEL_CHAT Say whats done + * debuglevel & DEBUGLEVEL_CHAT Say what's done * debuglevel & DEBUGLEVEL_DUMP Dump internal structures * debuglevel & DEBUGLEVEL_TRACE Create parser trace * debuglevel & DEBUGLEVEL_PPMSG Preprocessor messages diff --git a/tools/wrc/writeres.c b/tools/wrc/writeres.c index 8df92dc..e26a559 100644 --- a/tools/wrc/writeres.c +++ b/tools/wrc/writeres.c @@ -70,7 +70,7 @@ void write_resfile(char *outname, resource_t *top) put_word(res, 0); /* Memory options */ put_word(res, 0); /* Language */ put_dword(res, 0); /* Version */ - put_dword(res, 0); /* Charateristics */ + put_dword(res, 0); /* Characteristics */ ret = fwrite(res->data, 1, res->size, fo); if(ret != res->size) { -- 1.5.2.5