Assorted spelling fixes
Frédéric Delanoy
frederic.delanoy at gmail.com
Mon Mar 3 18:13:15 CST 2014
---
dlls/comctl32/imagelist.c | 6 +++---
dlls/comdlg32/filedlg.c | 2 +-
dlls/d3dx9_36/surface.c | 6 +++---
dlls/d3dx9_36/tests/math.c | 2 +-
dlls/ddraw/ddraw.c | 4 ++--
dlls/ddraw/device.c | 8 ++++----
dlls/dmime/segment.c | 2 +-
dlls/gdi32/bitmap.c | 2 +-
dlls/gphoto2.ds/gphoto2_main.c | 2 +-
dlls/imm32/tests/imm32.c | 2 +-
dlls/inetmib1/tests/main.c | 2 +-
dlls/kernel32/tests/sync.c | 2 +-
dlls/krnl386.exe16/vga.c | 10 +++++-----
dlls/msi/tests/db.c | 2 +-
dlls/mstask/tests/task_scheduler.c | 2 +-
dlls/msvfw32/msvideo_main.c | 2 +-
dlls/ole32/compobj.c | 4 ++--
dlls/oleaut32/tests/safearray.c | 2 +-
dlls/quartz/regsvr.c | 2 +-
dlls/riched20/reader.c | 2 +-
dlls/shell32/tests/shlfileop.c | 12 ++++++------
dlls/shell32/tests/shlfolder.c | 4 ++--
dlls/urlmon/sec_mgr.c | 2 +-
dlls/urlmon/tests/uri.c | 2 +-
dlls/user32/combo.c | 2 +-
dlls/user32/sysparams.c | 2 +-
dlls/usp10/usp10.c | 2 +-
dlls/wineps.drv/psdrv.h | 2 +-
dlls/winmm/tests/mcicda.c | 6 +++---
dlls/wintrust/tests/crypt.c | 2 +-
include/mapidefs.h | 2 +-
programs/cmd/tests/test_builtins.cmd | 2 +-
programs/cmd/tests/test_builtins.cmd.exp | 2 +-
programs/cmd/wcmdmain.c | 4 ++--
programs/start/start.c | 4 ++--
programs/wineconsole/winecon_private.h | 2 +-
programs/winedbg/winedbg.man.in | 2 +-
programs/winhlp32/winhelp.c | 2 +-
tools/c2man.pl | 2 +-
tools/widl/write_msft.c | 4 ++--
tools/winapi/nativeapi.pm | 4 ++--
tools/winapi/winapi_check | 4 ++--
tools/winebuild/relay.c | 2 +-
tools/winemaker | 10 +++++-----
44 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index ec90a9c..3f2a58d 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2066,13 +2066,13 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
* RETURNS
* Success: The newly created image list. It contains a single image
* consisting of the second image merged with the first.
- * Failure: NULL, if either himl1 or himl2 are invalid.
+ * Failure: NULL, if either himl1 or himl2 is invalid.
*
* NOTES
* - The returned image list should be deleted by the caller using
* ImageList_Destroy() when it is no longer required.
- * - If either i1 or i2 are not valid image indices they will be treated
- * as a blank image.
+ * - If either i1 or i2 is not a valid image index they will be treated
+ * as blank images.
*/
HIMAGELIST WINAPI
ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 9dbb69d..9bf5f45 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -1806,7 +1806,7 @@ static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam)
}
else
{
- /* Resize the height, if open as read only checkbox ad help button are
+ /* Resize the height; if open as read only, checkbox and help button are
* hidden and we are not using a custom template nor a customDialog
*/
if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 97c71bf..b6bfcb1 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1027,7 +1027,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 or pSrcData or SrcDataSize is NULL
* D3DXERR_INVALIDDATA, if pSrcData is no valid image file
*
*/
@@ -1717,7 +1717,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
@@ -1868,7 +1868,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/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index 9f30f52..ac4475d 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -2443,7 +2443,7 @@ static void test_D3DXSHAdd(void)
/*
* Order is not limited by D3DXSH_MINORDER and D3DXSH_MAXORDER!
* All values will work, test from 0-7 [D3DXSH_MINORDER = 2, D3DXSH_MAXORDER = 6]
- * Exceptions will show up when out, in1 or in2 are NULL
+ * Exceptions will show up when out, in1 or in2 is NULL
*/
for (k = 0; k <= D3DXSH_MAXORDER + 1; k++)
{
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index ed0606f..4d73cf4 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -1890,7 +1890,7 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st
*
* Returns
* DD_OK on success
- * DDERR_INVALIDPARAMS of free and total are NULL
+ * DDERR_INVALIDPARAMS if free and total are NULL
*
*****************************************************************************/
static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total,
@@ -4174,7 +4174,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
* D3D_OK on success
* DDERR_OUTOFMEMORY if memory allocation failed
* The return value of IWineD3DDevice::CreateVertexBuffer if this call fails
- * DDERR_INVALIDPARAMS if desc or vertex_buffer are NULL
+ * DDERR_INVALIDPARAMS if desc or vertex_buffer is NULL
*
*****************************************************************************/
static HRESULT WINAPI d3d7_CreateVertexBuffer(IDirect3D7 *iface, D3DVERTEXBUFFERDESC *desc,
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 874d78d..d158289e 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4450,8 +4450,8 @@ static HRESULT WINAPI d3d_device3_DrawIndexedPrimitiveVB(IDirect3DDevice3 *iface
* are passed in the Centers and Radii arrays, the results are passed back
* in the ReturnValues array. Return values are either completely visible,
* partially visible or completely invisible.
- * The return value consist of a combination of D3DCLIP_* flags, or it's
- * 0 if the sphere is completely visible(according to the SDK, not checked)
+ * The return value consists of a combination of D3DCLIP_* flags, or is
+ * 0 if the sphere is completely visible (according to the SDK, not checked)
*
* Version 3 and 7
*
@@ -4742,7 +4742,7 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
}
}
- /* Arg 1/2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */
+ /* Args 1 and 2 are already set to WINED3DTA_TEXTURE/WINED3DTA_CURRENT in case of D3DTBLEND_MODULATE */
if (tex_alpha)
wined3d_device_set_texture_stage_state(device->wined3d_device,
0, WINED3D_TSS_ALPHA_OP, WINED3D_TOP_SELECT_ARG1);
@@ -6056,7 +6056,7 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d
*
* Returns:
* D3D_OK on success
- * DDERR_INVALIDPARAMS if DestTex or SrcTex are NULL, broken coordinates or anything unexpected.
+ * DDERR_INVALIDPARAMS if DestTex or SrcTex is NULL, broken coordinates or anything unexpected.
*
*
*****************************************************************************/
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 9336802..c0eaf46 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -171,7 +171,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if
if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;
if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) {
/**
- * it rguidType is not null we must check if CLSID are equals
+ * it rguidType is not null we must check if CLSID are equal
* and the unique way to get it is using IPersistStream Interface
*/
hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream);
diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index 821f879..79374a0 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -138,7 +138,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
* Failure: NULL. Use GetLastError() to determine the cause.
*
* NOTES
- * If a width or height of 0 are given, a 1x1 monochrome bitmap is returned.
+ * If a width or height of 0 is given, a 1x1 monochrome bitmap is returned.
*/
HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
{
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index bb8104e..4377090 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -643,7 +643,7 @@ static TW_UINT16 GPHOTO2_SourceControlHandler (
break;
default:
twRC = TWRC_FAILURE;
- FIXME("unrecognized opertion triplet\n");
+ FIXME("unrecognized operation triplet\n");
}
break;
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 7275fe3..4c0a888 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -753,7 +753,7 @@ static void test_ImmGetIMCLockCount(void)
count = ImmGetIMCLockCount(0x00000000);
ok(count == 0, "NULL IMC should return 0\n");
ret = GetLastError();
- ok(ret == 0xdeadbeef, "Last Error should remain unchangedi %08x\n",ret);
+ ok(ret == 0xdeadbeef, "Last Error should remain unchanged: %08x\n",ret);
count = ImmGetIMCLockCount(imc);
ok(count == 0, "Destroyed IMC should return 0\n");
ret = GetLastError();
diff --git a/dlls/inetmib1/tests/main.c b/dlls/inetmib1/tests/main.c
index d7739f1..3051a3c 100644
--- a/dlls/inetmib1/tests/main.c
+++ b/dlls/inetmib1/tests/main.c
@@ -73,7 +73,7 @@ if (0) /* crashes on native */
if (0)
{
/* Fails when called on win8, documentation suggests that
- extension itself is resposible of freeing this oid */
+ extension itself is responsible of freeing this oid */
SnmpUtilOidFree(&oid);
}
}
diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
index 47984cc..2381302 100644
--- a/dlls/kernel32/tests/sync.c
+++ b/dlls/kernel32/tests/sync.c
@@ -2117,7 +2117,7 @@ static DWORD WINAPI srwlock_base_thread3(LPVOID x)
{
/* seq 15 */
while (srwlock_seq < 15) Sleep(1);
- Sleep(50); /* some delay, such that thread2 can try to acquire a second exclusive lock */
+ Sleep(50); /* some delay, so that thread2 can try to acquire a second exclusive lock */
if (InterlockedIncrement(&srwlock_seq) != 16)
InterlockedIncrement(&srwlock_base_errors.wrong_execution_order);
diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c
index 29eaf24..c37d9df 100644
--- a/dlls/krnl386.exe16/vga.c
+++ b/dlls/krnl386.exe16/vga.c
@@ -195,19 +195,19 @@ const VGA_MODE VGA_modelist[] =
/* VESA 1.2 modes */
{0x010d, GRAPHIC, 0, 0, 0, 0, 320, 200, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x010e, GRAPHIC, 0, 0, 0, 0, 320, 200, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x010f, GRAPHIC, 0, 0, 0, 0, 320, 200, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x010f, GRAPHIC, 0, 0, 0, 0, 320, 200, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0110, GRAPHIC, 0, 0, 0, 0, 640, 480, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0111, GRAPHIC, 0, 0, 0, 0, 640, 480, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0112, GRAPHIC, 0, 0, 0, 0, 640, 480, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0112, GRAPHIC, 0, 0, 0, 0, 640, 480, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0113, GRAPHIC, 0, 0, 0, 0, 800, 600, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0114, GRAPHIC, 0, 0, 0, 0, 800, 600, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0115, GRAPHIC, 0, 0, 0, 0, 800, 600, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0115, GRAPHIC, 0, 0, 0, 0, 800, 600, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0116, GRAPHIC, 0, 0, 0, 0, 1024, 768, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x0117, GRAPHIC, 0, 0, 0, 0, 1024, 768, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x0118, GRAPHIC, 0, 0, 0, 0, 1024, 768, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x0118, GRAPHIC, 0, 0, 0, 0, 1024, 768, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0x0119, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 15, 0, 1, TRUE}, /* VESA graphics mode, 32K colors */
{0x011a, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 16, 0, 1, TRUE}, /* VESA graphics mode, 64K colors */
- {0x011b, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 Million colors */
+ {0x011b, GRAPHIC, 0, 0, 0, 0, 1280, 1024, 24, 0, 1, TRUE}, /* VESA graphics mode, 16.8 million colors */
{0xffff, TEXT, 0, 0, 0, 0, 0, 0, 0, 0, 1, FALSE}
};
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index af8ac8c..257113b 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -2717,7 +2717,7 @@ static void test_markers(void)
DeleteFileA(msifile);
}
-#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */
+#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */
static void test_handle_limit(void)
{
int i;
diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c
index 576d2d60..428bf8c 100644
--- a/dlls/mstask/tests/task_scheduler.c
+++ b/dlls/mstask/tests/task_scheduler.c
@@ -182,7 +182,7 @@ static void test_SetTargetComputer(void)
hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer));
CoTaskMemFree(name);
- /* the two backslash are optional */
+ /* the two backslashes are optional */
hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2);
ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres);
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index ea38e0f..600b6cf 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 so as 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/ole32/compobj.c b/dlls/ole32/compobj.c
index 8ded196..ed293d9 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -3318,7 +3318,7 @@ HRESULT WINAPI CoGetInstanceFromFile(
init_multi_qi(count, results);
- /* optionaly get CLSID from a file */
+ /* optionally get CLSID from a file */
if (!rclsid)
{
hr = GetClassFile(filename, &clsid);
@@ -3380,7 +3380,7 @@ HRESULT WINAPI CoGetInstanceFromIStorage(
init_multi_qi(count, results);
- /* optionaly get CLSID from a file */
+ /* optionally get CLSID from a file */
if (!rclsid)
{
memset(&stat.clsid, 0, sizeof(stat.clsid));
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index cc6a62c..27b44ff 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -1662,7 +1662,7 @@ static void test_SafeArrayCreateEx(void)
sacopy = pSafeArrayCreateEx(VT_RECORD, 1, sab, &iRec->IRecordInfo_iface);
iRec->recordcopy = 0;
iRec->clearCalled = 0;
- /* array copy code doesn't explicitely clear a record */
+ /* array copy code doesn't explicitly clear a record */
hres = SafeArrayCopyData(sa, sacopy);
ok(hres == S_OK, "got 0x%08x\n", hres);
ok(iRec->recordcopy == sab[0].cElements, "got %d\n", iRec->recordcopy);
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 6afce5a..b0f1e9a 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -612,7 +612,7 @@ static HRESULT register_filters(struct regsvr_filter const *list)
if (list->pins[i].mediatypes[j].subtype)
memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].subtype, sizeof(CLSID));
else {
- /* Subtype are often a combination of major type + fourcc/tag */
+ /* Subtypes are often a combination of major type + fourcc/tag */
memcpy(lpClsid + j*2 + 1, list->pins[i].mediatypes[j].majortype, sizeof(CLSID));
*(DWORD*)(lpClsid + j*2 + 1) = list->pins[i].mediatypes[j].fourcc;
}
diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c
index 09b711a..e5202aa 100644
--- a/dlls/riched20/reader.c
+++ b/dlls/riched20/reader.c
@@ -710,7 +710,7 @@ static void _RTFGetToken2(RTF_Info *info)
/*
* Read the next character from the input. This handles setting the
- * current line and position-within-line variables. Those variable are
+ * current line and position-within-line variables. Those variables are
* set correctly whether lines end with CR, LF, or CRLF (the last being
* the tricky case).
*
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 64d0fbc..eba5450 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -898,13 +898,13 @@ static void test_copy(void)
DeleteFileA("test7.txt");
RemoveDirectoryA("test8.txt");
- /* number of sources do not correspond to number of targets */
+ /* number of sources does not correspond to number of targets */
set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0");
set_curr_dir_path(to, "test6.txt\0test7.txt\0");
retval = SHFileOperationA(&shfo2);
if (dir_exists("test6.txt"))
{
- /* Vista and W2K8 (broken or new behavior ?) */
+ /* Vista and W2K8 (broken or new behavior?) */
ok(retval == DE_DESTSAMETREE, "Expected DE_DESTSAMETREE, got %d\n", retval);
ok(DeleteFileA("test6.txt\\test1.txt"), "The file is not copied - many files "
"are specified as a target\n");
@@ -1871,7 +1871,7 @@ static void test_move(void)
init_shfo_tests();
- /* number of sources do not correspond to number of targets,
+ /* number of sources does not correspond to number of targets,
include directories */
set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0");
set_curr_dir_path(to, "test6.txt\0test7.txt\0");
@@ -1904,7 +1904,7 @@ static void test_move(void)
}
init_shfo_tests();
- /* number of sources do not correspond to number of targets,
+ /* number of sources does not correspond to number of targets,
files only,
from exceeds to */
set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt\0");
@@ -1939,7 +1939,7 @@ static void test_move(void)
}
init_shfo_tests();
- /* number of sources do not correspond to number of targets,
+ /* number of sources does not correspond to number of targets,
files only,
too exceeds from */
set_curr_dir_path(from, "test1.txt\0test2.txt\0");
@@ -1963,7 +1963,7 @@ static void test_move(void)
}
init_shfo_tests();
- /* number of sources do not correspond to number of targets,
+ /* number of sources does not correspond to number of targets,
target directories */
set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt\0");
set_curr_dir_path(to, "test4.txt\0test5.txt\0");
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c
index f096476..42e7aa9 100644
--- a/dlls/shell32/tests/shlfolder.c
+++ b/dlls/shell32/tests/shlfolder.c
@@ -3640,8 +3640,8 @@ static void test_ShellItemBindToHandler(void)
if(SUCCEEDED(hr)) IUnknown_Release(punk);
/* BHID_Transfer
- ITransferSource and ITransferDestination are accessible starting Vista, IUnknown is
- supported start Win8. */
+ ITransferSource and ITransferDestination are accessible starting from Vista, IUnknown is
+ supported starting from Win8. */
hr = IShellItem_BindToHandler(psi, NULL, &BHID_Transfer, &IID_ITransferSource, (void**)&punk);
ok(hr == S_OK || broken(FAILED(hr)) /* pre-Vista */, "Got 0x%08x\n", hr);
if(SUCCEEDED(hr))
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 cf10cb2..0bc43a7 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/user32/combo.c b/dlls/user32/combo.c
index 2aa4424..11476db 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -416,7 +416,7 @@ static void CBCalcPlacement(
/*
* In the case of a dropdown, the popup listbox is offset to the right.
- * so, we want to make sure it's flush with the right side of the
+ * so, we want to make sure it's flushed with the right side of the
* combobox
*/
if( CB_GETTYPE(lphc) == CBS_DROPDOWN )
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 9944119..79396ae 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -722,7 +722,7 @@ static BOOL get_twips_entry( union sysparam_all_entry *entry, UINT int_param, vo
if (load_entry( &entry->hdr, buf, sizeof(buf) ))
{
int val = atoiW( buf );
- /* Dimension are quoted as being "twips" values if negative and pixels if positive.
+ /* Dimensions are quoted as being "twips" values if negative and pixels if positive.
* One inch is 1440 twips.
* See for example
* Technical Reference to the Windows 2000 Registry ->
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 94785b2..9e94408 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -904,7 +904,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed)
if (str[index] == 0xc || str[index] == 0x20 || str[index] == 0x202f)
return Script_CR;
- /* These punctuation are separated out as Latin punctuation */
+ /* These punctuation characters are separated out as Latin punctuation */
if (strchrW(latin_punc,str[index]))
return Script_Punctuation2;
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/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c
index f6e126d..2f980a8 100644
--- a/dlls/winmm/tests/mcicda.c
+++ b/dlls/winmm/tests/mcicda.c
@@ -250,8 +250,8 @@ static void test_play(HWND hwnd)
test_notification(hwnd, "status 2flags", err ? 0 : MCI_NOTIFY_SUCCESSFUL);
err = mciSendStringA("play c from 00:02:00 to 00:01:00 notify", buf, sizeof(buf), hwnd);
- ok(err == MCIERR_OUTOFRANGE, "play 2s to 1s: %s\n", dbg_mcierr(err));
- test_notification(hwnd, "play 2s to 1s", err ? 0 : MCI_NOTIFY_SUCCESSFUL);
+ ok(err == MCIERR_OUTOFRANGE, "play from 2 s to 1 s: %s\n", dbg_mcierr(err));
+ test_notification(hwnd, "play from 2 s to 1 s", err ? 0 : MCI_NOTIFY_SUCCESSFUL);
err = mciSendStringA("resume c", buf, sizeof(buf), hwnd);
ok(err == MCIERR_HARDWARE || /* Win9x */ err == MCIERR_UNSUPPORTED_FUNCTION,
@@ -509,7 +509,7 @@ static void test_play(HWND hwnd)
ok(!err, "status mode: %s\n", dbg_mcierr(err));
if(!err) ok(!strcmp(buf, "stopped") || broken(!strcmp(buf, "playing")), "status mode after play is %s\n", buf);
if(!err && !strcmp(buf, "playing")) trace("status still playing\n");
- /* Some systems report playing even after Sleep(3900ms) yet the successful
+ /* Some systems report playing even after Sleep (3900 ms) yet the successful
* notification tests (not ABORTED) indicates they are finished. */
test_notification(hwnd, "dangling from PLAY", MCI_NOTIFY_SUPERSEDED);
diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c
index 4d9061b..8cea7b3 100644
--- a/dlls/wintrust/tests/crypt.c
+++ b/dlls/wintrust/tests/crypt.c
@@ -240,7 +240,7 @@ static void test_context(void)
* FIXME:
* We don't want to mess too much with these for now so we should delete only the ones
* that shouldn't be there like the deadbeef ones. We first have to figure out if it's
- * save to remove files and directories from CatRoot/CatRoot2.
+ * safe to remove files and directories from CatRoot/CatRoot2.
*/
ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0);
diff --git a/include/mapidefs.h b/include/mapidefs.h
index 2206e70..fab1056 100644
--- a/include/mapidefs.h
+++ b/include/mapidefs.h
@@ -182,7 +182,7 @@ typedef struct _MAPIUID
#define cchProfilePassMax 64 /* Maximum length of a profile password */
#endif
-/* Properties: The are the contents of cells in MAPI tables, as well as the
+/* Properties: These are the contents of cells in MAPI tables, as well as the
* values returned when object properties are queried.
*/
diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index 1d1eea4..0498fd9 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -1197,7 +1197,7 @@ call :checkenvvars WINE_foo 18
set WINE_foo=3
set /a WINE_bar="WINE_""foo"+4
call :checkenvvars WINE_foo 3 WINE_bar 7
-echo --- whitespace are ignored between double char operators
+echo --- whitespace is ignored between double char operators
set WINE_foo=4
set WINE_bar=5
set /a WINE_foo + = 6
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 7380185..3a2d1b0 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -853,7 +853,7 @@ WINE_baz correctly 2
WINE_foo correctly 18
WINE_foo correctly 3
WINE_bar correctly 7 at or_broken@ERROR: WINE_bar incorrectly 4 [7]
---- whitespace are ignored between double char operators
+--- whitespace is ignored between double char operators
WINE_foo correctly 10 at or_broken@ERROR: WINE_foo incorrectly 4 [10]
WINE_bar correctly 50 at or_broken@ERROR: WINE_bar incorrectly 5 [50]
WINE_foo correctly 772 at or_broken@ERROR: WINE_foo incorrectly 4 [772]
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/programs/start/start.c b/programs/start/start.c
index 7bf8ea8..2e2754b 100644
--- a/programs/start/start.c
+++ b/programs/start/start.c
@@ -221,8 +221,8 @@ int wmain (int argc, WCHAR *argv[])
sei.lpDirectory = NULL;
creation_flags = CREATE_NEW_CONSOLE;
- /* Canonical Microsoft commandline flag processing:
- * flags start with / and are case insensitive.
+ /* Canonical Microsoft commandline flag processing.
+ * Flags starting with / are case insensitive.
*/
for (i=1; i<argc; i++) {
if (argv[i][0] == '"') {
diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
index a827725..f6bb91d 100644
--- a/programs/wineconsole/winecon_private.h
+++ b/programs/wineconsole/winecon_private.h
@@ -75,7 +75,7 @@ struct inner_data {
void (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight);
void (*fnDeleteBackend)(struct inner_data* data);
- void* private; /* data part belonging to the chosen backed */
+ void* private; /* data part belonging to the chosen backend */
};
/* from wineconsole.c */
diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in
index b5beba2..d6e5dc9 100644
--- a/programs/winedbg/winedbg.man.in
+++ b/programs/winedbg/winedbg.man.in
@@ -70,7 +70,7 @@ When in \fBgdb\fR proxy mode, the following options are available:
.PP
.IP \fB--no-start\fR
\fBgdb\fR will not be automatically
-started. Relevant information for starting \fBgdb\fR are printed on
+started. Relevant information for starting \fBgdb\fR is printed on
screen. This is somehow useful when not directly using \fBgdb\fR but
some graphical front-ends, like \fBddd\fR or \fBkgbd\fR.
.IP \fB--with-xterm\fR
diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index cb1ac55..872b9a5 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -309,7 +309,7 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile,
/* Calculate horizontal size and position of a popup window */
GetWindowRect(parent->hMainWnd, &parent_rect);
wi.size.cx = (parent_rect.right - parent_rect.left) / 2;
- wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */
+ wi.size.cy = 10; /* need a non null value, so that borders are taken into account while computing */
wi.origin.x = (short)LOWORD(mouse);
wi.origin.y = (short)HIWORD(mouse);
diff --git a/tools/c2man.pl b/tools/c2man.pl
index f55b1b1..eb563e8 100755
--- a/tools/c2man.pl
+++ b/tools/c2man.pl
@@ -520,7 +520,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;
diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c
index cc039dc..03be597 100644
--- a/tools/widl/write_msft.c
+++ b/tools/widl/write_msft.c
@@ -282,7 +282,7 @@ static int ctl2_find_name(
*
* NOTES
*
- * Will throw an exception if name or result are NULL. Is not multithread
+ * Will throw an exception if name or result is NULL. Is not multithread
* safe in the slightest.
*/
static int ctl2_encode_name(
@@ -334,7 +334,7 @@ static int ctl2_encode_name(
*
* NOTES
*
- * Will throw an exception if string or result are NULL. Is not multithread
+ * Will throw an exception if string or result is NULL. Is not multithread
* safe in the slightest.
*/
static int ctl2_encode_string(
diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm
index 78b6ec9..db708e4 100644
--- a/tools/winapi/nativeapi.pm
+++ b/tools/winapi/nativeapi.pm
@@ -98,7 +98,7 @@ sub new($) {
# remove leading and trailing whitespace
s/^\s*(.*?)\s*$/$1/;
- # skip emty lines
+ # skip empty lines
if(/^$/) { next; }
# skip comments
@@ -147,7 +147,7 @@ sub new($) {
# remove leading and trailing whitespace
s/^\s*(.*?)\s*$/$1/;
- # skip emty lines
+ # skip empty lines
if(/^$/) { next; }
if(/^\#undef\s+(\S+)$/) {
diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check
index 61a0635..2aa8eed 100755
--- a/tools/winapi/winapi_check
+++ b/tools/winapi/winapi_check
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
-# Note that winapi_check are using heuristics quite heavily.
+# Note that winapi_check is using heuristics quite heavily.
# So always remember that:
#
# "Heuristics are bug ridden by definition.
@@ -577,7 +577,7 @@ foreach my $file (@c_files) {
if($nativeapi->is_conditional_header($header)) {
if(!$preprocessor->is_def($macro)) {
if($macro =~ /^HAVE_X11/) {
- # Do nothing X Windows is handled differently
+ # Do nothing: X Windows is handled differently
} elsif($macro =~ /^HAVE_(.*?)_H$/) {
my $name = $1;
if($header !~ /^alloca\.h$/ &&
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index cc7dd37..9d70880 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -86,7 +86,7 @@ static void function_header( const char *name )
* the Win95 16->32 thunk functions C16ThkSL and C16ThkSL01 and is
* implemented as follows:
* On entry, the EBX register is set up to contain a flat pointer to the
- * 16-bit stack such that EBX+22 points to the first argument.
+ * 16-bit stack so that EBX+22 points to the first argument.
* Then, the entry point is called, while EBP is set up to point
* to the return address (on the 32-bit stack).
* The called function returns with CX set to the number of bytes
diff --git a/tools/winemaker b/tools/winemaker
index af26243..60a9e2d 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -68,15 +68,15 @@ my $OPT_ASK_SKIP=-1;
# The following constants define the architecture
##
-# Default Architecture will be chosen
+# Default architecture will be chosen
my $OPT_ARCH_DEFAULT=0;
##
-# 32-Bit Target
+# 32-bit target
my $OPT_ARCH_32=32;
##
-# 64-Bit Target
+# 64-bit target
my $OPT_ARCH_64=64;
@@ -129,7 +129,7 @@ my $opt_target_type;
my $opt_flags;
##
-# Contains 32 for 32-Bit-Targets and 64 for 64-Bit-Targets
+# Contains 32 for 32-bit targets or 64 for 64-bit targets
my $opt_arch;
##
@@ -767,7 +767,7 @@ sub source_scan_project_file($$$)
# Build a DLL
$prj_target_type=$TT_DLL;
} elsif (/^incremental:[[:alpha:]]+$/) {
- # Link Incrmentally
+ # Link incrementally
} elsif (/^implib:/) {
# Name import library
} elsif (/^libpath:\"(.*)\"/) {
--
1.9.0
More information about the wine-patches
mailing list