marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Assorted spelling/grammar fixes.

oldstable
Frédéric Delanoy 2014-04-30 15:42:10 +02:00 committed by Alexandre Julliard
parent f6bb1a51a9
commit 2e5cb7aac8
16 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/comctl32/imagelist.c
View File

@ -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,

2
dlls/comdlg32/filedlg.c
View File

@ -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) &&

2
dlls/d3dx9_36/tests/math.c
View File

@ -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++)
{

8
dlls/ddraw/device.c
View File

@ -4443,8 +4443,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
*
@ -4735,7 +4735,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);
@ -6049,7 +6049,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.
*
*
*****************************************************************************/

2
dlls/dmime/segment.c
View File

@ -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);

2
dlls/gdi32/bitmap.c
View File

@ -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 )
{

2
dlls/gphoto2.ds/gphoto2_main.c
View File

@ -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;

2
dlls/imm32/tests/imm32.c
View File

@ -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();

2
dlls/inetmib1/tests/main.c
View File

@ -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);
}
}

2
dlls/kernel32/tests/sync.c
View File

@ -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);

2
dlls/mstask/tests/task_scheduler.c
View File

@ -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);

4
dlls/ole32/compobj.c
View File

@ -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));

2
dlls/oleaut32/tests/safearray.c
View File

@ -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);

2
dlls/quartz/regsvr.c
View File

@ -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;
}

2
dlls/riched20/reader.c
View File

@ -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).
*

12
dlls/shell32/tests/shlfileop.c
View File

@ -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");