Module: wine Branch: master Commit: ed9e74558023f2edeb934e667cbbbb87954ffebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9e74558023f2edeb934e667c...
Author: Francois Gouget fgouget@free.fr Date: Mon Oct 22 12:20:23 2012 +0200
Assorted spelling tweaks and fixes.
---
dlls/kernel32/tests/file.c | 2 +- dlls/wininet/urlcache.c | 2 +- programs/cmd/builtins.c | 8 ++++---- programs/cmd/tests/test_builtins.cmd | 6 +++--- programs/cmd/tests/test_cmdline.cmd | 2 +- programs/cmd/wcmdmain.c | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 5e607fe..92876e4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3354,7 +3354,7 @@ static void test_OpenFileById(void) ret2 = GetTempPathA(sizeof(tempPath), tempPath); ok(ret2, "OpenFileById: GetTempPath failed, got error %u.\n", GetLastError());
- /* ensure the existance of a file in the temp folder */ + /* ensure the existence of a file in the temp folder */ ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 004c6be..8fb62de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2456,7 +2456,7 @@ static int dword_cmp(const void *p1, const void *p2) * * PARAMETERS * cache_path [I] Which volume to free up from, or NULL if you don't care. - * size [I] How many percents of the cache should be free. + * size [I] Percentage of the cache that should be free. * filter [I] Which entries can't be deleted (CacheEntryType) * * RETURNS diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8ae9eb2..279e80d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -478,10 +478,10 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app * Syntax on command line is * ... /a | /b filename /a /b {[ + filename /a /b]} [dest /a /b] * Where first /a or /b sets 'mode in operation' until another is found - * once another is found, it applies to the file preceeding the /a or /b + * once another is found, it applies to the file preceding the /a or /b * In addition each filename can contain wildcards - * To make matters worse, the + may be in the same parameter (ie no whitespace) - * or with whitespace separating it + * To make matters worse, the + may be in the same parameter (i.e. no + * whitespace) or with whitespace separating it * * ASCII mode on read == read and stop at first EOF * ASCII mode on write == append EOF to destination @@ -944,7 +944,7 @@ void WCMD_copy(WCHAR * args) { } }
- /* Exit out of the routine, freeing any remaing allocated memory */ + /* Exit out of the routine, freeing any remaining allocated memory */ exitreturn:
thiscopy = sourcelist; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3d01151..fff067c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1743,7 +1743,7 @@ if errorlevel 1 echo Incorrect errorlevel call :CheckExist file1 cd ..
-rem Simple single file copy, destination supplied as non existant directory +rem Simple single file copy, destination supplied as nonexistent directory copy file1 dir2\ >nul 2>&1 if not errorlevel 1 echo Incorrect errorlevel call :CheckNotExist dir2 dir2\file1 @@ -1767,7 +1767,7 @@ if errorlevel 1 echo Incorrect errorlevel call :CheckExist file1 file2 file3 cd ..
-rem Simple wildcarded file copy, destination supplied as non existant directory +rem Simple wildcarded file copy, destination supplied as nonexistent directory copy file? dir2\ >nul 2>&1 if not errorlevel 1 echo Incorrect errorlevel call :CheckNotExist dir2 dir2\file1 dir2\file2 dir2\file3 @@ -1923,7 +1923,7 @@ rem All 2 have eof's, plus an extra = 6 + 12 + eof copy /b file1_plus_eof + file3_plus_eof file123_mixed_copy6 /a >nul 2>&1 call :CheckFileSize file123_mixed_copy6 19
-rem One file has EOF, but doesnt get an extra one, ie 6 +rem One file has EOF, but doesn't get an extra one, i.e. 6 copy /b file1_plus_eof file123_mixed_copy7 /a >nul 2>&1 call :CheckFileSize file123_mixed_copy7 6
diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 0442a38..e563341 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -53,7 +53,7 @@ rem - Try cmd.exe /k as well cmd.exe /k "copy file1 file2 >nul && exit" echo No prompts or I would not get here2
-rem Non existing variable expansion is as per command line, i.e. left as-is +rem Nonexistent variable expansion is as per command line, i.e. left as-is cmd.exe /c echo %%hello1%% cmd.exe /c echo %%hello2 cmd.exe /c echo %%hello3^:h=t%% diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 6931755..4e6305a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2393,7 +2393,7 @@ int wmain (int argc, WCHAR *argvW[]) } else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ { - /* Do not step to next paramater, instead carry on parsing this one */ + /* Do not step to next parameter, instead carry on parsing this one */ argPos+=2; }
@@ -2413,7 +2413,7 @@ int wmain (int argc, WCHAR *argvW[]) int len; WCHAR *q1 = NULL,*q2 = NULL,*p;
- /* Handle very edge case error scenarion, "cmd.exe /c" ie when there are no + /* Handle very edge case error scenario, "cmd.exe /c" ie when there are no * parameters after the /C or /K by pretending there was a single space */ if (argPos == NULL) argPos = (WCHAR *)spaceW;
@@ -2468,7 +2468,7 @@ int wmain (int argc, WCHAR *argvW[]) WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd));
/* Finally, we only stay in new mode IF the first parameter is quoted and - is a valid executable, ie must exist, otherwise drop back to old mode */ + is a valid executable, i.e. must exist, otherwise drop back to old mode */ if (!opt_s) { WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE, TRUE); WCHAR pathext[MAXSTRING];