diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2711ba4a416..7c14805c1da 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2096,7 +2096,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) if (This->dwMoviChunkPos == 0) AVIFILE_ComputeMoviStart(This); - /* written one record to much? */ + /* written one record too much? */ if (This->ckLastRecord.dwFlags & MMIO_DIRTY) { This->dwNextFramePos -= 3 * sizeof(DWORD); if (This->nIdxRecords > 0) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index fdde684b479..4ef4b5dea2a 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1354,7 +1354,7 @@ static LRESULT customdraw_1(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return -1; } @@ -1381,7 +1381,7 @@ static LRESULT customdraw_2(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1411,7 +1411,7 @@ static LRESULT customdraw_3(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } @@ -1439,7 +1439,7 @@ static LRESULT customdraw_4(int n, NMCUSTOMDRAW *nm) return 0; } - ok(FALSE, "To many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); + ok(FALSE, "Too many custom draw messages (n=%d, nm->dwDrawStage=%d)\n", n, nm->dwDrawStage); return 0; } diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 8b0885fad32..5e7bce0f079 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -510,7 +510,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER return ACMERR_NOTPOSSIBLE; } - /* The packing algorythm writes 32 bytes, then 33 bytes, + /* The packing algorithm writes 32 bytes, then 33 bytes, * and it seems to pad to align to 65 bytes always * adding extra data where necessary */ diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f84af32a79f..3ef255a0bcb 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -185,7 +185,7 @@ static nsresult NSAPI nsInputStream_ReadSegments(nsIInputStream *iface, nsres = aWriter(&This->nsIInputStream_iface, aClousure, This->buf, 0, aCount, &written); if(NS_FAILED(nsres)) - TRACE("aWritter failed: %08x\n", nsres); + TRACE("aWriter failed: %08x\n", nsres); else if(written != This->buf_size) FIXME("written %d != buf_size %d\n", written, This->buf_size); diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 668701a7486..882b5d2e088 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1486,7 +1486,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp; @@ -1534,7 +1534,7 @@ static LRESULT Compress(CodecInfo *pi, ICCOMPRESS* lpic, DWORD dwSize) } { /* swap buffer for current and previous frame */ - /* Don't free and alloc new -- costs to much time and they are of equal size ! */ + /* Don't free and alloc new -- costs too much time and they are of equal size ! */ LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 8905c55aa27..9c542fc9666 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -939,7 +939,7 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p IBindCtx *pbind; DWORD mkSys; ULONG nb1,nb2,i,sameIdx; - BOOL machimeNameCase=FALSE; + BOOL machineNameCase = FALSE; if (ppmkPrefix==NULL) return E_POINTER; @@ -997,20 +997,20 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p if (sameIdx > 1 && *stringTable1[0]=='\\' && *stringTable2[1]=='\\'){ - machimeNameCase=TRUE; + machineNameCase = TRUE; for(i=2;i 3 || nb2 > 3) ) + if (machineNameCase && (sameIdx<=3) && (nb1 > 3 || nb2 > 3) ) ret = MK_E_NOPREFIX; else { diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 362d4e6e656..8723546218f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -388,7 +388,7 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPCITEMIDLIST pIDL, SHCONTF fFilter) { * * RETURNS * Success, TRUE - * Failure, FALSE - Path not existent, too long, insufficient rights, to many symlinks + * Failure, FALSE - Path not existent, too long, insufficient rights, too many symlinks */ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index ba31583921c..80d77417191 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4595,7 +4595,7 @@ static const invalid_uri invalid_uri_tests[] = { {"*a*b*c*d://not.valid.com",0,FALSE}, /* Not allowed to have invalid % encoded data. */ {"ftp://google.co%XX/",0,FALSE}, - /* To many h16 components. */ + /* Too many h16 components. */ {"http://[1:2:3:4:5:6:7:8:9]",0,FALSE}, /* Not enough room for IPv4 address. */ {"http://[1:2:3:4:5:6:7:192.0.1.0]",0,FALSE}, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 724d60f2d22..dbdeaffc595 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1618,7 +1618,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) /* An IPv6 address can have no more than 8 h16 components. */ if(ip.h16_count >= 8) { *ptr = start; - TRACE("(%p %p %x): Not a IPv6 address, to many h16 components.\n", + TRACE("(%p %p %x): Not a IPv6 address, too many h16 components.\n", ptr, data, flags); return FALSE; } diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c index 25eceb887b1..0d829a01f01 100644 --- a/dlls/winegstreamer/glibthread.c +++ b/dlls/winegstreamer/glibthread.c @@ -1,7 +1,7 @@ /* GLIB - Library of useful routines for C programming * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * - * Wine Gstramer integration + * Wine GStreamer integration * Copyright 2010 Aric Stewart, CodeWeavers * * gthread.c: solaris thread system implementation