Spelling fixes.

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 418e92c8f2c53c68f698ea57da7e1e7299c02503..a22b168af103f80f4d8f80d682a3924c8afb1f44 100644 (file)
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -4471,9 +4471,9 @@ static void dp2add_ps_test(IDirect3DDevice9 *device)
 
     /* DP2ADD is defined as:  (src0.r * src1.r) + (src0.g * src1.g) + src2.
      * One D3D restriction of all shader instructions except SINCOS is that no more than 2
-     * source tokens can be constants.  So, for this excercise, we move contents of c0 to
+     * source tokens can be constants.  So, for this exercise, we move contents of c0 to
      * r0 first.
-     * The result here for the r,g,b components should be rougly 0.5:
+     * The result here for the r,g,b components should be roughly 0.5:
      *   (0.5 * 0.5) + (0.5 * 0.5) + 0.0 = 0.5 */
     static const DWORD shader_code_dp2add[] =  {
         0xffff0200,                                                             /* ps_2_0                       */

diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 98fbf51891e9d3cfb9f7d0ae022ab9533659e3ff..10cc1d9b7f6f4c6af116e883f2afe0a8da7b06c9 100644 (file)
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -100,7 +100,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject
                        return E_POINTER;
                }
        }
-       /* check if we wszAlias is big enough */
+       /* check if wszAlias is big enough */
        if (pwszAlias && IsBadWritePtr (pwszAlias, DMUS_MAX_FILENAME_SIZE)) {
                ERR(": wszAlias bad write pointer\n");
                return E_POINTER;               
@@ -158,7 +158,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_GetDescriptor
        ICOM_THIS_MULTI(IDirectMusicContainerImpl, ObjectVtbl, iface);
        TRACE("(%p, %p):\n", This, pDesc);
        
-       /* check if whe can write to whole pDesc */
+       /* check if we can write to whole pDesc */
        if (IsBadReadPtr (pDesc, sizeof(DWORD))) {
                ERR(": pDesc->dwSize bad read pointer\n");
                return E_POINTER;
@@ -184,7 +184,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_SetDescriptor
        ICOM_THIS_MULTI(IDirectMusicContainerImpl, ObjectVtbl, iface);
        TRACE("(%p, %p):\n", This, pDesc);
 
-       /* check if whe can read whole pDesc */
+       /* check if we can read whole pDesc */
        if (IsBadReadPtr (pDesc, sizeof(DWORD))) {
                ERR(": pDesc->dwSize bad read pointer\n");
                return E_POINTER;
@@ -461,7 +461,7 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTST
                ERR(": pStm bad read pointer\n");
                return E_POINTER;
        }
-       /* if stream is already set, this means we're loaded already */
+       /* if stream is already set, this means the container is already loaded */
        if (This->pStream) {
                TRACE(": stream is already set, which means container is already loaded\n");
                return DMUS_E_ALREADY_LOADED;
@@ -923,9 +923,9 @@ HRESULT WINAPI DMUSIC_DestroyDirectMusicContainerImpl (LPDIRECTMUSICCONTAINER if
        LIST_FOR_EACH (pEntry, This->pContainedObjects) {
                pContainedObject = LIST_ENTRY (pEntry, WINE_CONTAINER_ENTRY, entry);
                /* my tests indicate that container releases objects *only* 
-                  if they were loaded at it's load-time (makes sense, it doesn't
+                  if they were loaded at its load-time (makes sense, it doesn't
                   have pointers to objects otherwise); BTW: native container seems
-                  ti ignore the flags (I won't) */
+                  to ignore the flags (I won't) */
                if (pContainedObject->pObject && !(pContainedObject->dwFlags & DMUS_CONTAINED_OBJF_KEEP)) {
                        /* flags say it shouldn't be kept in loader's cache */
                        IDirectMusicLoader_ReleaseObject (pLoader, pContainedObject->pObject);

diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 4c8472ad13599692f76e51cc4d45470f1443aa23..c79e9fe6c598e9852be8ec22be757f0b69ca3882 100644 (file)
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -735,7 +735,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
       IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL);
       /** TODO trace pattern */
 
-      /** reset all datas, as a new pattern begin */
+      /** reset all data, as a new pattern begin */
       DM_STRUCT_INIT(&pNewMotif->desc);
       list_init (&pNewMotif->Items);
       break;
@@ -757,7 +757,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
     }
     case FOURCC_RIFF: {
       /**
-       * sould be embededs Bands into pattern
+       * should be embedded Bands into pattern
        */
       IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
       TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
@@ -785,7 +785,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST
        pNewMotif->pBand = pBand;
        IDirectMusicBand_AddRef(pBand);
 
-       IDirectMusicTrack_Release(pBand); pBand = NULL;  /* now we can release at as it inserted */
+       IDirectMusicTrack_Release(pBand); pBand = NULL;  /* now we can release it as it's inserted */
        
        /** now safe move the cursor */
        liMove.QuadPart = ListSize[1];
@@ -897,7 +897,7 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
       }   
       case FOURCC_RIFF: {
        /**
-        * sould be embededs Bands into style
+        * should be embedded Bands into style
         */
        IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
        TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID));
@@ -932,9 +932,9 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParseStyleForm (LPPERSISTST
          IDirectMusicBand_AddRef(pBand);
          list_add_tail (&This->Bands, &pNewBand->entry);
 
-         IDirectMusicTrack_Release(pBand); pBand = NULL;  /* now we can release at as it inserted */
+         IDirectMusicTrack_Release(pBand); pBand = NULL;  /* now we can release it as it's inserted */
        
-         /** now safe move the cursor */
+         /** now safely move the cursor */
          liMove.QuadPart = ListSize[0];
          IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL);
          

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 1fc7bd23cd36b063110a066645bb2c8d20d06516..ba16acc6c980cab614ea9b4c01aa03e27404dcbf 100644 (file)
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -588,7 +588,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load (LPPERSISTS
                                                                                                                case FOURCC_INS: {
                                                                                                                        LPDMUS_PRIVATE_INSTRUMENTENTRY pNewInstrument = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENTENTRY));
                                                                                                                        TRACE_(dmfile)(": instrument list\n");
-                                                                                                                       DMUSIC_CreateDirectMusicInstrumentImpl (&IID_IDirectMusicInstrument, (LPVOID*)&pNewInstrument->pInstrument, NULL); /* only way to create this one... even M$ does it discretly */
+                                                                                                                       DMUSIC_CreateDirectMusicInstrumentImpl (&IID_IDirectMusicInstrument, (LPVOID*)&pNewInstrument->pInstrument, NULL); /* only way to create this one... even M$ does it discretely */
                                                                                                                         {
                                                                                                                             ICOM_NAME_MULTI (IDirectMusicInstrumentImpl, InstrumentVtbl, pNewInstrument->pInstrument, pInstrument);
                                                                                                                             liMove.QuadPart = 0;

diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c
index c33c7d6639e5bc1fa2a609154c4ac1a4f25ed3df..a108c563cfb33f4faceca011b63500f91f93ebc7 100644 (file)
--- a/dlls/dnsapi/ns_name.c
+++ b/dlls/dnsapi/ns_name.c
@@ -410,7 +410,7 @@ dns_ns_name_skip(const u_char **ptrptr, const u_char *eom) {
 /*
  * special(ch)
  *     Thinking in noninternationalized USASCII (per the DNS spec),
- *     is this characted special ("in need of quoting") ?
+ *     is this character special ("in need of quoting") ?
  * return:
  *     boolean.
  */

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 012f773a8ec5da4c1d22419e7eb2f937c683f038..5be4c5d4e73cf2052b1bef6f9eee74e5c976ff70 100644 (file)
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -1978,7 +1978,7 @@ static HRESULT WINAPI DP_IF_EnumGroupPlayers
   for( ;; )
   {
     /* We do not enum the name server or app server as they are of no
-     * concequence to the end user.
+     * consequence to the end user.
      */
     if( ( lpPList->lpPData->dpid != DPID_NAME_SERVER ) &&
         ( lpPList->lpPData->dpid != DPID_SERVERPLAYER )
@@ -3334,7 +3334,7 @@ DWORD DP_CalcSessionDescSize( LPCDPSESSIONDESC2 lpSessDesc, BOOL bAnsi )
   return dwSize;
 }
 
-/* Assumes that contugous buffers are already allocated. */
+/* Assumes that contiguous buffers are already allocated. */
 static void DP_CopySessionDesc( LPDPSESSIONDESC2 lpSessionDest,
                                 LPCDPSESSIONDESC2 lpSessionSrc, BOOL bAnsi )
 {

diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 8833ceba1f5a81d4336f63311811817d9caf29f2..96f67769ca9debfeabc6f59172668ae1d5d9803c 100644 (file)
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -20,9 +20,9 @@
  *
  * NOTES: 
  *  o Implementation of all things which are associated with dplay on
- *    the computer - ie shared resources and such. Methods in this
- *    compilation unit should not call anything out side this unit
- *    excepting base windows services and an interface to start the
+ *    the computer - i.e. shared resources and such. Methods in this
+ *    compilation unit should not call anything outside of this unit
+ *    except base windows services and an interface to start the
  *    messaging thread.
  *  o Methods that begin with DPLAYX_ are used for dealing with
  *    dplayx.dll data which is accessible from all processes.
@@ -333,7 +333,7 @@ BOOL DPLAYX_ConstructData(void)
       sessionData[i].dwSize = 0;
     }
 
-    /* Zero out the dynmaic area */
+    /* Zero out the dynamic area */
     ZeroMemory( lpMemArea, dwDynamicSharedSize );
 
     /* Just for fun sync the whole data area */
@@ -433,7 +433,7 @@ BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppID, LPDPLAYX_LOBBYDATA* lplpDplData )
   return FALSE;
 }
 
-/* Reserve a spot for the new appliction. TRUE means success and FALSE failure.  */
+/* Reserve a spot for the new application. TRUE means success and FALSE failure.  */
 BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID )
 {
   UINT i;
@@ -506,7 +506,7 @@ BOOL DPLAYX_SetLobbyHandles( DWORD dwAppID,
 {
   LPDPLAYX_LOBBYDATA lpLData;
 
-  /* Need to explictly give lobby application. Can't set for yourself */
+  /* Need to explicitly give lobby application. Can't set for yourself */
   if( dwAppID == 0 )
   {
     return FALSE;
@@ -848,9 +848,9 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src )
 
 }
 
-/* Store the structure into the shared data structre. Ensure that allocs for
+/* Store the structure into the shared data structure. Ensure that allocs for
  * variable length strings come from the shared data structure.
- * FIXME: We need to free information as well
+ * FIXME: We need to free information as well.
  */
 HRESULT DPLAYX_SetConnectionSettingsA
 ( DWORD dwFlags,

diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index c311f74cda3cb86a1d0cd413e5d67cf46e763e07..075c75158ac66657af69ca69bfae33331d58566c 100644 (file)
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -22,7 +22,7 @@
  *  o DPMSGCMD_ENUMSESSIONSREPLY & DPMSGCMD_ENUMSESSIONSREQUEST
  *    Have most fields understood, but not all.  Everything seems to work.
  *  o DPMSGCMD_REQUESTNEWPLAYERID & DPMSGCMD_NEWPLAYERIDREPLY
- *    Barely work. This needs to be completed for sessions to start.
+ *    Barely works. This needs to be completed for sessions to start.
  *  o A small issue will be the fact that DirectX 6.1(ie. DirectPlay4)
  *    introduces a layer of functionality inside the DP objects which 
  *    provide guaranteed protocol delivery.  This is even if the native
@@ -30,7 +30,7 @@
  *    to leave this kind of implementation to as close to the end as 
  *    possible. However, I will implement an abstraction layer, where 
  *    possible, for this functionality. It will do nothing to start, but 
- *    will require only the implementation of the guaranteness to give 
+ *    will require only the implementation of the guarantee to give
  *    final implementation.
  *
  * TODO:
@@ -102,7 +102,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
   HRESULT hr = ( gdwDPlaySPRefCount > 0 ) ? S_FALSE : S_OK;
 
   /* FIXME: Should I be putting a check in for class factory objects
-   *        as well
+   *        as well?
    */
 
   TRACE( ": returning 0x%08x\n", hr );

diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index 4c59e839558ce8f157b7cb65042cd4fca30d9de5..30b0a9f835ee476cfff20273b6bf44fe43c2e2b4 100644 (file)
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -1388,7 +1388,7 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_SetConnectionSettings
 
   hr = DPLAYX_SetConnectionSettingsW( dwFlags, dwAppID, lpConn );
 
-  /* FIXME: Don't think that this is supposed to fail, but the docuementation
+  /* FIXME: Don't think that this is supposed to fail, but the documentation
             is somewhat sketchy. I'll try creating a lobby application
             for this... */
   if( hr == DPERR_NOTLOBBIED )
@@ -1422,7 +1422,7 @@ static HRESULT WINAPI IDirectPlayLobbyAImpl_SetConnectionSettings
 
   hr = DPLAYX_SetConnectionSettingsA( dwFlags, dwAppID, lpConn );
 
-  /* FIXME: Don't think that this is supposed to fail, but the docuementation
+  /* FIXME: Don't think that this is supposed to fail, but the documentation
             is somewhat sketchy. I'll try creating a lobby application
             for this... */
   if( hr == DPERR_NOTLOBBIED )

diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index af2a6ed6edc6e1ac6a244a2350df6753a6f37d50..4af7f5c58106e3be18e3cc8d16e6e11c64a7c352 100644 (file)
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -31,7 +31,7 @@ static BOOL CALLBACK EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnecti
 
     if(IsEqualGUID(lpguidSP,&DPSPGUID_TCPIP))
     {
-        /*I'm forcing TCP/IP Sevice provider*/
+        /*I'm forcing the TCP/IP Service provider*/
         hr = IDirectPlayX_InitializeConnection((LPDIRECTPLAY4) lpContext, lpConnection, 0);
         if( SUCCEEDED( hr ))
             validSP = TRUE;

diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index b01f989da57f5096ccd315dbfec1d1dc2000ef59..fd2f671ac4c912080e789bcf6217ebcb936fbfdb 100644 (file)
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -615,7 +615,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, DWORD writepos, DWORD mi
                return 0;
        }
 
-       /* take into acount already mixed data */
+       /* take into account already mixed data */
        mixlen -= primary_done;
 
        TRACE("primary_done=%d, mixlen (primary) = %i\n", primary_done, mixlen);
@@ -742,7 +742,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force)
        /* calculate the current wave frag position */
        wave_fragpos = (device->pwplay + device->pwqueue) % device->helfrags;
 
-       /* calculte the current wave write position */
+       /* calculate the current wave write position */
        wave_writepos = wave_fragpos * device->fraglen;
 
        TRACE("wave_fragpos = %i, wave_writepos = %i, pwqueue = %i, prebuf = %i\n",
@@ -908,7 +908,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
                else
                        device->normfunction(device->mix_buffer + DSOUND_bufpos_to_mixpos(device, writepos), device->buffer + writepos, frag);
 
-               /* update the mix position, taking wrap-around into acount */
+               /* update the mix position, taking wrap-around into account */
                device->mixpos = writepos + frag;
                device->mixpos %= device->buflen;
 

diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c
index 365f143b3d69b7fee35e51c728b8e6f867f58042..d4bd7131bbbb41f8d71b85b8bb2c45147f836ea4 100644 (file)
--- a/dlls/faultrep/faultrep.c
+++ b/dlls/faultrep/faultrep.c
@@ -41,7 +41,7 @@ static const WCHAR SZ_EXCLUSIONLIST_KEY[] = {
  * AddERExcludedApplicationW  [FAULTREP.@]
  *
  * Adds an application to a list of applications for which fault reports
- * shouldn't be genereated
+ * shouldn't be generated
  *
  * PARAMS
  * lpAppFileName  [I] The filename of the application executable
@@ -53,7 +53,7 @@ static const WCHAR SZ_EXCLUSIONLIST_KEY[] = {
  * Wine doesn't use this data but stores it in the registry (in the same place
  * as Windows would) in case it will be useful in a future version
  *
- * According to MSDN this function should succeed even if the user have no write
+ * According to MSDN this function should succeed even if the user has no write
  * access to HKLM. This probably means that there is no error checking.
  */
 BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName)