Assorted typo, spelling, wording and case fixes.

Francois Gouget fgouget at free.fr
Tue May 15 03:15:32 CDT 2012


---

This one contains the remainder of the typo, spelling, wording and case 
fixes. They are all in comments, trace messages, man pages or in the 
output of c2man.

 dlls/advapi32/eventlog.c                   |    2 +-
 dlls/amstream/tests/amstream.c             |    2 +-
 dlls/appwiz.cpl/appwiz.c                   |    6 +++---
 dlls/avifil32/extrachunk.c                 |    4 ++--
 dlls/avifil32/extrachunk.h                 |    2 +-
 dlls/browseui/progressdlg.c                |    2 +-
 dlls/comctl32/comctl32undoc.c              |    4 ++--
 dlls/comctl32/dpa.c                        |    2 +-
 dlls/comctl32/imagelist.c                  |    2 +-
 dlls/comctl32/toolbar.c                    |    2 +-
 dlls/comctl32/tooltips.c                   |    2 +-
 dlls/comdlg32/printdlg.c                   |    2 +-
 dlls/d3dx9_36/mesh.c                       |    2 +-
 dlls/d3dx9_36/sprite.c                     |    2 +-
 dlls/d3dxof/tests/d3dxof.c                 |    6 +++---
 dlls/dbghelp/minidump.c                    |    4 ++--
 dlls/dbghelp/stabs.c                       |    4 ++--
 dlls/ddraw/tests/d3d.c                     |    4 ++--
 dlls/ddraw/viewport.c                      |    2 +-
 dlls/devenum/mediacatenum.c                |    4 ++--
 dlls/dinput/tests/joystick.c               |    4 ++--
 dlls/dmloader/loader.c                     |    8 ++++----
 dlls/gameux/gamestatistics.c               |    2 +-
 dlls/gdi32/dibdrv/graphics.c               |    2 +-
 dlls/gdi32/mfdrv/objects.c                 |    2 +-
 dlls/gdiplus/graphicspath.c                |    2 +-
 dlls/hhctrl.ocx/chm.c                      |    2 +-
 dlls/ieframe/oleobject.c                   |    2 +-
 dlls/imaadp32.acm/imaadp32.c               |    2 +-
 dlls/jscript/regexp.c                      |    2 +-
 dlls/kernel32/sync.c                       |    4 ++--
 dlls/kernel32/tests/comm.c                 |    2 +-
 dlls/kernel32/tests/console.c              |    2 +-
 dlls/kernel32/tests/drive.c                |    2 +-
 dlls/krnl386.exe16/int21.c                 |    2 +-
 dlls/krnl386.exe16/vga.c                   |    2 +-
 dlls/mapi32/prop.c                         |    2 +-
 dlls/mapi32/tests/prop.c                   |   18 +++++++++---------
 dlls/msadp32.acm/msadp32.c                 |    2 +-
 dlls/msg711.acm/msg711.c                   |    2 +-
 dlls/msgsm32.acm/msgsm32.c                 |    2 +-
 dlls/mshtml/htmlwindow.c                   |    2 +-
 dlls/msi/tokenize.c                        |    2 +-
 dlls/msvcrt/undname.c                      |    4 ++--
 dlls/msxml3/tests/saxreader.c              |    2 +-
 dlls/netapi32/netbios.c                    |    2 +-
 dlls/netapi32/netbios.h                    |    2 +-
 dlls/ntdll/path.c                          |    2 +-
 dlls/ntdll/threadpool.c                    |    2 +-
 dlls/oleaut32/oleaut.c                     |    4 ++--
 dlls/oleaut32/variant.c                    |    2 +-
 dlls/quartz/acmwrapper.c                   |    2 +-
 dlls/quartz/avisplit.c                     |    2 +-
 dlls/shdocvw/tests/shortcut.c              |    2 +-
 dlls/shell32/shfldr_unixfs.c               |    2 +-
 dlls/shlwapi/assoc.c                       |    2 +-
 dlls/shlwapi/ordinal.c                     |    2 +-
 dlls/shlwapi/shlwapi_main.c                |    2 +-
 dlls/shlwapi/tests/ordinal.c               |    2 +-
 dlls/typelib.dll16/typelib.c               |    2 +-
 dlls/user.exe16/message.c                  |    4 ++--
 dlls/user32/dde_misc.c                     |    4 ++--
 dlls/user32/dde_private.h                  |    6 +++---
 dlls/user32/edit.c                         |    6 +++---
 dlls/user32/menu.c                         |    2 +-
 dlls/user32/tests/scroll.c                 |    2 +-
 dlls/usp10/shape.c                         |    8 ++++----
 dlls/usp10/tests/usp10.c                   |    2 +-
 dlls/usp10/usp10.c                         |    2 +-
 dlls/winealsa.drv/mmdevdrv.c               |    2 +-
 dlls/winecoreaudio.drv/midi.c              |    4 ++--
 dlls/wined3d/arb_program_shader.c          |   10 +++++-----
 dlls/wined3d/device.c                      |    2 +-
 dlls/wined3d/directx.c                     |    6 +++---
 dlls/wined3d/swapchain.c                   |    2 +-
 dlls/wined3d/utils.c                       |    2 +-
 dlls/winegstreamer/gstdemux.c              |    2 +-
 dlls/winegstreamer/main.c                  |    2 +-
 dlls/winemp3.acm/mpegl3.c                  |    2 +-
 dlls/wineoss.drv/midi.c                    |    4 ++--
 dlls/wineps.drv/ppd.c                      |    2 +-
 dlls/wineps.drv/ps.c                       |    2 +-
 dlls/winex11.drv/mouse.c                   |    2 +-
 dlls/winhttp/pac.js                        |    2 +-
 dlls/wininet/http.c                        |    4 ++--
 dlls/wininet/tests/http.c                  |    2 +-
 dlls/winmm/mmio.c                          |    4 ++--
 dlls/winmm/tests/mci.c                     |    2 +-
 dlls/winmm/tests/mcicda.c                  |    2 +-
 dlls/winmm/winmm.c                         |    4 ++--
 dlls/ws2_32/socket.c                       |    2 +-
 dlls/ws2_32/tests/sock.c                   |    4 ++--
 programs/regedit/regedit.man.in            |    8 ++++----
 programs/services/rpc.c                    |    2 +-
 programs/winecfg/driveui.c                 |    2 +-
 programs/wineconsole/user.c                |    2 +-
 programs/wineconsole/wineconsole.c         |    4 ++--
 programs/winedbg/gdbproxy.c                |   22 +++++++++++-----------
 programs/winedbg/winedbg.c                 |    6 +++---
 programs/winedbg/winedbg.man.in            |    4 ++--
 programs/winemenubuilder/winemenubuilder.c |    8 ++++----
 programs/winhlp32/hlpfile.c                |    2 +-
 server/protocol.def                        |   10 +++++-----
 tools/c2man.pl                             |   20 ++++++++++----------
 tools/wrc/parser.l                         |    2 +-
 105 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 8f40c29..f53005b 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -739,7 +739,7 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw
  *  GuidCount          [I]   Number of elements in the TraceGuidReg array
  *  TraceGuidReg       [I/O] Array of TRACE_GUID_REGISTRATION structures
  *  MofImagePath       [I]   not supported, set to NULL
- *  MofResourceNmae    [I]   not supported, set to NULL
+ *  MofResourceName    [I]   not supported, set to NULL
  *  RegistrationHandle [O]   Provider's registration handle
  *
  * RETURNS
diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c
index 36c97b9..ffc6fe0 100644
--- a/dlls/amstream/tests/amstream.c
+++ b/dlls/amstream/tests/amstream.c
@@ -184,7 +184,7 @@ static void test_media_streams(void)
     hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL);
     ok(hr == S_OK, "IAMMultiMediaStream_Initialize returned: %x\n", hr);
 
-    /* Retreive media stream filter */
+    /* Retrieve media stream filter */
     hr = IAMMultiMediaStream_GetFilter(pams, NULL);
     ok(hr == E_POINTER, "IAMMultiMediaStream_GetFilter returned: %x\n", hr);
     hr = IAMMultiMediaStream_GetFilter(pams, &media_stream_filter);
diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index 99732c5..1d8f47c 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -590,7 +590,7 @@ static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage
  *              msg     - reason for calling function
  *              wParam  - additional parameter
  *              lParam  - additional parameter
- * Returns    : Dependant on message
+ * Returns    : Depends on the message
  */
 static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -820,7 +820,7 @@ static HIMAGELIST ResetApplicationList(BOOL bFirstRun, HWND hWnd, HIMAGELIST hIm
  *              msg     - reason for calling function
  *              wParam  - additional parameter
  *              lParam  - additional parameter
- * Returns    : Dependant on message
+ * Returns    : Depends on the message
  */
 static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -990,7 +990,7 @@ static LONG start_params(const WCHAR *params)
  *              message - reason for calling function
  *              lParam1 - additional parameter
  *              lParam2 - additional parameter
- * Returns    : Dependant on message
+ * Returns    : Depends on the message
  */
 LONG CALLBACK CPlApplet(HWND hwndCPL, UINT message, LPARAM lParam1, LPARAM lParam2)
 {
diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c
index 48ea77e..de11ee8 100644
--- a/dlls/avifil32/extrachunk.c
+++ b/dlls/avifil32/extrachunk.c
@@ -28,7 +28,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
-/* reads a chunk outof the extrachunk-structure */
+/* reads a chunk out of the extrachunk-structure */
 HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size)
 {
   LPBYTE lp;
@@ -98,7 +98,7 @@ HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG siz
   return AVIERR_OK;
 }
 
-/* reads a chunk fomr the HMMIO into the extrachunk-structure */
+/* reads a chunk from the HMMIO into the extrachunk-structure */
 HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck)
 {
   LPDWORD lp;
diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h
index 843a73c..5b87d7f 100644
--- a/dlls/avifil32/extrachunk.h
+++ b/dlls/avifil32/extrachunk.h
@@ -40,7 +40,7 @@ HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lp,LPLONG siz
 /* writes a chunk into the extrachunk-structure */
 HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size) DECLSPEC_HIDDEN;
 
-/* reads a chunk fomr the HMMIO into the extrachunk-structure */
+/* reads a chunk from the HMMIO into the extrachunk-structure */
 HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,const MMCKINFO *lpck) DECLSPEC_HIDDEN;
 
 /* reads all non-junk chunks into the extrachunk-structure until it finds
diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index 5526854..e91d9cb 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -160,7 +160,7 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate)
 static void end_dialog(ProgressDialog *This)
 {
     SendMessageW(This->hwnd, WM_DLG_DESTROY, 0, 0);
-    /* native doesn't reenable the window? */
+    /* native doesn't re-enable the window? */
     if (This->hwndDisabledParent)
         EnableWindow(This->hwndDisabledParent, TRUE);
     This->hwnd = NULL;
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 5892d76..f20857c 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -143,8 +143,8 @@ DWORD WINAPI GetSize (LPVOID lpMem)
  * MRU-Functions  {COMCTL32}
  *
  * NOTES
- * The MRU-Api is a set of functions to manipulate lists of M.R.U. (Most Recently
- * Used) items. It is an undocumented Api that is used (at least) by the shell
+ * The MRU-API is a set of functions to manipulate lists of M.R.U. (Most Recently
+ * Used) items. It is an undocumented API that is used (at least) by the shell
  * and explorer to implement their recent documents feature.
  *
  * Since these functions are undocumented, they are unsupported by MS and
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index 9682344..dbe9bf8 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -455,7 +455,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow)
 /**************************************************************************
  * DPA_Clone [COMCTL32.331]
  *
- * Copies a pointer array to an other one or creates a copy
+ * Copies a pointer array to another one or creates a copy
  *
  * PARAMS
  *     hdpa    [I] handle (pointer) to the existing (source) pointer array
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 28e2968..4d18597 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -1186,7 +1186,7 @@ ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, UINT fStyle)
 /*************************************************************************
  * ImageList_DrawEx [COMCTL32.@]
  *
- * Draws an image and allows to use extended drawing features.
+ * Draws an image and allows using extended drawing features.
  *
  * PARAMS
  *     himl   [I] handle to image list
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index 7901f86..fbabc1d 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -2399,7 +2399,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                         nmtb.tbButton.iString >= 0 ? debugstr_w(infoPtr->strings[nmtb.tbButton.iString])
                         : "");
 
-		    /* insert button into the apropriate list */
+		    /* insert button into the appropriate list */
 		    index = TOOLBAR_GetButtonIndex (custInfo->tbInfo, nmtb.tbButton.idCommand, FALSE);
 		    if (index == -1)
 		    {
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index d1e57a3..ac1b45e 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -171,7 +171,7 @@ typedef struct
 #define ICON_HEIGHT 16
 #define ICON_WIDTH  16
 
-#define MAX_TEXT_SIZE_A 80 /* maximum retriving text size by ANSI message */
+#define MAX_TEXT_SIZE_A 80 /* maximum retrieving text size by ANSI message */
 
 static LRESULT CALLBACK
 TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef);
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 3d3ac2a..435d2e8 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -1521,7 +1521,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg,
     }
 
     /* FIXME: I allow more freedom than either Win95 or WinNT,
-     *        which do not agree to what errors should be thrown or not
+     *        which do not agree on what errors should be thrown or not
      *        in case nToPage or nFromPage is out-of-range.
      */
     if (lppd->nMaxPage < lppd->nMinPage)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 9c1853a..35365eb 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -1888,7 +1888,7 @@ static const struct ID3DXMeshVtbl D3DXMesh_Vtbl =
  */
 BOOL WINAPI D3DXBoxBoundProbe(CONST D3DXVECTOR3 *pmin, CONST D3DXVECTOR3 *pmax, CONST D3DXVECTOR3 *prayposition, CONST D3DXVECTOR3 *praydirection)
 
-/* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algoritm
+/* Algorithm taken from the article: An Efficient and Robust Ray-Box Intersection Algorithm
 Amy Williams             University of Utah
 Steve Barrus             University of Utah
 R. Keith Morley          University of Utah
diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
index a8cbb53..26c9b1e 100644
--- a/dlls/d3dx9_36/sprite.c
+++ b/dlls/d3dx9_36/sprite.c
@@ -178,7 +178,7 @@ static void set_states(ID3DXSpriteImpl *object)
     D3DXMATRIX mat;
     D3DVIEWPORT9 vp;
 
-    /* Miscelaneous stuff */
+    /* Miscellaneous stuff */
     IDirect3DDevice9_SetVertexShader(object->device, NULL);
     IDirect3DDevice9_SetPixelShader(object->device, NULL);
     IDirect3DDevice9_SetNPatchMode(object->device, 0.0f);
diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c
index 335db62..6361317 100644
--- a/dlls/d3dxof/tests/d3dxof.c
+++ b/dlls/d3dxof/tests/d3dxof.c
@@ -74,9 +74,9 @@ static char empty_bin_file[]  = "xof 0302bin 0064";
 /* MSZip data is generated with the command "MAKECAB.EXE /D Compress=ON /D CompressionType=MSZip file packed"
  * Data in cab is after the filename (null terminated) and the 32-bit checksum:
  * size (16-bit), packed_size (16-bit) and compressed data (with leading 16-bit CK signature)
- * for each MSZIP chunk whose decompressed size can not exceed 32768 bytes
- * Data in x files is preceeding by the size (32-bit) of the decompressed file including the xof header (16 bytes)
- * It does not seem possible to generate a MSZip data chunk with no byte, so put just 1 byte here */
+ * for each MSZIP chunk whose decompressed size cannot exceed 32768 bytes
+ * Data in x files is preceded by the size (32-bit) of the decompressed file including the xof header (16 bytes)
+ * It does not seem possible to generate an MSZip data chunk with no byte, so put just 1 byte here */
 /* "\n" packed with MSZip => no text */
 static char empty_tzip_file[] = "xof 0302tzip0064\x11\x00\x00\x00\x01\x00\x05\x00\x43\x4b\xe3\x02\x00";
 /* "\n" packed with MSZip => no token (token are 16-bit and there is only 1 byte) */
diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c
index c0882b0..7a21e8b 100644
--- a/dlls/dbghelp/minidump.c
+++ b/dlls/dbghelp/minidump.c
@@ -332,7 +332,7 @@ static void fetch_module_versioninfo(LPCWSTR filename, VS_FIXEDFILEINFO* ffi)
  *
  * Add a memory block to be dumped in a minidump
  * If rva is non 0, it's the rva in the minidump where has to be stored
- * also the rva of the memory block when written (this allows to reference
+ * also the rva of the memory block when written (this allows us to reference
  * a memory block from outside the list of memory blocks).
  */
 void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva)
@@ -513,7 +513,7 @@ static  unsigned        dump_modules(struct dump_context* dc, BOOL dump_elf)
         }
         if (flags_out & ModuleWriteModule)
         {
-            /* fetch CPU dependant module info (like UNWIND_INFO) */
+            /* fetch CPU dependent module info (like UNWIND_INFO) */
             dbghelp_current_cpu->fetch_minidump_module(dc, i, flags_out);
 
             mdModule.BaseOfImage = dc->modules[i].base;
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 3546cff..90a73c9 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -628,7 +628,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
     PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &sz) == -1);
 
     doadd = symt_set_udt_size(ptd->module, sdt, sz);
-    if (*ptd->ptr == '!') /* C++ inheritence */
+    if (*ptd->ptr == '!') /* C++ inheritance */
     {
         long     num_classes;
 
@@ -637,7 +637,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
         PTS_ABORTIF(ptd, *ptd->ptr++ != ',');
         while (--num_classes >= 0)
         {
-            ptd->ptr += 2; /* skip visibility and inheritence */
+            ptd->ptr += 2; /* skip visibility and inheritance */
             PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &ofs) == -1);
             PTS_ABORTIF(ptd, *ptd->ptr++ != ',');
 
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index bce9eca..d4a344d 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -938,11 +938,11 @@ static void ViewportTest(void)
 
     hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport2, (void**) &Viewport2);
     ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr);
-    ok(Viewport2 == (IDirect3DViewport2 *)Viewport, "IDirect3DViewport2 iface diffrent from IDirect3DViewport\n");
+    ok(Viewport2 == (IDirect3DViewport2 *)Viewport, "IDirect3DViewport2 iface different from IDirect3DViewport\n");
 
     hr = IDirect3DViewport_QueryInterface(Viewport, &IID_IDirect3DViewport3, (void**) &Viewport3);
     ok(hr==D3D_OK, "QueryInterface returned: %x\n", hr);
-    ok(Viewport3 == (IDirect3DViewport3 *)Viewport, "IDirect3DViewport3 iface diffrent from IDirect3DViewport\n");
+    ok(Viewport3 == (IDirect3DViewport3 *)Viewport, "IDirect3DViewport3 iface different from IDirect3DViewport\n");
     IDirect3DViewport3_Release(Viewport3);
 
     vp1_data.dwSize = sizeof(vp1_data);
diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
index 43091c6..6a4713a 100644
--- a/dlls/ddraw/viewport.c
+++ b/dlls/ddraw/viewport.c
@@ -529,7 +529,7 @@ static HRESULT WINAPI d3d_viewport_LightElements(IDirect3DViewport3 *iface,
 /*****************************************************************************
  * IDirect3DViewport3::SetBackground
  *
- * Sets tje background material
+ * Sets the background material
  *
  * Params:
  *  hMat: Handle from a IDirect3DMaterial interface
diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 1ff06df..f167feb 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -765,8 +765,8 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt)
 
     TRACE("(%p)->(%d)\n", iface, celt);
 
-    /* Before incrementing, check if there are any more values to run thru.
-       Some programs use the Skip() function to get the amount of devices */
+    /* Before incrementing, check if there are any more values to run through.
+       Some programs use the Skip() function to get the number of devices */
     if(RegQueryInfoKeyW(This->hkey, NULL, NULL, NULL, &subKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
     {
         return S_FALSE;
diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c
index 0251f35..c2f63c2 100644
--- a/dlls/dinput/tests/joystick.c
+++ b/dlls/dinput/tests/joystick.c
@@ -444,10 +444,10 @@ static BOOL CALLBACK EnumJoysticks(
              * State: enabled
              *
              * IDirectInputDevice2_SetProperty(DIPROP_AUTOCENTER) can only be
-             * executed when devide is released.
+             * executed when the device is released.
              *
              * If Executed interactively, user can feel that autocenter is
-             * only disabled when joystick is acquired.
+             * only disabled when the joystick is acquired.
              */
             diprop_word.diph.dwSize = sizeof(diprop_word);
             diprop_word.diph.dwHeaderSize = sizeof(diprop_word.diph);
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 1c25435..f97fad4 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -130,7 +130,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR
 	  return DMUS_E_LOADER_NOCLASSID;
 	}
 	
-	/* OK, first we iterate thru the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile)
+	/* OK, first we iterate through the list of objects we know about; these are either loaded (GetObject, LoadObjectFromFile)
 	   or set via SetObject; */
 	TRACE(": looking if we have object in the cache or if it can be found via alias\n");
 	LIST_FOR_EACH(pEntry, This->pObjects) {
@@ -563,8 +563,8 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject (LPD
 	DM_STRUCT_INIT(&Desc);
 	IDirectMusicObject_GetDescriptor (pObject, &Desc);
 	
-	/* now iterate thru list and check if we have alias (without object), corresponding
-	   to descriptor of input object */
+	/* now iterate through the list and check if we have an alias (without object), corresponding
+	   to the descriptor of the input object */
 	LIST_FOR_EACH(pEntry, This->pObjects) {
 		pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry);
 		if ((Desc.dwValidData & DMUS_OBJ_OBJECT) &&
@@ -645,7 +645,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (L
 	DM_STRUCT_INIT(&Desc);
 	IDirectMusicObject_GetDescriptor (pObject, &Desc);
 	
-	/* iterate thru the list of objects we know about; check only those with DMUS_OBJ_LOADED */
+	/* iterate through the list of objects we know about; check only those with DMUS_OBJ_LOADED */
 	TRACE(": looking for the object in cache\n");
 	LIST_FOR_EACH(pEntry, This->pObjects) {
 		pObjectEntry = LIST_ENTRY(pEntry, WINE_LOADER_ENTRY, entry);
diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c
index 5cdd516..0116304 100644
--- a/dlls/gameux/gamestatistics.c
+++ b/dlls/gameux/gamestatistics.c
@@ -930,7 +930,7 @@ static HRESULT WINAPI GameStatisticsImpl_SetStatistic(
                   value, dwValueLen+1);
     }
     else
-        /* Windows allows to pass NULL as value */
+        /* Windows allows passing NULL as value */
         This->stats.categories[categoryIndex].stats[statIndex].sValue[0] = 0;
 
     return hr;
diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c
index 346e74d..13b7c06 100644
--- a/dlls/gdi32/dibdrv/graphics.c
+++ b/dlls/gdi32/dibdrv/graphics.c
@@ -473,7 +473,7 @@ static const int padding[4] = {0, 3, 2, 1};
 /***********************************************************************
  *         get_glyph_bitmap
  *
- * Retrieve a 17-level bitmap for the appropiate glyph.
+ * Retrieve a 17-level bitmap for the appropriate glyph.
  *
  * For non-antialiased bitmaps convert them to the 17-level format
  * using only values 0 or 16.
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c
index 511b84f..34a405d 100644
--- a/dlls/gdi32/mfdrv/objects.c
+++ b/dlls/gdi32/mfdrv/objects.c
@@ -214,7 +214,7 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush )
 	}
 
 	default:
-	    FIXME("Unkonwn brush style %x\n", logbrush.lbStyle);
+	    FIXME("Unknown brush style %x\n", logbrush.lbStyle);
 	    return 0;
     }
     r = MFDRV_WriteRecord( dev, mr, mr->rdSize * 2);
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 25cf6be..f61d588 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -155,7 +155,7 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R
         if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine)))
             return FALSE;
 
-    /* do the same with halfs */
+    /* do the same with halves */
     flatten_bezier(start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node, flatness);
     flatten_bezier(node,  mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end,  flatness);
 
diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index 9d1f91e..af4fb19 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -212,7 +212,7 @@ LPWSTR FindContextAlias(CHMInfo *chm, DWORD index)
 }
 
 /*
- * Tests if the file <chmfile>.<ext> exists, used for loading Indicies, Table of Contents, etc.
+ * Tests if the file <chmfile>.<ext> exists, used for loading Indices, Table of Contents, etc.
  * when these files are not available from the HH_WINTYPE structure.
  */
 static WCHAR *FindHTMLHelpSetting(HHInfo *info, const WCHAR *extW)
diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c
index 601e458..f0b769e 100644
--- a/dlls/ieframe/oleobject.c
+++ b/dlls/ieframe/oleobject.c
@@ -503,7 +503,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption)
     TRACE("(%p)->(%d)\n", This, dwSaveOption);
 
     if(dwSaveOption != OLECLOSE_NOSAVE) {
-        FIXME("unimplemnted flag: %x\n", dwSaveOption);
+        FIXME("unimplemented flag: %x\n", dwSaveOption);
         return E_NOTIMPL;
     }
 
diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c
index f7b6ab1..0d7ed32 100644
--- a/dlls/imaadp32.acm/imaadp32.c
+++ b/dlls/imaadp32.acm/imaadp32.c
@@ -548,7 +548,7 @@ static	LRESULT	ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_IMA_ADPCM is bigger than PCM */
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c
index 0f6b0e2..f5a987e 100644
--- a/dlls/jscript/regexp.c
+++ b/dlls/jscript/regexp.c
@@ -2676,7 +2676,7 @@ ExecuteREBytecode(REGlobalData *gData, REMatchState *x)
                     result = NULL;
                     break;
                 }
-                /* else false thru... */
+                /* else fall through... */
 
               case REOP_ALT:
               doAlt:
diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index 08ea8cc..3264884 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -275,8 +275,8 @@ BOOL WINAPI UnregisterWaitEx( HANDLE WaitHandle, HANDLE CompletionEvent )
 /***********************************************************************
  *           SignalObjectAndWait  (KERNEL32.@)
  *
- * Allows to atomically signal any of the synchro objects (semaphore,
- * mutex, event) and wait on another.
+ * Makes it possible to atomically signal any of the synchronization
+ * objects (semaphore, mutex, event) and wait on another.
  */
 DWORD WINAPI SignalObjectAndWait( HANDLE hObjectToSignal, HANDLE hObjectToWaitOn,
                                   DWORD dwMilliseconds, BOOL bAlertable )
diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c
index 895a9ab..bdc1cc1 100644
--- a/dlls/kernel32/tests/comm.c
+++ b/dlls/kernel32/tests/comm.c
@@ -1168,7 +1168,7 @@ static void  test_WaitRx(HANDLE hcom)
 
 }
 
-/* Change the controling line after the given timeout to the given state
+/* Change the controlling line after the given timeout to the given state
    By the loopback, this should trigger the WaitCommEvent
 */
 static DWORD CALLBACK toggle_ctlLine(LPVOID arg)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index d0c58f8..4b9cfb6 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -1031,7 +1031,7 @@ static void test_OpenCON(void)
         h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL);
         /* Windows versions differ here:
          * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE
-         * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING
+         * NT, XP, Vista comply, but Win7 doesn't and allows opening CON with TRUNCATE_EXISTING
          * So don't test when disposition is TRUNCATE_EXISTING
          */
         if (accesses[i] != TRUNCATE_EXISTING)
diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c
index db9c9c4..14c0cf2 100644
--- a/dlls/kernel32/tests/drive.c
+++ b/dlls/kernel32/tests/drive.c
@@ -125,7 +125,7 @@ static void test_GetDiskFreeSpaceA(void)
                    "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n",
                    drive, ret, GetLastError());
                 if( GetVersion() & 0x80000000)
-                    /* win3.0 thru winME */
+                    /* win3.0 through winME */
                     ok( total_clusters <= 65535,
                             "total clusters is %d > 65535\n", total_clusters);
                 else if (pGetDiskFreeSpaceExA) {
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 241ecc1..a1bb8ce 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -1087,7 +1087,7 @@ static BOOL INT21_CreateFile( CONTEXT *context,
     {
         winHandle = CreateFileW( pathW, winAccess, winSharing, NULL,
                                  winMode, winAttributes, 0 );
-        /* DOS allows to open files on a CDROM R/W */
+        /* DOS allows opening files on a CDROM R/W */
         if( winHandle == INVALID_HANDLE_VALUE &&
                 (GetLastError() == ERROR_WRITE_PROTECT ||
                  GetLastError() == ERROR_ACCESS_DENIED)) {
diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c
index 03d7f83..70b3ef1 100644
--- a/dlls/krnl386.exe16/vga.c
+++ b/dlls/krnl386.exe16/vga.c
@@ -1608,7 +1608,7 @@ static void VGA_Poll_Graphics(void)
     WORD off = 0;
     BYTE bits = 6;
     BYTE value;
-    /* Go thru rows */
+    /* Iterate over the rows */
     for(Y=0; Y<vga_fb_height; Y++, surf+=(Pitch*2)){
       for(X=0; X<vga_fb_width; X++){
         off = Y & 1 ? (8 * 1024) : 0;
diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c
index 5173412..8b40e1d 100644
--- a/dlls/mapi32/prop.c
+++ b/dlls/mapi32/prop.c
@@ -1868,7 +1868,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS
  *           errors that occurred.
  *  Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid.
  *           E_ACCESSDENIED, if this object was created using CreateIProp() and
- *           a subsequent call to IPropData_SetObjAcess() was made specifying
+ *           a subsequent call to IPropData_SetObjAccess() was made specifying
  *           IPROP_READONLY as the access type.
  *
  * NOTES
diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c
index fb6b7be..da0a461 100644
--- a/dlls/mapi32/tests/prop.c
+++ b/dlls/mapi32/tests/prop.c
@@ -1302,7 +1302,7 @@ static void test_IProp(void)
 
     /* Set access to read and write */
     sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE);
-    ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
+    ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
 
     tags.cValues = 1;
     tags.aulPropTag[0] = PR_IMPORTANCE;
@@ -1311,31 +1311,31 @@ static void test_IProp(void)
     access[0] = 0;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
     ok(sc == MAPI_E_INVALID_PARAMETER,
-       "SetPropAcess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc);
+       "SetPropAccess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc);
     access[0] = IPROP_READWRITE;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
     ok(sc == MAPI_E_INVALID_PARAMETER,
-       "SetPropAcess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc);
+       "SetPropAccess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc);
     access[0] = IPROP_CLEAN;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
     ok(sc == MAPI_E_INVALID_PARAMETER,
-       "SetPropAcess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc);
+       "SetPropAccess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc);
 
     /* Set item access to read/write/clean */
     tags.cValues = 1;
     tags.aulPropTag[0] = PR_IMPORTANCE;
     access[0] = IPROP_READWRITE|IPROP_CLEAN;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
-    ok(sc == S_OK, "SetPropAcess(RW/C): Expected S_OK got 0x%08X\n",sc);
+    ok(sc == S_OK, "SetPropAccess(RW/C): Expected S_OK got 0x%08X\n",sc);
 
     /* Set object access to read only */
     sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READONLY);
-    ok(sc == S_OK, "SetObjAcess(READ): Expected S_OK got 0x%08X\n", sc);
+    ok(sc == S_OK, "SetObjAccess(READ): Expected S_OK got 0x%08X\n", sc);
 
     /* Set item access to read/write/dirty - doesn't care about RO object */
     access[0] = IPROP_READONLY|IPROP_DIRTY;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
-    ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
+    ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
 
     /* Delete any item when set to read only - Error */
     lpProbs = NULL;
@@ -1347,7 +1347,7 @@ static void test_IProp(void)
 
     /* Set access to read and write */
     sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE);
-    ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
+    ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
 
     /* Delete nonexistent item - No error */
     lpProbs = NULL;
@@ -1401,7 +1401,7 @@ static void test_IProp(void)
     /* Set item to r/w again */
     access[0] = IPROP_READWRITE|IPROP_DIRTY;
     sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access);
-    ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc);
+    ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc);
 
     /* Delete existing item (r/w) - No error, no problems */
     lpProbs = NULL;
diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c
index a9aba4c..d76a2f8 100644
--- a/dlls/msadp32.acm/msadp32.c
+++ b/dlls/msadp32.acm/msadp32.c
@@ -378,7 +378,7 @@ static	LRESULT	ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1; /* WAVE_FORMAT_ADPCM is bigger than PCM */
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
index db06905..f6f2ae6 100644
--- a/dlls/msg711.acm/msg711.c
+++ b/dlls/msg711.acm/msg711.c
@@ -695,7 +695,7 @@ static	LRESULT	G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1;
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c
index 12dfef9..2543e0b 100644
--- a/dlls/msgsm32.acm/msgsm32.c
+++ b/dlls/msgsm32.acm/msgsm32.c
@@ -221,7 +221,7 @@ static	LRESULT	GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 1;
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 2f792f9..43c65d9 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -2509,7 +2509,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD
             return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, dispex_id, 0, flags, params, res, ei, caller);
         }
         default:
-            FIXME("Not suppoted flags: %x\n", flags);
+            FIXME("Not supported flags: %x\n", flags);
             return E_NOTIMPL;
         }
     case GLOBAL_DISPEXVAR:
diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c
index c432888..4798917 100644
--- a/dlls/msi/tokenize.c
+++ b/dlls/msi/tokenize.c
@@ -266,7 +266,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
         *tokenType = TK_DOT;
         return 1;
       }
-      /* Fall thru into the next case */
+      /* Fall through */
     case '0': case '1': case '2': case '3': case '4':
     case '5': case '6': case '7': case '8': case '9':
       *tokenType = TK_INTEGER;
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index 7d296e1..4fe5c2c 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -269,7 +269,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...)
             {
             case 's': t = va_arg(args, char*); if (t) len += strlen(t); break;
             case 'c': (void)va_arg(args, int); len++; break;
-            default: i--; /* fall thru */
+            default: i--; /* fall through */
             case '%': len++; break;
             }
         }
@@ -296,7 +296,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...)
             case 'c':
                 *p++ = (char)va_arg(args, int);
                 break;
-            default: i--; /* fall thru */
+            default: i--; /* fall through */
             case '%': *p++ = '%'; break;
             }
         }
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index 1b19c3c..49a6cb0 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -185,7 +185,7 @@ static const char *event_names[EVENT_LAST] = {
     "endElement",
     "characters",
     "ignorableWhitespace",
-    "processingIntruction",
+    "processingInstruction",
     "skippedEntity",
     "error",
     "fatalError",
diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c
index 89b2c2a..94f0ae6 100644
--- a/dlls/netapi32/netbios.c
+++ b/dlls/netapi32/netbios.c
@@ -49,7 +49,7 @@ typedef struct _NetBIOSSession
  * is not NULL, the adapter is considered valid.  (transport is a pointer to
  * an entry in a NetBIOSTransportTableEntry.)  data has data for the callers of
  * NetBIOSEnumAdapters to be able to see.  The lana is repeated there, even
- * though I don't use it internally--it's for transports to use reenabling
+ * though I don't use it internally--it's for transports to use re-enabling
  * adapters using NetBIOSEnableAdapter.
  */
 typedef struct _NetBIOSAdapter
diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h
index 4cc9b2e..86fa999 100644
--- a/dlls/netapi32/netbios.h
+++ b/dlls/netapi32/netbios.h
@@ -54,7 +54,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, struct _NetBIOSTransport *transport) DEC
 BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *adapter) DECLSPEC_HIDDEN;
 
 /* During enumeration, all adapters from your transport are disabled
- * internally.  If an adapter is still valid, reenable it with this function.
+ * internally.  If an adapter is still valid, re-enable it with this function.
  * Adapters you don't enable will have their transport's NetBIOSCleanupAdapter
  * function (see below) called on them, and will be removed from the table.
  * (This is to deal with lack of plug-and-play--sorry.)
diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c
index d22434c..8b7cbaa 100644
--- a/dlls/ntdll/path.c
+++ b/dlls/ntdll/path.c
@@ -656,7 +656,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size)
                  * (this seems also to be the only spot in RtlGetFullPathName that the 
                  * existence of a part of a path is checked)
                  */
-                /* fall thru */
+                /* fall through */
             case STATUS_BUFFER_TOO_SMALL:
                 reqsize = val.Length + sizeof(WCHAR); /* append trailing '\\' */
                 val.Buffer[val.Length / sizeof(WCHAR)] = '\\';
diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
index 547e6eb..ef61ad0 100644
--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -900,7 +900,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue)
  *                 after the first callback.  If zero, the timer will only
  *                 fire once.  It still needs to be deleted with
  *                 RtlDeleteTimer.
- * Flags       [I] Flags controling the execution of the callback.  In
+ * Flags       [I] Flags controlling the execution of the callback.  In
  *                 addition to the WT_* thread pool flags (see
  *                 RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and
  *                 WT_EXECUTEONLYONCE are supported.
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 97d1b96..371873d 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -51,8 +51,8 @@ WINE_DECLARE_DEBUG_CHANNEL(heap);
  *  string type in ole automation. When encapsulated in a Variant type they are
  *  automatically copied and destroyed as the variant is processed.
  *
- *  The low level BSTR Api allows manipulation of these strings and is used by
- *  higher level Api calls to manage the strings transparently to the caller.
+ *  The low level BSTR API allows manipulation of these strings and is used by
+ *  higher level API calls to manage the strings transparently to the caller.
  *
  *  Internally the BSTR type is allocated with space for a DWORD byte count before
  *  the string data begins. This is undocumented and non-system code should not
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 2d6e2ce..20df548 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2817,7 +2817,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags)
     if (xmask == VTBIT_BSTR)
         return VarBstrCmp(V_BSTR(left), V_BSTR(right), lcid, flags);
 
-    /* A BSTR and an other variant; we have to take care of VT_RESERVED */
+    /* A BSTR and another variant; we have to take care of VT_RESERVED */
     if (xmask & VTBIT_BSTR) {
         VARIANT *bstrv, *nonbv;
         VARTYPE nonbvt;
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index 300559e..f98362c 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -180,7 +180,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam
         hr = IMediaSample_SetActualDataLength(pOutSample, ash.cbDstLengthUsed);
         assert(hr == S_OK);
 
-        /* Bug in acm codecs? It apparantly uses the input, but doesn't necessarily output immediately kl*/
+        /* Bug in acm codecs? It apparently uses the input, but doesn't necessarily output immediately */
         if (!ash.cbSrcLengthUsed)
         {
             WARN("Sample was skipped? Outputted: %u\n", ash.cbDstLengthUsed);
diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index 00b9cee..5027e90 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -399,7 +399,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample, DWORD_PT
         return S_OK;
     }
 
-    /* Send the sample to whatever thread is appropiate
+    /* Send the sample to whatever thread is appropriate
      * That thread should also not have a sample queued at the moment
      */
     /* Debugging */
diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c
index 4ed5f24..5bd9254 100644
--- a/dlls/shdocvw/tests/shortcut.c
+++ b/dlls/shdocvw/tests/shortcut.c
@@ -25,7 +25,7 @@
  * configured. This is documented at http://www.virtualplastic.net/html/ui_shell.html
  * You can also google for a tool called "ShellObjectEditor" by "Tropical 
  * Technologies". This mechanism would be cool for wine, since we could 
- * map Gnome's virtual devices to FolderShortcuts and have them appear in the
+ * map GNOME's virtual devices to FolderShortcuts and have them appear in the
  * file dialogs. These unit tests are meant to document how this mechanism
  * works on windows.
  *
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index bf891eb..b90fdfa 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -46,7 +46,7 @@
  *
  * With the introduction of the 'shell' in win32, Microsoft established an 
  * abstraction layer on top of the filesystem, called the shell namespace (I was
- * told that Gnome's virtual filesystem is conceptually similar). In the shell
+ * told that GNOME's virtual filesystem is conceptually similar). In the shell
  * namespace, one doesn't use ascii- or unicode-strings to uniquely identify
  * objects. Instead Microsoft introduced item-identifier-lists (The c type is 
  * called ITEMIDLIST) as an abstraction of path-names. As you probably would
diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 4ecc922..3156990 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -115,7 +115,7 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)
  *
  * RETURNS
  *  Success: S_OK. lpType and lpFlag contain the perceived type and
- *           its informations. If lppszType is not NULL, it will point
+ *           its information. If lppszType is not NULL, it will point
  *           to a string with perceived type text.
  *  Failure: An HRESULT error code indicating the error.
  *
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 78cd02d..0c64ed0 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -1334,7 +1334,7 @@ HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd)
 
   if (SUCCEEDED(hRet))
   {
-    /* Lazyness here - Since GetWindow() is the first method for the above 3
+    /* Laziness here - Since GetWindow() is the first method for the above 3
      * interfaces, we use the same call for them all.
      */
     hRet = IOleWindow_GetWindow((IOleWindow*)lpOle, lphWnd);
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index 78c4520..5dc5152 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -36,7 +36,7 @@ DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES;
 /*************************************************************************
  * SHLWAPI {SHLWAPI}
  *
- * The Shell Light-Weight Api dll provides a large number of utility functions
+ * The Shell Light-Weight API dll provides a large number of utility functions
  * which are commonly required by Win32 programs. Originally distributed with
  * Internet Explorer as a free download, it became a core part of Windows when
  * Internet Explorer was 'integrated' into the O/S with the release of Win98.
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 0cb0518..5d2fa0a 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -357,7 +357,7 @@ static void test_GetAcceptLanguagesA(void)
     buffer[maxlen] = 0;
     hr = pGetAcceptLanguagesA( buffer, &len);
     /* When the buffer is too small, win7_32 and w2k8_64 and above fail with
-       HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), other versions suceed
+       HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), other versions succeed
        and return a partial 0 terminated result while other versions
        fail with E_INVALIDARG and return a partial unterminated result */
     ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) ||
diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c
index bf733ae..ee06cfb 100644
--- a/dlls/typelib.dll16/typelib.c
+++ b/dlls/typelib.dll16/typelib.c
@@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
  * This dll is the 16 bit version of the Typelib API, part the original
  * implementation of Ole automation. It and its companion ole2disp.dll were
  * superseded by oleaut32.dll which provides 32 bit implementations of these
- * functions and greatly extends the Ole Api.
+ * functions and greatly extends the OLE API.
  *
  * Winelib developers cannot use these functions directly, they are implemented
  * solely for backwards compatibility with existing legacy applications.
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c
index d10ecb6..89692c9 100644
--- a/dlls/user.exe16/message.c
+++ b/dlls/user.exe16/message.c
@@ -890,7 +890,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1
                 break; /* atom, nothing to do */
             case 3:
                 MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi);
-                /* fall thru */
+                /* fall through */
             case 2:
                 hi = convert_handle_16_to_32(hi, GMEM_DDESHARE);
                 break;
@@ -1270,7 +1270,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
                 break; /* atom, nothing to do */
             case 3:
                 MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi);
-                /* fall thru */
+                /* fall through */
             case 2:
                 hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);
                 break;
diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c
index ac4657e..b40af66 100644
--- a/dlls/user32/dde_misc.c
+++ b/dlls/user32/dde_misc.c
@@ -1526,7 +1526,7 @@ HDDEDATA        WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEH
             default:
                 FIXME("Unsupported format (%04x) for data %p, passing raw information\n",
                       pDd->cfFormat, hMem);
-                /* fall thru */
+                /* fall through */
             case 0:
             case CF_TEXT:
                 ret = DdeCreateDataHandle(pConv->instance->instanceID, pDd->Value, size, 0, 0, pDd->cfFormat, 0);
@@ -1585,7 +1585,7 @@ HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease,
         default:
             FIXME("Unsupported format (%04x) for data %p, passing raw information\n",
                    pDdh->cfFormat, hDdeData);
-            /* fall thru */
+            /* fall through */
         case 0:
         case CF_TEXT:
             hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(WINE_DDEHEAD) + dwSize);
diff --git a/dlls/user32/dde_private.h b/dlls/user32/dde_private.h
index d5f7f7b..a6da664 100644
--- a/dlls/user32/dde_private.h
+++ b/dlls/user32/dde_private.h
@@ -72,9 +72,9 @@
  * be to provide a new protocol in the case were both partners are handled by DDEML.
  *
  * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom
- * can be used interchangably. However, in order to keep track of the allocated HSZ,
+ * can be used interchangeably. However, in order to keep track of the allocated HSZ,
  * and to free them upon instance termination, all HSZ are stored in a link list.
- * When the HSZ need to be passed thru DDE messages, we need to convert them back and
+ * When the HSZ need to be passed through DDE messages, we need to convert them back and
  * forth to global atoms.
  */
 
@@ -145,7 +145,7 @@ typedef struct tagWDML_LINK {
     struct tagWDML_LINK*	next;		/* to link all the active links */
     HCONV			hConv;		/* to get back to the conversation */
     UINT			transactionType;/* 0 for no link */
-    HSZ				hszItem;	/* item targetted for (hot/warm) link */
+    HSZ				hszItem;	/* item targeted for (hot/warm) link */
     UINT			uFmt;		/* format for data */
 } WDML_LINK;
 
diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 316df2a..ad71a2b 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -268,11 +268,11 @@ static inline UINT get_text_length(EDITSTATE *es)
  *	EDIT_WordBreakProc
  *
  *	Find the beginning of words.
- *	Note:	unlike the specs for a WordBreakProc, this function only
- *		allows to be called without linebreaks between s[0] up to
+ *	Note:	unlike the specs for a WordBreakProc, this function can
+ *		only be called without linebreaks between s[0] up to
  *		s[count - 1].  Remember it is only called
  *		internally, so we can decide this for ourselves.
- *		Additional we will always be breaking the full string.
+ *		Additionally we will always be breaking the full string.
  *
  */
 static INT EDIT_WordBreakProc(EDITSTATE *es, LPWSTR s, INT index, INT count, INT action)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 76fe007..5f26477 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -1039,7 +1039,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
         mis.itemHeight = ODitemheight;
         mis.itemWidth  = 0;
         SendMessageW( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&mis );
-        /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average
+        /* Tests reveal that Windows ( Win95 through WinXP) adds twice the average
          * width of a menufont character to the width of an owner-drawn menu. 
          */
         lpitem->rect.right += mis.itemWidth + 2 * menucharsize.cx;
diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c
index b0e206f..1d7e75e 100644
--- a/dlls/user32/tests/scroll.c
+++ b/dlls/user32/tests/scroll.c
@@ -375,7 +375,7 @@ todo_wine
     ret = EnableScrollBar( hwnd, SB_HORZ, ESB_ENABLE_BOTH);
     ok( !ret, "Horizontal window scroll bar was not enabled\n");
     DestroyWindow( hwnd);
-    /* finally, check if adding a WS_[HV]SColl style of a  window makes the scroll info
+    /* finally, check if adding a WS_[HV]SCROLL style of a window makes the scroll info
      * available */
     if( style & (WS_HSCROLL | WS_VSCROLL)) return;/* only test if not yet set */
     /* Start with a clean window */
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 5ba6e6f..a039504 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -1876,7 +1876,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *
     input = HeapAlloc(GetProcessHeap(), 0, (cChars * 2) * sizeof(WCHAR));
     memcpy(input, pwcChars, cChars * sizeof(WCHAR));
 
-    /* Step 1: Decompose Vowels and Compose Consonents */
+    /* Step 1: Decompose Vowels and Compose Consonants */
     DecomposeVowels(hdc, input,  &cCount, Bengali_vowels, pwLogClust, cChars);
     ComposeConsonants(hdc, input, &cCount, Bengali_consonants, pwLogClust);
     TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount);
@@ -1940,7 +1940,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
     input = HeapAlloc(GetProcessHeap(), 0, cChars * sizeof(WCHAR));
     memcpy(input, pwcChars, cChars * sizeof(WCHAR));
 
-    /* Step 1: Compose Consonents */
+    /* Step 1: Compose Consonants */
     ComposeConsonants(hdc, input, &cCount, Gurmukhi_consonants, pwLogClust);
     TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount);
 
@@ -2035,7 +2035,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
     input = HeapAlloc(GetProcessHeap(), 0, (cChars*2) * sizeof(WCHAR));
     memcpy(input, pwcChars, cChars * sizeof(WCHAR));
 
-    /* Step 1: Decompose Vowels and Compose Consonents */
+    /* Step 1: Decompose Vowels and Compose Consonants */
     DecomposeVowels(hdc, input,  &cCount, Oriya_vowels, pwLogClust, cChars);
     ComposeConsonants(hdc, input, &cCount, Oriya_consonants, pwLogClust);
     TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount);
@@ -2085,7 +2085,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps
     input = HeapAlloc(GetProcessHeap(), 0, (cChars*2) * sizeof(WCHAR));
     memcpy(input, pwcChars, cChars * sizeof(WCHAR));
 
-    /* Step 1: Decompose Vowels and Compose Consonents */
+    /* Step 1: Decompose Vowels and Compose Consonants */
     DecomposeVowels(hdc, input,  &cCount, Tamil_vowels, pwLogClust, cChars);
     ComposeConsonants(hdc, input, &cCount, Tamil_consonants, pwLogClust);
     TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount);
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c
index 0b5033b..ff757ee 100644
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -2433,7 +2433,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
             else
                 ok(lead < trail, "Trailing values should be after leading for ltr characters(%i)\n",Cp);
 
-            /* move by 1 pixel so that we are not inbetween 2 characters.  That could result in being the lead of a rtl and
+            /* move by 1 pixel so that we are not between 2 characters.  That could result in being the lead of a rtl and
                at the same time the trail of an ltr */
 
             /* inside the leading edge */
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 90b1259..ff842b0 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -2084,7 +2084,7 @@ static HRESULT SS_ItemOut( SCRIPT_STRING_ANALYSIS ssa,
  *  ssa       [I] buffer to hold the analysed string components
  *  iX        [I] X axis displacement for output
  *  iY        [I] Y axis displacement for output
- *  uOptions  [I] flags controling output processing
+ *  uOptions  [I] flags controlling output processing
  *  prc       [I] rectangle coordinates
  *  iMinSel   [I] starting pos for substringing output string
  *  iMaxSel   [I] ending pos for substringing output string
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index e3c1d15..93e2b8d 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -1385,7 +1385,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface,
         return AUDCLNT_E_NOT_INITIALIZED;
     }
 
-    /* Hide some frames in the ALSA buffer.  Allows to return GetCurrentPadding=0
+    /* Hide some frames in the ALSA buffer. Allows us to return GetCurrentPadding=0
      * yet have enough data left to play (as if it were in native's mixer). Add:
      * + mmdevapi_period such that at the end of it, ALSA still has data;
      * + EXTRA_SAFE (~4ms) to allow for late callback invocation / fluctuation;
diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index f539b0a..e7b78a7 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -408,10 +408,10 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
     /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
      * data, or can it also contain raw MIDI data, to be split up and sent to
      * modShortData() ?
-     * If the latest is true, then the following WARNing will fire up
+     * If the latter is true, then the following WARNing will fire up
      */
     if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
-	WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
+	WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
     }
 
     TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 6b2d950..468dfba 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6396,7 +6396,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi
             desc = new_desc;
         }
 
-        /* Now activate the replacement program. GL_FRAGMENT_PROGRAM_ARB is already active(however, note the
+        /* Now activate the replacement program. GL_FRAGMENT_PROGRAM_ARB is already active (however, note the
          * comment above the shader_select call below). If e.g. GLSL is active, the shader_select call will
          * deactivate it.
          */
@@ -6421,13 +6421,13 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi
     }
 
     /* Finally, select the shader. If a pixel shader is used, it will be set and enabled by the shader backend.
-     * If this shader backend is arbfp(most likely), then it will simply overwrite the last fixed function replace-
-     * ment shader. If the shader backend is not ARB, it currently is important that the opengl implementation
+     * If this shader backend is arbfp(most likely), then it will simply overwrite the last fixed function
+     * replacement shader. If the shader backend is not ARB, it currently is important that the opengl implementation
      * type overwrites GL_ARB_fragment_program. This is currently the case with GLSL. If we really want to use
      * atifs or nvrc pixel shaders with arb fragment programs we'd have to disable GL_FRAGMENT_PROGRAM_ARB here
      *
      * Don't call shader_select if the vertex shader is dirty, because it will be called later on by the vertex
-     * shader handler
+     * shader handler.
      */
     if (!isStateDirty(context, context->state_table[STATE_VSHADER].representative))
     {
@@ -7079,7 +7079,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_
      * regardless of the filtering setting. Vertical filtering works automatically
      * though - the U and V values of two rows are mixed nicely.
      *
-     * Appart of avoiding filtering issues, the code has to know which value it just
+     * Apart of avoiding filtering issues, the code has to know which value it just
      * read, and where it can find the other one. To determine this, it checks if
      * it sampled an even or odd pixel, and shifts the 2nd read accordingly.
      *
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index fcf5595..dc0957a 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1060,7 +1060,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_
 
     if (gl_info->supported[APPLE_CLIENT_STORAGE])
     {
-        /* Reenable because if supported it is enabled by default */
+        /* Re-enable because if supported it is enabled by default */
         glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
         checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)");
     }
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 9e3a86b..bd7f7d4 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -825,7 +825,7 @@ static void quirk_no_np2(struct wined3d_gl_info *gl_info)
      *
      *  Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot,
      *  triggering the software fallback. There is not much we can do here apart from disabling the
-     *  software-emulated extension and reenable ARB_tex_rect (which was previously disabled
+     *  software-emulated extension and re-enable ARB_tex_rect (which was previously disabled
      *  in wined3d_adapter_init_gl_caps).
      *  This fixup removes performance problems on both the FX 5900 and FX 5700 (e.g. for framebuffer
      *  post-processing effects in the game "Max Payne 2").
@@ -1294,7 +1294,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info,
     }
 
     /* When we reach this stage we always have a vendor or device id (it can be a default one).
-     * This means that unless the ids are overriden, we will always find a GPU description. */
+     * This means that unless the ids are overridden, we will always find a GPU description. */
     for (i = 0; i < (sizeof(gpu_description_table) / sizeof(gpu_description_table[0])); i++)
     {
         if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].card)
@@ -3048,7 +3048,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d,
     const struct wined3d_adapter *adapter;
     size_t len;
 
-    TRACE_(d3d_caps)("wined3d %p, adapter_idx %u, flags %#x, indentifier %p.\n",
+    TRACE_(d3d_caps)("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n",
             wined3d, adapter_idx, flags, identifier);
 
     if (adapter_idx >= wined3d->adapter_count)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 0e363a5..a98ac9f 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -489,7 +489,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT
         TRACE("Rendering the cursor. Creating fake surface at %p\n", &cursor);
         /* Build a fake surface to call the Blitting code. It is not possible to use the interface passed by
          * the application because we are only supposed to copy the information out. Using a fake surface
-         * allows to use the Blitting engine and avoid copying the whole texture -> render target blitting code.
+         * allows us to use the Blitting engine and avoid copying the whole texture -> render target blitting code.
          */
         memset(&cursor, 0, sizeof(cursor));
         cursor.resource.ref = 1;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 66c8444..dc63d8b 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1399,7 +1399,7 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal)
     if(color_match(readback[6], 0xffffffff, 5) || color_match(readback[6], 0x00000000, 5) ||
        color_match(readback[9], 0xffffffff, 5) || color_match(readback[9], 0x00000000, 5))
     {
-        TRACE("Read back colors 0x%08x and 0x%08x close to unfiltered color, asuming no filtering\n",
+        TRACE("Read back colors 0x%08x and 0x%08x close to unfiltered color, assuming no filtering\n",
               readback[6], readback[9]);
         ret = FALSE;
     }
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index fea844d..3f70ae3 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -973,7 +973,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI
         WARN("Ret: %i\n", ret);
         hr = E_FAIL;
     } else if (!This->cStreams) {
-        FIXME("Gstreamer could not find any streams\n");
+        FIXME("GStreamer could not find any streams\n");
         hr = E_FAIL;
     } else {
         gst_pad_query_duration(This->ppPins[0]->their_src, &format, &duration);
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 941f433..4f0e84f 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -1,4 +1,4 @@
-/* Gstreamer Base Functions
+/* GStreamer Base Functions
  *
  * Copyright 2002 Lionel Ulmer
  * Copyright 2010 Aric Stewart, CodeWeavers
diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
index 21962b4..57193b3 100644
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -700,7 +700,7 @@ static	LRESULT	MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
             aftd->dwFormatTagIndex = 2; /* WAVE_FORMAT_MPEG is biggest */
 	    break;
 	}
-	/* fall thru */
+	/* fall through */
     case ACM_FORMATTAGDETAILSF_FORMATTAG:
 	switch (aftd->dwFormatTag)
         {
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index b1c60da..318af94 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -1534,10 +1534,10 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
     /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
      * data, or can it also contain raw MIDI data, to be split up and sent to
      * modShortData() ?
-     * If the latest is true, then the following WARNing will fire up
+     * If the latter is true, then the following WARNing will fire up
      */
     if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
-	WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
+	WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
     }
 
     TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c
index 6ee11b0..5620885 100644
--- a/dlls/wineps.drv/ppd.c
+++ b/dlls/wineps.drv/ppd.c
@@ -181,7 +181,7 @@ static WORD UserBinType = DMBIN_USER;
  *
  *		PSDRV_PPDDecodeHex
  *
- * Copies str into a newly allocated string from the process heap subsituting
+ * Copies str into a newly allocated string from the process heap substituting
  * hex strings enclosed in '<' and '>' for their byte codes.
  *
  */
diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c
index 0312b36..4a391cc 100644
--- a/dlls/wineps.drv/ps.c
+++ b/dlls/wineps.drv/ps.c
@@ -593,7 +593,7 @@ BOOL PSDRV_WriteSetColor(PHYSDEV dev, PSCOLOR *color)
 	return PSDRV_WriteSpool(dev, buf, strlen(buf));
 
     default:
-        ERR("Unkonwn colour type %d\n", color->type);
+        ERR("Unknown colour type %d\n", color->type);
 	break;
     }
 
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index 3dc1196..2d38406 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -959,7 +959,7 @@ static Cursor create_cursor_from_bitmaps( HBITMAP src_xor, HBITMAP src_and, int
      * compatible between Windows and X11. Under X11, there are
      * only 3 possible color cursor: black, white and masked. So
      * we map the 4th Windows color (invert the bits on the screen)
-     * to black and an additional white bit on an other place
+     * to black and an additional white bit on another place
      * (+1,+1). This require some boolean arithmetic:
      *
      *         Windows          |          X11
diff --git a/dlls/winhttp/pac.js b/dlls/winhttp/pac.js
index da644bf..4cfac53 100644
--- a/dlls/winhttp/pac.js
+++ b/dlls/winhttp/pac.js
@@ -134,7 +134,7 @@ function dateRange() {
     if (isGMT) {
         argc--;
     }
-    // function will work even without explict handling of this case
+    // function will work even without explicit handling of this case
     if (argc == 1) {
         var tmp = parseInt(arguments[0]);
         if (isNaN(tmp)) {
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 01f0f95..da10282 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1,5 +1,5 @@
 /*
- * Wininet - Http Implementation
+ * Wininet - HTTP Implementation
  *
  * Copyright 1999 Corel Corporation
  * Copyright 2002 CodeWeavers Inc.
@@ -1288,7 +1288,7 @@ static DWORD HTTP_HttpAddRequestHeadersW(http_request_t *request,
  * NOTE
  * On Windows if dwHeaderLength includes the trailing '\0', then
  * HttpAddRequestHeadersW() adds it too. However this results in an
- * invalid Http header which is rejected by some servers so we probably
+ * invalid HTTP header which is rejected by some servers so we probably
  * don't need to match Windows on that point.
  *
  * RETURNS
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 3e67ec3..28e9189 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -1,5 +1,5 @@
 /*
- * Wininet - Http tests
+ * Wininet - HTTP tests
  *
  * Copyright 2002 Aric Stewart
  * Copyright 2004 Mike McCormack
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index 8c49826..e77d641 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -125,7 +125,7 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage,
 	/* Parameters:
 	 * lParam1 = new position
 	 * lParam2 = from whence to seek (SEEK_SET, SEEK_CUR, SEEK_END)
-	 * Returns: new file postion, -1 on error
+	 * Returns: new file position, -1 on error
 	 */
 	ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2);
 	if (ret != -1)
@@ -210,7 +210,7 @@ static LRESULT CALLBACK mmioMemIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage,
 	/* Parameters:
 	 * lParam1 = new position
 	 * lParam2 = from whence to seek (SEEK_SET, SEEK_CUR, SEEK_END)
-	 * Returns: new file postion, -1 on error
+	 * Returns: new file position, -1 on error
 	 * NOTE: lDiskOffset should be updated
 	 */
 	FIXME("MMIOM_SEEK on memory files should not occur, buffer may be lost!\n");
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index 5fbd2b8..ce06d07 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -139,7 +139,7 @@ static BOOL spurious_message(LPMSG msg)
   return FALSE;
 }
 
-/* A single ok() in each code path allows to prefix this with todo_wine */
+/* A single ok() in each code path allows us to prefix this with todo_wine */
 #define test_notification(hwnd, command, type) test_notification_dbg(hwnd, command, type, __LINE__)
 static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, int line)
 {   /* Use type 0 as meaning no message */
diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c
index 553679e..16c0b1c 100644
--- a/dlls/winmm/tests/mcicda.c
+++ b/dlls/winmm/tests/mcicda.c
@@ -45,7 +45,7 @@ static BOOL spurious_message(LPMSG msg)
   return FALSE;
 }
 
-/* A single ok() in each code path allows to prefix this with todo_wine */
+/* A single ok() in each code path allows us to prefix this with todo_wine */
 #define test_notification(hwnd, command, type) test_notification_dbg(hwnd, command, type, __LINE__)
 static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, int line)
 {   /* Use type 0 as meaning no message */
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 26ac410..890a3f0 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -1027,9 +1027,9 @@ static	BOOL	MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI
             break;
 	/* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent
 	 * by native mcimidi, it doesn't look like a correct one".
-	 * this trick allows to throw it away... but I don't like it.
+	 * this trick allows us to throw it away... but I don't like it.
 	 * It looks like part of the file I'm trying to play and definitively looks
-	 * like raw midi content
+	 * like raw midi content.
 	 * I'd really like to understand why native mcimidi sends it. Perhaps a bad
 	 * synchronization issue where native mcimidi is still processing raw MIDI
 	 * content before generating MIDIEVENTs ?
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 21e084b..447d501 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -6243,7 +6243,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString,
 /***********************************************************************
  *              WSAStringToAddressW                      (WS2_32.81)
  *
- * Does anybody know if this function allows to use Hebrew/Arabic/Chinese... digits?
+ * FIXME: Does anybody know if this function allows using Hebrew/Arabic/Chinese... digits?
  * If this should be the case, it would be required to map these digits
  * to Unicode digits (0-9) using FoldString first.
  */
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index e9814e3..f87a3f2 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3023,7 +3023,7 @@ static void test_ioctlsocket(void)
     ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n");
     ok(arg, "SIOCATMARK expected a non-zero value\n");
 
-    /* disable SO_OOBINLINE and get the same old bahavior */
+    /* disable SO_OOBINLINE and get the same old behavior */
     optval = 0;
     ret = setsockopt(sock, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval));
     ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n");
@@ -3749,7 +3749,7 @@ static void test_events(int useMessages)
     ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError());
     ok_event_seq(src, hEvent, empty_seq, NULL, 0);
 
-    /* fun fact - events are reenabled even on failure, but only for messages */
+    /* fun fact - events are re-enabled even on failure, but only for messages */
     ret = send(dst, "1", 1, 0);
     ok(ret == 1, "Failed to send buffer %d err %d\n", ret, GetLastError());
     ok_event_seq(src, hEvent, read_seq, NULL, 0);
diff --git a/programs/regedit/regedit.man.in b/programs/regedit/regedit.man.in
index 963adc2..b2f7066 100644
--- a/programs/regedit/regedit.man.in
+++ b/programs/regedit/regedit.man.in
@@ -17,13 +17,13 @@ the whole registry if no key is specified.
 .IP "\-D " regpath
 Deletes the specified registry key.
 .IP \-S
-Run regedit silently (ignored, CLI mode is always silent). This exists for compatability with Windows regedit.
+Run regedit silently (ignored, CLI mode is always silent). This exists for compatibility with Windows regedit.
 .IP \-V
-Run regedit in advanced mode (ignored). This exists for compatability with Windows regedit.
+Run regedit in advanced mode (ignored). This exists for compatibility with Windows regedit.
 .IP  "\-L " location
-Specifies the location of the system.dat registry file (ignored). This exists for compatability with Windows regedit.
+Specifies the location of the system.dat registry file (ignored). This exists for compatibility with Windows regedit.
 .IP "\-R " location
-Specifies the location of the user.dat registry file (ignored). This exists for compatability with Windows regedit.
+Specifies the location of the user.dat registry file (ignored). This exists for compatibility with Windows regedit.
 .IP  \-?
 Prints a help message. Any other options are ignored.
 .IP  \-C \fIfile.reg\fR
diff --git a/programs/services/rpc.c b/programs/services/rpc.c
index 579602a..9031430 100644
--- a/programs/services/rpc.c
+++ b/programs/services/rpc.c
@@ -1058,7 +1058,7 @@ DWORD __cdecl svcctl_ControlService(
     case SERVICE_START_PENDING:
         if (dwControl==SERVICE_CONTROL_STOP)
             break;
-        /* fall thru */
+        /* fall through */
     case SERVICE_STOP_PENDING:
         result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL;
         break;
diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c
index 852ac60..98e057b 100644
--- a/programs/winecfg/driveui.c
+++ b/programs/winecfg/driveui.c
@@ -462,7 +462,7 @@ static void update_controls(HWND dialog)
     EnableWindow( GetDlgItem( dialog, IDC_BUTTON_BROWSE_PATH ), (current_drive->letter != 'C') );
     EnableWindow( GetDlgItem( dialog, IDC_COMBO_TYPE ), (current_drive->letter != 'C') );
 
-    /* removeable media properties */
+    /* removable media properties */
     set_textW(dialog, IDC_EDIT_LABEL, current_drive->label ? current_drive->label : emptyW);
 
     /* set serial edit text */
diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c
index 46963ce..8a07e3a 100644
--- a/programs/wineconsole/user.c
+++ b/programs/wineconsole/user.c
@@ -1045,7 +1045,7 @@ static void    WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down,
         {
         case 2:
             /* FIXME... should generate two events... */
-            /* fall thru */
+            /* fall through */
         case 1:
             last = buf[0];
             break;
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 70c7a83..bda69a4 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -377,8 +377,8 @@ void     WINECON_SetConfig(struct inner_data* data, const struct config_data* cf
     {
         CONSOLE_CURSOR_INFO cinfo;
         cinfo.dwSize = cfg->cursor_size;
-        /* <FIXME>: this hack is needed to pass thru the invariant test operation on server side
-         * (no notification is sent when invariant operation is requested
+        /* <FIXME>: this hack is needed to pass through the invariant test operation on the server side
+         * (no notification is sent when invariant operation is requested)
          */
         cinfo.bVisible = !cfg->cursor_visible;
         SetConsoleCursorInfo(data->hConOut, &cinfo);
diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c
index 9205bad..28f41c5 100644
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@@ -1,7 +1,7 @@
 /*
- * A Win32 based proxy implementing the GBD remote protocol
- * This allows to debug Wine (and any "emulated" program) under
- * Linux using GDB
+ * A Win32 based proxy implementing the GBD remote protocol.
+ * This makes it possible to debug Wine (and any "emulated"
+ * program) under Linux using GDB.
  *
  * Copyright (c) Eric Pouech 2002-2004
  *
@@ -429,7 +429,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e
         ret = TRUE;
         break;
     case EXCEPTION_SINGLE_STEP:
-        /* fall thru */
+        /* fall through */
     case EXCEPTION_BREAKPOINT:
         gdbctx->last_sig = SIGTRAP;
         ret = TRUE;
@@ -1087,7 +1087,7 @@ static enum packet_return packet_verbose_cont(struct gdb_context* gdbctx)
          * (they're running winedbg, so I'm sure they can fix the problem from the error message!) */
         if (threadCount == 100)
         {
-            fprintf(stderr, "Wow, that's a lot of threads, change threadIDs in wine/programms/winedbg/gdbproxy.c to be higher\n");
+            fprintf(stderr, "Wow, that's a lot of threads, change threadIDs in wine/programs/winedbg/gdbproxy.c to be higher\n");
             break;
         }
     }
@@ -2133,16 +2133,16 @@ static BOOL extract_packets(struct gdb_context* gdbctx)
             }
             else 
             {
-                /* FIXME: if we have in our input buffer more than one packet, 
+                /* FIXME: If we have more than one packet in our input buffer,
                  * it's very likely that we took too long to answer to a given packet
-                 * and gdb is sending us again the same packet
-                 * We simply drop the second packet. This will lower the risk of error, 
-                 * but there's still some race conditions here
+                 * and gdb is sending us the same packet again.
+                 * So we simply drop the second packet. This will lower the risk of error,
+                 * but there's still some race conditions here.
                  * A better fix (yet not perfect) would be to have two threads:
                  * - one managing the packets for gdb
                  * - the second one managing the commands...
-                 * This would allow us also the reply with the '+' character (Ack of
-                 * the command) way sooner than what we do now
+                 * This would allow us to send the reply with the '+' character (Ack of
+                 * the command) way sooner than we do now.
                  */
                 if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL)
                     fprintf(stderr, "Dropping packet, I was too slow to respond\n");
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 7e63727..45e238c 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -35,11 +35,11 @@
  *
  * - minidump
  *      + ensure that all commands work as expected in minidump reload function
- *        (and reenable parser usager)
+ *        (and re-enable parser usage)
  * - CPU adherence
- *      + we always assume the stack grows as on i386 (ie downwards)
+ *      + we always assume the stack grows as on i386 (i.e. downwards)
  * - UI
- *      + enable back the limited output (depth of structure printing and number of 
+ *      + re-enable the limited output (depth of structure printing and number of
  *        lines)
  *      + make the output as close as possible to what gdb does
  * - symbol management:
diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in
index 1155111..af2de32 100644
--- a/programs/winedbg/winedbg.man.in
+++ b/programs/winedbg/winedbg.man.in
@@ -65,8 +65,8 @@ the command line, or generated by \fBWineDbg\fR when none is given.
 This file could later on be reloaded into \fBwinedbg\fR for further
 examination.
 .IP \fBfile.mdmp\fR
-This mode allows to reload into \fBwinedbg\fR the state of a debuggee
-which has been saved into a minidump file. See either the \fBminidump\fR
+In this mode \fBwinedbg\fR reloads the state of a debuggee which
+has been saved into a minidump file. See either the \fBminidump\fR
 command below, or the \fB--minidump mode\fR.
 
 .SH OPTIONS
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 294ef15..09b3908 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -31,7 +31,7 @@
  * between the user's desktop/start menu and the "All Users" copies.
  *
  *  This program will read a Windows shortcut file using the IShellLink
- * interface, then create a KDE/Gnome menu entry for the shortcut.
+ * interface, then create a KDE/GNOME menu entry for the shortcut.
  *
  *  winemenubuilder [ -w ] <shortcut.lnk>
  *
@@ -1172,8 +1172,8 @@ static void refresh_icon_cache(const char *iconsDir)
 {
     /* The icon theme spec only requires the mtime on the "toplevel"
      * directory (whatever that is) to be changed for a refresh,
-     * but on Gnome you have to create a file in that directory
-     * instead. Creating a file also works on KDE, XFCE and LXDE.
+     * but on GNOME you have to create a file in that directory
+     * instead. Creating a file also works on KDE, Xfce and LXDE.
      */
     char *filename = heap_printf("%s/.wine-refresh-XXXXXX", iconsDir);
     if (filename != NULL)
@@ -2590,7 +2590,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package
 
                 if (mimeTypeA != NULL)
                 {
-                    /* Gnome seems to ignore the <icon> tag in MIME packages,
+                    /* GNOME seems to ignore the <icon> tag in MIME packages,
                      * and the default name is more intuitive anyway.
                      */
                     if (iconW)
diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c
index b34c42f..e5248a3 100644
--- a/programs/winhlp32/hlpfile.c
+++ b/programs/winhlp32/hlpfile.c
@@ -1536,7 +1536,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
                     {
                     case 0x22:
                         fetch_ushort(&format); /* hot spot */
-                        /* fall thru */
+                        /* fall through */
                     case 0x03:
                         switch (GET_SHORT(format, 0))
                         {
diff --git a/server/protocol.def b/server/protocol.def
index 31a3b0d..33cbb30 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -731,7 +731,7 @@ typedef union
 @END
 
 
-/* Set a process informations */
+/* Set a process information */
 @REQ(set_process_info)
     obj_handle_t handle;       /* process handle */
     int          mask;         /* setting mask (see below) */
@@ -759,7 +759,7 @@ typedef union
 @END
 
 
-/* Set a thread informations */
+/* Set a thread information */
 @REQ(set_thread_info)
     obj_handle_t handle;       /* thread handle */
     int          mask;         /* setting mask (see below) */
@@ -1154,7 +1154,7 @@ enum server_fd_type
 @END
 
 
-/* Reenable pending socket events */
+/* Re-enable pending socket events */
 @REQ(enable_socket_event)
     obj_handle_t handle;        /* handle to the socket */
     unsigned int mask;          /* events to re-enable */
@@ -1348,7 +1348,7 @@ struct console_renderer_event
     short int    height;        /* height of the screen buffer */
     short int    attr;          /* default attribute */
     short int    win_left;      /* window actually displayed by renderer */
-    short int    win_top;       /* the rect area is expressed withing the */
+    short int    win_top;       /* the rect area is expressed within the */
     short int    win_right;     /* boundaries of the screen buffer */
     short int    win_bottom;
     short int    max_width;     /* maximum size (width x height) for the window */
@@ -1374,7 +1374,7 @@ struct console_renderer_event
     short int    height;        /* height of the screen buffer */
     short int    attr;          /* default attribute */
     short int    win_left;      /* window actually displayed by renderer */
-    short int    win_top;       /* the rect area is expressed withing the */
+    short int    win_top;       /* the rect area is expressed within the */
     short int    win_right;     /* boundaries of the screen buffer */
     short int    win_bottom;
     short int    max_width;     /* maximum size (width x height) for the window */
diff --git a/tools/c2man.pl b/tools/c2man.pl
index 7eca8c4..96bedd5 100755
--- a/tools/c2man.pl
+++ b/tools/c2man.pl
@@ -1486,7 +1486,7 @@ sub output_api_synopsis($)
   # Since our prototype is output in a pre-formatted block, line up the
   # parameters and parameter comments in the same column.
 
-  # First caluculate where the columns should start
+  # First calculate where the columns should start
   my $biggest_length = 0;
   for(my $i=0; $i < @{$comment->{PROTOTYPE}}; $i++)
   {
@@ -1814,8 +1814,8 @@ sub output_master_index_files()
   my $comment =
   {
     FILE => "",
-    COMMENT_NAME => "The Wine Api Guide",
-    ALT_NAME => "The Wine Api Guide",
+    COMMENT_NAME => "The Wine API Guide",
+    ALT_NAME => "The Wine API Guide",
     DLL_NAME => "",
     ORDINAL => "",
     RETURNS => "",
@@ -1839,15 +1839,15 @@ sub output_master_index_files()
 
   # Create the initial comment text
   push (@{$comment->{TEXT}},
-    "This document describes the Api calls made available",
+    "This document describes the API calls made available",
     "by Wine. They are grouped by the dll that exports them.",
     "",
     "Please do not edit this document, since it is generated automatically",
     "from the Wine source code tree. Details on updating this documentation",
     "are given in the \"Wine Developers Guide\".",
     "CONTRIBUTORS",
-    "Api documentation is generally written by the person who ",
-    "implements a given Api call. Authors of each dll are listed in the overview ",
+    "API documentation is generally written by the person who ",
+    "implements a given API call. Authors of each dll are listed in the overview ",
     "section for that dll. Additional contributors who have updated source files ",
     "but have not entered their names in a copyright statement are noted by an ",
     "entry in the file \"Changelog\" from the Wine source code distribution.",
@@ -1884,7 +1884,7 @@ sub output_master_index_files()
   {
     # Just write this as the initial blurb, with a chapter heading
     output_open_api_file("blurb");
-    print OUTPUT "<chapter id =\"blurb\">\n<title>Introduction to The Wine Api Guide</title>\n"
+    print OUTPUT "<chapter id =\"blurb\">\n<title>Introduction to The Wine API Guide</title>\n"
   }
 
   # Write out the document
@@ -1934,7 +1934,7 @@ sub output_xml_master_file($)
     print OUTPUT "<!ENTITY ",$_," SYSTEM \"",$_,".xml\">\n"
   }
 
-  print OUTPUT "]>\n\n<book id=\"index\">\n<bookinfo><title>The Wine Api Guide</title></bookinfo>\n\n";
+  print OUTPUT "]>\n\n<book id=\"index\">\n<bookinfo><title>The Wine API Guide</title></bookinfo>\n\n";
   print OUTPUT "  &blurb;\n";
 
   for (@$dlls)
@@ -1963,7 +1963,7 @@ sub output_sgml_master_file($)
     print OUTPUT "<!entity ",$_," SYSTEM \"",$_,".sgml\">\n"
   }
 
-  print OUTPUT "]>\n\n<book id=\"index\">\n<bookinfo><title>The Wine Api Guide</title></bookinfo>\n\n";
+  print OUTPUT "]>\n\n<book id=\"index\">\n<bookinfo><title>The Wine API Guide</title></bookinfo>\n\n";
   print OUTPUT "  &blurb;\n";
 
   for (@$dlls)
@@ -2238,7 +2238,7 @@ sub usage()
         "       The above can be given multiple times on the command line, as appropriate.\n",
         "Options:\n",
         " -Th      : Output HTML instead of a man page\n",
-        " -Ts      : Output SGML (Docbook source) instead of a man page\n",
+        " -Ts      : Output SGML (DocBook source) instead of a man page\n",
         " -C <dir> : Source directory, to find source files if they are not found in the\n",
         "            current directory. Default is \"",$opt_source_dir,"\"\n",
         " -R <dir> : Root of build directory, default is \"",$opt_wine_root_dir,"\"\n",
diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l
index a1ef1cf..cf16ccc 100644
--- a/tools/wrc/parser.l
+++ b/tools/wrc/parser.l
@@ -33,7 +33,7 @@
  *			  both single and double slash is recognized as
  *			  MS/Borland does.
  *			- Fixed a bug in 'yywf' case that prevented
- *			  double quoted names to be scanned propperly.
+ *			  double quoted names to be scanned properly.
  *
  * 19-May-1998 BS	- Started to build a preprocessor.
  *			- Changed keyword processing completely to
-- 
1.7.10




More information about the wine-patches mailing list