Module: wine Branch: master Commit: 2ab87290200553e90ec121651148ff4cdbb71e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab87290200553e90ec1216511...
Author: Frédéric Delanoy frederic.delanoy@gmail.com Date: Thu Jun 19 23:30:35 2014 +0200
Assorted spelling/grammar fixes.
---
dlls/ddraw/ddraw.c | 4 ++-- dlls/dmusic/collection.c | 2 +- dlls/gdi32/region.c | 2 +- dlls/ole32/storage32.h | 2 +- dlls/shell32/tests/shlfolder.c | 4 ++-- dlls/usp10/usp10.c | 2 +- dlls/wininet/internet.c | 4 ++-- dlls/wintrust/tests/crypt.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 062fe02..b62d5f6 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/dmusic/collection.c b/dlls/dmusic/collection.c index 5754884..ec9914f 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,7 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ + CHAR *szCopyright; /* FIXME: should probably be placed somewhere else */ DLSHEADER *pHeader; /* pool table */ POOLTABLE *pPoolTable; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 93aa6a7..a5df6f1 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -891,7 +891,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) GDI_ReleaseObj( hrgn ); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - /* user requested buffer size with rgndata NULL */ + /* user requested buffer size with NULL rgndata */ return FIELD_OFFSET(RGNDATA, Buffer[size]); }
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 108aad7..36cbc9d 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -504,7 +504,7 @@ StgStreamImpl* StgStreamImpl_Construct( /* Range lock constants. * * The storage format reserves the region from 0x7fffff00-0x7fffffff for - * locking and synchronization. Unfortuantely, the spec doesn't say which bytes + * locking and synchronization. Unfortunately, the spec doesn't say which bytes * within that range are used, and for what. These are guesses based on testing. * In particular, ends of ranges may be wrong.
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 474f605..e58a863 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3642,8 +3642,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/usp10/usp10.c b/dlls/usp10/usp10.c index 14feb6d..8769bd9 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/wininet/internet.c b/dlls/wininet/internet.c index bb46a43..aa58e34 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2104,7 +2104,7 @@ BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR lpszUrl, LPSTR lpszBuffer, { HRESULT hr;
- TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
dwFlags = convert_url_canonicalization_flags(dwFlags); @@ -2130,7 +2130,7 @@ BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR lpszUrl, LPWSTR lpszBuffer, { HRESULT hr;
- TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer, + TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer, lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
dwFlags = convert_url_canonicalization_flags(dwFlags); diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 55f9ece..0e77f93 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);