Assorted spelling fixes

Francois Gouget fgouget at free.fr
Tue Mar 23 13:09:53 CST 2004


Changelog:

 * dlls/comctl32/rebar.c
   dlls/d3d8/utils.c
   dlls/kernel/locale.c
   dlls/ntdll/rtlstr.c
   dlls/ole32/compobj.c
   dlls/ole32/ifs.c
   dlls/oleaut32/safearray.c
   dlls/oleaut32/vartype.c
   dlls/oleaut32/tests/vartype.c
   dlls/shell32/iconcache.c
   dlls/shell32/pidl.c
   dlls/shlwapi/ordinal.c
   programs/avitools/aviplay.c
   tools/winedump/misc.c

   Assorted spelling fixes.


Index: dlls/comctl32/rebar.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/rebar.c,v
retrieving revision 1.90
diff -u -r1.90 rebar.c
--- a/dlls/comctl32/rebar.c	19 Mar 2004 19:14:30 -0000	1.90
+++ b/dlls/comctl32/rebar.c	23 Mar 2004 18:50:49 -0000
@@ -2516,13 +2516,13 @@

 	}
     }
-    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) ||
Index: dlls/d3d8/utils.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/utils.c,v
retrieving revision 1.13
diff -u -r1.13 utils.c
--- a/dlls/d3d8/utils.c	6 Jan 2004 22:08:34 -0000	1.13
+++ b/dlls/d3d8/utils.c	23 Mar 2004 13:10:51 -0000
@@ -1013,7 +1013,7 @@
                 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:
@@ -1031,7 +1031,7 @@
                    Handled   = FALSE;
                    break;
                default:
-                   FIXME("Cant have COMBINE4 and COMBINE in efferct together, thisop=%d, otherop=%ld, isAlpha(%d)\n",
+                   FIXME("Can't have COMBINE4 and COMBINE in effect together, thisop=%d, otherop=%ld, isAlpha(%d)\n",
                               op, op2, isAlpha);

 		   LEAVE_GL();
Index: dlls/kernel/locale.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/locale.c,v
retrieving revision 1.36
diff -u -r1.36 locale.c
--- a/dlls/kernel/locale.c	9 Mar 2004 00:41:00 -0000	1.36
+++ b/dlls/kernel/locale.c	23 Mar 2004 13:06:42 -0000
@@ -2265,8 +2265,8 @@
  * 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
Index: dlls/ntdll/rtlstr.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/rtlstr.c,v
retrieving revision 1.42
diff -u -r1.42 rtlstr.c
--- a/dlls/ntdll/rtlstr.c	12 Mar 2004 01:59:35 -0000	1.42
+++ b/dlls/ntdll/rtlstr.c	23 Mar 2004 13:07:17 -0000
@@ -530,7 +530,7 @@
  *  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 @@
  *  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)
Index: dlls/ole32/compobj.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/compobj.c,v
retrieving revision 1.89
diff -u -r1.89 compobj.c
--- a/dlls/ole32/compobj.c	10 Feb 2004 01:36:20 -0000	1.89
+++ b/dlls/ole32/compobj.c	23 Mar 2004 18:56:15 -0000
@@ -1588,22 +1588,22 @@
 /***********************************************************************
  *           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 */
 }


Index: dlls/ole32/ifs.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ifs.c,v
retrieving revision 1.36
diff -u -r1.36 ifs.c
--- a/dlls/ole32/ifs.c	19 Feb 2004 01:26:45 -0000	1.36
+++ b/dlls/ole32/ifs.c	23 Mar 2004 13:03:59 -0000
@@ -565,7 +565,7 @@
  *           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)
Index: dlls/oleaut32/safearray.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/safearray.c,v
retrieving revision 1.34
diff -u -r1.34 safearray.c
--- a/dlls/oleaut32/safearray.c	27 Feb 2004 21:32:55 -0000	1.34
+++ b/dlls/oleaut32/safearray.c	23 Mar 2004 13:08:55 -0000
@@ -1240,7 +1240,7 @@
     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)
   {
Index: dlls/oleaut32/vartype.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/vartype.c,v
retrieving revision 1.6
diff -u -r1.6 vartype.c
--- a/dlls/oleaut32/vartype.c	25 Feb 2004 01:23:49 -0000	1.6
+++ b/dlls/oleaut32/vartype.c	23 Mar 2004 13:06:16 -0000
@@ -3848,7 +3848,7 @@
  * 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 @@
  * 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 @@
  * 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 @@
  * 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 @@
  * 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
Index: dlls/oleaut32/tests/vartype.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/tests/vartype.c,v
retrieving revision 1.8
diff -u -r1.8 vartype.c
--- a/dlls/oleaut32/tests/vartype.c	27 Jan 2004 04:01:10 -0000	1.8
+++ b/dlls/oleaut32/tests/vartype.c	23 Mar 2004 13:09:14 -0000
@@ -3270,8 +3270,8 @@
   /* 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);
Index: dlls/shell32/iconcache.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/iconcache.c,v
retrieving revision 1.76
diff -u -r1.76 iconcache.c
--- a/dlls/shell32/iconcache.c	22 Mar 2004 22:57:13 -0000	1.76
+++ b/dlls/shell32/iconcache.c	23 Mar 2004 13:34:40 -0000
@@ -296,7 +296,7 @@
  * 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)
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/pidl.c,v
retrieving revision 1.105
diff -u -r1.105 pidl.c
--- a/dlls/shell32/pidl.c	22 Mar 2004 22:58:19 -0000	1.105
+++ b/dlls/shell32/pidl.c	23 Mar 2004 13:34:40 -0000
@@ -1152,7 +1152,7 @@
  * 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 @@
  * 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)
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /var/cvs/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.81
diff -u -r1.81 ordinal.c
--- a/dlls/shlwapi/ordinal.c	18 Mar 2004 02:11:23 -0000	1.81
+++ b/dlls/shlwapi/ordinal.c	23 Mar 2004 13:01:57 -0000
@@ -1962,8 +1962,9 @@
  *  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)
 {
Index: programs/avitools/aviplay.c
===================================================================
RCS file: /var/cvs/wine/programs/avitools/aviplay.c,v
retrieving revision 1.18
diff -u -r1.18 aviplay.c
--- a/programs/avitools/aviplay.c	2 Dec 2003 05:33:26 -0000	1.18
+++ b/programs/avitools/aviplay.c	23 Mar 2004 13:11:21 -0000
@@ -190,7 +190,7 @@
 	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;

Index: tools/winedump/misc.c
===================================================================
RCS file: /var/cvs/wine/tools/winedump/misc.c,v
retrieving revision 1.5
diff -u -r1.5 misc.c
--- a/tools/winedump/misc.c	26 Aug 2002 21:47:41 -0000	1.5
+++ b/tools/winedump/misc.c	23 Mar 2004 13:11:44 -0000
@@ -208,7 +208,7 @@

   fp = fopen (fname, mode);
   if (!fp)
-    fatal ("Cant open file");
+    fatal ("Can't open file");
   return fp;
 }



-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
               RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt
                IP over Avian Carriers with Quality of Service



More information about the wine-patches mailing list