Commit 33ab097d authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

inetcomm: Use wide-char string literals.

parent 87fc5320
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); 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_READ (WM_USER + 0)
#define IX_READLINE (WM_USER + 1) #define IX_READLINE (WM_USER + 1)
......
...@@ -235,7 +235,7 @@ static void test_convert(void) ...@@ -235,7 +235,7 @@ static void test_convert(void)
ULONG read; ULONG read;
PROPVARIANT prop_in, prop_out; PROPVARIANT prop_in, prop_out;
static char test_string[] = "test string"; 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); hr = MimeOleGetInternat(&internat);
ok(hr == S_OK, "ret %08x\n", hr); ok(hr == S_OK, "ret %08x\n", hr);
......
...@@ -826,7 +826,6 @@ static void test_mhtml_message(void) ...@@ -826,7 +826,6 @@ static void test_mhtml_message(void)
static void test_MessageSetProp(void) static void test_MessageSetProp(void)
{ {
static const char topic[] = "wine topic"; static const char topic[] = "wine topic";
static const WCHAR topicW[] = {'w','i','n','e',' ','t','o','p','i','c',0};
HRESULT hr; HRESULT hr;
IMimeMessage *msg; IMimeMessage *msg;
IMimeBody *body; IMimeBody *body;
...@@ -906,7 +905,7 @@ static void test_MessageSetProp(void) ...@@ -906,7 +905,7 @@ static void test_MessageSetProp(void)
if(hr == S_OK) if(hr == S_OK)
{ {
ok(prop.vt == VT_LPWSTR, "type %d\n", prop.vt); 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); PropVariantClear(&prop);
} }
...@@ -1488,8 +1487,6 @@ static void test_mhtml_protocol_info(void) ...@@ -1488,8 +1487,6 @@ static void test_mhtml_protocol_info(void)
unsigned i, exlen; unsigned i, exlen;
HRESULT hres; 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, hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER,
&IID_IInternetProtocolInfo, (void**)&protocol_info); &IID_IInternetProtocolInfo, (void**)&protocol_info);
ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); ok(hres == S_OK, "Could not create protocol info: %08x\n", hres);
...@@ -1516,8 +1513,9 @@ static void test_mhtml_protocol_info(void) ...@@ -1516,8 +1513,9 @@ static void test_mhtml_protocol_info(void)
} }
} }
hres = IInternetProtocolInfo_CombineUrl(protocol_info, http_url, http_url, ICU_BROWSER_MODE, hres = IInternetProtocolInfo_CombineUrl(protocol_info, L"http://test.org", L"http://test.org",
combined_url, ARRAY_SIZE(combined_url), &combined_len, 0); ICU_BROWSER_MODE, combined_url, ARRAY_SIZE(combined_url),
&combined_len, 0);
ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres); ok(hres == E_FAIL, "CombineUrl failed: %08x\n", hres);
IInternetProtocolInfo_Release(protocol_info); IInternetProtocolInfo_Release(protocol_info);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment