Francois Gouget : Assorted spelling fixes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95d769a0470d8be60063316c4000cd49d3e5aeff
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95d769a0470d8be60063316c4000cd49d3e5aeff

Author: Francois Gouget <fgouget at free.fr>
Date:   Sat Jun 25 13:49:27 2011 +0200

Assorted spelling fixes.

---

 dlls/d3dx9_36/mesh.c           |    2 +-
 dlls/d3dx9_36/tests/mesh.c     |    2 +-
 dlls/d3dx9_36/tests/shader.c   |    2 +-
 dlls/shell32/shellpath.c       |    2 +-
 dlls/shell32/tests/shellpath.c |    6 +++---
 programs/wscript/tests/run.c   |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 0455ea7..2807150 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -630,7 +630,7 @@ static HRESULT WINAPI ID3DXMeshImpl_UpdateSemantics(ID3DXMesh *iface, D3DVERTEXE
     vertex_declaration_size = D3DXGetDeclVertexSize(declaration, declaration[0].Stream);
     if (vertex_declaration_size != This->vertex_declaration_size)
     {
-        WARN("Invalid declaration. New vertex size does not match the orginal vertex size.\n");
+        WARN("Invalid declaration. New vertex size does not match the original vertex size.\n");
         return D3DERR_INVALIDCALL;
     }
 
diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
index 6925f2d..c96b94e 100644
--- a/dlls/d3dx9_36/tests/mesh.c
+++ b/dlls/d3dx9_36/tests/mesh.c
@@ -99,7 +99,7 @@ struct test_context
 
 /* Initializes a test context struct. Use it to initialize DirectX.
  *
- * Returns NULL if an error occured.
+ * Returns NULL if an error occurred.
  */
 static struct test_context *new_test_context(void)
 {
diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
index 11626f5..1d6f0da 100644
--- a/dlls/d3dx9_36/tests/shader.c
+++ b/dlls/d3dx9_36/tests/shader.c
@@ -691,7 +691,7 @@ static void test_get_sampler_index(void)
     ok(index == 3, "ID3DXConstantTable_GetSamplerIndex returned wrong index: Got %d, expected 3\n", index);
 
     index = ID3DXConstantTable_GetSamplerIndex(ctable, "nonexistent");
-    ok(index == -1, "ID3DXConstantTable_GetSamplerIndex found non-existent sampler: Got %d\n",
+    ok(index == -1, "ID3DXConstantTable_GetSamplerIndex found nonexistent sampler: Got %d\n",
             index);
 
     index = ID3DXConstantTable_GetSamplerIndex(ctable, "notsampler");
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 8f4378f..aed7ceb 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3228,7 +3228,7 @@ static HRESULT WINAPI knownfolder_GetCategory(
 
     TRACE("%p, %p\n", knownfolder, pCategory);
 
-    /* we can not get category for folder which is not registered */
+    /* we cannot get a category for a folder which is not registered */
     if(!knownfolder->registryPath)
         hr = E_FAIL;
 
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index 825cca3..2b13cc4 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -1185,7 +1185,7 @@ static void test_knownFolders(void)
 
                     hr = IKnownFolder_GetPath(folder, 0, &folderPath);
                     ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr);
-                    ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
+                    ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
                     CoTaskMemFree(folderPath);
 
                     /* try to set new path for folder */
@@ -1195,7 +1195,7 @@ static void test_knownFolders(void)
                     /* verify modified path */
                     hr = IKnownFolder_GetPath(folder, 0, &folderPath);
                     ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr);
-                    ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
+                    ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
                     CoTaskMemFree(folderPath);
 
                     /* set again to first path, but use another way */
@@ -1207,7 +1207,7 @@ static void test_knownFolders(void)
                     hr = IKnownFolder_GetPath(folder, 0, &folderPath);
                     ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr);
                     todo_wine
-                    ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
+                    ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath));
                     CoTaskMemFree(folderPath);
 
                     /* check shell utility functions */
diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c
index 405aae4..2c2a15a 100644
--- a/programs/wscript/tests/run.c
+++ b/programs/wscript/tests/run.c
@@ -334,7 +334,7 @@ static BOOL register_activex(void)
 
     hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf,
             CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid);
-    ok(hres == S_OK, "Could not register screipt engine: %08x\n", hres);
+    ok(hres == S_OK, "Could not register script engine: %08x\n", hres);
     return TRUE;
 }