From 5f55a71b705c760441c19f47041d0ad00ed0fe35 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Mon, 24 Sep 2012 16:30:19 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/gdi32/freetype.c | 2 +- dlls/iphlpapi/ipstats.c | 8 ++++---- dlls/kernel32/tests/sync.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/shlwapi/tests/url.c | 6 +++--- dlls/wininet/urlcache.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a900367065..b02fb699f6c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6563,7 +6563,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!style_nameW) { - FIXME("failed to read sytle_nameW for font %s!\n", wine_dbgstr_w(font->name)); + FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name)); lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) * sizeof(WCHAR); style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a56e75348ac..a78424babbb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -558,7 +558,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) * * PARAMS * stats [Out] buffer for ICMP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -731,7 +731,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) * * PARAMS * stats [Out] buffer for IP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -981,7 +981,7 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) * * PARAMS * stats [Out] buffer for TCP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -1143,7 +1143,7 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) * * PARAMS * stats [Out] buffer for UDP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 02c023ad2b5..7fdb63379df 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1338,7 +1338,7 @@ static void test_condvars(void) ok(totalconsumed == totalproduced, "consumed %d != produced %d\n", totalconsumed, totalproduced); - ok (!condvar_sleeperr, "error occured during SleepConditionVariableCS\n"); + ok (!condvar_sleeperr, "error occurred during SleepConditionVariableCS\n"); /* Checking cnt1 - cnt2 for non-0 would be not good, the case where * one consumer does not get anything to do is possible. */ diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a1599e49279..de6c0f93bdd 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1911,7 +1911,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) { - /* if so, append lpFile http:// and call ShellExecute */ + /* if so, prefix lpFile with http:// and call ShellExecute */ WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 02dcb1cf6df..ee3adf681d7 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1288,7 +1288,7 @@ static void test_UrlUnescape(void) ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); - /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ + /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", @@ -1319,7 +1319,7 @@ static void test_UrlUnescape(void) ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); @@ -1330,7 +1330,7 @@ static void test_UrlUnescape(void) ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fa0c96f2624..45f447fd2e1 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2384,7 +2384,7 @@ static DWORD urlcache_rate_entry(URL_CACHEFILE_ENTRY *url_entry, FILETIME *cur_t time.u.LowPart = cur_time->dwLowDateTime; time.u.HighPart = cur_time->dwHighDateTime; - /* Don't touch entries that were added less then 10 minutes ago */ + /* Don't touch entries that were added less than 10 minutes ago */ if(time.QuadPart < access_time.QuadPart + (ULONGLONG)10*60*FILETIME_SECOND) return -1; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 77086ed37bf..42507ce06f8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -644,7 +644,7 @@ echo --- basic wildcards for %%i in (ba*) do echo %%i echo --- for /d for /d %%i in (baz foo bar) do echo %%i 2>&1 -rem Confirm we dont match files: +rem Confirm we don't match files: for /d %%i in (bazb*) do echo %%i 2>&1 for /d %%i in (bazb2*) do echo %%i 2>&1 rem Show we pass through non wildcards -- 2.11.4.GIT