Commit fd21557b authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

browseui: Use wide-char string literals.

parent 3ce68396
...@@ -86,15 +86,13 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) ...@@ -86,15 +86,13 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface)
return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface);
} }
static const WCHAR empty_string[] = {0};
static void set_buffer(LPWSTR *buffer, LPCWSTR string) static void set_buffer(LPWSTR *buffer, LPCWSTR string)
{ {
IMalloc *malloc; IMalloc *malloc;
ULONG cb; ULONG cb;
if (string == NULL) if (string == NULL)
string = empty_string; string = L"";
CoGetMalloc(MEMCTX_TASK, &malloc); CoGetMalloc(MEMCTX_TASK, &malloc);
cb = (lstrlenW(string) + 1)*sizeof(WCHAR); cb = (lstrlenW(string) + 1)*sizeof(WCHAR);
...@@ -134,9 +132,9 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) ...@@ -134,9 +132,9 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate)
SetWindowTextW(This->hwnd, This->title); SetWindowTextW(This->hwnd, This->title);
if (dwUpdate & UPDATE_LINE1) 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) 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) if (dwUpdate & UPDATE_LINE3)
SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2])); SetDlgItemTextW(This->hwnd, IDC_TEXT_LINE+2, (This->isCancelled ? This->cancelMsg : This->lines[2]));
......
...@@ -227,7 +227,7 @@ static void test_ACLMulti(void) ...@@ -227,7 +227,7 @@ static void test_ACLMulti(void)
{ {
const char *strings1[] = {"a", "c", "e"}; const char *strings1[] = {"a", "c", "e"};
const char *strings2[] = {"a", "b", "d"}; const char *strings2[] = {"a", "b", "d"};
WCHAR exp[] = {'A','B','C',0}; const WCHAR exp[] = L"ABC";
IEnumString *obj; IEnumString *obj;
IEnumACString *unk; IEnumACString *unk;
HRESULT hr; HRESULT hr;
......
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