Commit 66119ad2 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

find: Use wide-char string literals.

parent 43572cbd
...@@ -117,7 +117,6 @@ static void write_to_stdout(const WCHAR *str) ...@@ -117,7 +117,6 @@ static void write_to_stdout(const WCHAR *str)
static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
{ {
void *found; void *found;
WCHAR lineending[] = {'\r', '\n', 0};
if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0) if (lstrlenW(line) == 0 || lstrlenW(tofind) == 0)
return FALSE; return FALSE;
...@@ -127,7 +126,7 @@ static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) ...@@ -127,7 +126,7 @@ static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
if (found) if (found)
{ {
write_to_stdout(line); write_to_stdout(line);
write_to_stdout(lineending); write_to_stdout(L"\r\n");
return TRUE; return TRUE;
} }
......
...@@ -128,7 +128,6 @@ static void mangle_text(const BYTE *input, int input_len, BYTE *output, int outp ...@@ -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 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_stdin_read;
HANDLE child_stdout_write; HANDLE child_stdout_write;
HANDLE parent_stdin_write; HANDLE parent_stdin_write;
...@@ -157,7 +156,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp ...@@ -157,7 +156,7 @@ static void run_find_stdin_(const WCHAR *commandline, const BYTE *input, int inp
startup_info.hStdError = NULL; startup_info.hStdError = NULL;
startup_info.dwFlags |= STARTF_USESTDHANDLES; 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); CreateProcessW(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &startup_info, &process_info);
CloseHandle(child_stdin_read); CloseHandle(child_stdin_read);
...@@ -243,7 +242,7 @@ static void run_find_str_(const char *commandline, const char *input, const char ...@@ -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) 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 */ /* 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"; static const char str_test[] = "test";
BYTE out_expected_mangled[200] = {0}; BYTE out_expected_mangled[200] = {0};
......
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