diff --git a/debugger/types.c b/debugger/types.c index 84419c2f7ac..21f984ad2be 100644 --- a/debugger/types.c +++ b/debugger/types.c @@ -4,7 +4,7 @@ * Copyright (C) 1997, Eric Youngdale. * * This really doesn't do much at the moment, but it forms the framework - * upon which full support for datatype handling will eventually be hung. + * upon which full support for datatype handling will eventually be built. */ #include "config.h" @@ -723,7 +723,7 @@ int DEBUG_GetObjectSize(struct datatype * dt) * DEBUG_GetObjectSize(dt->un.array.basictype); case DT_BITFIELD: /* - * Bitfields have to be handled seperately later on + * Bitfields have to be handled separately later on * when we insert the element into the structure. */ return 0; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fe5f6fca034..19ac5964513 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1872,7 +1872,7 @@ static LRESULT LISTVIEW_MouseHover(HWND hwnd, WPARAM wParam, LPARAM lParam) /*** * DESCRIPTION: - * Called whenever WM_MOUSEMOVE is recieved. + * Called whenever WM_MOUSEMOVE is received. * * PARAMETER(S): * [I] HWND : window handle @@ -1901,7 +1901,7 @@ static LRESULT LISTVIEW_MouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) if(!(trackinfo.dwFlags & TME_HOVER)) { trackinfo.dwFlags = TME_HOVER; - /* call TRACKMOUSEEVENT so we recieve WM_MOUSEHOVER messages */ + /* call TRACKMOUSEEVENT so we receive WM_MOUSEHOVER messages */ _TrackMouseEvent(&trackinfo); } } diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 8ea76789f10..0c0a118776d 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -946,11 +946,11 @@ PAGER_SetCursor( HWND hwnd, WPARAM wParam, LPARAM lParam ) /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ _TrackMouseEvent(&trackinfo); - /* Make sure tracking is enabled so we recieve a WM_MOUSELEAVE message */ + /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */ if(!(trackinfo.dwFlags & TME_LEAVE)) { trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ - /* call TRACKMOUSEEVENT so we recieve a WM_MOUSELEAVE message */ + /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ /* and can properly deactivate the hot button */ _TrackMouseEvent(&trackinfo); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1ccb3cd3bf8..c6aaa88c1e8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3979,11 +3979,11 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) /* call _TrackMouseEvent to see if we are currently tracking for this hwnd */ _TrackMouseEvent(&trackinfo); - /* Make sure tracking is enabled so we recieve a WM_MOUSELEAVE message */ + /* Make sure tracking is enabled so we receive a WM_MOUSELEAVE message */ if(!(trackinfo.dwFlags & TME_LEAVE)) { trackinfo.dwFlags = TME_LEAVE; /* notify upon leaving */ - /* call TRACKMOUSEEVENT so we recieve a WM_MOUSELEAVE message */ + /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ /* and can properly deactivate the hot toolbar button */ _TrackMouseEvent(&trackinfo); } diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b8bf9328a30..48f6cb42a44 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4015,7 +4015,7 @@ static HRESULT WINAPI DP_IF_InitializeConnection TRACE( "Calling %s (SP entry point)\n", bIsDpSp ? "SPInit" : "DPLSPInit" ); - /* FIXME: Need to break this out into a seperate routine for DP SP and + /* FIXME: Need to break this out into a separate routine for DP SP and * DPL SP as they actually use different stuff... */ hr = (*SPInit)( &This->dp2->spData ); diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 94efbafb8d3..d8d54019f80 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -82,7 +82,7 @@ static int __MSVCRT__spawn(int flags, const char *exe, char * args, char *env) return -1; /* can't reach here */ } -/* INTERNAL: Convert argv list to a single 'delim'-seperated string */ +/* INTERNAL: Convert argv list to a single 'delim'-separated string */ static char * __MSVCRT__argvtos(const char * *arg, char delim) { const char **search = arg; diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 5008e34e323..0af9a64f746 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -81,7 +81,7 @@ HRESULT WINAPI AntiMonikerImpl_Construct(AntiMonikerImpl* iface); HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* iface); /********************************************************************************/ -/* Virtual function table for the AntiMonikerImpl class witch include Ipersist,*/ +/* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ static ICOM_VTABLE(IMoniker) VT_AntiMonikerImpl = { diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 11034c70ef7..be3a293a33e 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -40,11 +40,11 @@ typedef struct BindCtxImpl{ ULONG ref; /* reference counter for this object */ - BindCtxObject* bindCtxTable; /* this is a table in witch all bounded objects are stored*/ + BindCtxObject* bindCtxTable; /* this is a table in which all bounded objects are stored*/ DWORD bindCtxTableLastIndex; /* first free index in the table */ DWORD bindCtxTableSize; /* size table */ - BIND_OPTS2 bindOption2; /* a structure witch contains the bind options*/ + BIND_OPTS2 bindOption2; /* a structure which contains the bind options*/ } BindCtxImpl; diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index d1a53d2ecfe..3c032e2d28e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1571,7 +1571,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); /* - * Since enumerators are seperate objects from the parent data object + * Since enumerators are separate objects from the parent data object * we only need to support the IUnknown and IEnumFORMATETC interfaces */ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 6a4493907f1..cdc9b956dbb 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -123,8 +123,8 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface,IEnumMoniker** p HRESULT WINAPI EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tabSize,ULONG currentPos,BOOL leftToRigth,IEnumMoniker ** ppmk); /********************************************************************************/ -/* Virtual function table for the CompositeMonikerImpl class witch include */ -/* Ipersist, IPersistStream and IMoniker functions. */ +/* Virtual function table for the CompositeMonikerImpl class which includes */ +/* IPersist, IPersistStream and IMoniker functions. */ static ICOM_VTABLE(IMoniker) VT_CompositeMonikerImpl = { diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 25d103f6303..a2e0a54b25b 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -88,7 +88,7 @@ int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** tabStr); /********************************************************************************/ -/* Virtual function table for the FileMonikerImpl class witch include Ipersist,*/ +/* Virtual function table for the FileMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ static ICOM_VTABLE(IMoniker) VT_FileMonikerImpl = { @@ -318,7 +318,7 @@ HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface,IStream* pStm) * FileMoniker_Save ******************************************************************************/ HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, - IStream* pStm,/* poniter to the stream where the object is to be saved */ + IStream* pStm,/* pointer to the stream where the object is to be saved */ BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ { /* this function saves data of this object. In the begining I thougth that I have just to write diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 2de248d9a90..78308416787 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -87,7 +87,7 @@ static ULONG WINAPI ItemMonikerROTDataImpl_Release(IROTData* iface); static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparaisonData(IROTData* iface,BYTE* pbData,ULONG cbMax,ULONG* pcbData); /********************************************************************************/ -/* Virtual function table for the ItemMonikerImpl class witch include Ipersist,*/ +/* Virtual function table for the ItemMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ static ICOM_VTABLE(IMoniker) VT_ItemMonikerImpl = { @@ -342,9 +342,9 @@ HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, /* for more details see ItemMonikerImpl_Save coments */ - pcbSize->s.LowPart = sizeof(DWORD) + /* DWORD witch contains delimiter length */ + pcbSize->s.LowPart = sizeof(DWORD) + /* DWORD which contains delimiter length */ delimiterLength + /* item delimiter string */ - sizeof(DWORD) + /* DWORD witch contains item name length */ + sizeof(DWORD) + /* DWORD which contains item name length */ nameLength + /* item name string */ 34; /* this constant was added ! because when I tested this function it usually */ /* returns 34 bytes more than the number of bytes used by IMoniker::Save function */ diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 31e49127744..8913c261929 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -203,10 +203,10 @@ HRESULT WINAPI RunningObjectTableImpl_Initialize() /* the initial reference is set to "1" ! because if set to "0" it will be not practis when */ /* the ROT refered many times not in the same time (all the objects in the ROT will */ - /* be removed evry time the ROT is removed ) */ + /* be removed every time the ROT is removed ) */ runningObjectTableInstance->ref = 1; - /* allocate space memory for the table witch contains all the running objects */ + /* allocate space memory for the table which contains all the running objects */ runningObjectTableInstance->runObjTab = HeapAlloc(GetProcessHeap(), 0, sizeof(RunObject[BLOCK_TAB_SIZE])); if (runningObjectTableInstance->runObjTab == NULL) @@ -250,7 +250,7 @@ HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface, TRACE("(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); - /* there's only tow types of register : strong and or weak registration (only one must be passed on parameter) */ + /* there's only two types of register : strong and or weak registration (only one must be passed on parameter) */ if ( ( (grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || !(grfFlags & ROTFLAGS_ALLOWANYCLIENT)) && (!(grfFlags & ROTFLAGS_REGISTRATIONKEEPSALIVE) || (grfFlags & ROTFLAGS_ALLOWANYCLIENT)) && (grfFlags) ) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b77ace94967..f4b705739fe 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6403,7 +6403,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName strcpy(IStorageCompObj.strOleTypeName, strOleTypeName); /* copy the OleTypeName to the compobj struct */ - /* Note: in the test made, these where Identical */ + /* Note: in the test made, these were Identical */ IStorageCompObj.dwProgIDNameLength = strlen(strOleTypeName)+1; strcpy(IStorageCompObj.strProgIDName, strOleTypeName); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4187dbcd411..40bf97c5a35 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1368,7 +1368,7 @@ ITypeInfoImpl * TLB_DoTypeInfo( ptiRet = (ITypeInfoImpl*) ITypeInfo_Constructor(); TLB_Read(&tiBase, sizeof(tiBase) ,pcx , pcx->pTblDir->pTypeInfoTab.offset+count*sizeof(tiBase)); -/* this where we are coming from */ +/* this is where we are coming from */ ptiRet->pTypeLib = pLibInfo; ptiRet->index=count; /* fill in the typeattr fields */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 9ca2073da86..efe7d9fd27d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -342,12 +342,12 @@ static BOOL DateToTm( DATE dateIn, LCID lcid, struct tm* pTm ) memset(pTm,0,sizeof(*pTm)); - /* Because of the nature of DATE format witch + /* Because of the nature of DATE format which * associates 2.0 to January 1, 1900. We will * remove 1.0 from the whole part of the DATE * so that in the following code 1.0 * will correspond to January 1, 1900. - * This simplyfies the processing of the DATE value. + * This simplifies the processing of the DATE value. */ dateIn -= 1.0; @@ -359,7 +359,7 @@ static BOOL DateToTm( DATE dateIn, LCID lcid, struct tm* pTm ) int nDay = 0; int leapYear = 0; double yearsSince1900 = 0; - /* Start at 1900, this where the DATE time 0.0 starts. + /* Start at 1900, this is where the DATE time 0.0 starts. */ pTm->tm_year = 1900; /* find in what year the day in the "wholePart" falls into. @@ -375,12 +375,12 @@ static BOOL DateToTm( DATE dateIn, LCID lcid, struct tm* pTm ) wholePart++; } - /* find what day of that year does the "wholePart" corresponds to. + /* find what day of that year the "wholePart" corresponds to. * Note: nDay is in [1-366] format */ nDay = (int) ( wholePart - floor( yearsSince1900 * DAYS_IN_ONE_YEAR ) ); /* Set the tm_yday value. - * Note: The day is must be converted from [1-366] to [0-365] + * Note: The day must be converted from [1-366] to [0-365] */ /*pTm->tm_yday = nDay - 1;*/ /* find which mount this day corresponds to. diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index a73d4899438..49130c5e50f 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -338,7 +338,7 @@ static void SF_RegisterClipFmt (IGenericSFImpl * This) } /************************************************************************** -* we need a seperate IUnknown to handle aggregation +* we need a separate IUnknown to handle aggregation * (inner IUnknown) */ static HRESULT WINAPI IUnknown_fnQueryInterface( diff --git a/dlls/user/ddeml.c b/dlls/user/ddeml.c index a52d275fbff..48597d5c19a 100644 --- a/dlls/user/ddeml.c +++ b/dlls/user/ddeml.c @@ -1688,7 +1688,7 @@ BOOL WINAPI DdeSetUserHandle( HCONV hConv, DWORD id, DWORD hUser) } /****************************************************************************** - * DdeGetData [USER32.@] Copies data from DDE object ot local buffer + * DdeGetData [USER32.@] Copies data from DDE object to local buffer * * RETURNS * Size of memory object associated with handle diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index 5973f4594f1..c9a822755d5 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -374,7 +374,7 @@ static HRESULT ICO_ExtractIconExW( ); goto end; } - /* FIXME: doesn't work when the resources are not in a seperate section */ + /* FIXME: doesn't work when the resources are not in a separate section */ if (pe_sections[i].VirtualAddress == pe_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress) { rootresdir = (PIMAGE_RESOURCE_DIRECTORY)(peimage+pe_sections[i].PointerToRawData); diff --git a/graphics/x11drv/graphics.c b/graphics/x11drv/graphics.c index a9edf8f020a..f48a758f3e4 100644 --- a/graphics/x11drv/graphics.c +++ b/graphics/x11drv/graphics.c @@ -429,12 +429,12 @@ X11DRV_DrawArc( DC *dc, INT left, INT top, INT right, points[1].y = (int) floor(dc->DCOrgY + (top+bottom)/2.0 - sin(end_angle) * (bottom-top-width*2+2) / 2. + 0.5); - /* OK this stuff is optimized for Xfree86 - * which is probably the most used server by + /* OK, this stuff is optimized for Xfree86 + * which is probably the server most used by * wine users. Other X servers will not * display correctly. (eXceed for instance) - * so if you feel you must change make sure that - * you either use Xfree86 or seperate your changes + * so if you feel you must make changes, make sure that + * you either use Xfree86 or separate your changes * from these (compile switch or whatever) */ if (lines == 2) { diff --git a/include/ddraw.h b/include/ddraw.h index d71260a3cc1..d4c659ee885 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -283,7 +283,7 @@ typedef struct IDirectDrawGammaControl IDirectDrawGammaControl,*LPDIRECTDRAWGAMM #define DDSCAPS_RESERVED2 0x00800000 /* memory allocation delayed until Load() */ #define DDSCAPS_ALLOCONLOAD 0x04000000 -/* Indicates that the surface will recieve data from a video port */ +/* Indicates that the surface will receive data from a video port */ #define DDSCAPS_VIDEOPORT 0x08000000 /* surface is in local videomemory */ #define DDSCAPS_LOCALVIDMEM 0x10000000 diff --git a/objects/metafile.c b/objects/metafile.c index 46e5dfa3854..330cd86f391 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -1355,7 +1355,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf, * 2 Looks like a handle? - not constant * 3 0 or 1 ?? * 4 Total number of bytes - * 5 No. of seperate bands = n [see below] + * 5 No. of separate bands = n [see below] * 6 Largest number of x co-ords in a band * 7-10 Bounding box x1 y1 x2 y2 * 11-... n bands diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 098473819b8..c39f8bfff51 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -16,7 +16,7 @@ * - free unused memory * - solve Open problems * - smoother scrolling - * - seperate view code and document code + * - separate view code and document code * * This program is intended as a testbed for winelib as much as * a useful application. diff --git a/win32/device.c b/win32/device.c index ced430350b6..4b659793f35 100644 --- a/win32/device.c +++ b/win32/device.c @@ -692,7 +692,7 @@ static DWORD VxDCall_VMM( DWORD service, CONTEXT86 *context ) ERR("Can't reserve ring 1 memory\n"); return -1; } - /* FIXME: This has to be handled seperatly, when we have seperate + /* FIXME: This has to be handled separately, when we have separate address-spaces */ if ( page == PR_PRIVATE || page == PR_SHARED ) page = 0; /* FIXME: Handle flags in some way */ diff --git a/windows/winpos.c b/windows/winpos.c index e74a2b72152..8456478079e 100644 --- a/windows/winpos.c +++ b/windows/winpos.c @@ -2954,7 +2954,7 @@ Pos: /* ----------------------------------------------------------------------- /* Use PAINT_RedrawWindow to explicitly force an invalidation of the window, its parent and sibling and so on, and then erase the parent window - back ground if the parent is either a top-level window or its parent's parent + background if the parent is either a top-level window or its parent's parent is top-level window. Rely on the system to repaint other affected windows later on. */ if( uFlags & SWP_EX_PAINTSELF )