Michael Stefaniuc : msctf/tests: Use wide-char string literals.

Alexandre Julliard julliard at winehq.org
Mon Dec 7 15:51:32 CST 2020


Module: wine
Branch: master
Commit: 7f46f2314f7d2f8eea9323c51983c32860593c15
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7f46f2314f7d2f8eea9323c51983c32860593c15

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Sat Dec  5 16:51:10 2020 +0100

msctf/tests: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msctf/tests/inputprocessor.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
index 1c97d2c5d1c..55a6ab6c34c 100644
--- a/dlls/msctf/tests/inputprocessor.c
+++ b/dlls/msctf/tests/inputprocessor.c
@@ -1112,9 +1112,6 @@ static void test_Register(void)
 {
     HRESULT hr;
 
-    static const WCHAR szDesc[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',0};
-    static const WCHAR szFile[] = {'F','a','k','e',' ','W','i','n','e',' ','S','e','r','v','i','c','e',' ','F','i','l','e',0};
-
     hr = ITfInputProcessorProfiles_GetCurrentLanguage(g_ipp,&gLangid);
     ok(SUCCEEDED(hr),"Unable to get current language id\n");
     trace("Current Language %x\n",gLangid);
@@ -1124,7 +1121,8 @@ static void test_Register(void)
     hr = ITfInputProcessorProfiles_Register(g_ipp, &CLSID_FakeService);
     ok(SUCCEEDED(hr),"Unable to register text service(%x)\n",hr);
     hr = ITfInputProcessorProfiles_AddLanguageProfile(g_ipp, &CLSID_FakeService, gLangid,
-            &CLSID_FakeService, szDesc, ARRAY_SIZE(szDesc), szFile, ARRAY_SIZE(szFile), 1);
+            &CLSID_FakeService, L"Fake Wine Service", ARRAY_SIZE(L"Fake Wine Service"),
+            L"Fake Wine Service File", ARRAY_SIZE(L"Fake Wine Service File"), 1);
     ok(SUCCEEDED(hr),"Unable to add Language Profile (%x)\n",hr);
 }
 
@@ -2071,12 +2069,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt)
     HRESULT hr;
     ITfInsertAtSelection *iis;
     ITfRange *range=NULL;
-    static const WCHAR txt[] = {'H','e','l','l','o',' ','W','o','r','l','d',0};
 
     hr = ITfContext_QueryInterface(cxt, &IID_ITfInsertAtSelection , (LPVOID*)&iis);
     ok(SUCCEEDED(hr),"Failed to get ITfInsertAtSelection interface\n");
     test_ACP_InsertTextAtSelection = SINK_EXPECTED;
-    hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, txt, 11, &range);
+    hr = ITfInsertAtSelection_InsertTextAtSelection(iis, ec, 0, L"Hello World", 11, &range);
     ok(SUCCEEDED(hr),"ITfInsertAtSelection_InsertTextAtSelection failed %x\n",hr);
     sink_check_ok(&test_ACP_InsertTextAtSelection,"InsertTextAtSelection");
     ok(range != NULL,"No range returned\n");




More information about the wine-cvs mailing list