Assorted spelling/grammar fixes
Frédéric Delanoy
frederic.delanoy at gmail.com
Sun Jun 29 06:12:33 CDT 2014
---
dlls/d3dx9_36/surface.c | 6 +++---
dlls/msvfw32/msvideo_main.c | 2 +-
dlls/urlmon/sec_mgr.c | 2 +-
dlls/urlmon/tests/uri.c | 2 +-
dlls/wineps.drv/psdrv.h | 2 +-
dlls/ws2_32/socket.c | 2 +-
programs/cmd/builtins.c | 2 +-
programs/cmd/wcmdmain.c | 4 ++--
tools/c2man.pl | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 09c2fce..ad38444 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1030,7 +1030,7 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resour
*
* RETURNS
* Success: D3D_OK
- * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcData or SrcDataSize are NULL
+ * Failure: D3DERR_INVALIDCALL, if pDestSurface, pSrcData or SrcDataSize is NULL
* D3DXERR_INVALIDDATA, if pSrcData is no valid image file
*
*/
@@ -1720,7 +1720,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic
* RETURNS
* Success: D3D_OK, if we successfully load the pixel data into our surface or
* if pSrcMemory is NULL but the other parameters are valid
- * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or
+ * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect is NULL or
* if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or
* if DestRect is invalid
* D3DXERR_INVALIDDATA, if we fail to lock pDestSurface
@@ -1871,7 +1871,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
*
* RETURNS
* Success: D3D_OK
- * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface are NULL
+ * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface is NULL
* D3DXERR_INVALIDDATA, if one of the surfaces is not lockable
*
*/
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index ea38e0f..b6b7507 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -67,7 +67,7 @@ struct _reg_driver
static reg_driver* reg_driver_list = NULL;
-/* This one is a macro such that it works for both ASCII and Unicode */
+/* This one is a macro in order to work for both ASCII and Unicode */
#define fourcc_to_string(str, fcc) do { \
(str)[0] = LOBYTE(LOWORD(fcc)); \
(str)[1] = HIBYTE(LOWORD(fcc)); \
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index dc57c88..5c145ae 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -2077,7 +2077,7 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD
/********************************************************************
* IsInternetESCEnabledLocal (URLMON.108)
*
- * Undocumented, returns if IE is running in Enhanced Security Configuration.
+ * Undocumented, returns TRUE if IE is running in Enhanced Security Configuration.
*/
BOOL WINAPI IsInternetESCEnabledLocal(void)
{
diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c
index f142ffb..737d1bb 100644
--- a/dlls/urlmon/tests/uri.c
+++ b/dlls/urlmon/tests/uri.c
@@ -4583,7 +4583,7 @@ typedef struct _invalid_uri {
static const invalid_uri invalid_uri_tests[] = {
/* Has to have a scheme name. */
{"://www.winehq.org",0,FALSE},
- /* Window's doesn't like URI's which are implicitly file paths without the
+ /* Windows doesn't like URIs which are implicitly file paths without the
* ALLOW_IMPLICIT_FILE_SCHEME flag set.
*/
{"C:/test/test.mp3",0,FALSE},
diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h
index 3c057fa..232be47 100644
--- a/dlls/wineps.drv/psdrv.h
+++ b/dlls/wineps.drv/psdrv.h
@@ -99,7 +99,7 @@ typedef struct _tagAFM {
const AFMMETRICS *Metrics;
} AFM;
-/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allow more than
+/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allows more than
one list to exist without having to reallocate the entire AFM structure. We
keep a global list of all afms (PSDRV_AFMFontList) plus a list of available
fonts for each DC (dc->physDev->Fonts) */
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 10857dc..e1d0ce5 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -4758,7 +4758,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
switch(optname)
{
/* Some options need some conversion before they can be sent to
- * setsockopt. The conversions are done here, then they will fall though
+ * setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to
* setsockopt follow below that.*/
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 53229a7..4c95b43 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -874,7 +874,7 @@ void WCMD_copy(WCHAR * args) {
if (thiscopy->binarycopy == -1) thiscopy->binarycopy = !anyconcats;
/* Convert to fully qualified path/filename in srcpath, file filenamepart pointing
- to where the filename portion begins (used for wildcart expansion. */
+ to where the filename portion begins (used for wildcard expansion). */
GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart);
WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath));
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 647f988..c475ad2 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1605,8 +1605,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects,
case WCMD_FOR:
case WCMD_IF:
/* Very oddly, probably because of all the special parsing required for
- these two commands, neither for nor if are supported when called,
- ie call if 1==1... will fail. */
+ these two commands, neither 'for' nor 'if' is supported when called,
+ i.e. 'call if 1==1...' will fail. */
if (!retrycall) {
if (i==WCMD_FOR) WCMD_for (p, cmdList);
else if (i==WCMD_IF) WCMD_if (p, cmdList);
diff --git a/tools/c2man.pl b/tools/c2man.pl
index 029f460..fba17ab 100755
--- a/tools/c2man.pl
+++ b/tools/c2man.pl
@@ -521,7 +521,7 @@ sub process_comment_text($)
s/\[I\]|\[i\]|\[in\]|\[IN\]/\[In\] /g;
s/\[O\]|\[o\]|\[out\]|\[OUT\]/\[Out\]/g;
s/\[I\/O\]|\[I\,O\]|\[i\/o\]|\[in\/out\]|\[IN\/OUT\]/\[In\/Out\]/g;
- # TRUE/FALSE/NULL are defines, capitilise them
+ # TRUE/FALSE/NULL are defines, capitalise them
s/True|true/TRUE/g;
s/False|false/FALSE/g;
s/Null|null/NULL/g;
--
2.0.0
More information about the wine-patches
mailing list