Assorted spelling fixes.

Frédéric Delanoy frederic.delanoy at gmail.com
Mon Nov 18 13:34:31 CST 2013


---
 dlls/comctl32/commctrl.c      | 2 +-
 dlls/comctl32/datetime.c      | 2 +-
 dlls/comctl32/header.c        | 2 +-
 dlls/comctl32/propsheet.c     | 2 +-
 dlls/comctl32/tests/toolbar.c | 2 +-
 dlls/d3dx9_36/sprite.c        | 2 +-
 dlls/msi/dialog.c             | 2 +-
 dlls/msi/sql.y                | 2 +-
 dlls/msi/table.c              | 6 +++---
 dlls/ntdll/printf.c           | 4 ++--
 dlls/ole32/antimoniker.c      | 2 +-
 dlls/ole32/classmoniker.c     | 2 +-
 dlls/ole32/compositemoniker.c | 4 ++--
 dlls/ole32/filemoniker.c      | 2 +-
 dlls/ole32/itemmoniker.c      | 2 +-
 dlls/ole32/moniker.c          | 4 ++--
 dlls/ole32/stg_prop.c         | 2 +-
 dlls/oleaut32/typelib.c       | 2 +-
 dlls/riched20/tests/editor.c  | 2 +-
 dlls/urlmon/bindprot.c        | 2 +-
 dlls/user32/nonclient.c       | 6 +++---
 dlls/wined3d/directx.c        | 2 +-
 dlls/winhttp/request.c        | 2 +-
 dlls/wininet/utility.c        | 2 +-
 dlls/wintrust/register.c      | 6 +++---
 programs/winedbg/gdbproxy.c   | 2 +-
 programs/winedbg/tgt_active.c | 4 ++--
 tools/winedump/msmangle.c     | 2 +-
 28 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index d2ad28f..8588416 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -1492,7 +1492,7 @@ void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm)
  * identifies them.
  *
  * Some of the codes are in the CCM_FIRST..CCM_LAST range, but there is no
- * colision with defined CCM_ codes.
+ * collision with defined CCM_ codes.
  */
 BOOL COMCTL32_IsReflectedMessage(UINT uMsg)
 {
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 4b0b2ad..0fe4604 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -832,7 +832,7 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt)
 }
 
 /* Returns index of a closest date field from given counting to left
-   or -1 if there's no such fields at left */
+   or -1 if there's no such field left */
 static int DATETIME_GetPrevDateField(const DATETIME_INFO *infoPtr, int i)
 {
     for(--i; i >= 0; i--)
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index ec7d844..8f37e40 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -886,7 +886,7 @@ HEADER_SendNotifyWithIntFieldT(const HEADER_INFO *infoPtr, UINT code, INT iItem,
  * Prepare callback items
  *   depends on NMHDDISPINFOW having same structure as NMHDDISPINFOA 
  *   (so we handle the two cases only doing a specific cast for pszText).
- * Checks if any of the required field are callback. If there are sends a 
+ * Checks if any of the required fields are callbacks. If there are send a
  * NMHDISPINFO notify to retrieve these items. The items are stored in the
  * HEADER_ITEM pszText and iImage fields. They should be freed with
  * HEADER_FreeCallbackItems.
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index f2c55ab..0dd1ca7 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -1888,7 +1888,7 @@ static void PROPSHEET_UnChanged(HWND hwndDlg, HWND hwndCleanPage)
     if (psInfo->proppage[i].hwndPage == hwndCleanPage)
       psInfo->proppage[i].isDirty = FALSE;
 
-    /* look to see if there's any dirty pages */
+    /* look to see if there are any dirty pages */
     if (psInfo->proppage[i].isDirty)
       noPageDirty = FALSE;
   }
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index 9de319f..98c2e39 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -1413,7 +1413,7 @@ static void test_recalc(void)
     }
     else win_skip( "No recalc on TBSTYLE_EX_MIXEDBUTTONS\n" );
 
-    /* undocumented exstyle 0x2 seems to changes the top margin, what
+    /* undocumented exstyle 0x2 seems to change the top margin, what
      * interferes with these tests */
 
     DestroyWindow(hToolbar);
diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c
index 3c52c9f..8fbabc3 100644
--- a/dlls/d3dx9_36/sprite.c
+++ b/dlls/d3dx9_36/sprite.c
@@ -293,7 +293,7 @@ D3DXSPRITE_SORT_TEXTURE: sort by texture (so that it doesn't change too often)
                 D3DXSPRITE_DONOTMODIFY_RENDERSTATE | D3DXSPRITE_OBJECTSPACE |
                 D3DXSPRITE_SORT_DEPTH_BACKTOFRONT))
         FIXME("Flags unsupported: %#x\n", flags);
-    /* These flags should only matter to performances */
+    /* These flags should only matter to performance */
     else if(flags & (D3DXSPRITE_SORT_DEPTH_FRONTTOBACK | D3DXSPRITE_SORT_TEXTURE))
         TRACE("Flags unsupported: %#x\n", flags);
 
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 92374d4..245ed1e 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -3953,7 +3953,7 @@ void msi_dialog_check_messages( HANDLE handle )
         return;
     }
 
-    /* there's two choices for the UI thread */
+    /* there are two choices for the UI thread */
     while (1)
     {
         process_pending_messages( NULL );
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index fa54741..553cc6d 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -816,7 +816,7 @@ UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *str )
         ( (p[0]=='\'') && (p[len-1]!='\'') ) )
         return ERROR_FUNCTION_FAILED;
 
-    /* if there's quotes, remove them */
+    /* if there are quotes, remove them */
     if( ( (p[0]=='`') && (p[len-1]=='`') ) ||
         ( (p[0]=='\'') && (p[len-1]=='\'') ) )
     {
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 16e3144..f67981c 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -564,7 +564,7 @@ static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO
 
     *pcount = column_count;
 
-    /* if there's no columns, there's no table */
+    /* if there are no columns, there's no table */
     if (!column_count)
         return ERROR_INVALID_PARAMETER;
 
@@ -1528,7 +1528,7 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column )
 {
     UINT r, row, i;
 
-    /* check there's no null values where they're not allowed */
+    /* check there are no null values where they're not allowed */
     for( i = 0; i < tv->num_cols; i++ )
     {
         if ( tv->columns[i].type & MSITYPE_NULLABLE )
@@ -1560,7 +1560,7 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column )
         }
     }
 
-    /* check there's no duplicate keys */
+    /* check there are no duplicate keys */
     r = msi_table_find_row( tv, rec, &row, column );
     if (r == ERROR_SUCCESS)
         return ERROR_FUNCTION_FAILED;
diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c
index 432920b..d53dac4 100644
--- a/dlls/ntdll/printf.c
+++ b/dlls/ntdll/printf.c
@@ -414,7 +414,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis
     {
         q = strchrW( p, '%' );
 
-        /* there's no % characters left, output the rest of the string */
+        /* there are no % characters left, output the rest of the string */
         if( !q )
         {
             r = pf_output_stringW(out, p, -1);
@@ -424,7 +424,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis
             continue;
         }
 
-        /* there's characters before the %, output them */
+        /* there are characters before the %, output them */
         if( q != p )
         {
             r = pf_output_stringW(out, p, q - p);
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index 4c71fd4..02aeeec 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -125,7 +125,7 @@ AntiMonikerImpl_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0)
     {
         if (This->pMarshal) IUnknown_Release(This->pMarshal);
diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c
index d5c013b..9aa81d9 100644
--- a/dlls/ole32/classmoniker.c
+++ b/dlls/ole32/classmoniker.c
@@ -144,7 +144,7 @@ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0) ClassMoniker_Destroy(This);
 
     return ref;
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index fe5b7d4..a172a48 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -156,7 +156,7 @@ CompositeMonikerImpl_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0){
 
         /* release all the components before destroying this object */
@@ -1542,7 +1542,7 @@ EnumMonikerImpl_Release(IEnumMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0) {
 
         for(i=0;i<This->tabSize;i++)
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 9c542fc..825f5db 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -136,7 +136,7 @@ FileMonikerImpl_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no more references on it */
     if (ref == 0) FileMonikerImpl_Destroy(This);
 
     return ref;
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index 4dc15ba..576d3e3 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -123,7 +123,7 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* destroy the object if there's no more reference on it */
+    /* destroy the object if there are no moee references on it */
     if (ref == 0) ItemMonikerImpl_Destroy(This);
 
     return ref;
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 8d4e98f..90f1f38 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -389,7 +389,7 @@ RunningObjectTableImpl_Release(IRunningObjectTable* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* uninitialize ROT structure if there's no more references to it */
+    /* uninitialize ROT structure if there are no more references to it */
     if (ref == 0)
     {
         struct list *cursor, *cursor2;
@@ -1335,7 +1335,7 @@ static ULONG   WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface)
 
     ref = InterlockedDecrement(&This->ref);
 
-    /* uninitialize rot structure if there's no more reference to it*/
+    /* uninitialize rot structure if there are no more references to it */
     if (ref == 0)
     {
         ULONG i;
diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index c2626cf..ac3ccb4 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -1392,7 +1392,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This)
         goto end;
     }
     /* wackiness alert: if the format ID is FMTID_DocSummaryInformation, there
-     * follow not one, but two sections.  The first is the standard properties
+     * follows not one, but two sections.  The first is the standard properties
      * for the document summary information, and the second is user-defined
      * properties.  This is the only case in which multiple sections are
      * allowed.
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 0dd3f64..dcbea96 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -4541,7 +4541,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
 
     len = SLTG_ReadLibBlk(pLibBlk, pTypeLibImpl);
 
-    /* Now there's 0x40 bytes of 0xffff with the numbers 0 to TypeInfoCount
+    /* Now there are 0x40 bytes of 0xffff with the numbers 0 to TypeInfoCount
        interspersed */
 
     len += 0x40;
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 8ec5e9f..ae0f72f 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -4780,7 +4780,7 @@ static void test_WM_PASTE(void)
         "test paste: strcmp = %i\n", result);
 
     SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0);
-    /* Send WM_CHAR to simulates Ctrl-V */
+    /* Send WM_CHAR to simulate Ctrl-V */
     SendMessageA(hwndRichEdit, WM_CHAR, 22,
                 (MapVirtualKeyA('V', MAPVK_VK_TO_VSC) << 16) | 1);
     SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer);
diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c
index 33d6a64..6282a04 100644
--- a/dlls/urlmon/bindprot.c
+++ b/dlls/urlmon/bindprot.c
@@ -207,7 +207,7 @@ static HRESULT handle_mime_filter(BindProtocol *This, IInternetProtocol *mime_fi
         return hres;
     }
 
-    /* NOTE: IE9 calls it on the new protocol_sink. It doesn't make sense to is seems to be a bug there. */
+    /* NOTE: IE9 calls it on the new protocol_sink. It doesn't make sense. It seems to be a bug there. */
     IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_LOADINGMIMEHANDLER, NULL);
 
     return S_OK;
diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c
index 6becd5f..d8d0807 100644
--- a/dlls/user32/nonclient.c
+++ b/dlls/user32/nonclient.c
@@ -1291,7 +1291,7 @@ static void NC_TrackMinMaxBox( HWND hwnd, WORD wParam )
     ReleaseCapture();
     ReleaseDC( hwnd, hdc );
 
-    /* If the item minimize or maximize of the sysmenu are not there */
+    /* If the minimize or maximize items of the sysmenu are not there */
     /* or if the style is not present, do nothing */
     if ((!pressed) || (state == 0xFFFFFFFF))
         return;
@@ -1321,7 +1321,7 @@ static void NC_TrackCloseButton (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
     state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
 
-    /* If the item close of the sysmenu is disabled or not there do nothing */
+    /* If the close item of the sysmenu is disabled or not present do nothing */
     if((state & MF_DISABLED) || (state & MF_GRAYED) || (state == 0xFFFFFFFF))
         return;
 
@@ -1530,7 +1530,7 @@ LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam )
             HMENU hSysMenu = GetSystemMenu(hwnd, FALSE);
             UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND);
 
-            /* If the item close of the sysmenu is disabled or not there do nothing */
+            /* If the close item of the sysmenu is disabled or not present do nothing */
             if ((state & (MF_DISABLED | MF_GRAYED)) || (state == 0xFFFFFFFF))
                 break;
 
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 3fc4664..f26a29d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2378,7 +2378,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *
      * size of the database can be made quite small because when you know what
      * type of 3d functionality a card has, you know to which GPU family the
      * GPU must belong. Because of this you only have to check a small part of
-     * the renderer string to distinguishes between different models from that
+     * the renderer string to distinguish between different models from that
      * family.
      *
      * The code also selects a default amount of video memory which we will
diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
index 12f7722..84a0ed1 100644
--- a/dlls/winhttp/request.c
+++ b/dlls/winhttp/request.c
@@ -863,7 +863,7 @@ static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb,
 
     /*
      * Set (header) termination string for request
-     * Make sure there's exactly two new lines at the end of the request
+     * Make sure there are exactly two new lines at the end of the request
      */
     p = &requestString[strlenW(requestString)-1];
     while ( (*p == '\n') || (*p == '\r') )
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index 16ee059..2929447 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -161,7 +161,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort,
     TRACE("%s\n", debugstr_w(lpszServerName));
 
     /* Validate server name first
-     * Check if there is sth. like
+     * Check if there is sthg like
      * pinger.macromedia.com:80
      * if yes, eliminate the :80....
      */
diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c
index 05e48ef..39498b5 100644
--- a/dlls/wintrust/register.c
+++ b/dlls/wintrust/register.c
@@ -963,10 +963,10 @@ HRESULT WINAPI DllRegisterServer(void)
     TRACE("\n");
 
     /* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls
-     * the rest of these calls is skipped. Registering is however continued for the trust providers.
+     * the rest of these calls are skipped. Registering is however continued for the trust providers.
      *
-     * We are not totally in line with native as there all decoding functions are registered after all encoding
-     * functions.
+     * We are not totally in line with native as all decoding functions are registered after all encoding
+     * functions there.
      */
 #define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \
     do { \
diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c
index 04d36f7..0865f44 100644
--- a/programs/winedbg/gdbproxy.c
+++ b/programs/winedbg/gdbproxy.c
@@ -2286,7 +2286,7 @@ static BOOL extract_packets(struct gdb_context* gdbctx)
                  * it's very likely that we took too long to answer to a given packet
                  * and gdb is sending us the same packet again.
                  * So we simply drop the second packet. This will lower the risk of error,
-                 * but there's still some race conditions here.
+                 * but there are still some race conditions here.
                  * A better fix (yet not perfect) would be to have two threads:
                  * - one managing the packets for gdb
                  * - the second one managing the commands...
diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c
index a5db9f8..baf47e9 100644
--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@@ -602,8 +602,8 @@ static BOOL dbg_start_debuggee(LPSTR cmdLine)
     startup.wShowWindow = (current.dwFlags & STARTF_USESHOWWINDOW) ?
         current.wShowWindow : SW_SHOWNORMAL;
 
-    /* FIXME: shouldn't need the CREATE_NEW_CONSOLE, but as usual CUI:s need it
-     * while GUI:s don't
+    /* FIXME: shouldn't need the CREATE_NEW_CONSOLE, but as usual CUIs need it
+     * while GUIs don't
      */
     flags = DEBUG_PROCESS | CREATE_NEW_CONSOLE;
     if (!DBG_IVAR(AlsoDebugProcChild)) flags |= DEBUG_ONLY_THIS_PROCESS;
diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c
index 161bcc7d..1493484 100644
--- a/tools/winedump/msmangle.c
+++ b/tools/winedump/msmangle.c
@@ -532,7 +532,7 @@ static char *demangle_datatype (char **str, compound_type *ct,
 	  if (*iter == '6')
 	  {
 	      int sub_expressions = 0;
-	      /* FIXME: there are a tons of memory leaks here */
+              /* FIXME: there are tons of memory leaks here */
 	      /* FIXME: this is still broken in some cases and it has to be
 	       * merged with the function prototype parsing above...
 	       */
-- 
1.8.4.3




More information about the wine-patches mailing list