From f8a7d6ed74b69499ffb8a4a9610863de93f8457d Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Fri, 7 Aug 2015 15:40:50 +0200 Subject: [PATCH] Assorted spelling fixes. --- dlls/avifil32/icmstream.c | 8 ++++---- dlls/comctl32/listview.c | 6 +++--- dlls/comctl32/rebar.c | 2 +- dlls/d2d1/brush.c | 6 +++--- dlls/d3d8/device.c | 2 +- dlls/d3drm/tests/d3drm.c | 30 +++++++++++++++--------------- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/dbghelp.c | 2 +- dlls/gameux/tests/gamestatistics.c | 4 ++-- dlls/gdi32/bitmap.c | 2 +- dlls/kernel32/editline.c | 2 +- dlls/kernel32/tests/loader.c | 6 +++--- dlls/localui/localui.c | 2 +- dlls/mpr/tests/mpr.c | 4 ++-- dlls/msvcrt/mbcs.c | 2 +- dlls/msxml3/domdoc.c | 4 ++-- dlls/ntdll/virtual.c | 2 +- dlls/ole32/storage32.c | 4 ++-- dlls/riched20/tests/richole.c | 2 +- 19 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 1b86d00dab1..766f540e41f 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -771,11 +771,11 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, if (This->lKeyFrameEvery != 0) { if (This->lCurrent == This->sInfo.dwStart) { if (idxFlags & AVIIF_KEYFRAME) { - /* for keyframes allow to consume all unused bytes */ + /* allow keyframes to consume all unused bytes */ dwRequest = This->dwBytesPerFrame + This->dwUnusedBytes; This->dwUnusedBytes = 0; } else { - /* for non-keyframes only allow something of the unused bytes to be consumed */ + /* for non-keyframes only allow some of the unused bytes to be consumed */ DWORD tmp1 = 0; DWORD tmp2; @@ -797,8 +797,8 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, dwRequest = MAX_FRAMESIZE; } - /* must we check for framesize to gain requested - * datarate or could we trust codec? */ + /* must we check for frame size to gain the requested + * data rate or can we trust the codec? */ doSizeCheck = (dwRequest != 0 && ((This->dwICMFlags & (VIDCF_CRUNCH|VIDCF_QUALITY)) == 0)); dwMaxQual = dwCurQual = This->sInfo.dwQuality; diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d2cd9401851..e1c7cead50f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -63,9 +63,9 @@ * -- if list is sorted by item text LISTVIEW_InsertItemT could use * binary search to calculate item index (e.g. DPA_Search()). * This requires sorted state to be reliably tracked in item modifiers. - * -- we should keep an ordered array of coordinates in iconic mode - * this would allow to frame items (iterator_frameditems), - * and find nearest item (LVFI_NEARESTXY) a lot more efficiently + * -- we should keep an ordered array of coordinates in iconic mode. + * This would allow framing items (iterator_frameditems), + * and finding the nearest item (LVFI_NEARESTXY) a lot more efficiently. * * Flags * -- LVIF_COLUMNS diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 99069a9d3dd..466acae151c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2294,7 +2294,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, UINT uIndex, LPREBARBANDINFOW lprb if (lprbbi->fMask & RBBIM_CHILDSIZE) { lprbbi->cxMinChild = lpBand->cxMinChild; lprbbi->cyMinChild = lpBand->cyMinChild; - /* to make tests pass we follow Windows behaviour and allow to read these fields only + /* to make tests pass we follow Windows' behaviour and allow reading these fields only * for RBBS_VARIABLEHEIGHTS bands */ if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lprbbi->cyChild = lpBand->cyChild; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index bf8746a642b..6f9200a0148 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -721,7 +721,7 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } -static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTEND_MODE mode) +static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXTEND_MODE mode) { switch (mode) { @@ -853,8 +853,8 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_tar sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); + sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); + sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 26cc9acd968..916f23fbab5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1188,7 +1188,7 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, if (ds_desc.multisample_type != rt_desc.multisample_type || ds_desc.multisample_quality != rt_desc.multisample_quality) { - WARN("Multisample settings do not match, returing D3DERR_INVALIDCALL\n"); + WARN("Multisample settings do not match, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d36059100ef..fe5e36b0c39 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2047,7 +2047,7 @@ static void test_create_device_from_clipper1(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", surface_desc.dwWidth, surface_desc.dwHeight); ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); @@ -2069,7 +2069,7 @@ static void test_create_device_from_clipper1(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -2230,7 +2230,7 @@ static void test_create_device_from_clipper2(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", surface_desc.dwWidth, surface_desc.dwHeight); ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); @@ -2252,7 +2252,7 @@ static void test_create_device_from_clipper2(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -2418,7 +2418,7 @@ static void test_create_device_from_clipper3(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", surface_desc.dwWidth, surface_desc.dwHeight); ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); @@ -2440,7 +2440,7 @@ static void test_create_device_from_clipper3(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimensions = 300, 200, got %u, %u.\n", desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -2596,7 +2596,7 @@ static void test_create_device_from_surface1(void) ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -2778,7 +2778,7 @@ static void test_create_device_from_surface2(void) ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -2964,7 +2964,7 @@ static void test_create_device_from_surface3(void) ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); use_sysmem_zbuffer = desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY; - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok(desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -3250,7 +3250,7 @@ static void test_create_device_from_d3d1(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); @@ -3265,7 +3265,7 @@ static void test_create_device_from_d3d1(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -3440,7 +3440,7 @@ static void test_create_device_from_d3d2(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); @@ -3455,7 +3455,7 @@ static void test_create_device_from_d3d2(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; @@ -3565,7 +3565,7 @@ static void test_create_device_from_d3d3(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, desc.ddsCaps.dwCaps); @@ -3580,7 +3580,7 @@ static void test_create_device_from_d3d3(void) hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); - ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimentions = %u, %u, got %u, %u.\n", + ok((desc.dwWidth == rc.right) && (desc.dwHeight == rc.bottom), "Expected surface dimensions = %u, %u, got %u, %u.\n", rc.right, rc.bottom, desc.dwWidth, desc.dwHeight); ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 00745cb0ec4..37b2e2586e1 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -261,7 +261,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } } else - /* FIXME: this will allow to work when we're not attached to a live target, + /* FIXME: this will allow it to work when we're not attached to a live target, * but the 16 <=> 32 switch facility won't be available. */ curr_switch = 0; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index f5d0b679e04..a0424aa15cd 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -272,7 +272,7 @@ static BOOL check_live_target(struct process* pcs) * The initialisation of a dbghelp's context. * Note that hProcess doesn't need to be a valid process handle (except * when fInvadeProcess is TRUE). - * Since, we're also allow to load ELF (pure) libraries and Wine ELF libraries + * Since we also allow loading ELF (pure) libraries and Wine ELF libraries * containing PE (and NE) module(s), here's how we handle it: * - we load every module (ELF, NE, PE) passed in SymLoadModule * - in fInvadeProcess (in SymInitialize) is TRUE, we set up what is called ELF diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 90a16f72aea..dd9bd3748ae 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -196,13 +196,13 @@ static void test_gamestatisticsmgr( void ) /* test trying to create interface IGameStatistics using GetGameStatistics method */ - /* this should fail, cause statistics doesn't yet exists */ + /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %p\n", gs); - /* now, allow to create */ + /* now, allow them to be created */ hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr); ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 6d1bed90a4a..4b7a2ed3d04 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -194,7 +194,7 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - /* XP doesn't allow to create bitmaps larger than 128 Mb */ + /* XP doesn't allow creating bitmaps larger than 128 MB */ if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index f7e42a4e971..c0234d7c2c1 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -233,7 +233,7 @@ static BOOL WCEL_Grow(WCEL_Context* ctx, size_t len) { if (!WCEL_IsSingleLine(ctx, len) && !ctx->can_wrap) { - FIXME("Mode doesn't allow to wrap. However, we should allow to overwrite current string\n"); + FIXME("Mode doesn't allow wrapping. However, we should allow overwriting the current string\n"); return FALSE; } diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b8444334846..89feeb9f7d0 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1561,7 +1561,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); } - /* win7 doesn't allow to create a thread during process shutdown, + /* win7 doesn't allow creating a thread during process shutdown but * earlier Windows versions allow it. */ noop_thread_started = 0; @@ -1690,8 +1690,8 @@ todo_wine trace("dll: %p, DLL_THREAD_DETACH, %p\n", hinst, param); ret = pRtlDllShutdownInProgress(); - /* win7 doesn't allow to create a thread during process shutdown, - * earlier Windows versions allow it, and DLL_THREAD_DETACH is + /* win7 doesn't allow creating a thread during process shutdown but + * earlier Windows versions allow it. In that case DLL_THREAD_DETACH is * sent on thread exit, but DLL_THREAD_ATTACH is never received. */ if (noop_thread_started) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 4ea653ec806..9fb975cd851 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -615,7 +615,7 @@ static BOOL WINAPI localui_ConfigurePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPort * Failure: FALSE * * NOTES - * Native localui does not allow to delete a COM / LPT - Port (ERROR_NOT_SUPPORTED) + * Native localui does not allow deleting a COM/LPT port (ERROR_NOT_SUPPORTED) * */ static BOOL WINAPI localui_DeletePortUI(PCWSTR pName, HWND hWnd, PCWSTR pPortName) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index f3349dfb50a..99b05f61e3d 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -199,10 +199,10 @@ static BOOL CALLBACK enum_password_proc(PASSWORD_CACHE_ENTRY* pce, DWORD param) ok(pce->nType == m_type, "nType, got %d, got %d\n", pce->nType, m_type); buf = (char*)pce->abResource; - ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); + ok(strncmp(buf, m_resource, pce->cbResource)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbResource, buf, m_resource); buf += pce->cbResource; - ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated ressource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); + ok(strncmp(buf, m_password, pce->cbPassword)==0, "enumerated resource differs, got %.*s, expected %s\n", pce->cbPassword, buf, m_password); m_callback_reached = 1; return TRUE; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 240ec2c4535..ea650f4cf6f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1080,7 +1080,7 @@ int CDECL _mbscat_s_l( unsigned char *dst, MSVCRT_size_t size, for(j=0; src[j] && i+jprot + (((const char *)page - (const char *)view->base) >> page_shift); SIZE_T block_size; - /* If the page is not writeable then check for write watches + /* If the page is not writable then check for write watches * before giving up. This can be done without raising a real * exception. Similar to virtual_handle_fault. */ if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c8816209132..bfef4a23d7c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -876,7 +876,7 @@ static HRESULT removeFromTree( * IEnumSTATSTGImpl definitions. * * Definition of the implementation structure for the IEnumSTATSTGImpl interface. - * This class allows iterating through the content of a storage and to find + * This class allows iterating through the content of a storage and finding * specific items inside it. */ struct IEnumSTATSTGImpl @@ -2518,7 +2518,7 @@ static HRESULT deleteStreamContents( * Strategy: This implementation is built this way for simplicity not for speed. * I always delete the topmost element of the enumeration and adjust * the deleted element pointer all the time. This takes longer to - * do but allow to reinvoke DestroyElement whenever we encounter a + * do but allows reinvoking DestroyElement whenever we encounter a * storage object. The optimisation resides in the usage of another * enumeration strategy that would give all the leaves of a storage * first. (postfix order) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index dd1e8a5e0ca..047370fad30 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3034,7 +3034,7 @@ static void test_SetFont(void) EXPECT_REF(range2, 2); EXPECT_REF(range, 2); - /* originaly range 0-4 is non-italic */ + /* originally range 0-4 is non-italic */ value = tomTrue; hr = ITextFont_GetItalic(font, &value); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.11.4.GIT