Spelling fixes.

dlls/user32/button.c

@@ -1065,7 +1065,7 @@ static void GB_Paint( HWND hwnd, HDC hDC, UINT action )
      * But Windows doesn't clip label's rect, so do I.
      */
 
-    /* There is 1-pixel marging at the left, right, and bottom */
+    /* There is 1-pixel margin at the left, right, and bottom */
     rc.left--; rc.right++; rc.bottom++;
     FillRect(hDC, &rc, hbr);
     rc.left++; rc.right--; rc.bottom--;

dlls/user32/combo.c

@@ -1344,7 +1344,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
                 TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState );
 
                 /* do not roll up if selection is being tracked
-                 * by arrowkeys in the dropdown listbox */
+                 * by arrow keys in the dropdown listbox */
                 if (!(lphc->wState & CBF_NOROLLUP))
                 {
                     CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE );

dlls/user32/dde_private.h

@@ -143,7 +143,7 @@ typedef struct tagWDML_CONV
 /* DDE_LINK struct defines hot, warm, and cold links */
 typedef struct tagWDML_LINK {
     struct tagWDML_LINK*	next;		/* to link all the active links */
-    HCONV			hConv;		/* to get back to the converstaion */
+    HCONV			hConv;		/* to get back to the conversation */
     UINT			transactionType;/* 0 for no link */
     HSZ				hszItem;	/* item targetted for (hot/warm) link */
     UINT			uFmt;		/* format for data */

dlls/user32/edit.c

@@ -1180,7 +1180,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta
 			{
 				if (current_position - es->text > iend)
 					break; /* We reached end of line modifications */
-				/* else recalulate this line */
+				/* else recalculate this line */
 			}
 		}
 
@@ -3807,8 +3807,8 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap)
 	 * *sorting* the interval endpoints.  Let's assume that we sort them
 	 * in this order:
 	 *        start <= end <= old_start <= old_end
-	 * Knuth 5.3.1 (p 183) asssures us that this can be done optimally
+	 * Knuth 5.3.1 (p 183) assures us that this can be done optimally
-	 * in 5 comparisons; ie it's impossible to do better than the
+	 * in 5 comparisons; i.e. it is impossible to do better than the
 	 * following: */
         ORDER_UINT(end, old_end);
         ORDER_UINT(start, old_start);

dlls/user32/painting.c

@@ -1461,7 +1461,7 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy,
                 CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR );
             RedrawWindow( hwnd, NULL, hrgnTemp, rdw_flags);
 
-           /* Catch the case where the scolling amount exceeds the size of the
+           /* Catch the case where the scrolling amount exceeds the size of the
             * original window. This generated a second update area that is the
             * location where the original scrolled content would end up.
             * This second region is not returned by the ScrollDC and sets

dlls/user32/spy.c

@@ -1935,7 +1935,7 @@ static const SPY_NOTIFY spnfy_array[] = {
     SPNFY(RBN_DELETINGBAND,      NMREBAR),
     SPNFY(RBN_DELETEDBAND,       NMREBAR),
     SPNFY(RBN_CHILDSIZE,         NMREBARCHILDSIZE),
-    /* IP Adderss     0U-860U  to  0U-879U  */
+    /* IP address     0U-860U  to  0U-879U  */
     SPNFY(IPN_FIELDCHANGED,      NMHDR),
     /* Status bar     0U-880U  to  0U-899U  */
     SPNFY(SBN_SIMPLEMODECHANGE,  NMHDR),

dlls/user32/tests/class.c

@@ -582,7 +582,7 @@ static void test_builtinproc(void)
     static const int NUM_NORMAL_CLASSES = (sizeof(NORMAL_CLASSES)/sizeof(NORMAL_CLASSES[0]));
     static const char classA[] = "deftest";
     static const WCHAR classW[] = {'d','e','f','t','e','s','t',0};
-    WCHAR unistring[] = {0x142, 0x40e, 0x3b4, 0};  /* a string that would be destoryed by a W->A->W conversion */
+    WCHAR unistring[] = {0x142, 0x40e, 0x3b4, 0};  /* a string that would be destroyed by a W->A->W conversion */
     WNDPROC pDefWindowProcA, pDefWindowProcW;
     WNDPROC oldproc;
     WNDCLASSEXA cls;  /* the memory layout of WNDCLASSEXA and WNDCLASSEXW is the same */

dlls/user32/tests/combo.c

@@ -236,7 +236,7 @@ static void test_selection(DWORD style, const char * const text[],
     SendMessage(hCombo, WM_KEYDOWN, VK_UP, 0);
     ok(selchange_fired, "CBN_SELCHANGE not sent!\n");
 
-    /* programatic navigation */
+    /* programmatic navigation */
 
     expected_list_text = text[list[3]];
     expected_edit_text = text[edit[3]];

dlls/user32/tests/input.c

@@ -21,7 +21,7 @@
  * WM_KEYUP/DOWN vs WM_SYSKEYUP/DOWN  are sent in case of combined
  * keystrokes.
  *
- * For instance <ALT>-X can be accompished by
+ * For instance <ALT>-X can be accomplished by
  * the sequence ALT-KEY-DOWN, X-KEY-DOWN, ALT-KEY-UP, X-KEY-UP
  * but also X-KEY-DOWN, ALT-KEY-DOWN, X-KEY-UP, ALT-KEY-UP
  * Whether a KEY or a SYSKEY message is sent is not always clear, it is
@@ -79,7 +79,7 @@ static const int GETVKEY[]={0, VK_MENU, VK_MENU, 'X', 'X', VK_SHIFT, VK_SHIFT, V
 static const int GETSCAN[]={0, 0x38, 0x38, 0x2D, 0x2D, 0x2A, 0x2A, 0x1D, 0x1D };
 /* matching updown events */
 static const int GETFLAGS[]={0, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP, 0, KEYEVENTF_KEYUP};
-/* matching descripts */
+/* matching descriptions */
 static const char *getdesc[]={"", "+alt","-alt","+X","-X","+shift","-shift","+ctrl","-ctrl"};
 
 /* The MSVC headers ignore our NONAMELESSUNION requests so we have to define our own type */

dlls/user32/tests/menu.c

@@ -1091,7 +1091,7 @@ static void test_menu_iteminfo( void )
         {, S, MIIM_TYPE, MFT_OWNERDRAW, -9, -9, 0, -9, -9, -9, NULL, 4, NULL, },
         txt,  OK, OK )
     TMII_DONE
-    /* test with modifymenu: string is preserved after seting OWNERDRAW */
+    /* test with modifymenu: string is preserved after setting OWNERDRAW */
     TMII_INSMI( {, S, MIIM_STRING, MFT_STRING, -1, -1, -1, -1, -1, -1, txt, 0, -1, }, OK)
     TMII_MODM( MFT_OWNERDRAW, -1, 787, OK)
     TMII_GMII ( {, S, MIIM_FTYPE|MIIM_STRING|MIIM_DATA, -9, -9, -9, -9, -9, -9, -9, string, 80, -9, },

dlls/user32/uitools.c

@@ -370,7 +370,7 @@ static BOOL UITOOLS95_DrawDiagEdge(HDC hdc, LPRECT rc,
  * Well, I started testing this and found out that there are a few things
  * that weren't quite as win95. The following rewrite should reproduce
  * win95 results completely.
- * The colorselection is table-driven to avoid awfull if-statements.
+ * The colorselection is table-driven to avoid awful if-statements.
  * The table below show the color settings.
  *
  * Pen selection table for uFlags = 0

dlls/user32/winhelp.c

@@ -38,7 +38,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(win);
 
 /* Wine doesn't use the way WinHelp API sends information in Windows, because:
- * 1/ it's not consistent acrosss Win9x, NT...
+ * 1/ it's not consistent across Win9x, NT...
  * 2/ NT implementation is not yet fully understood (and includes some shared
  *     memory mechanism)
  * 3/ uses a dynamically allocated message number (WM_WINHELP), which 

dlls/user32/winproc.c

@@ -1526,7 +1526,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1
         break;
     case WM_ACTIVATEAPP:
         /* We need this when SetActiveWindow sends a Sendmessage16() to
-         * a 32bit window. Might be superflous with 32bit interprocess
+         * a 32-bit window. Might be superfluous with 32-bit interprocess
          * message queues. */
         if (lParam) lParam = HTASK_32(lParam);
         ret = callback( hwnd32, msg, wParam, lParam, result, arg );

dlls/uxtheme/draw.c

@@ -893,7 +893,7 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId,
         /* FIXME: This only accounts for 2 gradient colors (out of 5) and ignores
             the gradient ratios (no idea how those work)
             Few themes use this, and the ones I've seen only use 2 colors with
-            a gradient ratio of 0 and 255 respectivly
+            a gradient ratio of 0 and 255 respectively
         */
 
         COLORREF gradient1 = RGB(0,0,0);

dlls/uxtheme/system.c

@@ -1171,7 +1171,7 @@ HRESULT WINAPI EnumThemeSizes(LPWSTR pszThemeFileName, LPWSTR pszColorName,
  *     0x800706488 (Unknown property) when enumeration is canceled from callback
  *
  * NOTES
- * When pszUnknown is NULL the callback is never called, the value does not seem to surve
+ * When pszUnknown is NULL the callback is never called, the value does not seem to serve
  * any other purpose
  */
 HRESULT WINAPI ParseThemeIniFile(LPCWSTR pszIniFileName, LPWSTR pszUnknown,

dlls/winealsa.drv/waveinit.c

@@ -559,7 +559,7 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm
 **      Given an Alsa style configuration node, scan its subitems
 **  for environment variable names, and use them to find an override,
 **  if appropriate.
-**      This is essentially a long and convolunted way of doing:
+**      This is essentially a long and convoluted way of doing:
 **          getenv("ALSA_CARD")
 **          getenv("ALSA_CTL_CARD")
 **          getenv("ALSA_PCM_CARD")
@@ -619,7 +619,7 @@ static void ALSA_CheckEnvironment(snd_config_t *node, int *outvalue)
 **                          environment variable, we'll set to the
 **                          device the user specified.
 **
-**  Returns:  0 on success, < 0 on failiure
+**  Returns:  0 on success, < 0 on failure
 */
 static int ALSA_DefaultDevices(int directhw,
             long *defctlcard,
@@ -689,7 +689,7 @@ static int ALSA_DefaultDevices(int directhw,
 **      fixedpcmdev     If not -1, then gives the value of ALSA_PCM_DEVICE
 **                          or equivalent environment variable
 **
-**  Returns:  0 on success, < 0 on failiure
+**  Returns:  0 on success, < 0 on failure
 */
 static int ALSA_ScanDevices(int directhw,
         long defctlcard, long defpcmcard, long defpcmdev,

dlls/wineaudioio.drv/audio.c

@@ -430,7 +430,7 @@ static	BOOL	wodPlayer_WriteFragments(WINE_WAVEOUT* wwo)
  *And libaudioio just tracks the number of blocks in the streams queue to control latency
  */
 
-	if (!AudioIOCheckWriteReady()) return FALSE;   /*  Returns false if you have execeeded your specified latency (No space left)*/
+	if (!AudioIOCheckWriteReady()) return FALSE;   /*  Returns false if you have exceeded your specified latency (No space left)*/
 
 	lpWaveHdr = wwo->lpPlayPtr;
 	if (!lpWaveHdr) {
@@ -1219,8 +1219,8 @@ DWORD WINAPI LIBAUDIOIO_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
 
 /*======================================================================*
  *                  Low level DSOUND implementation			*
- *		While I have tampered somewhat with this code it is wholely unlikely that it works
+ *		While I have tampered somewhat with this code it is wholly unlikely that it works
- *		Elsewhere the driver returns Not Implemented for DIrectSound
+ *		Elsewhere the driver returns Not Implemented for DirectSound
  *		While it may be possible to map the sound device on Solaris
  *		Doing so would bypass the libaudioio library and therefore break any conversions
  *		that the libaudioio sample specification converter is doing
@@ -2091,7 +2091,7 @@ static DWORD widStop(WORD wDevID)
 	WARN("can't stop !\n");
 	return MMSYSERR_INVALHANDLE;
     }
-    /* FIXME: reset aint stop */
+    /* FIXME: reset isn't stop */
     PostThreadMessageA(WInDev[wDevID].dwThreadID, WINE_WM_RESETTING, 0, 0);
     WaitForSingleObject(WInDev[wDevID].hEvent, INFINITE);
 

dlls/wined3d/arb_program_shader.c

@@ -1993,7 +1993,7 @@ static void shader_arb_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUFF
      * a replacement shader depend on the texcoord.w being set properly.
      *
      * GL_NV_vertex_program defines that all output values are initialized to {0.0, 0.0, 0.0, 1.0}. This
-     * assetion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So
+     * assertion is in effect even when using GL_ARB_vertex_program without any NV specific additions. So
      * skip this if NV_vertex_program is supported. Otherwise, initialize the secondary color. For the tex-
      * coords, we have a flag in the opengl caps. Many cards do not require the texcoord being set, and
      * this can eat a number of instructions, so skip it unless this cap is set as well

dlls/wined3d/ati_fragment_shader.c

@@ -27,9 +27,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 
-/* Some private defines, Constant associations, etc
+/* Some private defines, Constant associations, etc.
  * Env bump matrix and per stage constant should be independent,
- * a stage that bumpmaps can't read the per state constant
+ * a stage that bump maps can't read the per state constant
  */
 #define ATI_FFP_CONST_BUMPMAT(i) (GL_CON_0_ATI + i)
 #define ATI_FFP_CONST_CONSTANT0 GL_CON_0_ATI
@@ -600,7 +600,7 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G
 
             case WINED3DTOP_BUMPENVMAP:
             case WINED3DTOP_BUMPENVMAPLUMINANCE:
-                /* Those are handled in the first pass of the shader(generation pass 1 and 2) alraedy */
+                /* Those are handled in the first pass of the shader(generation pass 1 and 2) already */
                 break;
 
             default: FIXME("Unhandled color operation %d on stage %d\n", op[stage].cop, stage);

dlls/wined3d/context.c

@@ -998,7 +998,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU
             }
 
             /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling
-             * blending when clearing improves the clearing performance increadibly
+             * blending when clearing improves the clearing performance incredibly.
              */
             glDisable(GL_BLEND);
             Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable);

dlls/wined3d/device.c

@@ -6970,7 +6970,7 @@ static HRESULT  WINAPI  IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice*
     IWineD3DResourceImpl *resource;
     TRACE("(%p) : state (%u)\n", This, This->state);
 
-    /* TODO: Implement wrapping of the WndProc so that mimimize and maxamise can be monitored and the states adjusted. */
+    /* TODO: Implement wrapping of the WndProc so that mimimize and maximize can be monitored and the states adjusted. */
     switch (This->state) {
     case WINED3D_OK:
         return WINED3D_OK;
@@ -7079,7 +7079,7 @@ static void reset_fbo_state(IWineD3DDevice *iface) {
         GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo));
         This->dst_fbo = 0;
     }
-    checkGLcall("Tear down fbos\n");
+    checkGLcall("Tear down FBOs\n");
     LEAVE_GL();
 
     for (i = 0; i < GL_LIMITS(buffers); ++i) {

dlls/wined3d/directx.c

@@ -832,7 +832,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) {
              */
             gl_info->supported[ATI_ENVMAP_BUMPMAP] = FALSE;
             if(gl_info->supported[NV_REGISTER_COMBINERS]) {
-                /* Also disable ATI_FRAGMENT_SHADER if register combienrs and texture_shader2
+                /* Also disable ATI_FRAGMENT_SHADER if register combiners and texture_shader2
                  * are supported. The nv extensions provide the same functionality as the
                  * ATI one, and a bit more(signed pixelformats)
                  */
@@ -2342,7 +2342,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
                     if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
                         UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP;
                     } else {
-                        /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */
+                        /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUTOGEN instead of D3D_OK */
                         TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n");
                     }
                 }
@@ -2485,7 +2485,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
                 if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {
                     UsageCaps |= WINED3DUSAGE_AUTOGENMIPMAP;
                 } else {
-                    /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUOTGEN instead of D3D_OK */
+                    /* When autogenmipmap isn't around continue and return WINED3DOK_NOAUTOGEN instead of D3D_OK */
                     TRACE_(d3d_caps)("[FAILED] - No autogenmipmap support, but continuing\n");
                 }
             }
@@ -3427,7 +3427,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) {
      * all the texture. This function detects this bug by its symptom and disables PBOs
      * if the test fails.
      *
-     * The test uplaods a 4x4 texture via the PBO in the "native" format GL_BGRA,
+     * The test uploads a 4x4 texture via the PBO in the "native" format GL_BGRA,
      * GL_UNSIGNED_INT_8_8_8_8_REV. This format triggers the bug, and it is what we use
      * for D3DFMT_A8R8G8B8. Then the texture is read back without any PBO and the data
      * read back is compared to the original. If they are equal PBOs are assumed to work,

dlls/wined3d/drawprim.c

@@ -840,13 +840,13 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVerte
     for(i = 0; i < MAX_STREAMS; i++) {
         /* Look at the streams and take the first one which matches */
         if(((stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) || (stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INDEXEDDATA)) && stateblock->streamSource[i]) {
-            /* D3d9 could set StreamFreq 0 with (INSTANCEDATA or INDEXEDDATA) and then it is handled as 1. See d3d9/tests/visual.c-> stream_test() */
+            /* D3D9 could set streamFreq 0 with (INSTANCEDATA or INDEXEDDATA) and then it is handled as 1. See d3d9/tests/visual.c-> stream_test() */
             if(stateblock->streamFreq[i] == 0){
                 numInstances = 1;
             } else {
                 numInstances = stateblock->streamFreq[i]; /* use the specified number of instances from the first matched stream. See d3d9/tests/visual.c-> stream_test() */
             }
-            break; /* break, bacause only the first suitable value is interesting */
+            break; /* break, because only the first suitable value is interesting */
         }
     }
 

dlls/wined3d/glsl_shader.c

@@ -686,7 +686,7 @@ void shader_generate_glsl_declarations(
             shader_addline(buffer, "attribute vec4 attrib%i;\n", i);
     }
 
-    /* Declare loop registers aLx */
+    /* Declare loop registers alx */
     for (i = 0; i < reg_maps->loop_depth; i++) {
         shader_addline(buffer, "int aL%u;\n", i);
         shader_addline(buffer, "int tmpInt%u;\n", i);

dlls/wined3d/state.c

@@ -682,7 +682,7 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon
              * and 128.0, although in d3d neither -1 nor 129 produce an error. GL_NV_max_light_exponent
              * allows bigger values. If the extension is supported, GL_LIMITS(shininess) contains the
              * value reported by the extension, otherwise 128. For values > GL_LIMITS(shininess) clamp
-             * them, it should be safe to do so without major visual dissortions.
+             * them, it should be safe to do so without major visual distortions.
              */
             WARN("Material power = %f, limit %f\n", stateblock->material.Power, GL_LIMITS(shininess));
             glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, GL_LIMITS(shininess));
@@ -3021,7 +3021,7 @@ static inline void unloadNumberedArrays(IWineD3DStateBlockImpl *stateblock) {
          * deactivated stream disabled, some other drivers(ATI, NV GF 8) set the undefined values to 0x00.
          * Let's set them to 0x00 to avoid hitting some undefined aspects of OpenGL. All that is really
          * important here is the glDisableVertexAttribArrayARB call above. The test shows that the refrast
-         * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2 Eposide 2
+         * keeps dereferencing the pointers, which would cause crashes in some games like Half Life 2: Episode Two.
          */
         GL_EXTCALL(glVertexAttrib4NubARB(i, 0, 0, 0, 0));
         checkGLcall("glVertexAttrib4NubARB(i, 0, 0, 0, 0)");
@@ -3393,7 +3393,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte
     /*     go directly into fast mode from app pgm, because       */
     /*     directx requires data in BGRA format.                  */
     /* currently fixupVertices swizzles the format, but this isn't*/
-    /* very practical when using VBOS                             */
+    /* very practical when using VBOs                             */
     /* NOTE: Unless we write a vertex shader to swizzle the colour*/
     /* , or the user doesn't care and wants the speed advantage   */
 

dlls/wined3d/stateblock.c

@@ -1235,7 +1235,7 @@ static HRESULT  WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
     }
 
     for(i = 0; i < GL_LIMITS(textures); i++) {
-        /* Note this avoids calling settexture, so pretend it has been called */
+        /* Note: This avoids calling SetTexture, so pretend it has been called */
         This->changed.textures[i] = TRUE;
         This->textures[i]         = NULL;
     }

dlls/wined3d/surface.c

@@ -1027,7 +1027,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED
 
     /* Now download the surface content from opengl
      * Use the render target readback if the surface is on a swapchain(=onscreen render target) or the current primary target
-     * Offscreen targets which are not active at the moment or are higher targets(fbos) can be locked with the texture path
+     * Offscreen targets which are not active at the moment or are higher targets(FBOs) can be locked with the texture path
      */
     IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain);
     if(swapchain || iface == myDevice->render_targets[0]) {
@@ -1189,7 +1189,7 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm
      * catch to put the dib section in InSync mode, which leads to a crash
      * and a blocked x server on my radeon card.
      *
-     * The following lines read the dib section so it is put in inSync mode
+     * The following lines read the dib section so it is put in InSync mode
      * before glDrawPixels is called and the crash is prevented. There won't
      * be any interfering gdi accesses, because UnlockRect is called from
      * ReleaseDC, and the app won't use the dc any more afterwards.
@@ -2579,7 +2579,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) {
         /* Now free the old memory if any */
         HeapFree(GetProcessHeap(), 0, release);
     } else if(This->Flags & SFLAG_USERPTR) {
-        /* Lockrect and GetDC will re-create the dib section and allocated memory */
+        /* LockRect and GetDC will re-create the dib section and allocated memory */
         This->resource.allocatedMemory = NULL;
         /* HeapMemory should be NULL already */
         if(This->resource.heapMemory != NULL) ERR("User pointer surface has heap memory allocated\n");

dlls/wined3d/surface_base.c

@@ -640,8 +640,8 @@ IWineD3DSurfaceImpl *surface_convert_format(IWineD3DSurfaceImpl *source, WINED3D
                                  0,     /* usage */
                                  WINED3DPOOL_SCRATCH,
                                  WINED3DMULTISAMPLE_NONE,   /* TODO: Multisampled conversion */
-                                 0,     /* multisamplequality */
+                                 0,     /* MultiSampleQuality */
-                                 NULL,  /* sharedhandle */
+                                 NULL,  /* SharedHandle */
                                  IWineD3DSurface_GetImplType((IWineD3DSurface *) source),
                                  NULL); /* parent */
     if(!ret) {

dlls/wined3d/surface_gdi.c

@@ -183,10 +183,10 @@ IWineGDISurfaceImpl_PreLoad(IWineD3DSurface *iface)
 }
 
 /*****************************************************************************
- * IWineD3DSurface::Unoad, GDI version
+ * IWineD3DSurface::UnLoad, GDI version
  *
  * This call is unsupported on GDI surfaces, if it's called something went
- * wrong in the parent library. Write an informative warning
+ * wrong in the parent library. Write an informative warning.
  *
  *****************************************************************************/
 static void WINAPI IWineGDISurfaceImpl_UnLoad(IWineD3DSurface *iface)
@@ -768,7 +768,7 @@ HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) {
         /* Now free the old memory if any */
         HeapFree(GetProcessHeap(), 0, release);
     } else if(This->Flags & SFLAG_USERPTR) {
-        /* Lockrect and GetDC will re-create the dib section and allocated memory */
+        /* LockRect and GetDC will re-create the dib section and allocated memory */
         This->resource.allocatedMemory = NULL;
         This->Flags &= ~SFLAG_USERPTR;
     }

dlls/wined3d/wined3d_private.h

@@ -129,9 +129,9 @@ void init_type_lookup(WineD3D_GL_Info *gl_info);
 /* The following functions convert 16 bit floats in the FLOAT16 data type
  * to standard C floats and vice versa. They do not depend on the encoding
  * of the C float, so they are platform independent, but slow. On x86 and
- * other IEEE 754 compliant platforms the conversion can be accelerated with
+ * other IEEE 754 compliant platforms the conversion can be accelerated by
- * bitshifting the exponent and mantissa. There are also some SSE-based
+ * bit shifting the exponent and mantissa. There are also some SSE-based
- * assembly routines out there
+ * assembly routines out there.
  *
  * See GL_NV_half_float for a reference of the FLOAT16 / GL_HALF format
  */
@@ -1347,7 +1347,7 @@ void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height)
 /* Surface flags: */
 #define SFLAG_OVERSIZE    0x00000001 /* Surface is bigger than gl size, blts only */
 #define SFLAG_CONVERTED   0x00000002 /* Converted for color keying or Palettized */
-#define SFLAG_DIBSECTION  0x00000004 /* Has a DIB section attached for getdc */
+#define SFLAG_DIBSECTION  0x00000004 /* Has a DIB section attached for GetDC */
 #define SFLAG_LOCKABLE    0x00000008 /* Surface can be locked */
 #define SFLAG_DISCARD     0x00000010 /* ??? */
 #define SFLAG_LOCKED      0x00000020 /* Surface is locked atm */

dlls/winedos/int31.c

@@ -183,7 +183,7 @@ static void INT_SetRealModeContext( REALMODECALL *call, CONTEXT86 *context )
 
 /**********************************************************************
  *          DPMI_xalloc
- * special virtualalloc, allocates lineary monoton growing memory.
+ * special virtualalloc, allocates linearly monoton growing memory.
  * (the usual VirtualAlloc does not satisfy that restriction)
  */
 static LPVOID DPMI_xalloc( DWORD len ) 

dlls/winex11.drv/bitblt.c

@@ -1322,7 +1322,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
 
     opcode = BITBLT_Opcodes[(rop >> 16) & 0xff];
 
-    /* a few optimisations for single-op rops */
+    /* a few optimizations for single-op ROPs */
     if (!fStretch && !opcode[1])
     {
         if (OP_SRCDST(*opcode) == OP_ARGS(PAT,DST))

dlls/wininet/http.c

@@ -3266,7 +3266,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders,
             if (lpwhr->dwContentLength == 0)
                 HTTP_FinishedReading(lpwhr);
 
-            /* Correct the case where both a Content-Length and Transfer-encoding = chuncked are set */
+            /* Correct the case where both a Content-Length and Transfer-encoding = chunked are set */
 
             dwBufferSize = sizeof(encoding);
             if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &dwBufferSize, NULL) &&

dlls/winmm/winmm.c

@@ -2197,7 +2197,7 @@ UINT WINAPI waveOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize)
     if (lpText == NULL) ret = MMSYSERR_INVALPARAM;
     else if (uSize == 0) ret = MMSYSERR_NOERROR;
     else if (
-	       /* test has been removed 'coz MMSYSERR_BASE is 0, and gcc did emit
+	       /* test has been removed because MMSYSERR_BASE is 0, and gcc did emit
 		* a warning for the test was always true */
 	       (/*uError >= MMSYSERR_BASE && */ uError <= MMSYSERR_LASTERROR) ||
 	       (uError >= WAVERR_BASE  && uError <= WAVERR_LASTERROR)) {

dlls/wintrust/tests/crypt.c

@@ -82,7 +82,7 @@ static void test_context(void)
      *
      * TODO: Find out what this GUID is/does.
      *
-     * On WinXp and up there is also a TimeStamp file in some of directories that
+     * On WinXP and up there is also a TimeStamp file in some of directories that
      * seem to indicate the last change to the catalog database for that GUID.
      *
      * On Windows 2000 some files are created/updated:

include/custcntl.h

@@ -28,7 +28,7 @@ extern "C" {
 #define CCHCCDESC 32
 #define CCHCCTEXT 256
 
-/* Custom Control Syte Structure */
+/* Custom Control Style Structure */
 typedef struct tagCCSYLEA {
   DWORD flStyle;
   DWORD flExtStyle;

include/ddraw.h

@@ -401,7 +401,7 @@ typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
     DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
     DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
     DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
+    DWORD	dwRops[DD_ROP_SPACE];   /* ROPs supported */
     DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superseded for DirectX6+ */
     DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
     DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
@@ -415,15 +415,15 @@ typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
     DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
     DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
     DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
+    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
     DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
     DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
     DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
+    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
     DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
     DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
     DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
+    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
     DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
     DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
     DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
@@ -431,7 +431,7 @@ typedef struct _DDCAPS_DX7		/* DirectX 7 version of caps struct */
     DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
     DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
     DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
     DDSCAPS2    ddsCaps;		/* surface capabilities */
 } DDCAPS_DX7,*LPDDCAPS_DX7;
 
@@ -462,7 +462,7 @@ typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
     DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
     DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
     DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
+    DWORD	dwRops[DD_ROP_SPACE];   /* ROPs supported */
     DDSCAPS	ddsOldCaps;             /* old DDSCAPS - superseded for DirectX6+ */
     DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
     DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
@@ -476,15 +476,15 @@ typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
     DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
     DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
     DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
+    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
     DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
     DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
     DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
+    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
     DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
     DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
     DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
+    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
     DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
     DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
     DWORD   	dwSVBCaps2;             /* more driver specific capabilities for System->Vmem blts */
@@ -492,7 +492,7 @@ typedef struct _DDCAPS_DX6		/* DirectX 6 version of caps struct */
     DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
     DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
     DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
     /* and one new member for DirectX 6 */
     DDSCAPS2    ddsCaps;		/* surface capabilities */
 } DDCAPS_DX6,*LPDDCAPS_DX6;
@@ -524,7 +524,7 @@ typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
     DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
     DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
     DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
+    DWORD	dwRops[DD_ROP_SPACE];   /* ROPs supported */
     DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
     DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
     DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
@@ -538,15 +538,15 @@ typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
     DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
     DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
     DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
+    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
     DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
     DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
     DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
+    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
     DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
     DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
     DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
+    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
     /* the following are the new DirectX 5 members */
     DWORD       dwMaxVideoPorts;        /* maximum number of usable video ports */
     DWORD   	dwCurrVideoPorts;       /* current number of video ports used */
@@ -555,7 +555,7 @@ typedef struct _DDCAPS_DX5		/* DirectX5 version of caps struct */
     DWORD   	dwNLVBCaps2;            /* more driver specific capabilities non-local->local vidmem blts */
     DWORD   	dwNLVBCKeyCaps;         /* driver color key capabilities for non-local->local vidmem blts */
     DWORD   	dwNLVBFXCaps;           /* driver FX capabilities for non-local->local blts */
-    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPS supported for non-local->local blts */
+    DWORD   	dwNLVBRops[DD_ROP_SPACE]; /* ROPs supported for non-local->local blts */
 } DDCAPS_DX5,*LPDDCAPS_DX5;
 
 typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
@@ -585,7 +585,7 @@ typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
     DWORD	dwAlignBoundaryDest;    /* dest rectangle alignment */
     DWORD	dwAlignSizeDest;        /* dest rectangle byte size */
     DWORD	dwAlignStrideAlign;     /* stride alignment */
-    DWORD	dwRops[DD_ROP_SPACE];   /* ROPS supported */
+    DWORD	dwRops[DD_ROP_SPACE];   /* ROPs supported */
     DDSCAPS	ddsCaps;                /* DDSCAPS structure has all the general capabilities */
     DWORD	dwMinOverlayStretch;    /* minimum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
     DWORD	dwMaxOverlayStretch;    /* maximum overlay stretch factor multiplied by 1000, eg 1000 == 1.0, 1300 == 1.3 */
@@ -599,15 +599,15 @@ typedef struct _DDCAPS_DX3		/* DirectX3 version of caps struct */
     DWORD	dwSVBCaps;              /* driver specific capabilities for System->Vmem blts */
     DWORD	dwSVBCKeyCaps;          /* driver color key capabilities for System->Vmem blts */
     DWORD	dwSVBFXCaps;            /* driver FX capabilities for System->Vmem blts */
-    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPS supported for System->Vmem blts */
+    DWORD	dwSVBRops[DD_ROP_SPACE];/* ROPs supported for System->Vmem blts */
     DWORD	dwVSBCaps;              /* driver specific capabilities for Vmem->System blts */
     DWORD	dwVSBCKeyCaps;          /* driver color key capabilities for Vmem->System blts */
     DWORD	dwVSBFXCaps;            /* driver FX capabilities for Vmem->System blts */
-    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPS supported for Vmem->System blts */
+    DWORD	dwVSBRops[DD_ROP_SPACE];/* ROPs supported for Vmem->System blts */
     DWORD	dwSSBCaps;              /* driver specific capabilities for System->System blts */
     DWORD	dwSSBCKeyCaps;          /* driver color key capabilities for System->System blts */
     DWORD	dwSSBFXCaps;            /* driver FX capabilities for System->System blts */
-    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPS supported for System->System blts */
+    DWORD	dwSSBRops[DD_ROP_SPACE];/* ROPs supported for System->System blts */
     DWORD	dwReserved4;
     DWORD	dwReserved5;
     DWORD	dwReserved6;

include/dmusicf.h

@@ -36,7 +36,7 @@ extern "C" {
 
 
 /*****************************************************************************
- * FOURCC Definitons
+ * FOURCC Definitions
  */
 /* Common chunks */
 #define DMUS_FOURCC_GUID_CHUNK                     mmioFOURCC('g','u','i','d')

include/mapidefs.h

@@ -434,7 +434,7 @@ typedef struct _SRowSet
 typedef struct _SPropProblem
 {
     ULONG ulIndex;   /* Index of the property */
-    ULONG ulPropTag; /* Proprty tag of the property */
+    ULONG ulPropTag; /* Property tag of the property */
     SCODE scode;     /* Error code of the problem */
 } SPropProblem, *LPSPropProblem;
 

include/mapitags.h

@@ -415,7 +415,7 @@
 #define PR_IPM_OUTBOX_SEARCH_KEY PROP_TAG(PT_BINARY,0x3411)
 #define PR_IPM_WASTEBASKET_SEARCH_KEY PROP_TAG(PT_BINARY,0x3412)
 #define PR_IPM_SENTMAIL_SEARCH_KEY PROP_TAG(PT_BINARY,0x3413)
-/* Provder-defined message store type */
+/* Provider-defined message store type */
 #define PR_MDB_PROVIDER PROP_TAG(PT_BINARY,0x3414)
 #define PR_RECEIVE_FOLDER_SETTINGS PROP_TAG(PT_OBJECT,0x3415)
 #define PR_VALID_FOLDER_MASK PROP_TAG(PT_I4,0x35DF)

include/msvcrt/share.h

@@ -16,7 +16,7 @@
  *
  *  This code is distributed in the hope that it will be useful but
  *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warranties of
+ *  DISCLAIMED. This includes but is not limited to warranties of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  */

include/rpcdcep.h

@@ -48,7 +48,7 @@ typedef struct _RPC_MESSAGE
     unsigned long RpcFlags;
 } RPC_MESSAGE, *PRPC_MESSAGE;
 
-/* or'd with ProcNum */
+/* or'ed with ProcNum */
 #define RPC_FLAGS_VALID_BIT         0x00008000
 
 #define RPC_CONTEXT_HANDLE_DEFAULT_GUARD ((void *)0xfffff00d)

include/shlobj.h

@@ -76,9 +76,9 @@ VOID         WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT);
 int          WINAPI RestartDialog(HWND,LPCWSTR,DWORD);
 int          WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD);
 
-#define SHFMT_ERROR     0xFFFFFFFFL  /* Error on last format, drive may be formatable */
+#define SHFMT_ERROR     0xFFFFFFFFL  /* Error on last format, drive may be formattable */
-#define SHFMT_CANCEL    0xFFFFFFFEL  /* Last format was canceled */
+#define SHFMT_CANCEL    0xFFFFFFFEL  /* Last format was cancelled */
-#define SHFMT_NOFORMAT  0xFFFFFFFDL  /* Drive is not formatable */
+#define SHFMT_NOFORMAT  0xFFFFFFFDL  /* Drive is not formattable */
 
 /* SHFormatDrive flags */
 #define SHFMT_ID_DEFAULT	0xFFFF

include/twain.h

@@ -1337,7 +1337,7 @@ typedef struct {
 /*  This has a couple implications:                                         */
 /*  1) Any additional DAT_ features require modifications to the thunk code */
 /*     for thunker support.                                                 */
-/*  2) Any applications which use the custom capabailites are not supported */
+/*  2) Any applications which use the custom capabilities are not supported */
 /*     under thunking since we have no way of knowing what size data (if    */
 /*     any) is being passed.                                                */
 

include/wine/mscvpdb.h

@@ -827,7 +827,7 @@ union codeview_fieldtype
 #define T_NBASICSTR         0x0005  /* near basic string */
 #define T_FBASICSTR         0x0006  /* far basic string */
 #define T_NOTTRANS          0x0007  /* untranslated type record from MS symbol format */
-#define T_HRESULT           0x0008  /* Hresult - or error code ??? */
+#define T_HRESULT           0x0008  /* HRESULT - or error code ??? */
 #define T_CHAR              0x0010  /* signed char */
 #define T_SHORT             0x0011  /* short */
 #define T_LONG              0x0012  /* long */
@@ -962,7 +962,7 @@ union codeview_fieldtype
 
 /* 32-bit near pointers to basic types */
 #define T_32PVOID           0x0403  /* 32-bit near pointer to void */
-#define T_32PHRESULT        0x0408  /* 16:32 near pointer to Hresult - or error code ??? */
+#define T_32PHRESULT        0x0408  /* 16:32 near pointer to HRESULT - or error code ??? */
 #define T_32PCHAR           0x0410  /* 16:32 near pointer to 8-bit signed */
 #define T_32PSHORT          0x0411  /* 16:32 near pointer to 16-bit signed */
 #define T_32PLONG           0x0412  /* 16:32 near pointer to 32-bit signed */

include/wine/wined3d_types.h

@@ -1260,11 +1260,11 @@ typedef enum _WINED3DDECLTYPE {
 #define WINED3DDECL_END() {0xFF,0,WINED3DDECLTYPE_UNUSED,0,0,0,-1}
 
 typedef struct WineDirect3DStridedData {
-    BYTE     *lpData;        /* Pointer to start of data               */
+    BYTE     *lpData;        /* Pointer to start of data                */
-    DWORD     dwStride;      /* Stride between occurances of this data */
+    DWORD     dwStride;      /* Stride between occurrences of this data */
-    DWORD     dwType;        /* Type (as in D3DVSDT_TYPE)              */
+    DWORD     dwType;        /* Type (as in D3DVSDT_TYPE)               */
-    int       VBO;           /* Vertex buffer object this data is in   */
+    int       VBO;           /* Vertex buffer object this data is in    */
-    UINT      streamNo;      /* D3D stream number                      */
+    UINT      streamNo;      /* D3D stream number                       */
 } WineDirect3DStridedData;
 
 typedef struct WineDirect3DVertexStridedData {

include/winsock.h

@@ -41,7 +41,7 @@
  * This means select and all the related stuff is already defined and we
  * cannot override types and function prototypes.
  * All we can do is disable all these symbols so that they are not used
- * inadvertantly.
+ * inadvertently.
  */
 #  include <sys/types.h>
 #  undef FD_SETSIZE

programs/cmd/directory.c

@@ -105,7 +105,7 @@ void WCMD_directory (WCHAR *cmd) {
 
   errorlevel = 0;
 
-  /* Prefill Quals with (uppercased) DIRCMD env var */
+  /* Prefill quals with (uppercased) DIRCMD env var */
   if (GetEnvironmentVariable (dircmdW, string, sizeof(string)/sizeof(WCHAR))) {
     p = string;
     while ( (*p = toupper(*p)) ) ++p;

programs/services/rpc.c

@@ -372,7 +372,7 @@ DWORD svcctl_CreateServiceW(
     entry->config.lpServiceStartName = strdupW(lpServiceStartName);
     entry->config.lpDisplayName = strdupW(lpDisplayName);
 
-    if (lpdwTagId)      /* TODO: in most situations a non-NULL tagid will generate a ERROR_INVALID_PARAMETER */
+    if (lpdwTagId)      /* TODO: In most situations a non-NULL TagId will generate an ERROR_INVALID_PARAMETER. */
         entry->config.dwTagId = *lpdwTagId;
     else
         entry->config.dwTagId = 0;

programs/wineconsole/user.c

@@ -1052,7 +1052,7 @@ static void    WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down,
 		break;
 	    }
 	}
-	ir.Event.KeyEvent.uChar.UnicodeChar = last; /* FIXME HACKY... and buggy 'coz it should be a stack, not a single value */
+	ir.Event.KeyEvent.uChar.UnicodeChar = last; /* FIXME: HACKY... and buggy because it should be a stack, not a single value */
 	if (!down) last = 0;
     }
 

programs/winhelp/hlpfile.c

@@ -1388,7 +1388,7 @@ static BOOL HLPFILE_ReadFileToBuffer(HLPFILE* hlpfile, HFILE hFile)
 
     if (_hread(hFile, dummy, 1) != 0) WINE_WARN("filesize2\n");
 
-    hlpfile->file_buffer[hlpfile->file_buffer_size] = '\0'; /* FIXME: was '0', sounds ackward to me */
+    hlpfile->file_buffer[hlpfile->file_buffer_size] = '\0'; /* FIXME: was '0', sounds backwards to me */
 
     return TRUE;
 }

tools/wmc/write.c

@@ -243,7 +243,7 @@ void write_h_file(const char *fname)
 			cptr = dup_u2c(ndp->u.msg->msgs[idx_en]->cp, ndp->u.msg->msgs[idx_en]->msg);
 			killnl(cptr, 0);
 			killcomment(cptr);
-			fprintf(fp, "/* Approx. msg: %s */\n", cptr);
+			fprintf(fp, "/* Approximate msg: %s */\n", cptr);
 			free(cptr);
 			cptr = dup_u2c(WMC_DEFAULT_CODEPAGE, ndp->u.msg->sym);
 			if(ndp->u.msg->cast)