Assorted spelling and grammar fixes (v2)

Hugh McMaster hugh.mcmaster at outlook.com
Mon Nov 16 22:21:40 CST 2015


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 dlls/advapi32/tests/eventlog.c | 2 +-
 dlls/advpack/tests/advpack.c   | 2 +-
 dlls/cabinet/fdi.c             | 2 +-
 dlls/comctl32/commctrl.c       | 4 ++--
 dlls/credui/tests/credui.c     | 2 +-
 dlls/ddraw/surface.c           | 2 +-
 dlls/dinput/tests/mouse.c      | 2 +-
 dlls/kernel32/tests/change.c   | 2 +-
 dlls/msi/registry.c            | 2 +-
 dlls/msi/tests/db.c            | 2 +-
 dlls/msi/tests/install.c       | 2 +-
 dlls/msi/tests/source.c        | 4 ++--
 dlls/msvcrt/tests/misc.c       | 2 +-
 dlls/psapi/tests/psapi_main.c  | 2 +-
 dlls/urlmon/uri.c              | 2 +-
 dlls/user32/dde_private.h      | 2 +-
 dlls/user32/tests/scroll.c     | 6 +++---
 dlls/wined3d/surface.c         | 2 +-
 programs/winedbg/types.c       | 2 +-
 programs/winhlp32/hlpfile.c    | 2 +-
 tools/wrc/parser.y             | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c
index 1e48348..3ca59c3 100644
--- a/dlls/advapi32/tests/eventlog.c
+++ b/dlls/advapi32/tests/eventlog.c
@@ -487,7 +487,7 @@ static void test_read(void)
     ok(!ret, "Expected failure\n");
     ok(read == 0, "Expected no bytes read\n");
     ok(needed > sizeof(EVENTLOGRECORD), "Expected the needed buffersize to be bigger than sizeof(EVENTLOGRECORD)\n");
-    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
 
     /* Read the first record */
     toread = needed;
diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c
index 5b9ed42..f7ac66b 100644
--- a/dlls/advpack/tests/advpack.c
+++ b/dlls/advpack/tests/advpack.c
@@ -661,7 +661,7 @@ START_TEST(advpack)
         return;
 
     /* Make sure we create the temporary file in a directory
-     * were we have enough rights
+     * where we have adequate rights
      */
     GetTempPathA(MAX_PATH, inf_file);
     lstrcatA(inf_file,"test.inf");
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index aedd972..ae6aec8 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -500,7 +500,7 @@ static char *FDI_read_string(FDI_Int *fdi, INT_PTR hf, long cabsize)
         break;
       }
       /* The buffer is too small for the string. Reset the file to the point
-       * were we started, free the buffer and increase the size for the next try
+       * where we started, free the buffer and increase the size for the next try
        */
       fdi->seek(hf, base, SEEK_SET);
       fdi->free(buf);
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 6d6b5e4..c12a214 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -1085,7 +1085,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
  * Gets the Reference data from a subclass.
  *
  * PARAMS
- *     hWnd [in] Handle to window which were subclassing
+ *     hWnd [in] Handle to the window which we are subclassing
  *     pfnSubclass [in] Pointer to the subclass procedure
  *     uID [in] Unique identifier of the subclassing procedure
  *     pdwRef [out] Pointer to the reference data
@@ -1128,7 +1128,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
  * Removes a window subclass.
  *
  * PARAMS
- *     hWnd [in] Handle to the window were subclassing
+ *     hWnd [in] Handle to the window which we are subclassing
  *     pfnSubclass [in] Pointer to the subclass procedure
  *     uID [in] Unique identifier of this subclass
  *
diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c
index 1f5aa02..01d657d 100644
--- a/dlls/credui/tests/credui.c
+++ b/dlls/credui/tests/credui.c
@@ -73,7 +73,7 @@ static void test_CredUIPromptForCredentials(void)
                                       sizeof(username)/sizeof(username[0]),
                                       password, sizeof(password)/sizeof(password[0]),
                                       NULL, CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX);
-    ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_FLAGS instead of %d\n", ret);
+    ok(ret == ERROR_INVALID_PARAMETER, "CredUIPromptForCredentials should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret);
 
     if (winetest_interactive)
     {
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index 8a10eff..45c7594 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -3510,7 +3510,7 @@ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface)
 
     switch(hr)
     {
-        /* D3D8 and 9 loose full devices, thus there's only a DEVICELOST error.
+        /* D3D8 and 9 lose full devices, thus there's only a DEVICELOST error.
          * WineD3D uses the same error for surfaces
          */
         case WINED3DERR_DEVICELOST:         return DDERR_SURFACELOST;
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index 34940e4..262ed0e 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -128,7 +128,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
 
     /* Foreground coop level requires window to have focus */
     /* Create a temporary window, this should make dinput
-     * loose mouse input */
+     * lose mouse input */
     hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL,
                           NULL);
     ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError());
diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c
index 19e55bb..4accad0 100644
--- a/dlls/kernel32/tests/change.c
+++ b/dlls/kernel32/tests/change.c
@@ -767,7 +767,7 @@ static void test_readdirectorychanges_filedir(void)
 
     hfile = CreateFileW( file, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL );
     ok( hfile != INVALID_HANDLE_VALUE, "failed to create file\n");
-    ok( CloseHandle(hfile), "failed toc lose file\n");
+    ok( CloseHandle(hfile), "failed to close file\n");
 
     r = WaitForSingleObject( ov.hEvent, 1000 );
     ok( r == WAIT_OBJECT_0, "event should be ready\n" );
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c
index e797f1e..f3b1ddf 100644
--- a/dlls/msi/registry.c
+++ b/dlls/msi/registry.c
@@ -1321,7 +1321,7 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index,
     REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY;
     HKEY key_users, key_components;
 
-    if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: were to find these? */
+    if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: where to find these? */
         return ERROR_NO_MORE_ITEMS;
 
     if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users ))
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 60e5c82..98e0e96 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -7265,7 +7265,7 @@ static void test_forcecodepage(void)
     create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0);
 
     r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt");
-    ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);
 
     MsiCloseHandle(hdb);
     DeleteFileA(msifile);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 9cd579b..e1113e7 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2996,7 +2996,7 @@ static void test_continuouscabs(void)
     }
     else
     {
-        ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r);
+        ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r);
         todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n");
         ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n");
         todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n");
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index 94e168d..a03cf55 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -987,7 +987,7 @@ machine_tests:
     r = pMsiSourceListAddSourceExA(prodcode, NULL,
                                   MSIINSTALLCONTEXT_MACHINE,
                                   MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0);
-    ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
+    ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r);
 
     lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\");
     lstrcatA(keypath, prod_squashed);
@@ -1316,7 +1316,7 @@ static void test_MsiSourceListEnumSources(void)
                                    MSIINSTALLCONTEXT_USERUNMANAGED,
                                    MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL,
                                    0, value, &size);
-    ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
     ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value);
     ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);
 
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index ab14e04..c568361 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -263,7 +263,7 @@ static void test__get_doserrno(void)
     out = 0xdeadbeef;
     ret = p_get_doserrno(&out);
     ok(ret == 0, "Expected _get_doserrno to return 0, got %d\n", ret);
-    ok(out == ERROR_INVALID_CMM, "Expected output variable to be ERROR_INVAID_CMM, got %d\n", out);
+    ok(out == ERROR_INVALID_CMM, "Expected output variable to be ERROR_INVALID_CMM, got %d\n", out);
 }
 
 static void test__get_errno(void)
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 799f0d8..7bc26fe 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -257,7 +257,7 @@ static void test_GetPerformanceInfo(void)
         /* compare with values from SYSTEM_PROCESS_INFORMATION */
         size = 0;
         status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size);
-        ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_LENGTH_MISMATCH, got %08x\n", status);
+        ok(status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
         ok(size > 0, "incorrect length %d\n", size);
         while (status == STATUS_INFO_LENGTH_MISMATCH)
         {
diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c
index 48b485b..e6f844b 100644
--- a/dlls/urlmon/uri.c
+++ b/dlls/urlmon/uri.c
@@ -1480,7 +1480,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO
     while((!is_res && !is_auth_delim(**ptr, known_scheme)) ||
           (is_res && **ptr && **ptr != '/')) {
         if(**ptr == ':' && !ignore_col) {
-            /* We can ignore ':' if were inside brackets.*/
+            /* We can ignore ':' if we are inside brackets.*/
             if(!inside_brackets) {
                 const WCHAR *tmp = (*ptr)++;
 
diff --git a/dlls/user32/dde_private.h b/dlls/user32/dde_private.h
index bdd0949..7e3d976 100644
--- a/dlls/user32/dde_private.h
+++ b/dlls/user32/dde_private.h
@@ -69,7 +69,7 @@
  * are available (most notably the REGISTER/UNREGISTER and CONNECT_CONFIRM messages
  * to the callback function). To be correct in every situation, all the basic
  * exchanges are made using the 'pure' DDE protocol. A (future !) enhancement would
- * be to provide a new protocol in the case were both partners are handled by DDEML.
+ * be to provide a new protocol in the case where both partners are handled by DDEML.
  *
  * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom
  * can be used interchangeably. However, in order to keep track of the allocated HSZ,
diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c
index 41201ec..22a5cb2 100644
--- a/dlls/user32/tests/scroll.c
+++ b/dlls/user32/tests/scroll.c
@@ -74,10 +74,10 @@ static void scrollbar_test_track(void)
     mainwnd = create_main_test_wnd();
 
     /* test that scrollbar tracking is terminated when
-     * the control looses mouse capture */
+     * the control loses mouse capture */
     SendMessageA( hScroll, WM_LBUTTONDOWN, 0, MAKELPARAM( 1, 1));
-    /* a normal return from the sendmessage */
-    /* not normal for instance by closing the windws */
+    /* a normal return from SendMessage */
+    /* not normal for instances such as closing the window */
     ok( IsWindow( hScroll), "Scrollbar has gone!\n");
 
     DestroyWindow(hScroll);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c3ddc84..8c70f34 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1920,7 +1920,7 @@ HRESULT CDECL wined3d_surface_is_lost(const struct wined3d_surface *surface)
 {
     TRACE("surface %p.\n", surface);
 
-    /* D3D8 and 9 loose full devices, ddraw only surfaces. */
+    /* D3D8 and 9 lose full devices, ddraw only surfaces. */
     return surface->flags & SFLAG_LOST ? WINED3DERR_DEVICELOST : WINED3D_OK;
 }
 
diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c
index 8e8e9c4..5b24715 100644
--- a/programs/winedbg/types.c
+++ b/programs/winedbg/types.c
@@ -324,7 +324,7 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, struct dbg_lv
         result->addr.Offset += index * (DWORD)length;
     }
     /* FIXME: the following statement is not always true (and can lead to buggy behavior).
-     * There is no way to tell were the deref:ed value is...
+     * There is no way to tell where the deref:ed value is...
      * For example:
      *	x is a pointer to struct s, x being on the stack
      *		=> lvalue is in debuggee, result is in debugger
diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c
index adfee2f..ab75b2a 100644
--- a/programs/winhlp32/hlpfile.c
+++ b/programs/winhlp32/hlpfile.c
@@ -1475,7 +1475,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd,
                     case 1: fs = page->file->fonts[font].LogFont.lfHeight; break;
                     case 2: fs = page->file->fonts[font].LogFont.lfHeight + 4; break;
                     }
-                    /* FIXME: missing at least colors, also bold attribute looses information */
+                    /* FIXME: colors are missing, at a minimum; also, the bold attribute loses information */
 
                     sprintf(tmp, "\\f%d\\cf%d\\fs%d%s%s%s%s",
                             font, font + 2, fs,
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 7ffc9c8..b41e7d7 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -1426,7 +1426,7 @@ stringtable
 				else
 					sttres = tagstt;
 			 }
-			 /* Else were done */
+			 /* Else, we're done */
 		}
 		free(tagstt_memopt);
 		tagstt_memopt = NULL;
-- 
1.9.1




More information about the wine-patches mailing list