Commit 95d769a0 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Assorted spelling fixes.

parent b47e6f1b
......@@ -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;
}
......
......@@ -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)
{
......
......@@ -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");
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment