Assorted spelling fixes.

dlls/dinput/joystick_private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Aric Stewart, Codeweavers
+ * Copyright 2009, Aric Stewart, CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

dlls/gdiplus/font.c

@@ -301,7 +301,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family)
  *
  * RETURNS
  *  SUCCESS: Ok
- *  FAILURE: InvalidParamter (font or size was NULL)
+ *  FAILURE: InvalidParameter (font or size was NULL)
  *
  * NOTES
  *  Size returned is actually emSize -- not internal size used for drawing.

dlls/msxml3/node.c

@@ -388,7 +388,7 @@ static HRESULT get_node(
     if ( !out )
         return E_INVALIDARG;
 
-    /* if we dont have a doc, use our parent. */
+    /* if we don't have a doc, use our parent. */
     if(node && !node->doc && node->parent)
         node->doc = node->parent->doc;
 

dlls/sane.ds/options.c

@@ -140,7 +140,7 @@ SANE_Status sane_option_get_str(SANE_Handle h, const char *option_name, SANE_Str
         return SANE_STATUS_NO_MEM;
 }
 
-/* Important:  SANE has the side effect of of overwriting val with the returned value */
+/* Important:  SANE has the side effect of overwriting val with the returned value */
 SANE_Status sane_option_set_str(SANE_Handle h, const char *option_name, SANE_String val, SANE_Int *status)
 {
     SANE_Status rc;

dlls/spoolss/router.c

@@ -270,7 +270,7 @@ BOOL backend_load_all(void)
 
     EnterCriticalSection(&backend_cs);
 
-    /* if we failed before, dont try again */
+    /* if we failed before, don't try again */
     if (!failed && (used_backends == 0)) {
         pb = backend_load(localsplW, NULL, NULL);
 

dlls/user32/tests/combo.c

@@ -380,7 +380,7 @@ static void test_changesize( DWORD style)
             rc.right - rc.left, clwidth - 2);
     ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n",
             rc.bottom - rc.top, ddheight);
-    /* new cx, cy is slightly bigger then the initial values */
+    /* new cx, cy is slightly bigger than the initial values */
     MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE);
     GetClientRect( hCombo, &rc);
     ok( rc.right - rc.left == clwidth + 2, "clientrect witdh is %d vs %d\n",

dlls/user32/tests/menu.c

@@ -562,8 +562,8 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt,
     }
     ret = GetMenuItemRect( hwnd, hmenu, 0, &rc);
     if (0)  /* comment out menu size checks, behavior is different in almost every Windows version */
-            /* the tests should however succeed on win2000, XP and Wine (at least upto 1.1.15) */
+            /* the tests should however succeed on win2000, XP and Wine (at least up to 1.1.15) */
-            /* with a variety of dpi's and desktop font sizes */
+            /* with a variety of dpis and desktop font sizes */
     {
         /* check menu width */
         if( ispop)
@@ -2809,7 +2809,7 @@ static void test_menu_trackpopupmenu(void)
                 gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ",
                 gflag_entermenuloop ? "WM_INITMENULOOP ": "",
                 gflag_initmenu ? "WM_INITMENU": "");
-        /* now a somewhat successfull call */
+        /* now a somewhat successful call */
         gle = 0xdeadbeef;
         gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0;
         ret = MyTrackPopupMenu( Ex, hmenu, 0x100, 100,100, hwnd, NULL);
@@ -2913,14 +2913,14 @@ static void test_menu_cancelmode(void)
     todo_wine {
         ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle);
     }
-    ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less then 2\n", g_got_enteridle);
+    ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle);
     /* menu owner is child window */
     g_hwndtosend = hwndchild;
     ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwndchild, NULL);
     todo_wine {
         ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle);
     }
-    ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less then 2\n", g_got_enteridle);
+    ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle);
     /* now send the WM_CANCELMODE messages to the WRONG window */
     /* those should fail ( to have any effect) */
     g_hwndtosend = hwnd;

dlls/user32/tests/sysparams.c

@@ -755,7 +755,7 @@ static void test_SPI_SETBORDER( void )                 /*      6 */
     /* FIXME: include new PaddedBorderWidth parameter */
     PaddedBorderWidth = ncmsave.iBorderWidth - old_border;
     if( PaddedBorderWidth){
-        win_skip( "Can not reliable restore border width yet (PaddedBorderWidth = %d)\n",
+        win_skip( "Cannot reliably restore border width yet (PaddedBorderWidth = %d)\n",
                 PaddedBorderWidth);
         return;
     }

dlls/winealsa.drv/waveout.c

@@ -373,7 +373,7 @@ static	void	wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset)
     } else {
         if (wwo->lpLoopPtr) {
             /* complicated case, not handled yet (could imply modifying the loop counter */
-            FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+            FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
             wwo->lpPlayPtr = wwo->lpLoopPtr;
             wwo->dwPartialOffset = 0;
             wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */

dlls/wined3d/glsl_shader.c

@@ -514,7 +514,7 @@ static void shader_glsl_load_np2fixup_constants(
             if (-1 != prog->np2Fixup_location[i]) {
                 const IWineD3DBaseTextureImpl* const tex = (const IWineD3DBaseTextureImpl*) stateBlock->textures[i];
                 if (!tex) {
-                    FIXME("Non-existant texture is flagged for NP2 texcoord fixup\n");
+                    FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n");
                     continue;
                 } else {
                     const float tex_dim[2] = {tex->baseTexture.pow2Matrix[0], tex->baseTexture.pow2Matrix[5]};

dlls/wineesd.drv/audio.c

@@ -935,7 +935,7 @@ static	void	wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset)
     } else {
         if (wwo->lpLoopPtr) {
             /* complicated case, not handled yet (could imply modifying the loop counter */
-            FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+            FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
             wwo->lpPlayPtr = wwo->lpLoopPtr;
             wwo->dwPartialOffset = 0;
             wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */

dlls/winejack.drv/audio.c

@@ -1184,7 +1184,7 @@ static  void  wodHelper_Reset(WINE_WAVEOUT* wwo, BOOL reset)
         if (wwo->lpLoopPtr)
         {
             /* complicated case, not handled yet (could imply modifying the loop counter) */
-            FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+            FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
             wwo->lpPlayPtr = wwo->lpLoopPtr;
             wwo->dwPartialOffset = 0;
             wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */

dlls/winenas.drv/audio.c

@@ -760,7 +760,7 @@ static	void	wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset)
     } else {
         if (wwo->lpLoopPtr) {
             /* complicated case, not handled yet (could imply modifying the loop counter */
-            FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+            FIXME("Pausing while in loop isn't correctly handled yet, expec strange results\n");
             wwo->lpPlayPtr = wwo->lpLoopPtr;
             wwo->WrittenTotal = wwo->PlayedTotal; /* this is wrong !!! */
         } else {

dlls/wineoss.drv/audio.c

@@ -1742,7 +1742,7 @@ static	void	wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset)
     } else {
         if (wwo->lpLoopPtr) {
             /* complicated case, not handled yet (could imply modifying the loop counter */
-            FIXME("Pausing while in loop isn't correctly handled yet, except strange results\n");
+            FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
             wwo->lpPlayPtr = wwo->lpLoopPtr;
             wwo->dwPartialOffset = 0;
             wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */

dlls/wininet/cookie.c

@@ -456,7 +456,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST
     strcpyW(data,cookie_data);
     memset(&expiry,0,sizeof(expiry));
 
-    /* lots of informations can be parsed out of the cookie value */
+    /* lots of information can be parsed out of the cookie value */
 
     ptr = data;
     for (;;)