Module: wine Branch: master Commit: f963f939645f1c36419230b85e7a60fdd7a63850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f963f939645f1c36419230b85e...
Author: Francois Gouget fgouget@free.fr Date: Sat Jan 5 16:17:18 2013 +0100
Assorted spelling fixes.
---
dlls/crypt32/rootstore.c | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- dlls/d3dx9_36/tests/texture.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/ole32/tests/compobj.c | 2 +- dlls/usp10/tests/usp10.c | 2 +- dlls/winmm/waveform.c | 2 +- dlls/xmllite/reader.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 386bc9b..4e4e4e4 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -189,7 +189,7 @@ static const char *trust_status_to_str(DWORD status) "\n\tbad name constraints"); if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsuported name constraint"); + "\n\tunsupported name constraint"); if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tundefined name constraint"); diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 1bc3641..1546bfe 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -642,7 +642,7 @@ static void test_fail(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *qquad_ge "function names\n"); ok(errors != NULL, "No errors returned for a shader with invalid variable and function " "names\n"); - ok(compiled == NULL, "A shader blob was returend for a shader with invalid variable and " + ok(compiled == NULL, "A shader blob was returned for a shader with invalid variable and " "function names\n");
IUnknown_Release(errors); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index ebaf385..7c69d90 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1591,7 +1591,7 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount);
hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(hr == D3D_OK, "GetLevelDesc returend %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(volume_desc.Width == 4, "Got width %u, expected 4\n", volume_desc.Width); ok(volume_desc.Height == 4, "Got height %u, expected 4\n", volume_desc.Height); ok(volume_desc.Depth == 2, "Got depth %u, expected 2\n", volume_desc.Depth); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fb4f1e8..89729f1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1248,7 +1248,7 @@ static nsresult NSAPI nsAsyncVerifyRedirectCallback_QueryInterface(nsIAsyncVerif nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface);
if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(%p)->(IID_nsISuports %p)\n", This, result); + TRACE("(%p)->(IID_nsISupports %p)\n", This, result); *result = &This->nsIAsyncVerifyRedirectCallback_iface; }else if(IsEqualGUID(&IID_nsIAsyncVerifyRedirectCallback, riid)) { TRACE("(%p)->(IID_nsIAsyncVerifyRedirectCallback %p)\n", This, result); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 7584d0d..d0adf79 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -707,7 +707,7 @@ static void test_CoRegisterPSClsid(void) CLSID clsid;
hr = CoRegisterPSClsid(&IID_IWineTest, &CLSID_WineTestPSFactoryBuffer); - ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returened CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED, "CoRegisterPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr);
pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d6786cd..9f7088d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1860,7 +1860,7 @@ static void test_ScriptGetFontProperties(HDC hdc) static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unkown, found by black box testing */ + U+F71B: unknown, found by black box testing */ BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC);
/* Some sanity checks for ScriptGetFontProperties */ diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8957c4c..e6fe360 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -107,7 +107,7 @@ typedef struct _WINMM_Device { BOOL stopped; DWORD loop_counter; UINT32 bytes_per_frame, samples_per_sec, ofs_bytes, played_frames; - UINT32 remainder_frames; /* header chunk frames already played when a device switch occured */ + UINT32 remainder_frames; /* header chunk frames already played when a device switch occurred */
/* stored in frames of sample rate, *not* AC::GetFrequency */ UINT64 last_clock_pos; diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a6caf66..a1ce662 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -366,7 +366,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) ULONG read; HRESULT hr;
- /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + /* always try to get aligned to 4 bytes, so the only case we can get partially read characters is variable width encodings like UTF-8 */ len = (len + 3) & ~3; /* try to use allocated space or grow */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2899418..4590769 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3778,7 +3778,7 @@ static int WCMD_handleExpression(WCHAR **expr, int *ret, int depth) WCHAR *nextpos;
/* Cannot have an expression with var/number twice, without an operator - inbetween, nor or number following a half constructed << or >> operator */ + in-between, nor or number following a half constructed << or >> operator */ if (lastwasnumber || foundhalf) { rc = WCMD_NOOPERATOR; goto exprerrorreturn; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 508691e..54070bc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1220,7 +1220,7 @@ set WINE_foo=2 set /a WINE_bar=WINE_foo=7 call :checkenvvars WINE_foo 7 WINE_bar 7 echo ----- equal precedence on stack -rem Unary - dont reduce if precedence is equal +rem Unary - don't reduce if precedence is equal set /a WINE_foo=!!1 call :checkenvvars WINE_foo 1 set /a WINE_foo=!!0 @@ -1262,7 +1262,7 @@ set /a WINE_foo=10-5+2 call :checkenvvars WINE_foo 7 set /a WINE_foo=1^<^<4^>^>1 call :checkenvvars WINE_foo 8 -rem Assignment - dont reduce if precedence is equal +rem Assignment - don't reduce if precedence is equal set /a WINE_foo=5 set /a WINE_bar=WINE_foo=6 call :checkenvvars WINE_foo 6 WINE_bar 6