system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 12:54:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

browseui: Use wide-char string literals.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-09-29 23:29:35 +02:00 committed by Alexandre Julliard
parent 3ce68396c2
commit fd21557bd1
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/browseui/progressdlg.c
View file

@ -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)
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]));

2
dlls/browseui/tests/autocomplete.c
View file

@ -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;