Assorted spelling fixes.

Francois Gouget fgouget at free.fr
Wed Jan 16 05:20:50 CST 2008


---

A spelling fix round mostly inspired from Austin English's recent fixes. 
I believe I've removed all the parts that could interfer with his 
pending patches.

 dlls/cabinet/fci.c              |    2 +-
 dlls/comctl32/listview.c        |    2 +-
 dlls/comctl32/tests/datetime.c  |    2 +-
 dlls/comctl32/treeview.c        |    2 +-
 dlls/d3d9/tests/visual.c        |    2 +-
 dlls/dbghelp/stabs.c            |    2 +-
 dlls/ddraw/device.c             |    2 +-
 dlls/ddraw/direct3d.c           |    2 +-
 dlls/dmstyle/style.c            |    2 +-
 dlls/dplayx/dplayx_messages.c   |    4 ++--
 dlls/dplayx/dplayx_queue.h      |    2 +-
 dlls/gdi32/bidi.c               |    2 +-
 dlls/gdi32/dib.c                |    2 +-
 dlls/gdi32/metafile.c           |    2 +-
 dlls/kernel32/cpu.c             |    2 +-
 dlls/kernel32/locale.c          |    2 +-
 dlls/mshtml/nsio.c              |    2 +-
 dlls/mshtml/nsservice.c         |    2 +-
 dlls/msi/tests/db.c             |    2 +-
 dlls/msxml3/attribute.c         |    2 +-
 dlls/msxml3/cdata.c             |    2 +-
 dlls/msxml3/comment.c           |    2 +-
 dlls/msxml3/pi.c                |    2 +-
 dlls/ntdll/serial.c             |    2 +-
 dlls/odbc32/proxyodbc.c         |    2 +-
 dlls/oleaut32/tests/vartype.c   |    2 +-
 dlls/oleaut32/typelib.h         |   10 +++++-----
 dlls/oleaut32/variant.c         |   10 +++++-----
 dlls/qcap/dllsetup.c            |    2 +-
 dlls/qcap/dllsetup.h            |    2 +-
 dlls/setupapi/stringtable.c     |    2 +-
 dlls/shell32/autocomplete.c     |    2 +-
 dlls/shell32/brsfolder.c        |    4 ++--
 dlls/shell32/dataobject.c       |    2 +-
 dlls/shell32/iconcache.c        |    2 +-
 dlls/shell32/pidl.c             |    2 +-
 dlls/shell32/pidl.h             |    2 +-
 dlls/shell32/shfldr_fs.c        |    2 +-
 dlls/shell32/shfldr_netplaces.c |    2 +-
 dlls/shell32/shfldr_unixfs.c    |    8 ++++----
 dlls/shell32/shlexec.c          |    2 +-
 dlls/shell32/shlfolder.c        |    2 +-
 dlls/shell32/shlview.c          |    6 +++---
 dlls/shell32/trash.c            |    2 +-
 dlls/shlwapi/url.c              |    2 +-
 dlls/user32/comm16.c            |    2 +-
 dlls/user32/dde_client.c        |    6 +++---
 dlls/user32/dde_misc.c          |    2 +-
 dlls/user32/defdlg.c            |    4 ++--
 dlls/user32/mdi.c               |    2 +-
 dlls/user32/tests/dialog.c      |    2 +-
 dlls/uxtheme/msstyles.c         |    4 ++--
 dlls/uxtheme/tests/system.c     |    6 +++---
 dlls/winealsa.drv/alsa.c        |    2 +-
 dlls/wineesd.drv/audio.c        |    2 +-
 dlls/wineoss.drv/audio.h        |    2 +-
 dlls/wineoss.drv/midi.c         |    2 +-
 dlls/winex11.drv/wintab.c       |    4 ++--
 dlls/wininet/tests/url.c        |   12 ++++++------
 dlls/ws2_32/socket.c            |    2 +-
 include/mmsystem.h              |    2 +-
 include/wine/rpcss_shared.h     |    2 +-
 include/wine/wingdi16.h         |    2 +-
 include/winternl.h              |    2 +-
 libs/wpp/wpp.c                  |    2 +-
 libs/wpp/wpp_private.h          |    2 +-
 programs/cmd/batch.c            |    2 +-
 programs/cmd/wcmdmain.c         |    2 +-
 programs/taskmgr/graphctl.c     |    4 ++--
 programs/winhelp/hlpfile.c      |    2 +-
 70 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c
index 55c219d..db24ddc 100644
--- a/dlls/cabinet/fci.c
+++ b/dlls/cabinet/fci.c
@@ -86,7 +86,7 @@ typedef struct {
   cab_UWORD cCFData;      /* number of this folder's CFDATA sections */
   cab_UWORD typeCompress; /* compression type of data in CFDATA section*/
   /* additional area if reserve flag was set */
-} CFFOLDER; /* minumum 8 bytes */
+} CFFOLDER; /* minimum 8 bytes */
 
 typedef struct {
   cab_ULONG cbFile;          /* size of the uncompressed file in bytes */
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 3abdd23..0c27885 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -7596,7 +7596,7 @@ static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM l
  * PARAMETER(S):
  * [I] infoPtr : valid pointer to the listview structure
  * [I] pfnCompare : application-defined value
- * [I] lParamSort : pointer to comparision callback
+ * [I] lParamSort : pointer to comparison callback
  *
  * RETURN:
  *   SUCCESS : TRUE
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 956f16e..d13abc6 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -311,7 +311,7 @@ static void test_dtm_set_and_get_range(HWND hWndDateTime)
 
     /* initialize st[0] to lowest possible value */
     fill_systime_struct(&st[0], 1601, 1, 0, 1, 0, 0, 0, 0);
-    /* intialize st[1] to all invalid numbers */
+    /* initialize st[1] to all invalid numbers */
     fill_systime_struct(&st[1], 0, 0, 7, 0, 24, 60, 60, 1000);
 
     r = SendMessage(hWndDateTime, DTM_SETRANGE, GDTR_MIN, (LPARAM)st);
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 25c2f22..2801969 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -169,7 +169,7 @@ typedef struct tagTREEVIEW_INFO
 #define TV_VSCROLL 	0x02	/* (horizontal/vertical) */
 #define TV_LDRAG		0x04	/* Lbutton pushed to start drag */
 #define TV_LDRAGGING	0x08	/* Lbutton pushed, mouse moved. */
-#define TV_RDRAG		0x10	/* dito Rbutton */
+#define TV_RDRAG		0x10	/* ditto Rbutton */
 #define TV_RDRAGGING	0x20
 
 /* bitflags for infoPtr->timer */
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 4fae64b..4cc07c8 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -5646,7 +5646,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device)
     /* The following test with vertex buffers doesn't serve to find out new information from windows.
      * It is a plain regression test because wined3d uses different codepaths for attribute conversion
      * with vertex buffers. It makes sure that the vertex buffer one works, while the above tests
-     * wether the immediate mode code works
+     * whether the immediate mode code works
      */
     hr = IDirect3DDevice9_BeginScene(device);
     ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed (%08x)\n", hr);
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index 8f651b1..c17dae6 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -498,7 +498,7 @@ static int stabs_pts_read_range(struct ParseTypedefData* ptd, const char* typena
     PTS_ABORTIF(ptd, *ptd->ptr++ != ';');	/* ';' */
 
     /* basically, we don't use ref... in some cases, for example, float is declared
-     * as a derivated type of int... which won't help us... so we guess the types
+     * as a derived type of int... which won't help us... so we guess the types
      * from the various formats
      */
     if (lo.sign == 0 && hi.sign < 0)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 135d6e9..a22d611 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -603,7 +603,7 @@ Thunk_IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface,
  *
  * This method seems to retrieve some stats from the device.
  * The MSDN documentation doesn't exist any more, but the D3DSTATS
- * structure suggests that the amout of drawn primitives and processed
+ * structure suggests that the amount of drawn primitives and processed
  * vertices is returned.
  *
  * Exists in Version 1, 2 and 3
diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c
index ef31046..a89dcb4 100644
--- a/dlls/ddraw/direct3d.c
+++ b/dlls/ddraw/direct3d.c
@@ -334,7 +334,7 @@ IDirect3DImpl_3_EnumDevices(IDirect3D3 *iface,
      * Some games(GTA 2) seem to use the second enumerated device, so I have to enumerate
      * at least 2 devices. So enumerate the reference device to have 2 devices.
      *
-     * Other games(Rollcage) tell emulation and hal device appart by certain flags.
+     * Other games(Rollcage) tell emulation and hal device apart by certain flags.
      * Rollcage expects D3DPTEXTURECAPS_POW2 to be set(yeah, it is a limitation flag),
      * and it refuses all devices that have the perspective flag set. This way it refuses
      * the emulation device, and HAL devices never have POW2 unset in d3d7 on windows.
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index f91de09..484aaa8 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -750,7 +750,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
       break;
     }
     case DMUS_FOURCC_MOTIFSETTINGS_CHUNK: {
-      TRACE_(dmfile)(": MotifSettigns chunk (skipping for now)\n");
+      TRACE_(dmfile)(": MotifSettings chunk (skipping for now)\n");
       IStream_Read (pStm, &pNewMotif->settings, Chunk.dwSize, NULL);
       /** TODO trace settings */
       break;
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index b47928b..de44443 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -138,7 +138,7 @@ static DWORD CALLBACK DPL_MSG_ThreadMain( LPVOID lpContext )
   CloseHandle( lpThreadInfo->hSettingRead );
   lpThreadInfo->hSettingRead = 0;
 
-  TRACE( "App created && intialized starting main message reception loop\n" );
+  TRACE( "App created && initialized starting main message reception loop\n" );
 
   for ( ;; )
   {
@@ -246,7 +246,7 @@ HRESULT DP_MSG_SendRequestPlayerId( IDirectPlay2AImpl* This, DWORD dwFlags,
     /* FIXME: I think that the rest of the message has something to do
      *        with remote data for the player that perhaps I need to setup.
      *        However, with the information that is passed, all that it could
-     *        be used for is a standardized intialization value, which I'm
+     *        be used for is a standardized initialization value, which I'm
      *        guessing we can do without. Unless the message content is the same
      *        for several different messages?
      */
diff --git a/dlls/dplayx/dplayx_queue.h b/dlls/dplayx/dplayx_queue.h
index cfde9df..7820717 100644
--- a/dlls/dplayx/dplayx_queue.h
+++ b/dlls/dplayx/dplayx_queue.h
@@ -174,7 +174,7 @@ do {                                                           \
  * elm  - how to find the next element
  * field - to be concatenated to rc to compare with fieldToCompare
  * fieldToCompare - The value that we're comparing against
- * compare_cb - Callback to invoke to determine if comparision should continue.
+ * compare_cb - Callback to invoke to determine if comparison should continue.
  *              Callback must be defined with DPQ_DECL_COMPARECB.
  * rc - Variable to put the return code. Same type as (head).lpQHFirst
  */
diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c
index b5fd469..f53ac26 100644
--- a/dlls/gdi32/bidi.c
+++ b/dlls/gdi32/bidi.c
@@ -454,7 +454,7 @@ static const int actionWeak[][10] =
 {
        /*  N,   L,   R,  AN,  EN,  AL, NSM,  CS,  ES,  ET */
 /*xa*/ { xxx, xxx, xxx, xxx, xxA, xxR, xxR, xxN, xxN, xxN }, /* arabic letter           */
-/*xr*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxR, xxN, xxN, xIx }, /* right leter             */
+/*xr*/ { xxx, xxx, xxx, xxx, xxE, xxR, xxR, xxN, xxN, xIx }, /* right letter            */
 /*xl*/ { xxx, xxx, xxx, xxx, xxL, xxR, xxL, xxN, xxN, xIx }, /* left letter             */
 
 /*ao*/ { xxx, xxx, xxx, xxx, xxA, xxR, xxN, xxN, xxN, xxN }, /* arabic lett. foll by ON */
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c
index cb64546..799bcd8 100644
--- a/dlls/gdi32/dib.c
+++ b/dlls/gdi32/dib.c
@@ -1173,7 +1173,7 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, const BITMAPINFO *bmi, UINT16 us
     return HBITMAP_16(hbitmap);
 }
 
-/* Copy/synthetize RGB palette from BITMAPINFO. Ripped from dlls/winex11.drv/dib.c */
+/* Copy/synthesize RGB palette from BITMAPINFO. Ripped from dlls/winex11.drv/dib.c */
 static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BITMAPINFO *info )
 {
     RGBQUAD *colorTable;
diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c
index d04a03d..57add72 100644
--- a/dlls/gdi32/metafile.c
+++ b/dlls/gdi32/metafile.c
@@ -294,7 +294,7 @@ METAHEADER *MF_LoadDiskBasedMetaFile(METAHEADER *mh)
  *         MF_CreateMetaHeaderDisk
  *
  * Take a memory based METAHEADER and change it to a disk based METAHEADER
- * assosiated with filename.  Note: Trashes contents of old one.
+ * associated with filename.  Note: Trashes contents of old one.
  */
 METAHEADER *MF_CreateMetaHeaderDisk(METAHEADER *mh, LPCVOID filename, BOOL uni )
 {
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index eed4cdd..d9a704b 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -730,7 +730,7 @@ VOID WINAPI GetSystemInfo(
 			    case CPU_SUBTYPE_POWERPC_750:
 			    case CPU_SUBTYPE_POWERPC_7400:
 			    case CPU_SUBTYPE_POWERPC_7450:
-				/* G3/G4 derivate from 603 so ... */
+				/* G3/G4 derive from 603 so ... */
 				cachedsi.dwProcessorType = PROCESSOR_PPC_603;
 				cachedsi.wProcessorLevel = 6;
 				break;
diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index ea39c52..a8bd099 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -1956,7 +1956,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen,
  *  None.
  *
  * RETURNS
- *  The LCID currently assocated with the calling thread.
+ *  The LCID currently associated with the calling thread.
  */
 LCID WINAPI GetThreadLocale(void)
 {
diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 0385f4a..c900bd9 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -2187,7 +2187,7 @@ static nsresult NSAPI nsIOServiceFactory_QueryInterface(nsIFactory *iface, nsIID
     *result = NULL;
 
     if(IsEqualGUID(&IID_nsISupports, riid)) {
-        TRACE("(IID_nsISupoprts %p)\n", result);
+        TRACE("(IID_nsISupports %p)\n", result);
         *result = iface;
     }else if(IsEqualGUID(&IID_nsIFactory, riid)) {
         TRACE("(IID_nsIFactory %p)\n", result);
diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c
index 2412855..a449274 100644
--- a/dlls/mshtml/nsservice.c
+++ b/dlls/mshtml/nsservice.c
@@ -394,7 +394,7 @@ static nsresult NSAPI nsServiceFactory_QueryInterface(nsIFactory *iface, nsIIDRe
     *result = NULL;
 
     if(IsEqualGUID(&IID_nsISupports, riid)) {
-        TRACE("(%p)->(IID_nsISupoprts %p)\n", This, result);
+        TRACE("(%p)->(IID_nsISupports %p)\n", This, result);
         *result = NSFACTORY(This);
     }else if(IsEqualGUID(&IID_nsIFactory, riid)) {
         TRACE("(%p)->(IID_nsIFactory %p)\n", This, result);
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index a327ced..85b65d7 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -2324,7 +2324,7 @@ static void test_try_transform(void)
     DeleteFileA("testdata.bin");
 
     /*
-     * Both these generate an equivilent transform,
+     * Both these generate an equivalent transform,
      *  but the first doesn't work in Wine yet
      *  because MsiDatabaseGenerateTransform is unimplemented.
      */
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index 6898299..2409aa6 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI domattr_QueryInterface(
     }
     else
     {
-        FIXME("Unsupported inteferace %s\n", debugstr_guid(riid));
+        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
         return E_NOINTERFACE;
     }
 
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index b46d851..4589896 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -71,7 +71,7 @@ static HRESULT WINAPI domcdata_QueryInterface(
     }
     else
     {
-        FIXME("Unsupported inteferace %s\n", debugstr_guid(riid));
+        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
         return E_NOINTERFACE;
     }
 
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index f9fc927..6359885 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI domcomment_QueryInterface(
     }
     else
     {
-        FIXME("Unsupported inteferace %s\n", debugstr_guid(riid));
+        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
         return E_NOINTERFACE;
     }
 
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index 3f997e2..ec70746 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -70,7 +70,7 @@ static HRESULT WINAPI dom_pi_QueryInterface(
     }
     else
     {
-        FIXME("Unsupported inteferace %s\n", debugstr_guid(riid));
+        FIXME("Unsupported interface %s\n", debugstr_guid(riid));
         return E_NOINTERFACE;
     }
 
diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c
index 2ca604d..774f2ee 100644
--- a/dlls/ntdll/serial.c
+++ b/dlls/ntdll/serial.c
@@ -1360,7 +1360,7 @@ NTSTATUS COMM_DeviceIoControl(HANDLE hDevice,
 
         /* this is an ioctl we implement in a non blocking way if hEvent is not
          * null
-         * so we have to explicitely wait if no hEvent is provided
+         * so we have to explicitly wait if no hEvent is provided
          */
         if (!hev)
         {
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 27941fe..6357ce3 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -703,7 +703,7 @@ SQLRETURN WINAPI SQLAllocStmt(SQLHDBC ConnectionHandle, SQLHSTMT *StatementHandl
 SQLRETURN WINAPI SQLAllocHandleStd( SQLSMALLINT HandleType,
                                                          SQLHANDLE InputHandle, SQLHANDLE *OutputHandle)
 {
-        TRACE("ProxyODBC: SQLAllocHandelStd.\n");
+        TRACE("ProxyODBC: SQLAllocHandleStd.\n");
 
         if (!gProxyHandle.bFunctionReady || gProxyHandle.dmHandle == NULL)
         {
diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c
index 2292036..b2ad415 100644
--- a/dlls/oleaut32/tests/vartype.c
+++ b/dlls/oleaut32/tests/vartype.c
@@ -4933,7 +4933,7 @@ static void test_VarBstrCmp(void)
     VARBSTRCMP(bstr,NULL,0,VARCMP_GT);
     VARBSTRCMP(NULL,bstr,0,VARCMP_LT);
 
-    /* NULL and empty string comparisions */
+    /* NULL and empty string comparisons */
     VARBSTRCMP(bstrempty,NULL,0,VARCMP_EQ);
     VARBSTRCMP(NULL,bstrempty,0,VARCMP_EQ);
 
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index fc1cba0..b25f031 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -96,13 +96,13 @@ typedef struct tagMSFT_SegDir {
 /*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */
                              /* (25 ints) */
 /*2*/MSFT_pSeg pImpInfo;     /* table with info for imported types */
-/*3*/MSFT_pSeg pImpFiles;    /* import libaries */
+/*3*/MSFT_pSeg pImpFiles;    /* import libraries */
 /*4*/MSFT_pSeg pRefTab;      /* References table */
-/*5*/MSFT_pSeg pLibtab;      /* always exists, alway same size (0x80) */
+/*5*/MSFT_pSeg pLibtab;      /* always exists, always same size (0x80) */
                              /* hash table w offsets to guid????? */
 /*6*/MSFT_pSeg pGuidTab;     /* all guids are stored here together with  */
                              /* offset in some table???? */
-/*7*/MSFT_pSeg res07;        /* always created, alway same size (0x200) */
+/*7*/MSFT_pSeg res07;        /* always created, always same size (0x200) */
                              /* purpose largely unknown */
 /*8*/MSFT_pSeg pNametab;     /* name tables */
 /*9*/MSFT_pSeg pStringtab;   /* string table */
@@ -120,10 +120,10 @@ typedef struct tagMSFT_SegDir {
 /* base type info data */
 typedef struct tagMSFT_TypeInfoBase {
 /*000*/ INT   typekind;             /*  it is the TKIND_xxx */
-                                    /* some byte alignment stuf */
+                                    /* some byte alignment stuff */
         INT     memoffset;          /* points past the file, if no elements */
         INT     res2;               /* zero if no element, N*0x40 */
-        INT     res3;               /* -1 if no lement, (N-1)*0x38 */
+        INT     res3;               /* -1 if no element, (N-1)*0x38 */
 /*010*/ INT     res4;               /* always? 3 */
         INT     res5;               /* always? zero */
         INT     cElement;           /* counts elements, HI=cVars, LO=cFuncs */
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index c794b24..ac71445 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -2654,7 +2654,7 @@ static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest,
  *  left    [I] First variant
  *  right   [I] Second variant
  *  lcid    [I] LCID (locale identifier) for the comparison
- *  flags   [I] Flags to be used in the comparision:
+ *  flags   [I] Flags to be used in the comparison:
  *              NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS,
  *              NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA
  *
@@ -2677,9 +2677,9 @@ static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest,
  *  is not an EMPTY variant. All four VT_RESERVED combinations have a
  *  different meaning:
  *   - BSTR and other: BSTR is always greater than the other variant.
- *   - BSTR|VT_RESERVED and other: a string comparision is performed.
+ *   - BSTR|VT_RESERVED and other: a string comparison is performed.
  *   - BSTR and other|VT_RESERVED: If the BSTR is a number a numeric
- *     comparision will take place else the BSTR is always greater.
+ *     comparison will take place else the BSTR is always greater.
  *   - BSTR|VT_RESERVED and other|VT_RESERVED: It seems that the other
  *     variant is ignored and the return value depends only on the sign
  *     of the BSTR if it is a number else the BSTR is always greater. A
@@ -2763,7 +2763,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags)
                 /* No VT_RESERVED set ==> BSTR always greater */
                 rc = VARCMP_GT;
             else if (breserv && !nreserv) {
-                /* BSTR has VT_RESERVED set. Do a string comparision */
+                /* BSTR has VT_RESERVED set. Do a string comparison */
                 rc = VariantChangeTypeEx(&rv,nonbv,lcid,0,VT_BSTR);
                 if (FAILED(rc))
                     return rc;
@@ -2780,7 +2780,7 @@ HRESULT WINAPI VarCmp(LPVARIANT left, LPVARIANT right, LCID lcid, DWORD flags)
                        the BSTR number */
                     rc = (V_R8(&lv) >= 0) ? VARCMP_GT : VARCMP_LT;
                 else
-                    /* Numeric comparision, will be handled below.
+                    /* Numeric comparison, will be handled below.
                        VARCMP_NULL used only to break out. */
                     rc = VARCMP_NULL;
             VariantClear(&lv);
diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c
index ad3d84c..850e6b0 100644
--- a/dlls/qcap/dllsetup.c
+++ b/dlls/qcap/dllsetup.c
@@ -313,7 +313,7 @@ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num,
  * This function is table driven using the static members of the
  * CFactoryTemplate class defined in the Dll.
  *
- * It calls the intialize function for any class in CFactoryTemplate with
+ * It calls the initialize function for any class in CFactoryTemplate with
  * one defined.
  *
  ****************************************************************************/
diff --git a/dlls/qcap/dllsetup.h b/dlls/qcap/dllsetup.h
index c1bcf98..4b587ac 100644
--- a/dlls/qcap/dllsetup.h
+++ b/dlls/qcap/dllsetup.h
@@ -74,7 +74,7 @@ extern HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, BOO
  * This function is table driven using the static members of the
  * CFactoryTemplate class defined in the Dll.
  *
- * It calls the intialize function for any class in CFactoryTemplate with
+ * It calls the initialize function for any class in CFactoryTemplate with
  * one defined.
  *
  ****************************************************************************/
diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c
index 985e777..58a2530 100644
--- a/dlls/setupapi/stringtable.c
+++ b/dlls/setupapi/stringtable.c
@@ -348,7 +348,7 @@ StringTableDuplicate(HSTRING_TABLE hStringTable)
     pDestinationTable = MyMalloc(sizeof(STRING_TABLE));
     if (pDestinationTable == NULL)
     {
-        ERR("Cound not allocate a new string table!\n");
+        ERR("Could not allocate a new string table!\n");
         return (HSTRING_TABLE)NULL;
     }
 
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index c80069e..ebe6826 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -507,7 +507,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 		    if ( (This->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) 
 			 && (!IsWindowVisible(This->hwndListBox) && (! *hwndText)) )
 		    {
-			 /* We must dispays all the entries */
+			 /* We must display all the entries */
 			 displayall = TRUE;
 		    } else {
 			if (IsWindowVisible(This->hwndListBox)) {
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 7f73bec..358e95d 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -50,7 +50,7 @@ typedef struct tagbrowse_info
 typedef struct tagTV_ITEMDATA
 {
    LPSHELLFOLDER lpsfParent; /* IShellFolder of the parent */
-   LPITEMIDLIST  lpi;        /* PIDL relativ to parent */
+   LPITEMIDLIST  lpi;        /* PIDL relative to parent */
    LPITEMIDLIST  lpifq;      /* Fully qualified PIDL */
    IEnumIDList*  pEnumIL;    /* Children iterator */ 
 } TV_ITEMDATA, *LPTV_ITEMDATA;
@@ -245,7 +245,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR
  * PARAMS
  *  info       [I] data for the dialog
  *  lpsf       [I] IShellFolder interface of the item's parent shell folder 
- *  pidl       [I] ITEMIDLIST of the child to insert, relativ to parent 
+ *  pidl       [I] ITEMIDLIST of the child to insert, relative to parent 
  *  pidlParent [I] ITEMIDLIST of the parent shell folder
  *  pEnumIL    [I] Iterator for the children of the item to be inserted
  *  hParent    [I] The treeview-item that represents the parent shell folder
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index 9d42868..743904b 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -1,7 +1,7 @@
 /*
  *	IEnumFORMATETC, IDataObject
  *
- * selecting and droping objects within the shell and/or common dialogs
+ * selecting and dropping objects within the shell and/or common dialogs
  *
  *	Copyright 1998, 1999	<juergen.schmied at metronet.de>
  *
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 133a84a..7345010 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
 typedef struct
 {
 	LPWSTR sSourceFile;	/* file (not path!) containing the icon */
-	DWORD dwSourceIndex;	/* index within the file, if it is a resoure ID it will be negated */
+	DWORD dwSourceIndex;	/* index within the file, if it is a resource ID it will be negated */
 	DWORD dwListIndex;	/* index within the iconlist */
 	DWORD dwFlags;		/* GIL_* flags */
 	DWORD dwAccessTime;
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index d37cde1..18bfebf 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -62,7 +62,7 @@ extern BOOL WINAPI Free(LPVOID);
  *
  * PARAMS
  *  psf        [I]   Shell Folder to start with, if NULL the desktop is used
- *  pidl       [I]   ItemIDList relativ to the psf to get the display name for
+ *  pidl       [I]   ItemIDList relative to the psf to get the display name for
  *  path       [O]   Filled in with the display name, assumed to be at least MAX_PATH long
  *  type       [I]   Type of display name to retrieve
  *                    0 = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR uses always the desktop as root
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index 4b4de7b..18935e8 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -49,7 +49,7 @@
 * a pidl of NULL means the desktop
 *
 * The structure of the pidl seems to be a union. The first byte of the
-* PIDLDATA desribes the type of pidl.
+* PIDLDATA describes the type of pidl.
 *
 *	object        ! first byte /  ! format       ! living space
 *	              ! size
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 7de6ae8..2b0e407 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -1462,7 +1462,7 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface,
     This->pidlRoot = ILClone (pidlRoot);
 
     /*
-     *  the target folder is spezified in csidl OR pidlTargetFolder OR
+     *  the target folder is specified in csidl OR pidlTargetFolder OR
      *  szTargetParsingName
      */
     if (ppfti) {
diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c
index 51b5aad..4e4a753 100644
--- a/dlls/shell32/shfldr_netplaces.c
+++ b/dlls/shell32/shfldr_netplaces.c
@@ -3,7 +3,7 @@
  *
  *	Copyright 1997			Marcus Meissner
  *	Copyright 1998, 1999, 2002	Juergen Schmied
- *	Copyright 2003                  Mike McCormack for Codeweavers
+ *	Copyright 2003                  Mike McCormack for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index e4cea4a..6ec8d11 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -41,7 +41,7 @@
  * show up in the title bar of an application's window. They tend to accumulate
  * in the most-recently-used section of the file-menu. And I've even seen some
  * in a configuration dialog's edit control. In those examples, wine can't do a
- * lot about this, since path-names can't be told appart from ordinary strings
+ * lot about this, since path-names can't be told apart from ordinary strings
  * here. That's different in the file dialogs, though.
  *
  * With the introduction of the 'shell' in win32, Microsoft established an 
@@ -104,7 +104,7 @@
  * might ask ("And I don't want wine have access to my complete hard drive, you 
  * *%&1#!"). No problem, as I stated above, unixfs uses the _posix_ apis to 
  * construct the ITEMIDLISTs. Folders, which aren't accessible via a drive letter,
- * don't have the SFGAO_FILESYSTEM flag set. So the file dialogs should'nt allow
+ * don't have the SFGAO_FILESYSTEM flag set. So the file dialogs shouldn't allow
  * the user to select such a folder for file storage (And if it does anyhow, it 
  * will not be able to return a valid path, since there is none). Think of those 
  * folders as a hierarchy of 'My Computer'-like folders, which happen to be a 
@@ -112,7 +112,7 @@
  * change anything at all in wine's fileio api's, windows applications will have 
  * no more access rights as they had before. 
  *
- * To sum it all up, you can still savely run wine with you root account (Just
+ * To sum it all up, you can still safely run wine with you root account (Just
  * kidding, don't do it.)
  *
  * If you are now standing in front of your computer, shouting hotly 
@@ -553,7 +553,7 @@ static char* UNIXFS_build_shitemid(char *pszUnixPath, void *pIDL) {
  *
  * PARAMS
  *  pUnixFolder [I] If path is relative, pUnixFolder represents the base path
- *  path        [I] An absolute unix or dos path or a path relativ to pUnixFolder
+ *  path        [I] An absolute unix or dos path or a path relative to pUnixFolder
  *  ppidl       [O] The corresponding ITEMIDLIST. Release with SHFree/ILFree
  *  
  * RETURNS
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index bc93e13..7cf0b03 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -188,7 +188,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
             case 'I':
 		if (pidl) {
 		    INT chars = 0;
-		    /* %p should not exceed 8, maybe 16 when looking foward to 64bit.
+		    /* %p should not exceed 8, maybe 16 when looking forward to 64bit.
 		     * allowing a buffer of 100 should more than exceed all needs */
 		    WCHAR buf[100];
 		    LPVOID  pv;
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index b6bdd07..11aeab5 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -113,7 +113,7 @@ BOOL SHELL32_GetCustomFolderAttribute(
  *
  * PARAMETERS
  *  pszNext [IN] string to get the element from
- *  pszOut  [IN] pointer to buffer whitch receives string
+ *  pszOut  [IN] pointer to buffer which receives string
  *  dwOut   [IN] length of pszOut
  *
  *  RETURNS
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index 6e6aba4..e7b6f02 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -3,7 +3,7 @@
  *
  *	Copyright 1998,1999	<juergen.schmied at debitel.net>
  *
- * This is the view visualizing the data provied by the shellfolder.
+ * This is the view visualizing the data provided by the shellfolder.
  * No direct access to data from pidls should be done from here.
  *
  * This library is free software; you can redistribute it and/or
@@ -21,9 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * FIXME: The order by part of the background context menu should be
- * buily according to the columns shown.
+ * built according to the columns shown.
  *
- * FIXME: Load/Save the view state from/into the stream provied by
+ * FIXME: Load/Save the view state from/into the stream provided by
  * the ShellBrowser
  *
  * FIXME: CheckToolbar: handle the "new folder" and "folder up" button
diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index 14d6f90..2762f04 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -349,7 +349,7 @@ static HRESULT TRASH_CreateSimplePIDL(const TRASH_ELEMENT *element, const WIN32_
 /***********************************************************************
  *      TRASH_UnpackItemID [Internal]
  *
- * DESCRITION:
+ * DESCRIPTION:
  * Extract the information stored in an Item ID. The TRASH_ELEMENT
  * identifies the element in the Trash. The WIN32_FIND_DATA contains the
  * information about the original file. The data->ftLastAccessTime contains
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index fed9a9f..01a0919 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -2013,7 +2013,7 @@ static LONG URL_ParseUrl(LPCWSTR pszUrl, WINE_PARSE_URL *pl)
  *  pszIn   [I]   Url to parse
  *  pszOut  [O]   Destination for part of pszIn requested
  *  pcchOut [I]   Size of pszOut
- *          [O]   length of pszOut string EXLUDING '\0' if S_OK, otherwise
+ *          [O]   length of pszOut string EXCLUDING '\0' if S_OK, otherwise
  *                needed size of pszOut INCLUDING '\0'.
  *  dwPart  [I]   URL_PART_ enum from "shlwapi.h"
  *  dwFlags [I]   URL_ flags from "shlwapi.h"
diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c
index ef8e843..f09389f 100644
--- a/dlls/user32/comm16.c
+++ b/dlls/user32/comm16.c
@@ -816,7 +816,7 @@ INT16 WINAPI SetCommState16(LPDCB16 lpdcb)
 	 * 1. if the baud rate is a CBR constant, interpret it.
 	 * 2. if it is greater than 57600, the baud rate is 115200
 	 * 3. use the actual baudrate
-	 * steps 2 and 3 are equivilent to 16550 baudrate divisor = 115200/BaudRate
+	 * steps 2 and 3 are equivalent to 16550 baudrate divisor = 115200/BaudRate
 	 * see http://support.microsoft.com/support/kb/articles/q108/9/28.asp
 	 */
 	switch(lpdcb->BaudRate)
diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c
index 45aca46..56e42fe 100644
--- a/dlls/user32/dde_client.c
+++ b/dlls/user32/dde_client.c
@@ -232,8 +232,8 @@ HCONV WINAPI DdeReconnect(HCONV hConv)
     {
 	BOOL	ret;
 
-	/* to reestablist a connection, we have to make sure that:
-	 * 1/ pConv is the converstation attached to the client window (it wouldn't be
+	/* to reestablish a connection, we have to make sure that:
+	 * 1/ pConv is the conversation attached to the client window (it wouldn't be
 	 *    if a call to DdeReconnect would have already been done...)
 	 *    FIXME: is this really an error ???
 	 * 2/ the pConv conversation had really been deconnected
@@ -1394,7 +1394,7 @@ BOOL WINAPI DdeDisconnect(HCONV hConv)
                     pConv->instance->lastError = DMLERR_POSTMSG_FAILED;
 
                 WDML_FreeTransaction(pConv->instance, pXAct, TRUE);
-                /* still have to destroy data assosiated with conversation */
+                /* still have to destroy data associated with conversation */
                 WDML_RemoveConv(pConv, WDML_CLIENT_SIDE);
             }
             else
diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c
index ad927a9..9061836 100644
--- a/dlls/user32/dde_misc.c
+++ b/dlls/user32/dde_misc.c
@@ -1724,7 +1724,7 @@ WDML_CONV*	WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side,
 {
     WDML_CONV*	pConv;
 
-    /* no converstation yet, add it */
+    /* no conversation yet, add it */
     pConv = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_CONV));
     if (!pConv) return NULL;
 
diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c
index 911e0ce..d2305e0 100644
--- a/dlls/user32/defdlg.c
+++ b/dlls/user32/defdlg.c
@@ -375,7 +375,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam,
     HWND hwnd32 = WIN_Handle32( hwnd );
     BOOL result = FALSE;
 
-    /* Perform DIALOGINFO intialization if not done */
+    /* Perform DIALOGINFO initialization if not done */
     if(!(dlgInfo = DIALOG_get_info(hwnd32, TRUE))) return -1;
 
     SetWindowLongPtrW( hwnd32, DWLP_MSGRESULT, 0 );
@@ -477,7 +477,7 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )
     BOOL result = FALSE;
     DLGPROC dlgproc;
 
-    /* Perform DIALOGINFO intialization if not done */
+    /* Perform DIALOGINFO initialization if not done */
     if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return -1;
 
     SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, 0 );
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index bad5519..4145944 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -28,7 +28,7 @@
  *
  *      When we have more than 9 opened windows, a "More Windows..."
  *      option appears in the "Windows" menu. Each child window has
- *      a WND* associated with it, accesible via the children list of
+ *      a WND* associated with it, accessible via the children list of
  *      the parent window. This WND* has a wIDmenu member, which reflects
  *      the position of the child in the window list. For example, with
  *      9 child windows, we could have the following pattern:
diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 718805e..77c5b72 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -268,7 +268,7 @@ static int id (HWND h)
  *   3. Prev Group of hDlg in hDlg is null
  *   4. Prev Tab of hDlg in hDlg is null
  *   5. Next Group of null is first visible enabled child
- *      Check it skips invisible, diabled and both.
+ *      Check it skips invisible, disabled and both.
  *   6. Next Tab of null is first visible enabled tabstop
  *      Check it skips invisible, disabled, nontabstop, and in combination.
  *   7. Next Group of hDlg in hDlg is as of null
diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index f1577fb..96921e6 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -141,7 +141,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
     }
     pszSizes = (LPWSTR)LoadResource(hTheme, hrsc);
 
-    /* Validate requested color against whats available from the theme */
+    /* Validate requested color against what's available from the theme */
     if(pszColorName) {
         tmp = pszColors;
         while(*tmp) {
@@ -155,7 +155,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST
     else
         pszSelectedColor = pszColors; /* Use the default color */
 
-    /* Validate requested size against whats available from the theme */
+    /* Validate requested size against what's available from the theme */
     if(pszSizeName) {
         tmp = pszSizes;
         while(*tmp) {
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index 1fd3d97..8b4e29a 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -128,7 +128,7 @@ static void test_GetWindowTheme(void)
             "Expected E_HANDLE, got 0x%08x\n",
             GetLastError());
 
-    /* Only do the bare minumum to get a valid hwnd */
+    /* Only do the bare minimum to get a valid hwnd */
     hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL);
     if (!hWnd) return;
 
@@ -161,7 +161,7 @@ static void test_SetWindowTheme(void)
             GetLastError());
     }
 
-    /* Only do the bare minumum to get a valid hwnd */
+    /* Only do the bare minimum to get a valid hwnd */
     hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL);
     if (!hWnd) return;
 
@@ -231,7 +231,7 @@ static void test_OpenThemeData(void)
                 GetLastError());
     }
 
-    /* Only do the bare minumum to get a valid hdc */
+    /* Only do the bare minimum to get a valid hdc */
     hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL);
     if (!hWnd) return;
 
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 50992af..ce6b75d 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -122,7 +122,7 @@ void ALSA_WaitRingMessage(ALSA_MSG_RING* omr, DWORD sleep)
 /******************************************************************
  *		ALSA_AddRingMessage
  *
- * Inserts a new message into the ring (should be called from DriverProc derivated routines)
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
  */
 int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD param, BOOL wait)
 {
diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c
index 97b9fa6..a5a04db 100644
--- a/dlls/wineesd.drv/audio.c
+++ b/dlls/wineesd.drv/audio.c
@@ -571,7 +571,7 @@ static int ESD_DestroyRingMessage(ESD_MSG_RING* mr)
 /******************************************************************
  *		ESD_AddRingMessage
  *
- * Inserts a new message into the ring (should be called from DriverProc derivated routines)
+ * Inserts a new message into the ring (should be called from DriverProc derived routines)
  */
 static int ESD_AddRingMessage(ESD_MSG_RING* mr, enum win_wm_message msg, DWORD param, BOOL wait)
 {
diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h
index a535d7e..d90719b 100644
--- a/dlls/wineoss.drv/audio.h
+++ b/dlls/wineoss.drv/audio.h
@@ -137,7 +137,7 @@ typedef struct {
     DWORD			dwThreadID;
     OSS_MSG_RING		msgRing;
 
-    /* make accomodation for the inaccuracy of OSS when reporting buffer size remaining by using the clock instead of GETOSPACE */
+    /* make accommodation for the inaccuracy of OSS when reporting buffer size remaining by using the clock instead of GETOSPACE */
     DWORD                       dwProjectedFinishTime;
 
 } WINE_WAVEOUT;
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index dfcdc23..10e026f 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -330,7 +330,7 @@ LRESULT OSS_MidiInit(void)
 
 	/* This whole part is somewhat obscure to me. I'll keep trying to dig
 	   info about it. If you happen to know, please tell us. The very
-	   descritive minfo.dev_type was not used here.
+	   descriptive minfo.dev_type was not used here.
 	*/
 	/* Manufac ID. We do not have access to this with soundcard.h
 	   Does not seem to be a problem, because in mmsystem.h only
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 348a7f5..bb91de8 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -506,7 +506,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
     devices = pXListInputDevices(data->display, &num_devices);
     if (!devices)
     {
-        WARN("XInput Extenstions reported as not avalable\n");
+        WARN("XInput Extensions reported as not avalable\n");
         wine_tsx11_unlock();
         return;
     }
@@ -1240,7 +1240,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
             if (wCategory - WTI_CURSORS >= gNumCursors)
             {
                 rc = 0;
-                WARN("Requested cursor information for non existent cursor %d; only %d cursors\n",
+                WARN("Requested cursor information for nonexistent cursor %d; only %d cursors\n",
                         wCategory - WTI_CURSORS, gNumCursors);
             }
             else
diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c
index dd71edb..ccc5607 100644
--- a/dlls/wininet/tests/url.c
+++ b/dlls/wininet/tests/url.c
@@ -452,7 +452,7 @@ static void InternetCreateUrlA_test(void)
 		"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
 	ok(len == -1, "Expected len -1, got %d\n", len);
 
-	/* test valid lpUrlComponets, NULL lpdwUrlLength */
+	/* test valid lpUrlComponents, NULL lpdwUrlLength */
 	fill_url_components(&urlComp);
 	SetLastError(0xdeadbeef);
 	ret = InternetCreateUrlA(&urlComp, 0, NULL, NULL);
@@ -461,7 +461,7 @@ static void InternetCreateUrlA_test(void)
 		"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
 	ok(len == -1, "Expected len -1, got %d\n", len);
 
-	/* test valid lpUrlComponets, empty szUrl
+	/* test valid lpUrlComponents, empty szUrl
 	 * lpdwUrlLength is size of buffer required on exit, including
 	 * the terminating null when GLE == ERROR_INSUFFICIENT_BUFFER
 	 */
@@ -481,7 +481,7 @@ static void InternetCreateUrlA_test(void)
 		"Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
 	ok(len == 51, "Expected len 51, got %d\n", len);
 
-	/* test valid lpUrlComponets, alloced szUrl, small size */
+	/* test valid lpUrlComponents, alloc-ed szUrl, small size */
 	SetLastError(0xdeadbeef);
 	szUrl = HeapAlloc(GetProcessHeap(), 0, len);
 	len -= 2;
@@ -491,7 +491,7 @@ static void InternetCreateUrlA_test(void)
 		"Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
 	ok(len == 51, "Expected len 51, got %d\n", len);
 
-	/* alloced szUrl, NULL lpszScheme
+	/* alloc-ed szUrl, NULL lpszScheme
 	 * shows that it uses nScheme instead
 	 */
 	SetLastError(0xdeadbeef);
@@ -503,7 +503,7 @@ static void InternetCreateUrlA_test(void)
 	ok(len == 50, "Expected len 50, got %d\n", len);
 	ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl);
 
-	/* alloced szUrl, invalid nScheme
+	/* alloc-ed szUrl, invalid nScheme
 	 * any nScheme out of range seems ignored
 	 */
 	fill_url_components(&urlComp);
@@ -516,7 +516,7 @@ static void InternetCreateUrlA_test(void)
 		"Expected 0xdeadbeef, got %d\n", GetLastError());
 	ok(len == 50, "Expected len 50, got %d\n", len);
 
-	/* test valid lpUrlComponets, alloced szUrl */
+	/* test valid lpUrlComponents, alloc-ed szUrl */
 	fill_url_components(&urlComp);
 	SetLastError(0xdeadbeef);
 	len = 51;
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index f82ecc5..46083c7 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -1976,7 +1976,7 @@ int WINAPI WSAHtonl(SOCKET s, WS_u_long hostlong, WS_u_long *lpnetlong)
 
 /***********************************************************************
  *		WSAHtons		(WS2_32.47)
- *  From MSDN decription of error codes, this function should also
+ *  From MSDN description of error codes, this function should also
  *  check if WinSock has been initialized and the socket is a valid
  *  socket. But why? This function only translates a host byte order
  *  u_short into a network byte order u_short...
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 37373e4..bb13cfd 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -476,7 +476,7 @@ typedef struct pcmwaveformat_tag {
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
-/* dito same for Win16 / Win32 */
+/* ditto same for Win16 / Win32 */
 typedef struct tWAVEFORMATEX {
     WORD	wFormatTag;
     WORD	nChannels;
diff --git a/include/wine/rpcss_shared.h b/include/wine/rpcss_shared.h
index e2ffeeb..821a155 100644
--- a/include/wine/rpcss_shared.h
+++ b/include/wine/rpcss_shared.h
@@ -54,7 +54,7 @@
 /* number of microseconds/10 to wait for master mutex before giving up */
 #define MASTER_MUTEX_TIMEOUT 6000000
 
-/* number of miliseconds to wait on the master mutex after it returns BUSY */
+/* number of milliseconds to wait on the master mutex after it returns BUSY */
 #define MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT 5000
 
 /* a data payload; not a normal message */
diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index c8b8ee4..c360d10 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -172,7 +172,7 @@ typedef struct {
     DWORD  dfFace;
     DWORD  dfReserved;
     CHAR   szDeviceName[60]; /* FIXME: length unknown */
-    CHAR   szFaceName[60];   /* dito */
+    CHAR   szFaceName[60];   /* ditto */
 } FONTDIR16, *LPFONTDIR16;
 
 typedef struct
diff --git a/include/winternl.h b/include/winternl.h
index 43bc374..2ce9b2b 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -1064,7 +1064,7 @@ typedef struct _SYSTEM_CPU_INFORMATION {
 #define CPU_FEATURE_MTRR   0x00000040   /* Memory Type Range Registers */
 #define CPU_FEATURE_CX8    0x00000080   /* Compare and eXchange 8 byte instr. */
 #define CPU_FEATURE_MMX    0x00000100   /* Multi Media eXtensions */
-#define CPU_FEATURE_X86    0x00000200   /* seems to be alway ON, on the '86 */
+#define CPU_FEATURE_X86    0x00000200   /* seems to be always ON, on the '86 */
 #define CPU_FEATURE_PAT    0x00000400   /* Page Attribute Table */
 #define CPU_FEATURE_FXSR   0x00000800   /* FXSAVE and FXSTORE instructions */
 #define CPU_FEATURE_SEP    0x00001000   /* SYSENTER and SYSEXIT instructions */
diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c
index 7b87c36..d149591 100644
--- a/libs/wpp/wpp.c
+++ b/libs/wpp/wpp.c
@@ -1,7 +1,7 @@
 /*
  * Exported functions of the Wine preprocessor
  *
- * Copyrignt 1998 Bertho A. Stultiens
+ * Copyright 1998 Bertho A. Stultiens
  * Copyright 2002 Alexandre Julliard
  *
  * This library is free software; you can redistribute it and/or
diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h
index ff0fae7..24ed6b8 100644
--- a/libs/wpp/wpp_private.h
+++ b/libs/wpp/wpp_private.h
@@ -181,7 +181,7 @@ typedef struct cval {
 	ctype_t	type;
 	union {
 #if 0
-		signed char	sc;	/* Explicitely signed because compilers are stupid */
+		signed char	sc;	/* Explicitly signed because compilers are stupid */
 		unsigned char	uc;
 		short		ss;
 		unsigned short	us;
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index 15057b3..c9f6e76 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -423,7 +423,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu
     memcpy(env, start, (end-start) * sizeof(WCHAR));
     env[(end-start)] = 0x00;
 
-    /* If env var not found, return emptry string */
+    /* If env var not found, return empty string */
     if ((GetEnvironmentVariable(env, fullpath, MAX_PATH) == 0) ||
         (SearchPath(fullpath, outputparam, NULL,
                     MAX_PATH, outputparam, NULL) == 0)) {
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 32511cf..24efebf 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -919,7 +919,7 @@ static void init_msvcrt_io_block(STARTUPINFO* st)
  *        If any found, cycle through PATHEXT looking for name.exe one by one
  *      Launching
  *        Once a match has been found, it is launched - Code currently uses
- *          findexecutable to acheive this which is left untouched.
+ *          findexecutable to achieve this which is left untouched.
  */
 
 void WCMD_run_program (WCHAR *command, int called) {
diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c
index a914595..38156fe 100644
--- a/programs/taskmgr/graphctl.c
+++ b/programs/taskmgr/graphctl.c
@@ -414,7 +414,7 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this)
          *  note: the m_dcPlot covers the entire client
          *        but we only shift bitmap that is the size 
          *        of the plot rectangle
-         *  grab the right side of the plot (exluding m_nShiftPixels on the left)
+         *  grab the right side of the plot (excluding m_nShiftPixels on the left)
          *  move this grabbed bitmap to the left by m_nShiftPixels
          */
         BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top+1, 
@@ -430,7 +430,7 @@ void GraphCtrl_DrawPoint(TGraphCtrl* this)
         /*  fill the cleanup area with the background */
         FillRect(this->m_dcPlot, &rectCleanUp, this->m_brushBack);
 
-        /*  draw the next line segement */
+        /*  draw the next line segment */
         for (i = 0; i < MAX_PLOTS; i++) 
         {
             /*  grab the plotting pen */
diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index 49e652c..39b3081 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -119,7 +119,7 @@ static HLPFILE_PAGE *HLPFILE_PageByNumber(HLPFILE* hlpfile, UINT wNum)
  * As of today, we only return the page... we should also return
  * a paragraph, and then, while opening a new page, compute the
  * y-offset of the paragraph to be shown and scroll the window
- * accordinly
+ * accordingly
  */
 /******************************************************************
  *		HLPFILE_PageByOffset
-- 
1.5.3.7



More information about the wine-patches mailing list