Assorted spelling fixes.
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index a722c41..b66a9ad 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -954,7 +954,7 @@
/* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */
/* specified. It then creates it's own version of the EDIT control */
/* and makes the ComboBox the parent. This is because a normal */
- /* DROPDOWNLIST does not have a EDIT control, but we need one. */
+ /* DROPDOWNLIST does not have an EDIT control, but we need one. */
/* We also need to place the edit control at the proper location */
/* (allow space for the icons). */
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 5a21e0c..e8b2cf8 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -83,7 +83,7 @@
INT iHotItem; /* index of hot item (cursor is over this item) */
INT iMargin; /* width of the margin that surrounds a bitmap */
- HIMAGELIST himl; /* handle to a image list (may be 0) */
+ HIMAGELIST himl; /* handle to an image list (may be 0) */
HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */
BOOL bRectsValid; /* validity flag for bounding rectangles */
} HEADER_INFO;
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 50be7cb..5d86bde 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -1022,7 +1022,7 @@
* five versa, should leave the iterator at the same item:
* prev * n, next * n = next * n, prev * n
*
- * The iterator has a notion of a out-of-order, special item,
+ * The iterator has a notion of an out-of-order, special item,
* which sits at the start of the list. This is used in
* LVS_ICON, and LVS_SMALLICON mode to handle the focused item,
* which needs to be first, as it may overlap other items.
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 55220d0..7213bd0 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -38,7 +38,7 @@
* -- take care of internationalization.
* -- keyboard handling.
* -- GetRange: At the moment, we copy ranges anyway, regardless of
- * infoPtr->rangeValid; a invalid range is simply filled
+ * infoPtr->rangeValid; an invalid range is simply filled
* with zeros in SetRange. Is this the right behavior?
* -- search for FIXME
*/
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 284d41f..b02b058 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2475,7 +2475,7 @@
if (imindBand == -1) imindBand = i;
/* minimum size of each band is size of header plus */
/* size of minimum child plus offset of child from header plus */
- /* a one to separate each band. */
+ /* one to separate each band. */
if (i < ihitBand)
LHeaderSum += (band->lcx + SEP_WIDTH);
else
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 799f837..2714009 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -82,7 +82,7 @@
USHORT uVItemPadding_s; /* Set amount of vertical padding, in pixels */
HFONT hFont; /* handle to the current font */
HCURSOR hcurArrow; /* handle to the current cursor */
- HIMAGELIST himl; /* handle to a image list (may be 0) */
+ HIMAGELIST himl; /* handle to an image list (may be 0) */
HWND hwndToolTip; /* handle to tab's tooltip */
INT leftmostVisible; /* Used for scrolling, this member contains
* the index of the first visible item */
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index b507c94..9a2dfce 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -65,7 +65,7 @@
/* Chose Color PRIVATE Structure:
*
* This structure is duplicated in the 16 bit code with
- * a extra member
+ * an extra member
*/
typedef struct CCPRIVATE
diff --git a/dlls/commdlg/colordlg16.c b/dlls/commdlg/colordlg16.c
index 1ebde84..fea8488 100644
--- a/dlls/commdlg/colordlg16.c
+++ b/dlls/commdlg/colordlg16.c
@@ -46,7 +46,7 @@
/* Chose Color PRIVATE Structure:
*
* This is a duplicate of the 32bit code with
- * a extra member
+ * an extra member
*/
typedef struct CCPRIVATE
{
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 2e521c3..cd9fade 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -2406,7 +2406,7 @@
/***********************************************************************
* FILEDLG95_FILETYPE_SearchExt
*
- * searches for a extension in the filetype box
+ * searches for an extension in the filetype box
*/
static int FILEDLG95_FILETYPE_SearchExt(HWND hwnd,LPCWSTR lpstrExt)
{
diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index 23888ad..6799c1c 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -720,7 +720,7 @@
fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
- /* If the selected object is not a folder, send a IDOK command to parent window */
+ /* If the selected object is not a folder, send an IDOK command to parent window */
if((pidl = GetPidlFromDataObject(fodInfos->Shell.FOIDataObject, 1)))
{
HRESULT hRes;
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 8d32424..86cd98a 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -1094,7 +1094,7 @@
/*IDirect3DStateBlock9Vtbl *lpVtbl;*/
DWORD ref;
- /* The device, to be replaced by a IDirect3DDeviceImpl */
+ /* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
D3DSTATEBLOCKTYPE blockType;
@@ -1183,7 +1183,7 @@
/*IDirect3DVertexShaderDeclaration9Vtbl *lpVtbl;*/
DWORD ref;
- /* The device, to be replaced by a IDirect3DDeviceImpl */
+ /* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
/** precomputed fvf if simple declaration */
@@ -1219,7 +1219,7 @@
/*IDirect3DVertexShader9Vtbl *lpVtbl;*/
DWORD ref;
- /* The device, to be replaced by a IDirect3DDeviceImpl */
+ /* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
DWORD* function;
@@ -1268,7 +1268,7 @@
/*IDirect3DPixelShader9Vtbl *lpVtbl;*/
DWORD ref;
- /* The device, to be replaced by a IDirect3DDeviceImpl */
+ /* The device, to be replaced by an IDirect3DDeviceImpl */
IDirect3DDevice8Impl* device;
DWORD* function;
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 741f2ad..d48ecc9 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -396,11 +396,11 @@
TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot);
if (D3DFMT_A8R8G8B8 != pSur->myDesc.Format) {
- ERR("(%p) : surface(%p) have a invalid format\n", This, pCursorBitmap);
+ ERR("(%p) : surface(%p) has an invalid format\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
if (32 != pSur->myDesc.Height || 32 != pSur->myDesc.Width) {
- ERR("(%p) : surface(%p) have a invalid size\n", This, pCursorBitmap);
+ ERR("(%p) : surface(%p) has an invalid size\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
@@ -1182,7 +1182,7 @@
FIXME("(%p) : Should return whole screen, only returns GL context window in top left corner\n", This);
if (D3DFMT_A8R8G8B8 != ((IDirect3DSurface8Impl*) pDestSurface)->myDesc.Format) {
- ERR("(%p) : surface(%p) have a invalid format\n", This, pDestSurface);
+ ERR("(%p) : surface(%p) has an invalid format\n", This, pDestSurface);
return D3DERR_INVALIDCALL;
}
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 3d2662b..0f6fb73 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -119,8 +119,8 @@
TRACE("(%p) Relay\n", This);
- /* The container returned from IWineD3DSurface_GetContainer is either a IWineD3DDevice,
- one of the subclasses of IWineD3DBaseTexture or a IWineD3DSwapChain */
+ /* The container returned from IWineD3DSurface_GetContainer is either an IWineD3DDevice,
+ one of the subclasses of IWineD3DBaseTexture or an IWineD3DSwapChain */
/* Get the IUnknown container. */
res = IWineD3DSurface_GetContainer(This->wineD3DSurface, &IID_IUnknown, (void **)&IWineContainer);
if (res == D3D_OK && IWineContainer != NULL) {
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index c3172b1..a5d3c02 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -127,7 +127,7 @@
/******************************************************************
* elf_map_section
*
- * Maps a single section into memory from a ELF file
+ * Maps a single section into memory from an ELF file
*/
static const char* elf_map_section(struct elf_file_map* fmap, int sidx)
{
@@ -162,7 +162,7 @@
/******************************************************************
* elf_map_file
*
- * Maps a ELF file into memory (and checks it's a real ELF file)
+ * Maps an ELF file into memory (and checks it's a real ELF file)
*/
static BOOL elf_map_file(const char* filename, struct elf_file_map* fmap)
{
@@ -222,7 +222,7 @@
/******************************************************************
* elf_unmap_file
*
- * Unmaps a ELF file from memory (previously mapped with elf_map_file)
+ * Unmaps an ELF file from memory (previously mapped with elf_map_file)
*/
static void elf_unmap_file(struct elf_file_map* fmap)
{
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index 8a3adb0..abaa5b3 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -216,7 +216,7 @@
/******************************************************************
* fetch_elf_module_info_cb
*
- * Callback for accumulating in dump_context a ELF modules set
+ * Callback for accumulating in dump_context an ELF modules set
*/
static BOOL fetch_elf_module_info_cb(const char* name, unsigned long base,
void* user)
diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index c1de821..a72e7fa 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -384,7 +384,7 @@
IDirectMusicObject* pObject = NULL;
if (pChunk->fccID != DMUS_FOURCC_INSTRUMENT_LIST) {
- ERR_(dmfile)(": %s chunk should be a INSTRUMENT list\n", debugstr_fourcc (pChunk->fccID));
+ ERR_(dmfile)(": %s chunk should be an INSTRUMENT list\n", debugstr_fourcc (pChunk->fccID));
return E_FAIL;
}
@@ -482,7 +482,7 @@
LARGE_INTEGER liMove; /* used when skipping chunks */
if (pChunk->fccID != DMUS_FOURCC_INSTRUMENTS_LIST) {
- ERR_(dmfile)(": %s chunk should be a INSTRUMENTS list\n", debugstr_fourcc (pChunk->fccID));
+ ERR_(dmfile)(": %s chunk should be an INSTRUMENTS list\n", debugstr_fourcc (pChunk->fccID));
return E_FAIL;
}
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index fb63a79..7b881d7 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -304,7 +304,7 @@
}
hr = IDirectMusicObject_QueryInterface(pObject, &IID_IDirectMusicStyle8, (LPVOID*)&pNewItem->pObject);
if (FAILED(hr)) {
- ERR(": Reference not a IDirectMusicStyle, exiting\n");
+ ERR(": Reference not an IDirectMusicStyle, exiting\n");
exit(-1);
return hr;
}
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index c5afb2f..d098264 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -296,7 +296,7 @@
}
This->dp2->lpSessionDesc->dwSize = sizeof( *This->dp2->lpSessionDesc );
- /* We are a emulating a dp 6 implementation */
+ /* We are emulating a dp 6 implementation */
This->dp2->spData.dwSPVersion = DPSP_MAJORVERSION;
This->dp2->spData.lpCB = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 2b4c031..4a4e21b 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -473,7 +473,7 @@
* Connects an application to the session specified by the DPLCONNECTION
* structure currently stored with the DirectPlayLobby object.
*
- * Returns a IDirectPlay interface.
+ * Returns an IDirectPlay interface.
*
*/
static HRESULT WINAPI DPL_ConnectEx
diff --git a/dlls/gdi/enhmetafile.c b/dlls/gdi/enhmetafile.c
index a18ddaf1..cd7e4bb 100644
--- a/dlls/gdi/enhmetafile.c
+++ b/dlls/gdi/enhmetafile.c
@@ -2427,7 +2427,7 @@
/***************************************************************
* Find the EMR_EOF record and then use it to find the
* palette entries for this enhanced metafile.
- * The lpData is actually a pointer to a EMF_PaletteCopy struct
+ * The lpData is actually a pointer to an EMF_PaletteCopy struct
* which contains the max number of elements to copy and where
* to copy them to.
*
diff --git a/dlls/kernel/instr.c b/dlls/kernel/instr.c
index dcb3301..d2285de 100644
--- a/dlls/kernel/instr.c
+++ b/dlls/kernel/instr.c
@@ -361,7 +361,7 @@
/***********************************************************************
* INSTR_inport
*
- * input on a I/O port
+ * input on an I/O port
*/
static DWORD INSTR_inport( WORD port, int size, CONTEXT86 *context )
{
@@ -395,7 +395,7 @@
/***********************************************************************
* INSTR_outport
*
- * output on a I/O port
+ * output on an I/O port
*/
static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context )
{
diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c
index e8e316e..4bf9feb 100644
--- a/dlls/mapi32/prop.c
+++ b/dlls/mapi32/prop.c
@@ -789,7 +789,7 @@
* Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid.
*
* NOTES
- * The resulting property value array is stored in a contigous block starting at lpDst.
+ * The resulting property value array is stored in a contiguous block starting at lpDst.
*/
SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG *lpCount)
{
@@ -922,8 +922,8 @@
* between offsets and pointers. This does not work in native (it crashes),
* and cannot be made to work in Wine because the original interface design
* is deficient. The only use left for this function is to remap pointers
- * in a contigous property array that has been copied with memcpy() to another
- * memory location.
+ * in a contiguous property array that has been copied with memcpy() to
+ * another memory location.
*/
SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
LPVOID lpNew, ULONG *lpCount)
@@ -949,7 +949,7 @@
* The code below would handle both cases except that the design of this
* function makes it impossible to know when the pointers in lpProps are
* valid. If both lpOld and lpNew are non-NULL, native reads the pointers
- * after converting them, so we must do the same. Its seems this
+ * after converting them, so we must do the same. It seems this
* functionality was never tested by MS.
*/
@@ -1086,7 +1086,7 @@
/*************************************************************************
* ScDupPropset@16 (MAPI32.174)
*
- * Duplicate a property value array into a contigous block of memory.
+ * Duplicate a property value array into a contiguous block of memory.
*
* PARAMS
* cValues [I] Number of properties in lpProps
@@ -1848,7 +1848,7 @@
/**************************************************************************
* IMAPIProp_DeleteProps {MAPI32}
*
- * Delete one or more property values from a IMAPIProp objects.
+ * Delete one or more property values from an IMAPIProp object.
*
* PARAMS
* iface [I] IMAPIProp object to remove property values from.
diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c
index 080aa04..0bcf88a 100644
--- a/dlls/mscms/profile.c
+++ b/dlls/mscms/profile.c
@@ -392,7 +392,7 @@
* machine [I] Name of the machine for which to get the standard color space.
* Must be NULL, which indicates the local machine.
* id [I] Id of a standard color space.
- * profile [O] Buffer to recieve the profile filename.
+ * profile [O] Buffer to receive the profile filename.
* size [I/O] Size of the filename buffer in bytes.
*
* RETURNS
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 8918d7f..a6d4ab0 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -406,7 +406,7 @@
/* Sets *matches to whether the file (whose path is filePath) matches the
* versions set in sig.
* Return ERROR_SUCCESS in case of success (whether or not the file matches),
- * something else if a install-halting error occurs.
+ * something else if an install-halting error occurs.
*/
static UINT ACTION_FileVersionMatches(MSISIGNATURE *sig, LPCWSTR filePath,
BOOL *matches)
@@ -481,7 +481,7 @@
* fullFilePath is assumed to be the full path of the file specified in
* findData, which may be necessary to compare the version.
* Return ERROR_SUCCESS in case of success (whether or not the file matches),
- * something else if a install-halting error occurs.
+ * something else if an install-halting error occurs.
*/
static UINT ACTION_FileMatchesSig(MSISIGNATURE *sig,
LPWIN32_FIND_DATAW findData, LPCWSTR fullFilePath, BOOL *matches)
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c
index 07a07e0..90b6f66 100644
--- a/dlls/msrle32/msrle32.c
+++ b/dlls/msrle32/msrle32.c
@@ -762,7 +762,7 @@
assert(jumpx != -1);
if (pos < jumpx) {
- /* can only jump in positive direction -- do a EOL then jump */
+ /* can only jump in positive direction -- do an EOL then jump */
assert(jumpy > 0);
jumpx = 0;
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 235e2dd..7854308 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -117,7 +117,7 @@
* sharing [I] Type of shared access the caller would like to the file
* disposition [I] Specifies what to do, depending on whether the file already exists
* options [I] Options for creating a new file
- * ea_buffer [I] Pointer to a extended attributes buffer
+ * ea_buffer [I] Pointer to an extended attributes buffer
* ea_length [I] Length of ea_buffer
*
* RETURNS
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 02a0552..ecb5dee 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -849,7 +849,7 @@
sig_act.sa_flags = 0;
sigemptyset( &sig_act.sa_mask );
- /* ignore SIGPIPE so that we get a EPIPE error instead */
+ /* ignore SIGPIPE so that we get an EPIPE error instead */
sigaction( SIGPIPE, &sig_act, NULL );
/* automatic child reaping to avoid zombies */
#ifdef SA_NOCLDWAIT
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 591fa6f..f06f905 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -145,7 +145,7 @@
static ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable;
/*
- converts a objectpointer to This
+ converts an object pointer to This
*/
#define _IErrorInfo_Offset ((int)(&(((ErrorInfoImpl*)0)->lpvtei)))
#define _ICOM_THIS_From_IErrorInfo(class, name) class* This = (class*)(((char*)name)-_IErrorInfo_Offset)
@@ -157,7 +157,7 @@
#define _ICOM_THIS_From_ISupportErrorInfo(class, name) class* This = (class*)(((char*)name)-_ISupportErrorInfo_Offset)
/*
- converts This to a objectpointer
+ converts This to an object pointer
*/
#define _IErrorInfo_(This) (IErrorInfo*)&(This->lpvtei)
#define _ICreateErrorInfo_(This) (ICreateErrorInfo*)&(This->lpvtcei)
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index dc4b5ec..b057ec2 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -54,8 +54,8 @@
*/
struct HGLOBALStreamImpl
{
- IStreamVtbl *lpVtbl; /* Needs to be the first item in the stuct
- * since we want to cast this in a IStream pointer */
+ IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct
+ * since we want to cast this in an IStream pointer */
/*
* Reference count
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index f945e47..7d7fae5 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -49,7 +49,7 @@
struct HGLOBALLockBytesImpl
{
/*
- * Needs to be the first item in the stuct
+ * Needs to be the first item in the struct
* since we want to cast this in an ILockBytes pointer
*/
ILockBytesVtbl *lpVtbl;
diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c
index 0320b45..a2ae7a3 100644
--- a/dlls/ole32/memlockbytes16.c
+++ b/dlls/ole32/memlockbytes16.c
@@ -49,7 +49,7 @@
struct HGLOBALLockBytesImpl16
{
/*
- * Needs to be the first item in the stuct
+ * Needs to be the first item in the struct
* since we want to cast this in an ILockBytes pointer
*/
ILockBytes16Vtbl *lpVtbl;
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index e45f7c2..68bf945 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -160,7 +160,7 @@
TRACE("->CreateInstance(%s)\n",debugstr_guid(&iid));
hres = IUnknown_QueryInterface(This->pUnkServer,&IID_IClassFactory,(LPVOID*)&classfac);
if (hres) {
- FIXME("Ole server does not provide a IClassFactory?\n");
+ FIXME("Ole server does not provide an IClassFactory?\n");
return hres;
}
hres = IClassFactory_CreateInstance(classfac,NULL,&iid,(LPVOID*)&ppv);
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 43e522a..834afe7 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -533,7 +533,7 @@
struct IEnumSTATSTGImpl
{
IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct
- * since we want to cast this in a IEnumSTATSTG pointer */
+ * since we want to cast this in an IEnumSTATSTG pointer */
ULONG ref; /* Reference count */
StorageImpl* parentStorage; /* Reference to the parent storage */
@@ -618,7 +618,7 @@
struct StgStreamImpl
{
IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct
- * since we want to cast this in a IStream pointer */
+ * since we want to cast this to an IStream pointer */
/*
* Reference count
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 090ae9a..e984895 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -647,7 +647,7 @@
/************************************************************************
* SafeArrayCreateVector (OLEAUT32.411)
*
- * Create a one dimensional, contigous SafeArray.
+ * Create a one dimensional, contiguous SafeArray.
*
* PARAMS
* vt [I] Type to store in the safe array
@@ -674,7 +674,7 @@
/************************************************************************
* SafeArrayCreateVectorEx (OLEAUT32.411)
*
- * Create a one dimensional, contigous SafeArray.
+ * Create a one dimensional, contiguous SafeArray.
*
* PARAMS
* vt [I] Type to store in the safe array
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 1535926..548186e 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -1625,25 +1625,25 @@
* member information is stored in a data structure at offset
* indicated by the memoffset field of the typeinfo structure
* There are several distinctive parts.
- * the first part starts with a field that holds the total length
+ * The first part starts with a field that holds the total length
* of this (first) part excluding this field. Then follow the records,
* for each member there is one record.
*
- * First entry is always the length of the record (including this
+ * The first entry is always the length of the record (including this
* length word).
- * Rest of the record depends on the type of the member. If there is
- * a field indicating the member type (function variable intereface etc)
+ * The rest of the record depends on the type of the member. If there is
+ * a field indicating the member type (function, variable, interface, etc)
* I have not found it yet. At this time we depend on the information
* in the type info and the usual order how things are stored.
*
- * Second follows an array sized nrMEM*sizeof(INT) with a memeber id
+ * Second follows an array sized nrMEM*sizeof(INT) with a member id
* for each member;
*
- * Third is a equal sized array with file offsets to the name entry
+ * Third is an equal sized array with file offsets to the name entry
* of each member.
*
- * Forth and last (?) part is an array with offsets to the records in the
- * first part of this file segment.
+ * The fourth and last (?) part is an array with offsets to the records
+ * in the first part of this file segment.
*/
int infolen, nameoffset, reclength, nrattributes, i;
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 4e2a022..9d75ccf 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -83,7 +83,7 @@
#define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset);
/*
- converts This to a interface pointer
+ converts This to an interface pointer
*/
#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
#define _IAutoComplete2_(This) (IAutoComplete2*)&(This->lpvtblAutoComplete2)
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 9b4ae6e..0b41c07 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -87,7 +87,7 @@
/*
- converts This to a interface pointer
+ converts This to an interface pointer
*/
#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl)
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index 82bf7e6..f4c17f4 100644
--- a/dlls/shell32/memorystream.c
+++ b/dlls/shell32/memorystream.c
@@ -1,12 +1,12 @@
/*
- * this class implements a pure IStream object
- * and can be used for many purposes
+ * This class implements a pure IStream object
+ * and can be used for many purposes.
*
- * the main reason for implementing this was
+ * The main reason for implementing this was
* a cleaner implementation of IShellLink which
- * needs to be able to load lnk's from a IStream
+ * needs to be able to load lnks from an IStream
* interface so it was obvious to capsule the file
- * access in a IStream to.
+ * access in an IStream to.
*
* Copyright 1999 Juergen Schmied
* Copyright 2003 Mike McCormack for CodeWeavers
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 1c1cf1b..e2fbdd7 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1226,7 +1226,7 @@
if (SUCCEEDED(hr))
PathAddBackslashA(pszPath);
}
- /* The only other valid case is a item ID list beginning at "My Computer" */
+ /* The only other valid case is an item ID list beginning at "My Computer" */
else if (_ILIsMyComputer(pidl))
pidl = ILGetNext(pidl);
@@ -1338,7 +1338,7 @@
if (SUCCEEDED(hr))
PathAddBackslashW(pszPath);
}
- /* The only other valid case is a item ID list beginning at "My Computer" */
+ /* The only other valid case is an item ID list beginning at "My Computer" */
else if (_ILIsMyComputer(pidl))
pidl = ILGetNext(pidl);
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index 44ad4ae..7ffc4f7 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -1,5 +1,5 @@
/*
- * defines helperfunctions to manipulate the contents of a IShellFolder
+ * Defines helper functions to manipulate the contents of an IShellFolder
*
* Copyright 2000 Juergen Schmied
*
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index b7bfaa2..376b1ab 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -162,14 +162,14 @@
TRACE("WithoutCom=%u FromShell=%u\n", bLoadWithoutCOM, bLoadFromShell32);
- /* now we create a instance */
+ /* now we create an instance */
if (bLoadFromShell32) {
if (! SUCCEEDED(SHELL32_DllGetClassObject(myclsid, &IID_IClassFactory,(LPVOID*)&pcf))) {
ERR("LoadFromShell failed for CLSID=%s\n", shdebugstr_guid(myclsid));
}
} else if (bLoadWithoutCOM) {
- /* load a external dll without ole32 */
+ /* load an external dll without ole32 */
HANDLE hLibrary;
typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, REFIID iid, LPVOID *ppv);
DllGetClassObjectFunc DllGetClassObject;
@@ -190,7 +190,7 @@
} else {
- /* load a external dll in the usual way */
+ /* load an external dll in the usual way */
hres = CoCreateInstance(myclsid, pUnkOuter, CLSCTX_INPROC_SERVER, refiid, ppv);
goto end;
}
@@ -493,9 +493,9 @@
* SHCreateDefClassObject
*
* NOTES
- * helper function for dll's without a own classfactory
- * a generic classfactory is returned
- * when the CreateInstance of the cf is called the callback is executed
+ * Helper function for dlls without their own classfactory.
+ * A generic classfactory is returned.
+ * When the CreateInstance of the cf is called the callback is executed.
*/
typedef struct
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index ab8fd0a..34f637c 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -104,7 +104,7 @@
#define _ICOM_THIS_From_ISFHelper(class, name) class* This = (class*)(((char*)name)-_ISFHelper_Offset);
/*
- converts This to a interface pointer
+ converts This to an interface pointer
*/
#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
#define _IShellFolder_(This) (IShellFolder*)&(This->lpvtblShellFolder)
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index a3bb5bc..4c76ebc 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -71,7 +71,7 @@
#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
/*
- converts This to a interface pointer
+ converts This to an interface pointer
*/
#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl)
#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl)
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index bdc32a9..f04828a 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -180,7 +180,7 @@
default:
/*
- * Check if this is a env-variable here...
+ * Check if this is an env-variable here...
*/
/* Make sure that we have at least one more %.*/
@@ -195,7 +195,7 @@
*tmpB++ = *fmt++;
*tmpB++ = 0;
- TRACE("Checking %s to be a env-var\n", debugstr_w(tmpBuffer));
+ TRACE("Checking %s to be an env-var\n", debugstr_w(tmpBuffer));
envRet = GetEnvironmentVariableW(tmpBuffer, tmpEnvBuff, MAX_PATH);
if (envRet == 0 || envRet > MAX_PATH)
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index efb024b..7256b14 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -304,7 +304,7 @@
* - asks it for the displayname of [subpidl2][subpidl3]
*
* Is possible the pidl is a simple pidl. In this case it asks the
- * subfolder for the displayname of a empty pidl. The subfolder
+ * subfolder for the displayname of an empty pidl. The subfolder
* returns the own displayname eg. "::{guid}". This is used for
* virtual folders with the registry key WantsFORPARSING set.
*/
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index cd958a3..ea245f2 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -647,7 +647,7 @@
* FileMenu_InitMenuPopup [SHELL32.109]
*
* NOTES
- * The filemenu is a ownerdrawn menu. Call this function responding to
+ * The filemenu is an ownerdrawn menu. Call this function responding to
* WM_INITPOPUPMENU
*
*/
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index f60564c..2244626 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -378,14 +378,14 @@
break;
default:
- /* if it's a id just pass it to the parent shv */
+ /* if it's an id just pass it to the parent shv */
if (hWndSV) SendMessageA(hWndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0),0 );
break;
}
}
if (lpSV)
- IShellView_Release(lpSV); /* QueryActiveShellView does AddRef*/
+ IShellView_Release(lpSV); /* QueryActiveShellView does AddRef */
return NOERROR;
}
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 591e62f..6c61d55 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -2665,7 +2665,7 @@
* Failure: An HRESULT error code.
*
* NOTES
- * This QueryInterface asks the inner object for a interface. In case
+ * This QueryInterface asks the inner object for an interface. In case
* of aggregation this request would be forwarded by the inner to the
* outer object. This function asks the inner object directly for the
* interface circumventing the forwarding to the outer object.
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index c12cfb9..9fd274d 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -1305,7 +1305,7 @@
*
* subcase-2: buffer is to small to hold the expanded string:
* the function return success (!!) and the result is truncated
- * *** This is clearly a error in the native implementation. ***
+ * *** This is clearly an error in the native implementation. ***
*
* case-2: the unexpanded string is bigger than the expanded one
* The buffer must have enough space to hold the unexpanded
diff --git a/dlls/user/edit.c b/dlls/user/edit.c
index 3af5161..3e71ea3 100644
--- a/dlls/user/edit.c
+++ b/dlls/user/edit.c
@@ -1579,7 +1579,7 @@
*
* Initially the edit control allocates a HLOCAL32 buffer
* (32 bit linear memory handler). However, 16 bit application
- * might send a EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF
+ * might send an EM_GETHANDLE message and expect a HLOCAL16 (16 bit SEG:OFF
* handler). From that moment on we have to keep using this 16 bit memory
* handler, because it is supposed to be valid at all times after EM_GETHANDLE.
* What we do is create a HLOCAL16 buffer, copy the text, and do pointer
diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index 13362d8..fa7a162 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -1220,7 +1220,7 @@
/* Modify the work area only minimally as this causes the icons that
* fall outside it to be moved around thus requiring the user to
* reposition them manually one by one.
- * Changing the work area by just one pixel should make this occurence
+ * Changing the work area by just one pixel should make this occurrence
* reasonably unlikely.
*/
curr_val.left = old_area.left;
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 9a64693..dc465e4 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -33,7 +33,7 @@
{
IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj);
- /* FIXME: This needs to extend a IWineD3DBaseObject */
+ /* FIXME: This needs to extend an IWineD3DBaseObject */
if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_IWineD3DResource)
|| IsEqualGUID(riid, &IID_IWineD3DBaseTexture)) {
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 48225e6..6e9eac5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -240,7 +240,7 @@
HRESULT WINAPI IWineD3DDeviceImpl_QueryInterface(IWineD3DDevice *iface,REFIID riid,LPVOID *ppobj)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- /* FIXME: This needs to extend a IWineD3DBaseObject */
+ /* FIXME: This needs to extend an IWineD3DBaseObject */
TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(riid, &IID_IUnknown)
@@ -269,7 +269,7 @@
if (!refCount) {
/* TODO: Clean up all the surfaces and textures! */
- /* FIXME: Create targets and stablocks in d3d8 */
+ /* FIXME: Create targets and state blocks in d3d8 */
if (((IWineD3DImpl *)This->wineD3D)->dxVersion > 8) { /*We don't create a state block in d3d8 yet*/
/* NOTE: You must release the parent if the objects was created via a callback
** ***************************/
@@ -4264,18 +4264,18 @@
HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* iface, UINT XHotSpot,
UINT YHotSpot, IWineD3DSurface *pCursorBitmap) {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface;
- /* TODO: the use of Impl is depricated. */
+ /* TODO: the use of Impl is deprecated. */
/* some basic validation checks */
IWineD3DSurfaceImpl * pSur = (IWineD3DSurfaceImpl *) pCursorBitmap;
TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot);
if (WINED3DFMT_A8R8G8B8 != pSur->currentDesc.Format) {
- ERR("(%p) : surface(%p) have a invalid format\n", This, pCursorBitmap);
+ ERR("(%p) : surface(%p) has an invalid format\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
if (32 != pSur->currentDesc.Height || 32 != pSur->currentDesc.Width) {
- ERR("(%p) : surface(%p) have a invalid size\n", This, pCursorBitmap);
+ ERR("(%p) : surface(%p) has an invalid size\n", This, pCursorBitmap);
return D3DERR_INVALIDCALL;
}
/* TODO: make the cursor 'real' */
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e8b29cd..ce9fcb3 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -156,7 +156,7 @@
HRESULT WINAPI IWineD3DImpl_QueryInterface(IWineD3D *iface,REFIID riid,LPVOID *ppobj)
{
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
- /* FIXME: This needs to extend a IWineD3DBaseObject */
+ /* FIXME: This needs to extend an IWineD3DBaseObject */
TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj);
if (IsEqualGUID(riid, &IID_IUnknown)
diff --git a/dlls/wineps/escape.c b/dlls/wineps/escape.c
index 6c2c59e..bf680c9 100644
--- a/dlls/wineps/escape.c
+++ b/dlls/wineps/escape.c
@@ -431,7 +431,7 @@
}
if(!physDev->job.OutOfPage) {
- WARN("Somebody forgot a EndPage\n");
+ WARN("Somebody forgot an EndPage\n");
PSDRV_EndPage( physDev );
}
PSDRV_WriteFooter( physDev );
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index e4c0a0c..e3d9f66 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1890,7 +1890,7 @@
WININET_Release( &lpwhs->hdr );
/*
- * a INTERNET_STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on
+ * an INTERNET_STATUS_REQUEST_COMPLETE is NOT sent here as per my tests on
* windows
*/
diff --git a/dlls/winmm/winealsa/midi.c b/dlls/winmm/winealsa/midi.c
index 4a8996c..8aeabd8 100644
--- a/dlls/winmm/winealsa/midi.c
+++ b/dlls/winmm/winealsa/midi.c
@@ -293,7 +293,7 @@
pfd = (struct pollfd *)HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd));
snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN);
- /* Check if a event is present */
+ /* Check if an event is present */
if (poll(pfd, npfd, 250) < 0) {
HeapFree(GetProcessHeap(), 0, pfd);
continue;
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index fd6b54e..3eda184 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -632,7 +632,7 @@
while(!end_thread) {
TRACE("Thread loop\n");
- /* Check if a event is present */
+ /* Check if an event is present */
if (poll(&pfd, 1, 250) <= 0)
continue;
diff --git a/documentation/ole.sgml b/documentation/ole.sgml
index e1aa12d..d270917 100644
--- a/documentation/ole.sgml
+++ b/documentation/ole.sgml
@@ -358,7 +358,7 @@
<para>
Then we implement the interface methods. To match what has
been declared in the header file they must take a pointer to
- a IDirect3D structure and we must cast it to an _IDirect3D
+ an IDirect3D structure and we must cast it to an _IDirect3D
so that we can manipulate the fields. This is performed by
the ICOM_THIS macro.
</para>
diff --git a/documentation/winedev-kernel.sgml b/documentation/winedev-kernel.sgml
index ddd58f1..28eae99 100644
--- a/documentation/winedev-kernel.sgml
+++ b/documentation/winedev-kernel.sgml
@@ -1510,7 +1510,7 @@
<title>Devices & volume management</title>
<para>
We've covered so far the ways file names are mapped into Unix
- pathes. There's still need to cover it for devices. As a regular
+ paths. There's still need to cover it for devices. As a regular
file, devices are manipulated in Windows with both read / write
operations, but also control mechanisms (speed or parity of a serial
line; volume name of a hard disk...). Since, this is also supported
@@ -1691,10 +1691,10 @@
old Win9x apps, still talking directly to VxD. This is no longer
supported on Windows NT, newest programs are less likely to make use
of this feature, so we don't expect lots of development in this
- area, eventhough the framework is there and working. Note also that
+ area, even though the framework is there and working. Note also that
Wine doesn't provide support for native VxDs (as a game, report how
many times this information is written in the documentation; as an
- advanced exercice, find how many more occurences we need in order to
+ advanced exercise, find how many more occurrences we need in order to
stop questions whether it's possible or not).
</para>
</sect3>
@@ -1766,7 +1766,7 @@
<listitem>
<para>
the second and third ones are closer to the NT scheme, albeit
- different to what NT does. The <command>wineserver</command>
+ different from what NT does. The <command>wineserver</command>
plays the role of the <filename>csrss.exe</filename> subsystem
(all requests are sent to it), and are then dispatched to a
dedicated wine process, called (surprise!)
diff --git a/include/objbase.h b/include/objbase.h
index 7638c4f..f552dbe 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -206,7 +206,7 @@
* - Then we predeclare our static virtual table variable, we will need its address in some
* methods to initialize the virtual table pointer of the returned interface objects.
* - Then we implement the interface methods. To match what has been declared in the header file
- * they must take a pointer to a IDirect3D structure and we must cast it to an IDirect3DImpl so
+ * they must take a pointer to an IDirect3D structure and we must cast it to an IDirect3DImpl so
* that we can manipulate the fields.
* - Finally we initialize the virtual table.
*/
diff --git a/include/winnt.h b/include/winnt.h
index e726c2a..9c90bac 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1535,7 +1535,7 @@
} EXCEPTION_REGISTRATION_RECORD;
/*
- * function pointer to a exception filter
+ * function pointer to an exception filter
*/
typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS ExceptionInfo);
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index a7200b7..90b94c0 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -215,7 +215,7 @@
int count = size / sizeof(void *);
void **ptr = (void **)dir;
- /* everything is either a pointer or a ordinal value below 0x10000 */
+ /* everything is either a pointer or an ordinal value below 0x10000 */
while (count--)
{
if (*ptr >= (void *)0x10000) *ptr = (void *)((char *)*ptr - (char *)base);
diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c
index e460f36..5264dc5 100644
--- a/programs/winedbg/break.c
+++ b/programs/winedbg/break.c
@@ -899,7 +899,7 @@
*/
be_cpu->get_addr(dbg_curr_thread->handle, &dbg_context,
be_cpu_addr_stack, &addr);
- /* FIXME: we assume stack grows as on a i386 */
+ /* FIXME: we assume stack grows as on an i386 */
addr.Offset += 2 * sizeof(unsigned int);
dbg_read_memory(memory_to_linear_addr(&addr),
&addr.Offset, sizeof(addr.Offset));
diff --git a/tools/font_convert.sh b/tools/font_convert.sh
index 635acb1..cbfb050 100755
--- a/tools/font_convert.sh
+++ b/tools/font_convert.sh
@@ -84,7 +84,7 @@
$Q echo -n "looking for bitmap fonts (\"$PAT\") in directory \"$WIND\"... ";
FONTS=`find $WIND -iname "$PAT" 1>$TFILE 2>/dev/null`;
if [ $? -ne 0 ]; then
- $Q echo "$PAT is a invalid search expression"; exit 1;
+ $Q echo "$PAT is an invalid search expression"; exit 1;
fi;
i=0;
diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c
index c9c0560..46d0a6c 100644
--- a/tools/wrc/newstruc.c
+++ b/tools/wrc/newstruc.c
@@ -858,8 +858,8 @@
/* We only go through the RIFF file if we need to swap
* bytes in words/dwords. Else we couldn't care less
* what the file contains. This is consistent with
- * MS' rc.exe, which doesn't complain at all, eventhough
- * the fileformat might not be entirely correct.
+ * MS' rc.exe, which doesn't complain at all, even though
+ * the file format might not be entirely correct.
*/
rtp++; /* Skip the "RIFF" tag */
