From b948778660e3b26598b94d3a03680a0f9866b524 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Tue, 23 Mar 2004 23:20:16 +0000 Subject: [PATCH] Assorted spelling fixes. --- dlls/comctl32/rebar.c | 6 +++--- dlls/d3d8/utils.c | 2 +- dlls/kernel/locale.c | 4 ++-- dlls/ntdll/rtlstr.c | 4 ++-- dlls/ole32/compobj.c | 8 ++++---- dlls/ole32/ifs.c | 2 +- dlls/oleaut32/safearray.c | 2 +- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 10 +++++----- dlls/shell32/iconcache.c | 2 +- dlls/shell32/pidl.c | 4 ++-- dlls/shlwapi/ordinal.c | 5 +++-- programs/avitools/aviplay.c | 2 +- tools/winedump/misc.c | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index c7f673eb6a9..defe8237b9d 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2516,13 +2516,13 @@ REBAR_HandleLRDrag (REBAR_INFO *infoPtr, POINTS *ptsmove) } } - if (RHeaderSum) RHeaderSum -= SEP_WIDTH; /* no separator afterlast band */ + if (RHeaderSum) RHeaderSum -= SEP_WIDTH; /* no separator after last band */ mindBand = &infoPtr->bands[imindBand]; maxdBand = &infoPtr->bands[imaxdBand]; - if (imindBand == imaxdBand) return; /* nothing to drag agains */ - if (imindBand == ihitBand) return; /* first band in row, cant drag */ + if (imindBand == imaxdBand) return; /* nothing to drag against */ + if (imindBand == ihitBand) return; /* first band in row, can't drag */ /* limit movement to inside adjustable bands - Left */ if ( (ptsmove->x < mindBand->rcBand.left) || diff --git a/dlls/d3d8/utils.c b/dlls/d3d8/utils.c index 3ac6064c3a8..6d4f123663b 100644 --- a/dlls/d3d8/utils.c +++ b/dlls/d3d8/utils.c @@ -1013,7 +1013,7 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o op2 = This->UpdateStateBlock->texture_state[Stage][D3DTSS_ALPHAOP]; } - /* Note: If COMBINE4 in effect cant go back to combine! */ + /* Note: If COMBINE4 in effect can't go back to combine! */ switch (op2) { case D3DTOP_ADDSMOOTH: diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c index 3a7fe5e1cfb..82027380bda 100644 --- a/dlls/kernel/locale.c +++ b/dlls/kernel/locale.c @@ -2265,8 +2265,8 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style, * Compare two locale sensitive strings. * * PARAMS - * lcid [I] LCID for the comparason - * style [I] Flags for the comparason (NORM_ constants from "winnls.h"). + * lcid [I] LCID for the comparison + * style [I] Flags for the comparison (NORM_ constants from "winnls.h"). * str1 [I] First string to compare * len1 [I] Length of str1, or -1 if str1 is NUL terminated * str2 [I] Second string to compare diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 2df9ab04a36..65879b9387d 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -530,7 +530,7 @@ BOOLEAN WINAPI RtlPrefixUnicodeString( const UNICODE_STRING *s1, * 0 if the names are equal, non-zero otherwise. * * NOTES - * The comparason is case insensitive. + * The comparison is case insensitive. */ NTSTATUS WINAPI RtlEqualComputerName(const UNICODE_STRING *left, const UNICODE_STRING *right) @@ -564,7 +564,7 @@ NTSTATUS WINAPI RtlEqualComputerName(const UNICODE_STRING *left, * 0 if the names are equal, non-zero otherwise. * * NOTES - * The comparason is case insensitive. + * The comparison is case insensitive. */ NTSTATUS WINAPI RtlEqualDomainName(const UNICODE_STRING *left, const UNICODE_STRING *right) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2e6e6db7ff5..bde8ee58275 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1588,22 +1588,22 @@ HINSTANCE WINAPI CoLoadLibrary(LPOLESTR lpszLibName, BOOL bAutoFree) /*********************************************************************** * CoFreeLibrary [OLE32.@] * - * NOTES: don't belive the docu + * NOTES: don't believe the documentation */ void WINAPI CoFreeLibrary(HINSTANCE hLibrary) { - FreeLibrary(hLibrary); + FreeLibrary(hLibrary); } /*********************************************************************** * CoFreeAllLibraries [OLE32.@] * - * NOTES: don't belive the docu + * NOTES: don't believe the documentation */ void WINAPI CoFreeAllLibraries(void) { - /* NOP */ + /* NOP */ } diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 2850651670b..90ad2a8ce8b 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -565,7 +565,7 @@ LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) * CoRegisterMallocSpy [OLE32.@] * * NOTES - * if a mallocspy is already registered, we cant do it again since + * if a mallocspy is already registered, we can't do it again since * only the spy knows, how to free a memory block */ HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 6cb11a4b80a..5b4a0e46f53 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1240,7 +1240,7 @@ HRESULT WINAPI SafeArrayDestroyData(SAFEARRAY *psa) return E_INVALIDARG; if (psa->cLocks) - return DISP_E_ARRAYISLOCKED; /* Cant delete a locked array */ + return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */ if (psa->pvData) { diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 68a76751eb0..8c286e6e5cf 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3270,8 +3270,8 @@ static void test_VarDateFromStr(void) /* If the numbers can't be day/month, they are assumed to be year/month */ DFS("30 2"); EXPECT_DBL(10990.0); DFS("2 30"); EXPECT_DBL(10990.0); - DFS("32 49"); EXPECT_MISMATCH; /* Cant be any format */ - DFS("0 49"); EXPECT_MISMATCH; /* Cant be any format */ + DFS("32 49"); EXPECT_MISMATCH; /* Can't be any format */ + DFS("0 49"); EXPECT_MISMATCH; /* Can't be any format */ /* If a month name is given the other number is the day */ DFS("Jan 2"); MKRELDATE(2,1); EXPECT_DBL(relative); DFS("2 Jan"); EXPECT_DBL(relative); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 219a7b7d977..8d3c4e3fca7 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3848,7 +3848,7 @@ HRESULT WINAPI VarCyRound(const CY cyIn, int cDecimals, CY* pCyOut) * RETURNS * Success: VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that the value to * compare is less, equal or greater than source respectively. - * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparason + * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) { @@ -3882,7 +3882,7 @@ HRESULT WINAPI VarCyCmp(const CY cyLeft, const CY cyRight) * RETURNS * Success: VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that dblRight is * less than, equal to or greater than cyLeft respectively. - * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparason + * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ HRESULT WINAPI VarCyCmpR8(const CY cyLeft, double dblRight) { @@ -4677,7 +4677,7 @@ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOu * RETURNS * Success: VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that pDecLeft * is less than, equal to or greater than pDecRight respectively. - * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparason + * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ HRESULT WINAPI VarDecCmp(const DECIMAL* pDecLeft, const DECIMAL* pDecRight) { @@ -4713,7 +4713,7 @@ HRESULT WINAPI VarDecCmp(const DECIMAL* pDecLeft, const DECIMAL* pDecRight) * RETURNS * Success: VARCMP_LT, VARCMP_EQ or VARCMP_GT indicating that dblRight * is less than, equal to or greater than pDecLeft respectively. - * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparason + * Failure: DISP_E_OVERFLOW, if overflow occurs during the comparison */ HRESULT WINAPI VarDecCmpR8(const DECIMAL* pDecLeft, double dblRight) { @@ -5706,7 +5706,7 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft, BSTR pbstrRight, BSTR *pbstrOut) * PARAMS * pbstrLeft [I] Source * pbstrRight [I] Value to compare - * lcid [I] LCID for the comparason + * lcid [I] LCID for the comparison * dwFlags [I] Flags to pass directly to CompareStringW(). * * RETURNS diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6d0f18cf762..c5c77093298 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -296,7 +296,7 @@ void SIC_Destroy(void) * Shell_GetImageList [SHELL32.71] * * PARAMETERS - * imglist[1|2] [OUT] pointer which recive imagelist handles + * imglist[1|2] [OUT] pointer which receives imagelist handles * */ BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index d438b810502..f511bd5cafb 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1152,7 +1152,7 @@ HRESULT WINAPI SHGetSpecialFolderLocation( * SHGetFolderLocation [SHELL32.@] * * NOTES - * the pidl can be a simple one. since we cant get the path out of the pidl + * the pidl can be a simple one. since we can't get the path out of the pidl * we have to take all data from the pidl */ HRESULT WINAPI SHGetFolderLocation( @@ -1171,7 +1171,7 @@ HRESULT WINAPI SHGetFolderLocation( * SHGetDataFromIDListA [SHELL32.247] * * NOTES - * the pidl can be a simple one. since we cant get the path out of the pidl + * the pidl can be a simple one. since we can't get the path out of the pidl * we have to take all data from the pidl */ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, int nFormat, LPVOID dest, int len) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index fea60ce04d3..d2d3f6100c0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1962,8 +1962,9 @@ DWORD WINAPI SHGetCurColorRes() * dwTimeout [I] Timeout in ticks or INFINITE to never timeout * * RETURNS - * STATUS_TIMEOUT if no message is recieved before dwTimeout ticks passes. - * Otherwise returns value from MsgWaitForMultipleObjectsEx when a message is available. + * STATUS_TIMEOUT if no message is received before dwTimeout ticks passes. + * Otherwise returns the value from MsgWaitForMultipleObjectsEx when a + * message is available. */ DWORD WINAPI SHWaitForSendMessageThread(HANDLE hand, DWORD dwTimeout) { diff --git a/programs/avitools/aviplay.c b/programs/avitools/aviplay.c index 8d08378fcf7..2aad746136e 100644 --- a/programs/avitools/aviplay.c +++ b/programs/avitools/aviplay.c @@ -190,7 +190,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) lpbmi = (LPBITMAPINFOHEADER)decodedframe; decodedbits = (LPVOID)(((DWORD)decodedframe)+lpbmi->biSize); if (lpbmi->biBitCount == 8) { - /* cant detect palette change that way I think */ + /* can't detect palette change that way I think */ RGBQUAD *rgb = (RGBQUAD*)(lpbmi+1); int i,palchanged; diff --git a/tools/winedump/misc.c b/tools/winedump/misc.c index b164e57a78b..f64f243ce07 100644 --- a/tools/winedump/misc.c +++ b/tools/winedump/misc.c @@ -208,7 +208,7 @@ FILE *open_file (const char *name, const char *ext, const char *mode) fp = fopen (fname, mode); if (!fp) - fatal ("Cant open file"); + fatal ("Can't open file"); return fp; } -- 2.11.4.GIT