From da8b3dd7f20d4d4c1f6e56f5fd51a34df791be05 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Wed, 26 Jan 2005 21:09:04 +0000 Subject: [PATCH] Assorted spelling fixes. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/dplayx/dplayx_global.c | 4 +-- dlls/dplayx/dplobby.c | 4 +-- dlls/msi/action.c | 24 ++++++------- dlls/msi/custom.c | 8 ++--- dlls/msi/format.c | 8 ++--- dlls/msi/table.c | 2 +- dlls/rsaenh/mpi.c | 4 +-- dlls/shell32/shellord.c | 2 +- dlls/wininet/cookie.c | 2 +- dlls/wininet/http.c | 2 +- documentation/ole.sgml | 2 +- programs/winedbg/db_disasm.c | 4 +-- tools/winapi/make_parser.pm | 66 ++++++++++++++++++------------------ 15 files changed, 68 insertions(+), 68 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fa8a07ba424..b33d18ec687 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4143,7 +4143,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr) for (i = infoPtr->nItemCount - 1; i >= 0; i--) { - /* send LVN_DELETEITEM notification, if not supressed */ + /* send LVN_DELETEITEM notification, if not suppressed */ if (!bSuppress) notify_deleteitem(infoPtr, i); if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 333a94135a0..162a273e923 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -64,7 +64,7 @@ * enablebtn.exe, getbmp.exe, getbtn.exe, getflags.exe, hidebtn.exe, * indetbtn.exe, insbtn.exe, pressbtn.exe, setbtnsz.exe, setcmdid.exe, * setparnt.exe, setrows.exe, toolwnd.exe. - * - Microsofts controlspy examples. + * - Microsoft's controlspy examples. * - Charles Petzold's 'Programming Windows': gadgets.exe */ diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index ba37e9169a2..5630ca40aec 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -1207,8 +1207,8 @@ BOOL DPLAYX_SetLobbyMsgThreadId( DWORD dwAppId, DWORD dwThreadId ) /* NOTE: This is potentially not thread safe. You are not guaranteed to end up with the correct string printed in the case where the HRESULT is not - known. You'll just get the last hr passed in printed. This can change - over time if this method is used alot :) */ + known. You will just get the last hr passed in. This can change + over time if this method is used a lot :) */ LPCSTR DPLAYX_HresultToString(HRESULT hr) { static char szTempStr[12]; diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 5e33d0b50f7..5755ea660a4 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -70,9 +70,9 @@ BOOL DPL_CreateAndSetLobbyHandles( DWORD dwDestProcessId, HANDLE hDestProcess, /***************************************************************************** * IDirectPlayLobby {1,2,3} implementation structure * - * The philosophy behind this extra pointer derefernce is that I wanted to + * The philosophy behind this extra pointer dereference is that I wanted to * have the same structure for all types of objects without having to do - * alot of casting. I also only wanted to implement an interface in the + * a lot of casting. I also only wanted to implement an interface in the * object it was "released" with IUnknown interface being implemented in the 1 version. * Of course, with these new interfaces comes the data required to keep the state required * by these interfaces. So, basically, the pointers contain the data associated with diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d0953c34f29..ed0ca32942a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1028,9 +1028,9 @@ end: *******************************************************/ /* - * Alot of actions are really important even if they don't do anything - * explicit.. Lots of properties are set at the beginning of the installation - * CostFinalize does a bunch of work to translated the directories and such + * A lot of actions are really important even if they don't do anything + * explicit... Lots of properties are set at the beginning of the installation + * CostFinalize does a bunch of work to translate the directories and such * * But until I get write access to the database that is hard, so I am going to * hack it to see if I can get something to run. @@ -1430,13 +1430,13 @@ static void load_feature(MSIPACKAGE* package, MSIRECORD * row) * I am not doing any of the costing functionality yet. * Mostly looking at doing the Component and Feature loading * - * The native MSI does ALOT of modification to tables here. Mostly adding alot - * of temporary columns to the Feature and Component tables. + * The native MSI does A LOT of modification to tables here. Mostly adding + * a lot of temporary columns to the Feature and Component tables. * - * note: native msi also tracks the short filename. but I am only going to + * note: Native msi also tracks the short filename. But I am only going to * track the long ones. Also looking at this directory table * it appears that the directory table does not get the parents - * resolved base on property only based on their entrys in the + * resolved base on property only based on their entries in the * directory table. */ static UINT ACTION_CostInitialize(MSIPACKAGE *package) @@ -1949,7 +1949,7 @@ static UINT SetFeatureStates(MSIPACKAGE *package) } /* - * Alot is done in this function aside from just the costing. + * A lot is done in this function aside from just the costing. * The costing needs to be implemented at some point but for now I am going * to focus on the directory building * @@ -2817,7 +2817,7 @@ static UINT ACTION_DuplicateFiles(MSIPACKAGE *package) } -/* OK this value is "interpretted" and then formatted based on the +/* OK this value is "interpreted" and then formatted based on the first few characters */ static LPSTR parse_value(MSIPACKAGE *package, WCHAR *value, DWORD *type, DWORD *size) @@ -4270,7 +4270,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) msiobj_release(&view->hdr); next: - /* ok there is alot more done here but i need to figure out what */ + /* ok there is a lot more done here but i need to figure out what */ productcode = load_dynamic_property(package,szProductCode,&rc); if (!productcode) return rc; @@ -5197,8 +5197,8 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, * MSIRUNMODE_REBOOTATEND We need to reboot after installation completed * MSIRUNMODE_REBOOTNOW We need to reboot to continue the installation * MSIRUNMODE_CABINET Files from cabinet are installed - * MSIRUNMODE_SOURCESHORTNAMES Long names in source files is supressed - * MSIRUNMODE_TARGETSHORTNAMES Long names in destination files is supressed + * MSIRUNMODE_SOURCESHORTNAMES Long names in source files is suppressed + * MSIRUNMODE_TARGETSHORTNAMES Long names in destination files is suppressed * MSIRUNMODE_RESERVED11 Reserved * MSIRUNMODE_WINDOWS9X Running under Windows95/98 * MSIRUNMODE_ZAWENABLED Demand installation is supported diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e9a2e6c7258..7366d71aa3f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -364,8 +364,8 @@ static UINT process_handle(MSIPACKAGE* package, UINT type, if (!(type & 0x80)) { - /* syncronous */ - TRACE("Syncronous Execution of action %s\n",debugstr_w(Name)); + /* synchronous */ + TRACE("Synchronous Execution of action %s\n",debugstr_w(Name)); if (ProcessHandle) WaitForSingleObject(ProcessHandle,INFINITE); else @@ -385,8 +385,8 @@ static UINT process_handle(MSIPACKAGE* package, UINT type, } else { - TRACE("Asyncronous Execution of action %s\n",debugstr_w(Name)); - /* asyncronous */ + TRACE("Asynchronous Execution of action %s\n",debugstr_w(Name)); + /* asynchronous */ if (type & 0x40) { if (ProcessHandle) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 012a2d75d87..9d3646c0b12 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -59,7 +59,7 @@ static const WCHAR* scanW(LPCWSTR buf, WCHAR token, DWORD len) } /* - * This helper function should probably go alot of places + * This helper function should probably go a lot of places * * Thinking about this, maybe this should become yet another Bison file * @@ -178,14 +178,14 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, } else { - ERR("Unknown enviroment variable\n"); + ERR("Unknown environment variable\n"); chunk = 0; value = NULL; rc = ERROR_FUNCTION_FAILED; } break; default: - /* check for numaric values */ + /* check for numeric values */ index = 0; while (isdigitW(key[index])) index++; if (key[index] == 0) @@ -297,7 +297,7 @@ szResult, DWORD *sz) return ERROR_INVALID_HANDLE; original_len = *sz; - /* +1 just to make sure we have a buffer incase the len is 0 */ + /* +1 just to make sure we have a buffer in case the len is 0 */ szwResult = HeapAlloc(GetProcessHeap(),0,(original_len+1) * sizeof(WCHAR)); rc = MSI_FormatRecordW(package, record, szwResult, sz); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 80b8087acf2..4194da0e18d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -408,7 +408,7 @@ UINT read_table_from_storage( MSIDATABASE *db, LPCWSTR name, MSITABLE **ptable) TRACE("%s\n",debugstr_w(name)); - /* non-existing tables should be interpretted as empty tables */ + /* non-existing tables should be interpreted as empty tables */ t = HeapAlloc( GetProcessHeap(), 0, sizeof (MSITABLE) + lstrlenW(name)*sizeof (WCHAR) ); if( !t ) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 69137314234..5746c836add 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1493,7 +1493,7 @@ mp_exch (mp_int * a, mp_int * b) /* this is a shell function that calls either the normal or Montgomery * exptmod functions. Originally the call to the montgomery code was - * embedded in the normal function but that wasted alot of stack space + * embedded in the normal function but that wasted a lot of stack space * for nothing (since 99% of the time the Montgomery code would be called) */ int mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y) @@ -2629,7 +2629,7 @@ mp_mod_d (mp_int * a, mp_digit b, mp_digit * c) * shifts with subtractions when the result is greater than b. * * The method is slightly modified to shift B unconditionally upto just under - * the leading bit of b. This saves alot of multiple precision shifting. + * the leading bit of b. This saves a lot of multiple precision shifting. */ int mp_montgomery_calc_normalization (mp_int * a, mp_int * b) { diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index ad6261e510f..403afe2e855 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -673,7 +673,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) if (ret == ERROR_SUCCESS) { if (!( (type == REG_DWORD) || ((type == REG_BINARY) && (datalen == 4)) )) { - ERR("Error policy data for \"NoRecentDocsHistory\" not formated correctly, type=%ld, len=%ld\n", + ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%ld, len=%ld\n", type, datalen); return; } diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 0ec115e092a..36333b82a47 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME * Cookies are currently memory only. * Cookies are NOT THREAD SAFE - * Cookies could use ALOT OF MEMORY. We need some kind of memory management here! + * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! * Cookies should care about the expiry time */ diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 747390a52fd..4369d4fbc60 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2057,7 +2057,7 @@ BOOL HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) { LPWSTR * pFieldAndValue; - TRACE("got line %s, now interpretting\n", debugstr_a(bufferA)); + TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) diff --git a/documentation/ole.sgml b/documentation/ole.sgml index 829b5ecab35..e1aa12d724c 100644 --- a/documentation/ole.sgml +++ b/documentation/ole.sgml @@ -624,7 +624,7 @@ static ICOM_VTABLE(IDirect3D) d3dvt = { DCOM is theoretically an internet RFC [2] and is specced out, but in reality the only implementation of it apart from - ours is Microsofts, and as a result there are lots of interfaces + ours is Microsoft's, and as a result there are lots of interfaces which can be used if you want to customize or control DCOM but in practice are badly documented or not documented at all, or exist mostly as interfaces between MIDL generated code and COM diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index 3723374429b..6b29c419f3c 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1330,7 +1330,7 @@ void be_i386_disasm_one_insn(ADDRESS *addr, int display) struct i_addr address; /* - * Set this so we get can supress the printout if we need to. + * Set this so we get can suppress the printout if we need to. */ db_display = display; switch (addr->Mode) @@ -1760,7 +1760,7 @@ void be_i386_disasm_one_insn(ADDRESS *addr, int display) case Dl: if (size == WORD) { get_value_inc(displ, addr, 2, TRUE); - /* Offsetset only affects low 16 bits */ + /* Offset only affects low 16 bits */ displ = (addr->Offset & 0xffff0000) | ((addr->Offset + displ) & 0xffff); } diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 45523b0bf5d..b221ff7b9be 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -292,7 +292,7 @@ sub gcc_output($$) { if(s/^(\d+):\s+//) { $line = $1; if(s/^warning:\s+//) { - my $supress = 0; + my $suppress = 0; if(0) { # Nothing @@ -306,77 +306,77 @@ sub gcc_output($$) { HRASCONN|HRGN|HRSRC|HWAVEIN|HWAVEOUT|HWINSTA|HWND| SC_HANDLE|WSAEVENT|handle_t|pointer)$/x) { - $supress = 1; + $suppress = 1; } else { - $supress = 0; + $suppress = 0; } } elsif(/^\(near initialization for \`(.*?)\'\)$/) { - $supress = 0; + $suppress = 0; } elsif(/^\`(.*?)\' defined but not used$/) { - $supress = 0; + $suppress = 0; } elsif(/^\`(.*?)\' is not at beginning of declaration$/) { - $supress = 0; + $suppress = 0; } elsif(/^\`%x\' yields only last 2 digits of year in some locales$/) { - $supress = 1; + $suppress = 1; } elsif(/^assignment makes integer from pointer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^assignment makes pointer from integer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^assignment from incompatible pointer type$/) { - $supress = 0; + $suppress = 0; } elsif(/^cast from pointer to integer of different size$/) { - $supress = 0; + $suppress = 0; } elsif(/^comparison between pointer and integer$/) { - $supress = 0; + $suppress = 0; } elsif(/^comparison between signed and unsigned$/) { - $supress = 0; + $suppress = 0; } elsif(/^comparison of unsigned expression < 0 is always false$/) { - $supress = 0; + $suppress = 0; } elsif(/^comparison of unsigned expression >= 0 is always true$/) { - $supress = 0; + $suppress = 0; } elsif(/^conflicting types for built-in function \`(.*?)\'$/) { - $supress = 0; + $suppress = 0; } elsif(/^empty body in an if-statement$/) { - $supress = 0; + $suppress = 0; } elsif(/^empty body in an else-statement$/) { - $supress = 0; + $suppress = 0; } elsif(/^implicit declaration of function \`(.*?)\'$/) { - $supress = 0; + $suppress = 0; } elsif(/^initialization from incompatible pointer type$/) { - $supress = 0; + $suppress = 0; } elsif(/^initialization makes pointer from integer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^missing initializer$/) { - $supress = 0; + $suppress = 0; } elsif(/^ordered comparison of pointer with integer zero$/) { - $supress = 0; + $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') from incompatible pointer type$/) { my $arg = $1; my $name = $2; if(defined($name) && $name =~ /^GDI_AllocObject$/) { - $supress = 1; + $suppress = 1; } else { - $supress = 0; + $suppress = 0; } } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes integer from pointer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^passing arg (\d+) of (?:pointer to function|\`(\S+)\') makes pointer from integer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^return makes integer from pointer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^return makes pointer from integer without a cast$/) { - $supress = 0; + $suppress = 0; } elsif(/^type of \`(.*?)\' defaults to \`(.*?)\'$/) { - $supress = 0; + $suppress = 0; } elsif(/^unused variable \`(.*?)\'$/) { - $supress = 0; + $suppress = 0; } elsif(!$options->pedantic) { - $supress = 0; + $suppress = 0; } else { error("gcc_output"); } - if(!$supress) { + if(!$suppress) { if($function) { $message = "function $function: warning: $_"; } else {