[PATCH 0/6] MR2826: Assorted spelling fixes

[PATCH 1/6] imm32/tests: Fix the spelling of a comment.

[Francois Gouget]

From: Francois Gouget

---
 dlls/imm32/tests/imm32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 4bdb6be4a31..95f832b97e4 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -3924,7 +3924,7 @@ static void test_ImmGetProperty(void)
     else if (hkl == (HKL)0x08040804) expect = &expect_ime_info_0804;
     else expect = &expect_ime_info;

-    /* IME_PROP_COMPLETE_ON_UNSELECT seems to be somtimes set on CJK locales IMEs, sometimes not */
+    /* IME_PROP_COMPLETE_ON_UNSELECT seems to be sometimes set on CJK locales IMEs, sometimes not */
     ok_ret( expect->fdwProperty,       ImmGetProperty( hkl, IGP_PROPERTY ) & ~IME_PROP_COMPLETE_ON_UNSELECT );
     todo_wine
     ok_ret( expect->fdwConversionCaps, ImmGetProperty( hkl, IGP_CONVERSION ) );

[PATCH 2/6] mf/tests: Fix the spelling of a win_skip() message.

[Francois Gouget]

From: Francois Gouget

---
 dlls/mf/tests/transform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
index 34a00526eab..28f83f61c50 100644
--- a/dlls/mf/tests/transform.c
+++ b/dlls/mf/tests/transform.c
@@ -7077,7 +7077,7 @@ static void test_h264_with_dxgi_manager(void)

if (!pMFCreateDXGIDeviceManager)
     {
-        win_skip("MFCreateDXGIDeviceManager() is not avaliable, skipping tests.\n");
+        win_skip("MFCreateDXGIDeviceManager() is not available, skipping tests.\n");
         return;
     }

[PATCH 3/6] msado15: Fix the spelling of a comment.

[Francois Gouget]

From: Francois Gouget

---
 dlls/msado15/recordset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index 5522a3c9e61..84db7fc581d 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -2087,7 +2087,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT
         return hr;

/* We want to create the field member variable without mapping the rowset fields, this will
-     * save quering the fields twice.  Fields will be added while we create the bindings
+     * save querying the fields twice. Fields will be added while we create the bindings.
      */
     hr = fields_create( recordset, &recordset->fields );
     if (FAILED(hr))

[PATCH 4/6] ndtll: Fix the spelling of a comment.

[Francois Gouget]

From: Francois Gouget

---
 dlls/ntdll/unix/sync.c | 2 +-
 dlls/wow64/sync.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 831c16130b9..c164539d214 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -1022,7 +1022,7 @@ static NTSTATUS event_data_to_state_change( const debug_event_t *data, DBGUI_WAI
 }

#ifndef _WIN64
-/* helper to NtWaitForDebugEvent; retrive machine from PE image */
+/* helper to NtWaitForDebugEvent; retrieve machine from PE image */
 static NTSTATUS get_image_machine( HANDLE handle, USHORT *machine )
 {
     IMAGE_DOS_HEADER dos_hdr;
diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c
index 385477ef5fa..a1a1968ecd5 100644
--- a/dlls/wow64/sync.c
+++ b/dlls/wow64/sync.c
@@ -1490,7 +1490,7 @@ NTSTATUS WINAPI wow64_NtWaitForAlertByThreadId( UINT *args )
 }

-/* helper to wow64_NtWaitForDebugEvent; retrive machine from PE image */
+/* helper to wow64_NtWaitForDebugEvent; retrieve machine from PE image */
 static NTSTATUS get_image_machine( HANDLE handle, USHORT *machine )
 {
     IMAGE_DOS_HEADER dos_hdr;

[PATCH 5/6] taskschd/tests: Fix the spelling of a test string.

[Francois Gouget]

From: Francois Gouget

---
 dlls/taskschd/tests/scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c
index 6db3a86ba8a..bf6e13be98b 100644
--- a/dlls/taskschd/tests/scheduler.c
+++ b/dlls/taskschd/tests/scheduler.c
@@ -1380,7 +1380,7 @@ static void create_action(ITaskDefinition *taskdef)
 {
     static WCHAR task1_exe[] = L"task1.exe";
     static WCHAR workdir[] = L"workdir";
-    static WCHAR args[] = L"argumens";
+    static WCHAR args[] = L"arguments";
     static WCHAR comment[] = L"comment";
     HRESULT hr;
     IActionCollection *actions;

[PATCH 6/6] uiautomationcore/tests: Fix the spelling of a win_skip() message.

[Francois Gouget]

From: Francois Gouget

---
 dlls/uiautomationcore/tests/uiautomation.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c
index 35f2f18ffcf..8494f29212c 100644
--- a/dlls/uiautomationcore/tests/uiautomation.c
+++ b/dlls/uiautomationcore/tests/uiautomation.c
@@ -2975,7 +2975,7 @@ static void test_uia_prov_from_acc_ia2(void)
         CHECK_CALLED(Accessible2_get_accRole);
         CHECK_CALLED(Accessible2_QI_IAccIdentity);
         CHECK_CALLED(Accessible2_get_accParent);
-        win_skip("Win10v1909 doesn't support IAccessible2 interface comparsion, skipping tests.\n");
+        win_skip("Win10v1909 doesn't support IAccessible2 interface comparison, skipping tests.\n");
         return;
     }
     called_Accessible_get_accRole = expect_Accessible_get_accRole = 0;
@@ -13188,7 +13188,7 @@ static void test_default_clientside_providers(void)
     UiaNodeRelease(node);

/*
-     * Create a node repesenting an HWND that is a top-level window, but is
+     * Create a node representing an HWND that is a top-level window, but is
      * owned by another window. For top-level HWNDs, parent navigation will go
      * to the owner instead of the parent.
      */

[PATCH 6/6] uiautomationcore/tests: Fix the spelling of a win_skip() message.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=132715

Your paranoid android.

=== w10pro64_ja (64 bit report) ===

imm32:
imm32.c:7610: Test failed: 0 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_STARTCOMPOSITION, wparam 0, lparam 0, comp L"", result L""
imm32.c:7610: Test failed: 1 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0xff4e, lparam 0x1b9, comp L"\ff4e", result L""
imm32.c:7610: Test failed: 2 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b", result L""
imm32.c:7610: Test failed: 3 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b\ff48", result L""
imm32.c:7610: Test failed: 4 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b\307b", result L""
imm32.c:7610: Test failed: 5 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b\307b\ff4e", result L""
imm32.c:7610: Test failed: 6 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b\307b\3093\ff47", result L""
imm32.c:7610: Test failed: 7 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306b, lparam 0x1b9, comp L"\306b\307b\3093\3054", result L""
imm32.c:7610: Test failed: 8 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x65e5, lparam 0x1b9, comp L"\65e5\672c\8a9e", result L""
imm32.c:7610: Test failed: 9 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x65e5, lparam 0x1e00, comp L"", result L"\65e5\672c\8a9e"
imm32.c:7610: Test failed: 10 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_CHAR, wparam 0x65e5, lparam 0x1, comp L"", result L""
imm32.c:7610: Test failed: 11 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_CHAR, wparam 0x672c, lparam 0x1, comp L"", result L""
imm32.c:7610: Test failed: 12 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_CHAR, wparam 0x8a9e, lparam 0x1, comp L"", result L""
imm32.c:7610: Test failed: 13 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_ENDCOMPOSITION, wparam 0, lparam 0, comp L"", result L""
imm32.c:7610: Test failed: 14 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_STARTCOMPOSITION, wparam 0, lparam 0, comp L"", result L""
imm32.c:7610: Test failed: 15 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0xff4e, lparam 0x1b9, comp L"\ff4e", result L""
imm32.c:7610: Test failed: 16 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306e, lparam 0x1b9, comp L"\306e", result L""
imm32.c:7610: Test failed: 17 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_COMPOSITION, wparam 0x306e, lparam 0x1e00, comp L"", result L"\306e"
imm32.c:7610: Test failed: 18 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_CHAR, wparam 0x306e, lparam 0x1, comp L"", result L""
imm32.c:7610: Test failed: 19 (missing): hkl 0000000004110411, himc 00000000001003CD, MSG_TEST_WIN msg WM_IME_ENDCOMPOSITION, wparam 0, lparam 0, comp L"", result L""

=== debian11 (32 bit report) ===

wmvcore:
wmvcore.c:1713: Test failed: Stream 0: Format 4: Got hr 0xc00d0041.
wmvcore.c:1730: Test failed: Stream 0: Format 4: Media types didn't match.

[PATCH 0/6] MR2826: Assorted spelling fixes - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.

[PATCH 0/6] MR2826: Assorted spelling fixes - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.

[PATCH 0/6] MR2826: Assorted spelling fixes - approved

[Connor McAdams (＠cmcadams)]

This merge request was approved by Connor McAdams.