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

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Tue Sep 29 23:29:35 2020 +0200

browseui: Use wide-char string literals.

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

---

dlls/browseui/progressdlg.c        | 8 +++-----
 dlls/browseui/tests/autocomplete.c | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
index bca61f5482..89e70e9020 100644
--- a/dlls/browseui/progressdlg.c
+++ b/dlls/browseui/progressdlg.c
@@ -86,15 +86,13 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface)
     return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface);
 }

-static const WCHAR empty_string[] = {0};
-
 static void set_buffer(LPWSTR *buffer, LPCWSTR string)
 {
     IMalloc *malloc;
     ULONG cb;

if (string == NULL)
-        string = empty_string;
+        string = L"";
     CoGetMalloc(MEMCTX_TASK, &malloc);

cb = (lstrlenW(string) + 1)*sizeof(WCHAR);
@@ -134,9 +132,9 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate)
         SetWindowTextW(This->hwnd, This->title);

if (dwUpdate & UPDATE_LINE1)
-        SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? empty_string : This->lines[0]));
+        SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE, (This->isCancelled ? L"" : This->lines[0]));
     if (dwUpdate & UPDATE_LINE2)
-        SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? empty_string : This->lines[1]));
+        SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+1, (This->isCancelled ? L"" : This->lines[1]));
     if (dwUpdate & UPDATE_LINE3)
         SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2]));

diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c
index 0b04ab2d96..5ff274da72 100644
--- a/dlls/browseui/tests/autocomplete.c
+++ b/dlls/browseui/tests/autocomplete.c
@@ -227,7 +227,7 @@ static void test_ACLMulti(void)
 {
     const char *strings1[] = {"a", "c", "e"};
     const char *strings2[] = {"a", "b", "d"};
-    WCHAR exp[] = {'A','B','C',0};
+    const WCHAR exp[] = L"ABC";
     IEnumString *obj;
     IEnumACString *unk;
     HRESULT hr;