From 4823b2c7bf2e7cf05e02a99d6abe3c54172e9766 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 1 Sep 2008 17:01:17 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/advapi32/tests/service.c | 12 ++++++------ dlls/d3dxof/d3dxof.c | 4 ++-- dlls/mstask/tests/task.c | 6 +++--- dlls/mstask/tests/task_scheduler.c | 2 +- dlls/riched20/table.c | 4 ++-- dlls/shdocvw/tests/intshcut.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/winhttp/tests/winhttp.c | 8 +++++--- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 268827e043c..da62b0b5e8b 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1110,7 +1110,7 @@ static void test_enum_svc(void) /* Store the number of returned services */ tempreturned = returned; - /* Allocate less then the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle */ services = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1128,7 +1128,7 @@ static void test_enum_svc(void) } HeapFree(GetProcessHeap(), 0, services); - /* Allocate less then the needed bytes, this time with a correct resume handle */ + /* Allocate less than the needed bytes, this time with a correct resume handle */ services = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1173,8 +1173,8 @@ static void test_enum_svc(void) /* Vista only shows the drivers with a state of SERVICE_RUNNING as active * and doesn't count the others as inactive. This means that Vista could - * show a total that is greater then the sum of active and inactive drivers. - * + * show a total that is greater than the sum of active and inactive + * drivers. * The number of active and inactive drivers is greatly influenced by the * time when tests are run, immediately after boot or later for example. * @@ -1460,7 +1460,7 @@ static void test_enum_svc(void) /* Store the number of returned services */ tempreturned = returned; - /* Allocate less then the needed bytes and don't specify a resume handle */ + /* Allocate less than the needed bytes and don't specify a resume handle */ exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; @@ -1478,7 +1478,7 @@ static void test_enum_svc(void) } HeapFree(GetProcessHeap(), 0, exservices); - /* Allocate less then the needed bytes, this time with a correct resume handle */ + /* Allocate less than the needed bytes, this time with a correct resume handle */ exservices = HeapAlloc(GetProcessHeap(), 0, tempneeded - 1); bufsize = tempneeded - 1; needed = 0xdeadbeef; diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d1f580c5079..9f19d5fb997 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -778,7 +778,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) } if (cur_member->idx_template == buf->pdxf->nb_xtemplates) { - TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + TRACE("Reference to a nonexistent template '%s'\n", (char*)buf->value); return FALSE; } if (check_TOKEN(buf) == TOKEN_NAME) @@ -817,7 +817,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) } if (cur_member->idx_template == buf->pdxf->nb_xtemplates) { - TRACE("Reference to non existing template '%s'\n", (char*)buf->value); + TRACE("Reference to nonexistent template '%s'\n", (char*)buf->value); return FALSE; } } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 820b962948f..7cb76737ed8 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -126,7 +126,7 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - /* Set application name to a non-existent application and then get + /* Set application name to a nonexistent application and then get * the application name that is actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); ok(hres == S_OK, "Failed setting name %s: %08x\n", @@ -170,8 +170,8 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - /* After having a valid application name set, set application name - * to a non-existant application and then get the name that is + /* After having a valid application name set, set application the name + * to a nonexistent application and then get the name that is * actually stored */ hres = ITask_SetApplicationName(test_task, non_application_name); ok(hres == S_OK, "Failed setting name %s: %08x\n", diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index af3a565cf65..2de0e160496 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -93,7 +93,7 @@ static void test_Activate(void) return; } - /* Attempt to Activate a non-existant task */ + /* Attempt to activate a nonexistent task */ hres = ITaskScheduler_Activate(test_task_scheduler, not_task_name, &IID_ITask, (IUnknown**)&task); ok(hres == COR_E_FILENOTFOUND, "Expected COR_E_FILENOTFOUND: %08x\n", hres); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 6289e345853..9cb4bbffd65 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -29,7 +29,7 @@ * Richedit version 1.0 - 3.0: * Tables are implemented in these versions using tabs at the end of cells, * and tab stops to position the cells. The paragraph format flag PFE_TABLE - * will indicate the the paragraph is a table row. Note that in this + * will indicate that the paragraph is a table row. Note that in this * implementation there is one paragraph per table row. * * Richedit version 4.1: @@ -37,7 +37,7 @@ * each with it's own paragraph format, and cells may even contain tables * nested within the cell. * - * There are is also a paragraph at the start of each table row that contains + * There is also a paragraph at the start of each table row that contains * the rows paragraph format (e.g. to change the row alignment to row), and a * paragraph at the end of the table row with the PFE_TABLEROWDELIMITER flag * set. The paragraphs at the start and end of the table row should always be diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index bdd6d2be7d8..0b0798ac1f7 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -171,7 +171,7 @@ static void test_NullURLs(void) hr = urlA->lpVtbl->GetURL(urlA, &url); ok(SUCCEEDED(hr), "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); - ok(url == NULL, "unitialized URL is not NULL but %s\n", url); + ok(url == NULL, "uninitialized URL is not NULL but %s\n", url); hr = urlA->lpVtbl->SetURL(urlA, NULL, 0); ok(SUCCEEDED(hr), "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d26940600f0..60d77f0c27c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3882,7 +3882,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying * within the limits enforced by the ARB_texture_rectangle extension. This however is not true for the * FX series, which instantly falls back to a slower software path as soon as ARB_tex_npot is used. - * We therefore completly remove ARB_tex_npot from the list of supported extensions. + * We therefore completely remove ARB_tex_npot from the list of supported extensions. * * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, * triggering the software fallback. There is not much we can do here apart from disabling the diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6ba3a32a7fd..1e50f36810d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -267,13 +267,15 @@ static void test_WinHttpAddHeaders(void) test_header_name, buffer, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, second index should not exist.\n"); - /* Try to fetch the header info with a buffer thats big enough to fit string but not NULL terminator. */ + /* Try to fetch the header info with a buffer that's big enough to fit the + * string but not the NULL terminator. + */ index = 0; len = 5*sizeof(WCHAR); memcpy(buffer, check_buffer, sizeof(buffer)); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, test_header_name, buffer, &len, &index); - ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer thats too small.\n"); + ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded with a buffer that's too small.\n"); ok(memcmp(buffer, check_buffer, sizeof(buffer)) == 0, "WinHttpQueryHeaders failed, modified the buffer when it should not have.\n"); ok(len == 6*sizeof(WCHAR), "WinHttpQueryHeaders returned invalid length, expected 12, got %d\n", len); @@ -289,7 +291,7 @@ static void test_WinHttpAddHeaders(void) ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n"); - /* Try with a NULL buffer and a length thats too small */ + /* Try with a NULL buffer and a length that's too small */ index = 0; len = 10; SetLastError(0xdeadbeef);