From 0dd5cb1cef2d50653377e304ac76693792e48aae Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 28 Sep 2014 23:53:46 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/comctl32/tests/button.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/d3d8/tests/device.c | 2 +- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/dpvoice/tests/voice.c | 12 ++++++------ dlls/dwrite/analyzer.c | 2 +- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/mshtml/tests/dom.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wmp/oleobj.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- dlls/xmllite/writer.c | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index ecb438e97d4..eb4e924e0f0 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -759,7 +759,7 @@ if (ret) /* TODO: remove once Wine is fixed */ ok(!strcmp(buffA, "Button"), "got %s\n", buffA); DestroyWindow(hwnd); - /* explicitely create with versioned class name */ + /* explicitly create with versioned class name */ hwnd = CreateWindowExW(0, nameW, testW, BS_CHECKBOX, 0, 0, 50, 14, NULL, 0, 0, NULL); todo_wine ok(hwnd != NULL, "failed to create a window %s\n", wine_dbgstr_w(nameW)); diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d65c459eb96..9a3f8510b5e 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -674,7 +674,7 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); ok(hr == S_OK, "got 0x%08x.\n", hr); - /* I hope noone relies on this one */ + /* I hope no one relies on this one */ todo_wine ok(filetype == 0, "got %d\n", filetype); hr = IFileSaveDialog_SetFileTypeIndex(pfsd, 0); ok(hr == S_OK, "got 0x%08x.\n", hr); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a92ca81e9d6..e066b77201b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3343,7 +3343,7 @@ static void test_validate_ps(void) *ps = 0xffff0101; /* ps_1_1 */ hr = ValidatePixelShader(ps, ps, 1, 0); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen th 3rd parameter always passed as either 0 or 1, but passing + /* I've seen the 3rd parameter always passed as either 0 or 1, but passing * other values doesn't seem to hurt. */ hr = ValidatePixelShader(ps, 0, 12345, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4c35baa91fb..742d82c76f4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5214,7 +5214,7 @@ static void test_palette_gdi(void) * from a regular surface. Tests for the interaction between the ddraw palette and * the system palette are not included pending an application that depends on this. * The relation between those causes problems on Windows Vista and newer for games - * like Age of Empires or Starcraft. Don't emulate it without a real need. */ + * like Age of Empires or StarCraft. Don't emulate it without a real need. */ i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) @@ -5243,7 +5243,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); /* Here the offscreen surface appears to use the primary's palette, - * but in all likelyhood it is actually the system palette. */ + * but in all likelihood it is actually the system palette. */ hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 750cc6eb41f..c5a8393ebb8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6282,7 +6282,7 @@ static void test_palette_gdi(void) * from a regular surface. Tests for the interaction between the ddraw palette and * the system palette are not included pending an application that depends on this. * The relation between those causes problems on Windows Vista and newer for games - * like Age of Empires or Starcraft. Don't emulate it without a real need. */ + * like Age of Empires or StarCraft. Don't emulate it without a real need. */ i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) @@ -6311,7 +6311,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); /* Here the offscreen surface appears to use the primary's palette, - * but in all likelyhood it is actually the system palette. */ + * but in all likelihood it is actually the system palette. */ hr = IDirectDrawSurface_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8776deceebf..009ac6f7475 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7280,7 +7280,7 @@ static void test_palette_gdi(void) * from a regular surface. Tests for the interaction between the ddraw palette and * the system palette are not included pending an application that depends on this. * The relation between those causes problems on Windows Vista and newer for games - * like Age of Empires or Starcraft. Don't emulate it without a real need. */ + * like Age of Empires or StarCraft. Don't emulate it without a real need. */ i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) @@ -7309,7 +7309,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); /* Here the offscreen surface appears to use the primary's palette, - * but in all likelyhood it is actually the system palette. */ + * but in all likelihood it is actually the system palette. */ hr = IDirectDrawSurface4_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5e88b33cd19..ec50fb8253c 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7002,7 +7002,7 @@ static void test_palette_gdi(void) * from a regular surface. Tests for the interaction between the ddraw palette and * the system palette are not included pending an application that depends on this. * The relation between those causes problems on Windows Vista and newer for games - * like Age of Empires or Starcraft. Don't emulate it without a real need. */ + * like Age of Empires or StarcCaft. Don't emulate it without a real need. */ i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); ok(i == sizeof(rgbquad) / sizeof(*rgbquad), "Expected count 255, got %u.\n", i); for (i = 0; i < sizeof(expected2) / sizeof(*expected2); i++) @@ -7031,7 +7031,7 @@ static void test_palette_gdi(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); /* Here the offscreen surface appears to use the primary's palette, - * but in all likelyhood it is actually the system palette. */ + * but in all likelihood it is actually the system palette. */ hr = IDirectDrawSurface7_GetDC(surface, &dc); ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); i = GetDIBColorTable(dc, 0, sizeof(rgbquad) / sizeof(*rgbquad), rgbquad); diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 883c684af4f..80482807701 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -139,8 +139,8 @@ static BOOL test_init_dpvoice_server(void) } else { - /* Everything after Windows XP doesnt have dpvoice installed. */ - win_skip("IDirectPlayVoiceServer not supported on thie platform\n"); + /* Everything after Windows XP doesn't have dpvoice installed. */ + win_skip("IDirectPlayVoiceServer not supported on this platform\n"); } return vserver != NULL; @@ -276,8 +276,8 @@ static BOOL test_init_dpvoice_client(void) } else { - /* Everything after Windows XP doesnt have dpvoice installed. */ - win_skip("IDirectPlayVoiceClient not supported on thie platform\n"); + /* Everything after Windows XP doesn't have dpvoice installed. */ + win_skip("IDirectPlayVoiceClient not supported on this platform\n"); } return vclient != NULL; @@ -338,8 +338,8 @@ static void create_voicetest(void) } else { - /* Everything after Windows XP doesnt have dpvoice installed. */ - win_skip("IDirectPlayVoiceClient not supported on thie platform\n"); + /* Everything after Windows XP doesn't have dpvoice installed. */ + win_skip("IDirectPlayVoiceClient not supported on this platform\n"); } } diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 46e3769eb56..3bf546c4a45 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -366,7 +366,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; case b_ZW: set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - /* LB8 - break before character after zero-width space, skip spaces inbetween */ + /* LB8 - break before character after zero-width space, skip spaces in-between */ while (i < count-1 && break_class[i+1] == b_SP) i++; set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_CAN_BREAK, &state); diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3f89086f655..056f95b050f 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -127,9 +127,9 @@ static void test_CreateNamedPipe(int pipemode) else trace("test_CreateNamedPipe starting in message mode\n"); - /* Wait for non existing pipe */ + /* Wait for nonexistent pipe */ ret = WaitNamedPipeA(PIPENAME, 2000); - ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret); + ok(ret == 0, "WaitNamedPipe returned %d for nonexistent pipe\n", ret); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); /* Bad parameter checks */ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4f69e7a8022..ab81eadb698 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7378,7 +7378,7 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_search((IUnknown*)elem, "?how?old=are", FALSE); /* due to incorrect behavior of ie6, search string without leading "?" is interpreted - as part of the pathname, and can not be accessed by get_search. */ + as part of the pathname, and cannot be accessed by get_search. */ test_anchor_put_search((IUnknown*)elem, "word=abc"); test_anchor_search((IUnknown*)elem, "?word=abc", TRUE); diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 026149a9a83..7894560d360 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6458,7 +6458,7 @@ static void test_recinfo(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(testcopy.bstr == NULL, "got %p\n", testcopy.bstr); - /* now destination contains inteface pointer */ + /* now the destination contains the interface pointer */ memset(&testcopy, 0, sizeof(testcopy)); testcopy.disp = &dispatch.IDispatch_iface; dispatch.ref = 10; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 0ba916311fc..0a73942906c 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1678,7 +1678,7 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample hr = IMediaSample_SetDiscontinuity(sample, FALSE); if(SUCCEEDED(hr)) hr = IMediaSample_SetSyncPoint(sample, flags & AM_SAMPLE_SPLICEPOINT); - /* TODO: avoid unnecesarry copying */ + /* TODO: avoid unnecessary copying */ if(SUCCEEDED(hr)) hr = IMediaSample_GetPointer(sample, &buf); if(SUCCEEDED(hr)) { diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5192c2f9afc..00be8a765b7 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -200,7 +200,7 @@ static BOOL init_aes_environment(void) hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; /* we are using NULL as provider name for RSA_AES provider as the provider - * names are different in Windows XP and Vista. It's different to what + * names are different in Windows XP and Vista. This differs from what * is defined in the SDK on Windows XP. * This provider is available on Windows XP, Windows 2003 and Vista. */ diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3468fcc3202..51de6351f99 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1983,7 +1983,7 @@ static void test_move(void) init_shfo_tests(); - /* 0 incomming files */ + /* 0 incoming files */ set_curr_dir_path(from, "\0\0"); set_curr_dir_path(to, "test6.txt\0\0"); retval = SHFileOperationA(&shfo2); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 43f4cdd7d1e..a83f8dde11b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1692,8 +1692,8 @@ static enum wined3d_d3d_level d3d_level_from_caps(const struct shader_caps *shad } if (shader_caps->vs_version == 3) { - /* Wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed - * on compatibility contexts */ + /* Wine cannot use SM 4 on mesa drivers as the necessary functionality + * is not exposed on compatibility contexts */ if (glsl_version >= MAKEDWORD_VERSION(1, 30)) return WINED3D_D3D_LEVEL_10; return WINED3D_D3D_LEVEL_9_SM3; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index cbf1eae222b..33c03232625 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -29,7 +29,7 @@ static HWND get_container_hwnd(WindowsMediaPlayer *This) HWND hwnd = NULL; HRESULT hres; - /* IOleInPlaceSite (which inherits from IOleWindow) is prefered. */ + /* IOleInPlaceSite (which inherits from IOleWindow) is preferred. */ hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleInPlaceSite, (void**)&ole_window); if(FAILED(hres)) { hres = IOleClientSite_QueryInterface(This->client_site, &IID_IOleWindow, (void**)&ole_window); diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 875fc77c54b..cc2f4fe2c18 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -878,7 +878,7 @@ static void test_wmp(void) win_skip("CLSID_WindowsMediaPlayer not registered\n"); return; } - ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); ok(hres == S_OK, "got 0x%08x\n", hres); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e6548cd7133..abbe07deb60 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -333,7 +333,7 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) buffer = &output->buffer; - /* It will loop forever until everything is written or an error occured. */ + /* It will loop forever until everything is written or an error occurred. */ do { written = 0; hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written);