From 5cdcd4493fba65aca4d6b0865399660e27c0b980 Mon Sep 17 00:00:00 2001 From: Andrey Gusev Date: Mon, 17 Aug 2015 16:11:55 +0300 Subject: [PATCH] Assorted spelling and typos fixes. --- dlls/kernel32/time.c | 2 +- dlls/mshtml/tests/dom.c | 2 +- dlls/mshtml/tests/script.c | 6 +++--- dlls/msvcrt/tests/time.c | 4 ++-- dlls/ntdll/tests/exception.c | 2 +- dlls/ole32/marshal.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 8 ++++---- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/qcap/tests/smartteefilter.c | 2 +- dlls/quartz/tests/filtermapper.c | 2 +- dlls/riched20/tests/richole.c | 2 +- dlls/scrrun/tests/dictionary.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- include/mapidefs.h | 2 +- programs/cmd/builtins.c | 2 +- tools/c2man.pl | 4 ++-- tools/wmc/mcl.c | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 7dcf71f3543..ac39fdec121 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1190,7 +1190,7 @@ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) { static int once; if (!once++) - FIXME("(%p,%p,): stub!\n", thread, cycle); + FIXME("(%p,%p): stub!\n", thread, cycle); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3f68d874f61..55b64efba75 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3140,7 +3140,7 @@ static void _test_img_alt(unsigned line, IUnknown *unk, const char *exalt) hres = IHTMLImgElement_get_alt(img, &alt); ok_(__FILE__,line) (hres == S_OK, "get_alt failed: %08x\n", hres); if(exalt) - ok_(__FILE__,line) (!strcmp_wa(alt, exalt), "inexopected alt %s\n", wine_dbgstr_w(alt)); + ok_(__FILE__,line) (!strcmp_wa(alt, exalt), "unexpected alt %s\n", wine_dbgstr_w(alt)); else ok_(__FILE__,line) (!alt, "alt != NULL\n"); SysFreeString(alt); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index b92b66b0887..251193954f5 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -333,20 +333,20 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG { if(IsEqualGUID(guidService, &SID_VariantConversion)) { CHECK_EXPECT(QS_VariantConversion); - ok(IsEqualGUID(riid, &IID_IVariantChangeType), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + ok(IsEqualGUID(riid, &IID_IVariantChangeType), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = &VChangeType; return S_OK; } if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { CHECK_EXPECT(QS_IActiveScriptSite); - ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "unexpected riid %s\n", wine_dbgstr_guid(riid)); return IActiveScriptSite_QueryInterface(site, riid, ppv); } if(IsEqualGUID(guidService, &SID_GetCaller)) { CHECK_EXPECT(QS_GetCaller); - ok(IsEqualGUID(riid, &IID_IServiceProvider), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 995ece2f9c8..e26648d1dc3 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -763,12 +763,12 @@ static void test_asctime(void) gmt = 0; gmt_tm = p_gmtime(&gmt); ret = p_asctime(gmt_tm); - ok(!strcmp(ret, "Thu Jan 01 00:00:00 1970\n"), "asctime retunred %s\n", ret); + ok(!strcmp(ret, "Thu Jan 01 00:00:00 1970\n"), "asctime returned %s\n", ret); gmt = 312433121; gmt_tm = p_gmtime(&gmt); ret = p_asctime(gmt_tm); - ok(!strcmp(ret, "Mon Nov 26 02:58:41 1979\n"), "asctime retunred %s\n", ret); + ok(!strcmp(ret, "Mon Nov 26 02:58:41 1979\n"), "asctime returned %s\n", ret); /* Week day is only checked if it's in 0..6 range */ gmt_tm->tm_wday = 3; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a594e3fe6ce..84779881676 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -953,7 +953,7 @@ static void test_debugger(void) sizeof(stage), &size_read); ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); - ok(!de.u.DebugString.fUnicode, "unepxected unicode debug string event\n"); + ok(!de.u.DebugString.fUnicode, "unexpected unicode debug string event\n"); ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", de.u.DebugString.nDebugStringLength); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index cc8d6fe4fd0..5ed2f04b1bc 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1733,7 +1733,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, OBJREF objref; LPMARSHAL pMarshal; - TRACE("(%p, %s, %p, %x, %p,", pStream, debugstr_guid(riid), pUnk, + TRACE("(%p, %s, %p, %x, %p)", pStream, debugstr_guid(riid), pUnk, dwDestContext, pvDestContext); dump_MSHLFLAGS(mshlFlags); TRACE(")\n"); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 5ff6ab2c4b7..d0f9c712297 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -115,7 +115,7 @@ static BOOL last_release_closes; static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { - ok(0, "unxpected call\n"); + ok(0, "unexpected call\n"); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 3dd8bd2c380..dca85ac246a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -93,7 +93,7 @@ static DWORD external_connections; static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { - ok(0, "unxpected call\n"); + ok(0, "unexpected call\n"); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b590d3dc5f7..b297f03d0e8 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2104,7 +2104,7 @@ static ULONG WINAPI OleRun_Release(IRunnableObject *iface) static HRESULT WINAPI OleRun_GetRunningClass(IRunnableObject *iface, CLSID *clsid) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return E_NOTIMPL; } @@ -2116,20 +2116,20 @@ static HRESULT WINAPI OleRun_Run(IRunnableObject *iface, LPBINDCTX ctx) static BOOL WINAPI OleRun_IsRunning(IRunnableObject *iface) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return FALSE; } static HRESULT WINAPI OleRun_LockRunning(IRunnableObject *iface, BOOL lock, BOOL last_unlock_closes) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return E_NOTIMPL; } static HRESULT WINAPI OleRun_SetContainedObject(IRunnableObject *iface, BOOL contained) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return E_NOTIMPL; } diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f9d9db9e4b7..a2fa6e81924 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -156,7 +156,7 @@ static BOOL expect_last_release_closes; static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { - ok(0, "unxpected call\n"); + ok(0, "unexpected call\n"); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 4ad11809bf6..4c02034b8e6 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1733,7 +1733,7 @@ static void test_smart_tee_filter(void) ok(has_interface((IUnknown*)inputPin, &IID_IUnknown), "IUnknown should exist on the input pin\n"); ok(has_interface((IUnknown*)inputPin, &IID_IMemInputPin), "IMemInputPin should exist the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't eixst on the input pin\n"); + ok(!has_interface((IUnknown*)inputPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the input pin\n"); ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the input pin\n"); ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamControl), "IAMStreamControl shouldn't exist on the input pin\n"); ok(!has_interface((IUnknown*)inputPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the input pin\n"); diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index bf1839aa5f3..aee231053b8 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -509,7 +509,7 @@ static void test_parse_filter_data(void) saBound.lLbound = 0; saBound.cElements = sizeof(data_block); psa = SafeArrayCreate(VT_UI1, 1, &saBound); - ok(psa != NULL, "Unable to crate safe array\n"); + ok(psa != NULL, "Unable to create safe array\n"); if (!psa) goto out; hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); ok(hr == S_OK, "Unable to access array data\n"); diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 047370fad30..7c6c5d5c1ee 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -2361,7 +2361,7 @@ static void test_ITextFont(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(value != tomUndefined, "got %d\n", value); - /* reset to undefined for deatached font */ + /* reset to undefined for detached font */ hr = ITextFont_Reset(font2, tomUndefined); ok(hr == S_OK, "got 0x%08x\n", hr); test_textfont_undefined(font2); diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index e1c80f91f64..a1b7d0692f4 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -209,7 +209,7 @@ static HRESULT WINAPI test_unk_no_QI(IUnknown *iface, REFIID riid, void **obj) static ULONG WINAPI test_unk_AddRef(IUnknown *iface) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return 2; } @@ -244,7 +244,7 @@ static HRESULT WINAPI test_disp_QI(IDispatch *iface, REFIID riid, void **obj) static ULONG WINAPI test_disp_AddRef(IDispatch *iface) { - ok(0, "unxpected\n"); + ok(0, "unexpected\n"); return 2; } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 51e940f65ce..5795d854683 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -227,7 +227,7 @@ typedef struct { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; IStream *stream; - CRITICAL_SECTION lock; /* Must be held when tiff is used or initiailzed is set */ + CRITICAL_SECTION lock; /* Must be held when tiff is used or initialized is set */ TIFF *tiff; BOOL initialized; } TiffDecoder; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 73b2218ecb7..2c69c02e7bf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1979,7 +1979,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, dst, reg_dest); /* 1.0-1.4: Use destination register number as texture code. - 2.0+: Use provided sampler number as texure code. */ + 2.0+: Use provided sampler number as texture code. */ if (shader_version < WINED3D_SHADER_VERSION(2,0)) reg_sampler_code = dst->reg.idx[0].offset; else diff --git a/include/mapidefs.h b/include/mapidefs.h index 2206e700e32..be72a958194 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -478,7 +478,7 @@ typedef struct _SPropProblemArray typedef ULONG BOOKMARK; #define BOOKMARK_BEGINNING ((BOOKMARK)0) /* The first row */ -#define BOOKMARK_CURRENT ((BOOKMARK)1) /* The curent table row */ +#define BOOKMARK_CURRENT ((BOOKMARK)1) /* The current table row */ #define BOOKMARK_END ((BOOKMARK)2) /* The last row */ /* Row restrictions */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5309bc09cea..b1248768f23 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -136,7 +136,7 @@ typedef struct _OPSTACK } OPSTACK; /* This maintains a stack of values, where each value can either be a - numeric value, or a string represeting an environment variable */ + numeric value, or a string representing an environment variable */ typedef struct _VARSTACK { BOOL isnum; diff --git a/tools/c2man.pl b/tools/c2man.pl index fba17ab16de..e4056849f73 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -2018,7 +2018,7 @@ sub output_sgml_dll_file($) `rm -f $opt_output_directory/$_.sgml`; } - # close the chapter, and overwite the dll source + # close the chapter, and overwrite the dll source open(OUTPUT,">>$tmp_name") || die "Couldn't create $tmp_name\n"; print OUTPUT "\n"; close OUTPUT; @@ -2064,7 +2064,7 @@ sub output_xml_dll_file($) `rm -f $opt_output_directory/$_.xml`; } - # close the chapter, and overwite the dll source + # close the chapter, and overwrite the dll source open(OUTPUT,">>$tmp_name") || die "Couldn't create $tmp_name\n"; print OUTPUT "\n"; close OUTPUT; diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 7be41d51925..0a57e2b9801 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -226,7 +226,7 @@ try_again: if(!n && ferror(yyin)) xyyerror(err_fatalread); else - xyyerror("Fatal: file to short to determine byteorder (should never happen)\n"); + xyyerror("Fatal: file too short to determine byteorder (should never happen)\n"); } if(isisochar(inputbuffer[0]) && isisochar(inputbuffer[1]) &&