Assorted spelling/grammar fixes
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed Apr 30 08:42:10 CDT 2014
---
dlls/comctl32/imagelist.c | 6 +++---
dlls/comdlg32/filedlg.c | 2 +-
dlls/d3dx9_36/tests/math.c | 2 +-
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/mstask/tests/task_scheduler.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 ++++++------
16 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index ec90a9c..eedf7c5 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..0f1a144 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 opened 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/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/device.c b/dlls/ddraw/device.c
index 88142a9..945520d 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4447,8 +4447,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
*
@@ -4739,7 +4739,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);
@@ -6053,7 +6053,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 dst_texture or src_texture is NULL, broken coordinates or anything unexpected.
*
*
*****************************************************************************/
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 9336802..1bdf163 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 CLSIDs 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..057cc6e 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 for 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/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/ole32/compobj.c b/dlls/ole32/compobj.c
index 51c0b20..250c0f9 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 2be8b06..ae8b2a8 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -1650,7 +1650,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");
--
1.9.2
More information about the wine-patches
mailing list