Michael Stefaniuc : inetcomm: Use wide-char string literals.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Fri Oct 23 11:20:01 2020 +0200

inetcomm: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/inetcomm/internettransport.c |  2 +-
 dlls/inetcomm/tests/mimeintl.c    |  2 +-
 dlls/inetcomm/tests/mimeole.c     | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c
index dcce0d9df17..f7060abe9e7 100644
--- a/dlls/inetcomm/internettransport.c
+++ b/dlls/inetcomm/internettransport.c
@@ -35,7 +35,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);

-static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0};
+static const WCHAR wszClassName[] = L"ThorConnWndClass";

#define IX_READ     (WM_USER + 0)
 #define IX_READLINE (WM_USER + 1)
diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c
index 09f9dae8d8c..11ec68d3223 100644
--- a/dlls/inetcomm/tests/mimeintl.c
+++ b/dlls/inetcomm/tests/mimeintl.c
@@ -235,7 +235,7 @@ static void test_convert(void)
     ULONG read;
     PROPVARIANT prop_in, prop_out;
     static char test_string[] = "test string";
-    static WCHAR test_stringW[] = {'t','e','s','t',' ','s','t','r','i','n','g',0};
+    static WCHAR test_stringW[] = L"test string";

hr = MimeOleGetInternat(&internat);
     ok(hr == S_OK, "ret %08x\n", hr);
diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c
index afd25af015c..04edd3773fd 100644
--- a/dlls/inetcomm/tests/mimeole.c
+++ b/dlls/inetcomm/tests/mimeole.c
@@ -826,7 +826,6 @@ static void test_mhtml_message(void)
 static void test_MessageSetProp(void)
 {
     static const char topic[] = "wine topic";
-    static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0};
     HRESULT hr;
     IMimeMessage *msg;
     IMimeBody *body;
@@ -906,7 +905,7 @@ static void test_MessageSetProp(void)
     if(hr == S_OK)
     {
         ok(prop.vt == VT_LPWSTR, "type %d\n", prop.vt);
-        ok(!lstrcmpW(prop.u.pwszVal, topicW), "got %s\n", wine_dbgstr_w(prop.u.pwszVal));
+        ok(!lstrcmpW(prop.u.pwszVal, L"wine topic"), "got %s\n", wine_dbgstr_w(prop.u.pwszVal));
         PropVariantClear(&prop);
     }

@@ -1488,8 +1487,6 @@ static void test_mhtml_protocol_info(void)
     unsigned i, exlen;
     HRESULT hres;

-    static const WCHAR http_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','o','r','g',0};
-
     hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER,
                             &IID_IInternetProtocolInfo, (void**)&protocol_info);
     ok(hres == S_OK, "Could not create protocol info: %08x\n", hres);
@@ -1516,8 +1513,9 @@ static void test_mhtml_protocol_info(void)
         }
     }

-    hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE,
-                                            combined_url, ARRAY_SIZE(combined_url), &combined_len, 0);
+    hres = IInternetProtocolInfo_CombineUrl(protocol_info, L"http://test.org", L"http://test.org",
+                                            ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url),
+                                            &combined_len, 0);
     ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres);

IInternetProtocolInfo_Release(protocol_info);