Assorted spelling fixes

Francois Gouget fgouget at free.fr
Mon Mar 21 06:42:26 CST 2005


Changelog:

  * dlls/comctl32/comboex.c
    dlls/comctl32/header.c
    dlls/comctl32/listview.c
    dlls/comctl32/monthcal.c
    dlls/comctl32/rebar.c
    dlls/comctl32/tab.c
    dlls/commdlg/colordlg.c
    dlls/commdlg/colordlg16.c
    dlls/commdlg/filedlg.c
    dlls/commdlg/filedlgbrowser.c
    dlls/d3d8/d3d8_private.h
    dlls/d3d8/device.c
    dlls/d3d9/surface.c
    dlls/dbghelp/elf_module.c
    dlls/dbghelp/minidump.c
    dlls/dmband/band.c
    dlls/dmstyle/styletrack.c
    dlls/dplayx/dplay.c
    dlls/dplayx/dplobby.c
    dlls/gdi/enhmetafile.c
    dlls/kernel/instr.c
    dlls/mapi32/prop.c
    dlls/mscms/profile.c
    dlls/msi/appsearch.c
    dlls/msrle32/msrle32.c
    dlls/ntdll/file.c
    dlls/ntdll/server.c
    dlls/ole32/errorinfo.c
    dlls/ole32/hglobalstream.c
    dlls/ole32/memlockbytes.c
    dlls/ole32/memlockbytes16.c
    dlls/ole32/oleproxy.c
    dlls/ole32/storage32.h
    dlls/oleaut32/safearray.c
    dlls/oleaut32/typelib.c
    dlls/shell32/autocomplete.c
    dlls/shell32/cpanelfolder.c
    dlls/shell32/memorystream.c
    dlls/shell32/pidl.c
    dlls/shell32/shellfolder.h
    dlls/shell32/shellole.c
    dlls/shell32/shfldr_fs.c
    dlls/shell32/shfldr_mycomp.c
    dlls/shell32/shlexec.c
    dlls/shell32/shlfolder.c
    dlls/shell32/shlmenu.c
    dlls/shell32/shv_bg_cmenu.c
    dlls/shlwapi/ordinal.c
    dlls/shlwapi/reg.c
    dlls/user/edit.c
    dlls/user/tests/sysparams.c
    dlls/wined3d/basetexture.c
    dlls/wined3d/device.c
    dlls/wined3d/directx.c
    dlls/wineps/escape.c
    dlls/wininet/http.c
    dlls/winmm/winealsa/midi.c
    dlls/winmm/wineoss/midi.c
    documentation/ole.sgml
    documentation/winedev-kernel.sgml
    include/objbase.h
    include/winnt.h
    libs/wine/loader.c
    programs/winedbg/break.c
    tools/font_convert.sh
    tools/wrc/newstruc.c

    Assorted spelling fixes.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
       Any sufficiently advanced bug is indistinguishable from a feature.
                             -- from some indian guy
-------------- next part --------------
Index: dlls/comctl32/comboex.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/comboex.c,v
retrieving revision 1.81
diff -u -p -r1.81 comboex.c
--- dlls/comctl32/comboex.c	21 Mar 2005 10:30:33 -0000	1.81
+++ dlls/comctl32/comboex.c	21 Mar 2005 11:14:29 -0000
@@ -954,7 +954,7 @@ static LRESULT COMBOEX_Create (HWND hwnd
     /* 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).                                     */
 
Index: dlls/comctl32/header.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/header.c,v
retrieving revision 1.71
diff -u -p -r1.71 header.c
--- dlls/comctl32/header.c	23 Feb 2005 12:41:43 -0000	1.71
+++ dlls/comctl32/header.c	21 Mar 2005 00:30:51 -0000
@@ -83,7 +83,7 @@ typedef struct
     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;
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/listview.c,v
retrieving revision 1.404
diff -u -p -r1.404 listview.c
--- dlls/comctl32/listview.c	21 Feb 2005 20:38:31 -0000	1.404
+++ dlls/comctl32/listview.c	20 Mar 2005 13:04:59 -0000
@@ -1022,7 +1022,7 @@ static inline BOOL ranges_delitem(RANGES
  *       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.
Index: dlls/comctl32/monthcal.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/monthcal.c,v
retrieving revision 1.52
diff -u -p -r1.52 monthcal.c
--- dlls/comctl32/monthcal.c	11 Jan 2005 10:43:03 -0000	1.52
+++ dlls/comctl32/monthcal.c	21 Mar 2005 00:30:28 -0000
@@ -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
  */
Index: dlls/comctl32/rebar.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/rebar.c,v
retrieving revision 1.105
diff -u -p -r1.105 rebar.c
--- dlls/comctl32/rebar.c	2 Mar 2005 13:53:52 -0000	1.105
+++ dlls/comctl32/rebar.c	20 Mar 2005 13:04:59 -0000
@@ -2473,7 +2473,7 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr,
 	    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
Index: dlls/comctl32/tab.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/tab.c,v
retrieving revision 1.105
diff -u -p -r1.105 tab.c
--- dlls/comctl32/tab.c	25 Feb 2005 16:19:07 -0000	1.105
+++ dlls/comctl32/tab.c	21 Mar 2005 00:30:16 -0000
@@ -82,7 +82,7 @@ typedef struct
   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 */
Index: dlls/commdlg/colordlg.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/colordlg.c,v
retrieving revision 1.50
diff -u -p -r1.50 colordlg.c
--- dlls/commdlg/colordlg.c	15 Feb 2005 21:51:07 -0000	1.50
+++ dlls/commdlg/colordlg.c	20 Mar 2005 13:14:55 -0000
@@ -65,7 +65,7 @@ static const COLORREF predefcolors[6][8]
 /* Chose Color PRIVATE Structure:
  *
  * This structure is duplicated in the 16 bit code with
- * a extra member
+ * an extra member
  */
 
 typedef struct CCPRIVATE
Index: dlls/commdlg/colordlg16.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/colordlg16.c,v
retrieving revision 1.8
diff -u -p -r1.8 colordlg16.c
--- dlls/commdlg/colordlg16.c	15 Feb 2005 21:51:07 -0000	1.8
+++ dlls/commdlg/colordlg16.c	20 Mar 2005 13:15:06 -0000
@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 /* Chose Color PRIVATE Structure:
  *
  * This is a duplicate of the 32bit code with
- * a extra member
+ * an extra member
  */
 typedef struct CCPRIVATE
 {
Index: dlls/commdlg/filedlg.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filedlg.c,v
retrieving revision 1.98
diff -u -p -r1.98 filedlg.c
--- dlls/commdlg/filedlg.c	15 Feb 2005 21:51:07 -0000	1.98
+++ dlls/commdlg/filedlg.c	20 Mar 2005 13:15:19 -0000
@@ -2406,7 +2406,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand
 /***********************************************************************
  *      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)
 {
Index: dlls/commdlg/filedlgbrowser.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filedlgbrowser.c,v
retrieving revision 1.48
diff -u -p -r1.48 filedlgbrowser.c
--- dlls/commdlg/filedlgbrowser.c	10 Jan 2005 12:25:29 -0000	1.48
+++ dlls/commdlg/filedlgbrowser.c	21 Mar 2005 00:30:01 -0000
@@ -720,7 +720,7 @@ HRESULT WINAPI IShellBrowserImpl_ICommDl
 
     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;
Index: dlls/d3d8/d3d8_private.h
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/d3d8_private.h,v
retrieving revision 1.60
diff -u -p -r1.60 d3d8_private.h
--- dlls/d3d8/d3d8_private.h	2 Mar 2005 12:23:22 -0000	1.60
+++ dlls/d3d8/d3d8_private.h	21 Mar 2005 00:29:38 -0000
@@ -1094,7 +1094,7 @@ struct  IDirect3DStateBlockImpl {
   /*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 @@ struct IDirect3DVertexShaderDeclarationI
   /*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 @@ struct IDirect3DVertexShaderImpl {
   /*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 @@ struct IDirect3DPixelShaderImpl { 
   /*IDirect3DPixelShader9Vtbl *lpVtbl;*/
   DWORD ref;
 
-  /* The device, to be replaced by a IDirect3DDeviceImpl */
+  /* The device, to be replaced by an IDirect3DDeviceImpl */
   IDirect3DDevice8Impl* device;
 
   DWORD* function;
Index: dlls/d3d8/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/device.c,v
retrieving revision 1.123
diff -u -p -r1.123 device.c
--- dlls/d3d8/device.c	8 Feb 2005 12:10:57 -0000	1.123
+++ dlls/d3d8/device.c	21 Mar 2005 00:28:57 -0000
@@ -396,11 +396,11 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Se
     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 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Ge
     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;
     }
     
Index: dlls/d3d9/surface.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d9/surface.c,v
retrieving revision 1.14
diff -u -p -r1.14 surface.c
--- dlls/d3d9/surface.c	11 Mar 2005 10:25:30 -0000	1.14
+++ dlls/d3d9/surface.c	21 Mar 2005 00:28:21 -0000
@@ -119,8 +119,8 @@ HRESULT WINAPI IDirect3DSurface9Impl_Get
 
     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) {
Index: dlls/dbghelp/elf_module.c
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/elf_module.c,v
retrieving revision 1.16
diff -u -p -r1.16 elf_module.c
--- dlls/dbghelp/elf_module.c	7 Mar 2005 11:03:21 -0000	1.16
+++ dlls/dbghelp/elf_module.c	21 Mar 2005 00:27:30 -0000
@@ -127,7 +127,7 @@ struct thunk_area
 /******************************************************************
  *		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 @@ static void elf_unmap_section(struct elf
 /******************************************************************
  *		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 @@ static BOOL elf_map_file(const char* fil
 /******************************************************************
  *		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)
 {
Index: dlls/dbghelp/minidump.c
===================================================================
RCS file: /var/cvs/wine/dlls/dbghelp/minidump.c,v
retrieving revision 1.2
diff -u -p -r1.2 minidump.c
--- dlls/dbghelp/minidump.c	7 Mar 2005 11:03:21 -0000	1.2
+++ dlls/dbghelp/minidump.c	21 Mar 2005 00:26:40 -0000
@@ -216,7 +216,7 @@ static BOOL WINAPI fetch_pe_module_info_
 /******************************************************************
  *		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)
Index: dlls/dmband/band.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmband/band.c,v
retrieving revision 1.15
diff -u -p -r1.15 band.c
--- dlls/dmband/band.c	31 Jan 2005 20:40:44 -0000	1.15
+++ dlls/dmband/band.c	21 Mar 2005 00:25:36 -0000
@@ -384,7 +384,7 @@ static HRESULT IDirectMusicBandImpl_IPer
   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 @@ static HRESULT IDirectMusicBandImpl_IPer
   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;
   }  
 
Index: dlls/dmstyle/styletrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/styletrack.c,v
retrieving revision 1.11
diff -u -p -r1.11 styletrack.c
--- dlls/dmstyle/styletrack.c	24 Jan 2005 19:33:23 -0000	1.11
+++ dlls/dmstyle/styletrack.c	21 Mar 2005 00:24:56 -0000
@@ -304,7 +304,7 @@ static HRESULT IDirectMusicStyleTrack_IP
 	}
 	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;
 	}
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.54
diff -u -p -r1.54 dplay.c
--- dlls/dplayx/dplay.c	7 Jan 2005 15:40:09 -0000	1.54
+++ dlls/dplayx/dplay.c	20 Mar 2005 13:15:32 -0000
@@ -296,7 +296,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID
   }
   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,
Index: dlls/dplayx/dplobby.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplobby.c,v
retrieving revision 1.40
diff -u -p -r1.40 dplobby.c
--- dlls/dplayx/dplobby.c	9 Mar 2005 11:48:05 -0000	1.40
+++ dlls/dplayx/dplobby.c	20 Mar 2005 15:10:58 -0000
@@ -473,7 +473,7 @@ static ULONG WINAPI DPL_Release
  * 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
Index: dlls/gdi/enhmetafile.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/enhmetafile.c,v
retrieving revision 1.9
diff -u -p -r1.9 enhmetafile.c
--- dlls/gdi/enhmetafile.c	3 Jan 2005 14:50:12 -0000	1.9
+++ dlls/gdi/enhmetafile.c	20 Mar 2005 15:10:42 -0000
@@ -2427,7 +2427,7 @@ typedef struct tagEMF_PaletteCopy
 /***************************************************************
  * 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.
  *
Index: dlls/kernel/instr.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/instr.c,v
retrieving revision 1.15
diff -u -p -r1.15 instr.c
--- dlls/kernel/instr.c	14 Jun 2004 17:04:35 -0000	1.15
+++ dlls/kernel/instr.c	20 Mar 2005 15:10:27 -0000
@@ -361,7 +361,7 @@ static BOOL INSTR_EmulateLDS( CONTEXT86 
 /***********************************************************************
  *           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 @@ static DWORD INSTR_inport( WORD port, in
 /***********************************************************************
  *           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 )
 {
Index: dlls/mapi32/prop.c
===================================================================
RCS file: /var/cvs/wine/dlls/mapi32/prop.c,v
retrieving revision 1.8
diff -u -p -r1.8 prop.c
--- dlls/mapi32/prop.c	22 Feb 2005 14:51:03 -0000	1.8
+++ dlls/mapi32/prop.c	20 Mar 2005 15:08:24 -0000
@@ -789,7 +789,7 @@ SCODE WINAPI ScCountProps(INT iCount, LP
  *  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 @@ SCODE WINAPI ScCopyProps(int cValues, LP
  *  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 @@ SCODE WINAPI ScRelocProps(int cValues, L
      * 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 @@ LPSPropValue WINAPI LpValFindProp(ULONG 
 /*************************************************************************
  * ScDupPropset at 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_fnSetProps(LPMAPIPROP iface, U
 /**************************************************************************
  *  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.
Index: dlls/mscms/profile.c
===================================================================
RCS file: /var/cvs/wine/dlls/mscms/profile.c,v
retrieving revision 1.13
diff -u -p -r1.13 profile.c
--- dlls/mscms/profile.c	9 Mar 2005 18:42:52 -0000	1.13
+++ dlls/mscms/profile.c	11 Mar 2005 06:57:32 -0000
@@ -392,7 +392,7 @@ BOOL WINAPI GetStandardColorSpaceProfile
  *  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
Index: dlls/msi/appsearch.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/appsearch.c,v
retrieving revision 1.5
diff -u -p -r1.5 appsearch.c
--- dlls/msi/appsearch.c	10 Mar 2005 17:24:20 -0000	1.5
+++ dlls/msi/appsearch.c	20 Mar 2005 15:08:04 -0000
@@ -406,7 +406,7 @@ static void ACTION_ExpandAnyPath(MSIPACK
 /* 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 @@ static UINT ACTION_FileVersionMatches(MS
  * 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)
Index: dlls/msrle32/msrle32.c
===================================================================
RCS file: /var/cvs/wine/dlls/msrle32/msrle32.c,v
retrieving revision 1.12
diff -u -p -r1.12 msrle32.c
--- dlls/msrle32/msrle32.c	10 Feb 2005 19:19:36 -0000	1.12
+++ dlls/msrle32/msrle32.c	20 Mar 2005 15:07:21 -0000
@@ -762,7 +762,7 @@ LRESULT MSRLE32_CompressRLE8(CodecInfo *
 	  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;
Index: dlls/ntdll/file.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/file.c,v
retrieving revision 1.78
diff -u -p -r1.78 file.c
--- dlls/ntdll/file.c	21 Mar 2005 10:28:23 -0000	1.78
+++ dlls/ntdll/file.c	21 Mar 2005 11:51:20 -0000
@@ -117,7 +117,7 @@ NTSTATUS WINAPI NtOpenFile( PHANDLE hand
  *	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
Index: dlls/ntdll/server.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/server.c,v
retrieving revision 1.18
diff -u -p -r1.18 server.c
--- dlls/ntdll/server.c	18 Oct 2004 19:34:37 -0000	1.18
+++ dlls/ntdll/server.c	20 Mar 2005 15:07:05 -0000
@@ -849,7 +849,7 @@ void server_init_thread( int unix_pid, i
     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
Index: dlls/ole32/errorinfo.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/errorinfo.c,v
retrieving revision 1.26
diff -u -p -r1.26 errorinfo.c
--- dlls/ole32/errorinfo.c	14 Feb 2005 11:07:55 -0000	1.26
+++ dlls/ole32/errorinfo.c	20 Mar 2005 13:04:59 -0000
@@ -146,7 +146,7 @@ static ICreateErrorInfoVtbl	ICreateError
 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)
@@ -158,7 +158,7 @@ static ISupportErrorInfoVtbl	ISupportErr
 #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)
Index: dlls/ole32/hglobalstream.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/hglobalstream.c,v
retrieving revision 1.28
diff -u -p -r1.28 hglobalstream.c
--- dlls/ole32/hglobalstream.c	14 Dec 2004 11:35:12 -0000	1.28
+++ dlls/ole32/hglobalstream.c	21 Mar 2005 00:24:28 -0000
@@ -54,8 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage);
  */
 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
Index: dlls/ole32/memlockbytes.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/memlockbytes.c,v
retrieving revision 1.23
diff -u -p -r1.23 memlockbytes.c
--- dlls/ole32/memlockbytes.c	14 Dec 2004 15:28:58 -0000	1.23
+++ dlls/ole32/memlockbytes.c	21 Mar 2005 00:26:02 -0000
@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 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;
Index: dlls/ole32/memlockbytes16.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/memlockbytes16.c,v
retrieving revision 1.9
diff -u -p -r1.9 memlockbytes16.c
--- dlls/ole32/memlockbytes16.c	24 Sep 2004 01:16:53 -0000	1.9
+++ dlls/ole32/memlockbytes16.c	21 Mar 2005 00:25:52 -0000
@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 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;
Index: dlls/ole32/oleproxy.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/oleproxy.c,v
retrieving revision 1.30
diff -u -p -r1.30 oleproxy.c
--- dlls/ole32/oleproxy.c	15 Feb 2005 21:48:09 -0000	1.30
+++ dlls/ole32/oleproxy.c	21 Mar 2005 00:24:11 -0000
@@ -160,7 +160,7 @@ CFStub_Invoke(
 	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);
Index: dlls/ole32/storage32.h
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/storage32.h,v
retrieving revision 1.19
diff -u -p -r1.19 storage32.h
--- dlls/ole32/storage32.h	17 Mar 2005 10:25:13 -0000	1.19
+++ dlls/ole32/storage32.h	21 Mar 2005 00:23:51 -0000
@@ -533,7 +533,7 @@ HRESULT WINAPI StorageInternalImpl_Rever
 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 @@ INT IEnumSTATSTGImpl_FindParentProperty(
 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
Index: dlls/oleaut32/safearray.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/safearray.c,v
retrieving revision 1.43
diff -u -p -r1.43 safearray.c
--- dlls/oleaut32/safearray.c	31 Jan 2005 11:31:51 -0000	1.43
+++ dlls/oleaut32/safearray.c	20 Mar 2005 13:06:31 -0000
@@ -647,7 +647,7 @@ SAFEARRAY* WINAPI SafeArrayCreateEx(VART
 /************************************************************************
  *		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 @@ SAFEARRAY* WINAPI SafeArrayCreateVector(
 /************************************************************************
  *		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
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.145
diff -u -p -r1.145 typelib.c
--- dlls/oleaut32/typelib.c	2 Mar 2005 13:53:51 -0000	1.145
+++ dlls/oleaut32/typelib.c	20 Mar 2005 13:17:54 -0000
@@ -1625,25 +1625,25 @@ MSFT_DoFuncs(TLBContext*     pcx,
      * 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;
Index: dlls/shell32/autocomplete.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/autocomplete.c,v
retrieving revision 1.13
diff -u -p -r1.13 autocomplete.c
--- dlls/shell32/autocomplete.c	14 Jan 2005 16:02:20 -0000	1.13
+++ dlls/shell32/autocomplete.c	20 Mar 2005 15:05:59 -0000
@@ -83,7 +83,7 @@ static struct IAutoComplete2Vtbl ac2vt;
 #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) 
Index: dlls/shell32/cpanelfolder.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/cpanelfolder.c,v
retrieving revision 1.15
diff -u -p -r1.15 cpanelfolder.c
--- dlls/shell32/cpanelfolder.c	19 Mar 2005 17:08:52 -0000	1.15
+++ dlls/shell32/cpanelfolder.c	20 Mar 2005 15:05:48 -0000
@@ -87,7 +87,7 @@ static IShellExecuteHookAVtbl vt_ShellEx
 
 
 /*
-  converts This to a interface pointer
+  converts This to an interface pointer
 */
 #define _IUnknown_(This)	   (IUnknown*)&(This->lpVtbl)
 #define _IShellFolder_(This)	   (IShellFolder*)&(This->lpVtbl)
Index: dlls/shell32/memorystream.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/memorystream.c,v
retrieving revision 1.21
diff -u -p -r1.21 memorystream.c
--- dlls/shell32/memorystream.c	19 Mar 2005 17:09:14 -0000	1.21
+++ dlls/shell32/memorystream.c	20 Mar 2005 15:05:34 -0000
@@ -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
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/pidl.c,v
retrieving revision 1.127
diff -u -p -r1.127 pidl.c
--- dlls/shell32/pidl.c	22 Feb 2005 14:50:35 -0000	1.127
+++ dlls/shell32/pidl.c	20 Mar 2005 15:04:53 -0000
@@ -1226,7 +1226,7 @@ HRESULT SHELL_GetPathFromIDListA(LPCITEM
         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 @@ HRESULT SHELL_GetPathFromIDListW(LPCITEM
         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);
 
Index: dlls/shell32/shellfolder.h
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shellfolder.h,v
retrieving revision 1.10
diff -u -p -r1.10 shellfolder.h
--- dlls/shell32/shellfolder.h	5 Oct 2004 04:16:21 -0000	1.10
+++ dlls/shell32/shellfolder.h	20 Mar 2005 15:04:18 -0000
@@ -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
  *
Index: dlls/shell32/shellole.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shellole.c,v
retrieving revision 1.76
diff -u -p -r1.76 shellole.c
--- dlls/shell32/shellole.c	17 Mar 2005 20:53:37 -0000	1.76
+++ dlls/shell32/shellole.c	20 Mar 2005 15:03:59 -0000
@@ -162,14 +162,14 @@ HRESULT WINAPI SHCoCreateInstance(
 
 	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 @@ HRESULT WINAPI SHCoCreateInstance(
 
 	} 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 @@ HRESULT WINAPI SHGetDesktopFolder(IShell
  * 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
Index: dlls/shell32/shfldr_fs.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_fs.c,v
retrieving revision 1.35
diff -u -p -r1.35 shfldr_fs.c
--- dlls/shell32/shfldr_fs.c	17 Mar 2005 20:53:37 -0000	1.35
+++ dlls/shell32/shfldr_fs.c	20 Mar 2005 15:03:49 -0000
@@ -104,7 +104,7 @@ static struct ISFHelperVtbl shvt;
 #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)
Index: dlls/shell32/shfldr_mycomp.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shfldr_mycomp.c,v
retrieving revision 1.33
diff -u -p -r1.33 shfldr_mycomp.c
--- dlls/shell32/shfldr_mycomp.c	17 Mar 2005 20:53:37 -0000	1.33
+++ dlls/shell32/shfldr_mycomp.c	20 Mar 2005 15:03:35 -0000
@@ -71,7 +71,7 @@ static struct IPersistFolder2Vtbl vt_Per
 #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)
Index: dlls/shell32/shlexec.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shlexec.c,v
retrieving revision 1.61
diff -u -p -r1.61 shlexec.c
--- dlls/shell32/shlexec.c	17 Mar 2005 20:50:53 -0000	1.61
+++ dlls/shell32/shlexec.c	20 Mar 2005 13:18:55 -0000
@@ -180,7 +180,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, in
 
 	    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 @@ static BOOL SHELL_ArgifyW(WCHAR* out, in
                         *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)
Index: dlls/shell32/shlfolder.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shlfolder.c,v
retrieving revision 1.96
diff -u -p -r1.96 shlfolder.c
--- dlls/shell32/shlfolder.c	17 Mar 2005 18:55:49 -0000	1.96
+++ dlls/shell32/shlfolder.c	20 Mar 2005 13:19:12 -0000
@@ -304,7 +304,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLI
  * - 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.
  */
Index: dlls/shell32/shlmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shlmenu.c,v
retrieving revision 1.37
diff -u -p -r1.37 shlmenu.c
--- dlls/shell32/shlmenu.c	19 Oct 2004 03:56:40 -0000	1.37
+++ dlls/shell32/shlmenu.c	20 Mar 2005 13:11:37 -0000
@@ -647,7 +647,7 @@ LRESULT WINAPI FileMenu_DrawItem(
  * 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
  *
  */
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.37
diff -u -p -r1.37 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c	14 Mar 2005 10:49:03 -0000	1.37
+++ dlls/shell32/shv_bg_cmenu.c	20 Mar 2005 15:03:16 -0000
@@ -378,14 +378,14 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCo
 		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;
 }
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.106
diff -u -p -r1.106 ordinal.c
--- dlls/shlwapi/ordinal.c	18 Mar 2005 14:01:16 -0000	1.106
+++ dlls/shlwapi/ordinal.c	20 Mar 2005 15:02:42 -0000
@@ -2665,7 +2665,7 @@ DWORD WINAPI SHRestrictionLookup(
  *  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.
Index: dlls/shlwapi/reg.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/reg.c,v
retrieving revision 1.57
diff -u -p -r1.57 reg.c
--- dlls/shlwapi/reg.c	21 Mar 2005 10:50:55 -0000	1.57
+++ dlls/shlwapi/reg.c	21 Mar 2005 11:14:50 -0000
@@ -1305,7 +1305,7 @@ LONG WINAPI SHQueryInfoKeyW(HKEY hKey, L
  *
  *       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
Index: dlls/user/edit.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/edit.c,v
retrieving revision 1.20
diff -u -p -r1.20 edit.c
--- dlls/user/edit.c	25 Feb 2005 16:51:13 -0000	1.20
+++ dlls/user/edit.c	20 Mar 2005 15:01:17 -0000
@@ -1579,7 +1579,7 @@ static LPWSTR EDIT_GetPasswordPointer_SL
  *
  *	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
Index: dlls/user/tests/sysparams.c
===================================================================
RCS file: /var/cvs/wine/dlls/user/tests/sysparams.c,v
retrieving revision 1.35
diff -u -p -r1.35 sysparams.c
--- dlls/user/tests/sysparams.c	7 Mar 2005 19:23:32 -0000	1.35
+++ dlls/user/tests/sysparams.c	11 Mar 2005 06:58:02 -0000
@@ -1220,7 +1220,7 @@ static void test_SPI_SETWORKAREA( void )
     /* 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;
Index: dlls/wined3d/basetexture.c
===================================================================
RCS file: /var/cvs/wine/dlls/wined3d/basetexture.c,v
retrieving revision 1.6
diff -u -p -r1.6 basetexture.c
--- dlls/wined3d/basetexture.c	14 Mar 2005 10:12:52 -0000	1.6
+++ dlls/wined3d/basetexture.c	20 Mar 2005 14:58:33 -0000
@@ -33,7 +33,7 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_Q
 {
     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)) {
Index: dlls/wined3d/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/wined3d/device.c,v
retrieving revision 1.27
diff -u -p -r1.27 device.c
--- dlls/wined3d/device.c	14 Mar 2005 10:12:52 -0000	1.27
+++ dlls/wined3d/device.c	20 Mar 2005 15:01:03 -0000
@@ -240,7 +240,7 @@ void WINAPI IWineD3DDeviceImpl_SetupText
 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 @@ ULONG WINAPI IWineD3DDeviceImpl_Release(
 
     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_SetDep
 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' */
Index: dlls/wined3d/directx.c
===================================================================
RCS file: /var/cvs/wine/dlls/wined3d/directx.c,v
retrieving revision 1.25
diff -u -p -r1.25 directx.c
--- dlls/wined3d/directx.c	2 Mar 2005 13:44:58 -0000	1.25
+++ dlls/wined3d/directx.c	20 Mar 2005 14:58:45 -0000
@@ -156,7 +156,7 @@ static void WineD3D_ReleaseFakeGLContext
 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)        
Index: dlls/wineps/escape.c
===================================================================
RCS file: /var/cvs/wine/dlls/wineps/escape.c,v
retrieving revision 1.28
diff -u -p -r1.28 escape.c
--- dlls/wineps/escape.c	9 Jan 2005 16:52:50 -0000	1.28
+++ dlls/wineps/escape.c	20 Mar 2005 14:37:09 -0000
@@ -431,7 +431,7 @@ INT PSDRV_EndDoc( PSDRV_PDEVICE *physDev
     }
 
     if(!physDev->job.OutOfPage) {
-        WARN("Somebody forgot a EndPage\n");
+        WARN("Somebody forgot an EndPage\n");
 	PSDRV_EndPage( physDev );
     }
     PSDRV_WriteFooter( physDev );
Index: dlls/wininet/http.c
===================================================================
RCS file: /var/cvs/wine/dlls/wininet/http.c,v
retrieving revision 1.96
diff -u -p -r1.96 http.c
--- dlls/wininet/http.c	10 Mar 2005 11:14:24 -0000	1.96
+++ dlls/wininet/http.c	20 Mar 2005 14:36:52 -0000
@@ -1890,7 +1890,7 @@ lerror:
         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
  */
 
Index: dlls/winmm/winealsa/midi.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/winealsa/midi.c,v
retrieving revision 1.13
diff -u -p -r1.13 midi.c
--- dlls/winmm/winealsa/midi.c	10 Jan 2005 13:26:33 -0000	1.13
+++ dlls/winmm/winealsa/midi.c	20 Mar 2005 13:20:46 -0000
@@ -293,7 +293,7 @@ static DWORD WINAPI midRecThread(LPVOID 
 	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;
Index: dlls/winmm/wineoss/midi.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/wineoss/midi.c,v
retrieving revision 1.43
diff -u -p -r1.43 midi.c
--- dlls/winmm/wineoss/midi.c	4 Mar 2005 12:38:37 -0000	1.43
+++ dlls/winmm/wineoss/midi.c	20 Mar 2005 13:21:30 -0000
@@ -632,7 +632,7 @@ static DWORD WINAPI midRecThread(LPVOID 
     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;
 	
Index: documentation/ole.sgml
===================================================================
RCS file: /var/cvs/wine/documentation/ole.sgml,v
retrieving revision 1.10
diff -u -p -r1.10 ole.sgml
--- documentation/ole.sgml	26 Jan 2005 21:09:04 -0000	1.10
+++ documentation/ole.sgml	20 Mar 2005 14:36:32 -0000
@@ -358,7 +358,7 @@ static ICOM_VTABLE(IDirect3D) d3dvt = {
         <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>
Index: documentation/winedev-kernel.sgml
===================================================================
RCS file: /var/cvs/wine/documentation/winedev-kernel.sgml,v
retrieving revision 1.5
diff -u -p -r1.5 winedev-kernel.sgml
--- documentation/winedev-kernel.sgml	14 Mar 2005 10:47:14 -0000	1.5
+++ documentation/winedev-kernel.sgml	15 Mar 2005 22:42:58 -0000
@@ -1510,7 +1510,7 @@ if (res != ERROR_SUCCESS) return res;
 	  <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 @@ if (res != ERROR_SUCCESS) return res;
 	    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 @@ if (res != ERROR_SUCCESS) return res;
 	      <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!)
Index: include/objbase.h
===================================================================
RCS file: /var/cvs/wine/include/objbase.h,v
retrieving revision 1.55
diff -u -p -r1.55 objbase.h
--- include/objbase.h	17 Mar 2005 10:26:20 -0000	1.55
+++ include/objbase.h	20 Mar 2005 14:36:03 -0000
@@ -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.
  */
Index: include/winnt.h
===================================================================
RCS file: /var/cvs/wine/include/winnt.h,v
retrieving revision 1.204
diff -u -p -r1.204 winnt.h
--- include/winnt.h	19 Mar 2005 17:14:12 -0000	1.204
+++ include/winnt.h	20 Mar 2005 13:21:46 -0000
@@ -1535,7 +1535,7 @@ typedef struct _EXCEPTION_REGISTRATION_R
 } EXCEPTION_REGISTRATION_RECORD;
 
 /*
- * function pointer to a exception filter
+ * function pointer to an exception filter
  */
 
 typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS ExceptionInfo);
Index: libs/wine/loader.c
===================================================================
RCS file: /var/cvs/wine/libs/wine/loader.c,v
retrieving revision 1.22
diff -u -p -r1.22 loader.c
--- libs/wine/loader.c	3 Sep 2004 17:28:39 -0000	1.22
+++ libs/wine/loader.c	20 Mar 2005 13:13:37 -0000
@@ -215,7 +215,7 @@ static void fixup_imports( IMAGE_IMPORT_
     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);
Index: programs/winedbg/break.c
===================================================================
RCS file: /var/cvs/wine/programs/winedbg/break.c,v
retrieving revision 1.10
diff -u -p -r1.10 break.c
--- programs/winedbg/break.c	31 Jan 2005 11:35:00 -0000	1.10
+++ programs/winedbg/break.c	20 Mar 2005 14:34:54 -0000
@@ -899,7 +899,7 @@ void break_restart_execution(int count)
          */
         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));
Index: tools/font_convert.sh
===================================================================
RCS file: /var/cvs/wine/tools/font_convert.sh,v
retrieving revision 1.6
diff -u -p -r1.6 font_convert.sh
--- tools/font_convert.sh	14 Dec 2004 11:39:14 -0000	1.6
+++ tools/font_convert.sh	20 Mar 2005 14:34:12 -0000
@@ -84,7 +84,7 @@ type -p $FC 1>/dev/null || { $Q echo "Ca
 $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;
 
Index: tools/wrc/newstruc.c
===================================================================
RCS file: /var/cvs/wine/tools/wrc/newstruc.c,v
retrieving revision 1.23
diff -u -p -r1.23 newstruc.c
--- tools/wrc/newstruc.c	25 Feb 2005 14:07:56 -0000	1.23
+++ tools/wrc/newstruc.c	15 Mar 2005 22:45:15 -0000
@@ -858,8 +858,8 @@ ani_curico_t *new_ani_curico(enum res_e 
 		/* 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 */
 


More information about the wine-patches mailing list