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

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Oct  7 00:51:54 2020 +0200

view: Use wide-char string literals.

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

---

 programs/view/view.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/programs/view/view.c b/programs/view/view.c
index 2664eeb9b1..ad29734828 100644
--- a/programs/view/view.c
+++ b/programs/view/view.c
@@ -24,7 +24,7 @@
 
 static HINSTANCE hInst;
 static HWND hMainWnd;
-static WCHAR szAppName[5] = {'V','i','e','w',0};
+static const WCHAR szAppName[] = L"View";
 static WCHAR szTitle[MAX_PATH];
 static WCHAR szFileTitle[MAX_PATH];
 
@@ -52,14 +52,13 @@ typedef struct
 static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz)
 {
   WCHAR filter[120], metafileFilter[100];
-  static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0};
   OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW),
                         0, 0, NULL, NULL, 0, 0, NULL,
                         fnsz, NULL, 0, NULL, NULL,
                         OFN_SHOWHELP, 0, 0, NULL, 0, NULL };
 
   LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) );
-  swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 );
+  swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 );
 
   ofn.lpstrFilter = filter;
   ofn.hwndOwner = hWnd;
@@ -217,7 +216,6 @@ static void UpdateWindowCaption(void)
 {
   WCHAR szCaption[MAX_PATH];
   WCHAR szView[MAX_PATH];
-  static const WCHAR hyphenW[] = { ' ','-',' ',0 };
 
   LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView));
 
@@ -225,7 +223,7 @@ static void UpdateWindowCaption(void)
   {
     lstrcpyW(szCaption, szFileTitle);
     LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView));
-    lstrcatW(szCaption, hyphenW);
+    lstrcatW(szCaption, L" - ");
     lstrcatW(szCaption, szView);
   }
   else