wininet: Use wide-char string literals in struct initialization.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wininet: Use wide-char string literals in struct initialization.
085f3738 · Michael Stefaniuc · Alexandre Julliard · 4807a8f5 · 085f3738 · 085f3738
Commit 085f3738 authored Nov 24, 2020 by Michael Stefaniuc Committed by Alexandre Julliard Nov 24, 2020
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 11 deletions

http.c dlls/wininet/http.c +0 -0

internet.c dlls/wininet/internet.c +5 -5

urlcache.c dlls/wininet/urlcache.c +3 -6

No files found.
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3279,12 +3279,12 @@ BOOL WINAPI InternetSetOptionExW(HINTERNET hInternet, DWORD dwOption,
 }
 static const WCHAR WININET_wkday[7][4] =
-    { { 'S','u','n', 0 }, { 'M','o','n', 0 }, { 'T','u','e', 0 }, { 'W','e','d', 0 },
+    { L"Sun", L"Mon", L"Tue", L"Wed",
-      { 'T','h','u', 0 }, { 'F','r','i', 0 }, { 'S','a','t', 0 } };
+      L"Thu", L"Fri", L"Sat"};
 static const WCHAR WININET_month[12][4] =
-    { { 'J','a','n', 0 }, { 'F','e','b', 0 }, { 'M','a','r', 0 }, { 'A','p','r', 0 },
+    { L"Jan", L"Feb", L"Mar", L"Apr",
-      { 'M','a','y', 0 }, { 'J','u','n', 0 }, { 'J','u','l', 0 }, { 'A','u','g', 0 },
+      L"May", L"Jun", L"Jul", L"Aug",
-      { 'S','e','p', 0 }, { 'O','c','t', 0 }, { 'N','o','v', 0 }, { 'D','e','c', 0 } };
+      L"Sep", L"Oct", L"Nov", L"Dec"};
 /***********************************************************************
 *           InternetTimeFromSystemTimeA (WININET.@)

--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -748,9 +748,6 @@ static void cache_container_delete_container(cache_container *pContainer)
 static void cache_containers_init(void)
 {
-    static const WCHAR UrlSuffix[] = {'C','o','n','t','e','n','t','.','I','E','5',0};
-    static const WCHAR HistorySuffix[] = {'H','i','s','t','o','r','y','.','I','E','5',0};
-    static const WCHAR CookieSuffix[] = {0};
    static const struct
    {
        int nFolder; /* CSIDL_* constant */
@@ -759,9 +756,9 @@ static void cache_containers_init(void)
        DWORD default_entry_type;
    } DefaultContainerData[] = 
    {
-        { CSIDL_INTERNET_CACHE, UrlSuffix, "", NORMAL_CACHE_ENTRY },
+        { CSIDL_INTERNET_CACHE, L"Content.IE5", "", NORMAL_CACHE_ENTRY },
-        { CSIDL_HISTORY, HistorySuffix, "Visited:", URLHISTORY_CACHE_ENTRY },
+        { CSIDL_HISTORY, L"History.IE5", "Visited:", URLHISTORY_CACHE_ENTRY },
-        { CSIDL_COOKIES, CookieSuffix, "Cookie:", COOKIE_CACHE_ENTRY },
+        { CSIDL_COOKIES, L"", "Cookie:", COOKIE_CACHE_ENTRY },
    };
    DWORD i;