Michael Stefaniuc : find: Use wide-char string literals.
Alexandre Julliard
julliard at winehq.org
Tue Oct 20 15:57:16 CDT 2020
Module: wine
Branch: master
Commit: 66119ad2284f275d667f5351a8b0d11a2f6cc999
URL: https://source.winehq.org/git/wine.git/?a=commit;h=66119ad2284f275d667f5351a8b0d11a2f6cc999
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Tue Oct 20 00:31:43 2020 +0200
find: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/find/find.c | 3 +--
programs/find/tests/find.c | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/programs/find/find.c b/programs/find/find.c
index 2eeb1ce2120..7d178874b4d 100644
--- a/programs/find/find.c
+++ b/programs/find/find.c
@@ -117,7 +117,6 @@ static void write_to_stdout(const WCHAR *str)
static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
{
void *found;
- WCHAR lineending[] = {'\r', '\n', 0};
if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0)
return FALSE;
@@ -127,7 +126,7 @@ static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
if (found)
{
write_to_stdout(line);
- write_to_stdout(lineending);
+ write_to_stdout(L"\r\n");
return TRUE;
}
diff --git a/programs/find/tests/find.c b/programs/find/tests/find.c
index d50dcdd36ae..b7c2d7b77c4 100644
--- a/programs/find/tests/find.c
+++ b/programs/find/tests/find.c
@@ -128,7 +128,6 @@ static void mangle_text(const BYTE *input, int input_len, BYTE *output, int outp
static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, const char *file, int line)
{
- static const WCHAR find_exe[] = { 'f','i','n','d','.','e','x','e',' ','%','s',0 };
HANDLE child_stdin_read;
HANDLE child_stdout_write;
HANDLE parent_stdin_write;
@@ -157,7 +156,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp
startup_info.hStdError = NULL;
startup_info.dwFlags |= STARTF_USESTDHANDLES;
- wsprintfW(cmd, find_exe, commandline);
+ wsprintfW(cmd, L"find.exe %s", commandline);
CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info);
CloseHandle(child_stdin_read);
@@ -243,7 +242,7 @@ static void run_find_str_(const char *commandline, const char *input, const char
static void run_find_unicode_(const BYTE *input, int input_len, const BYTE *out_expected, int out_expected_len, int exitcode_expected, BOOL is_file, const char *file, int line)
{
/* Need "test" as char and quoted wchar */
- static const WCHAR wstr_quoted_test[] = { '"','t', 'e', 's', 't','"',0 };
+ static const WCHAR wstr_quoted_test[] = L"\"test\"";
static const char str_test[] = "test";
BYTE out_expected_mangled[200] = {0};
More information about the wine-cvs
mailing list