From: Eric Pouech epouech@codeweavers.com
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/cmd/wcmd.h | 3 +-- programs/cmd/wcmdmain.c | 25 ------------------------- 2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index ec0a6f2a066..6810598142c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -220,12 +220,11 @@ WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); RETURN_CODE WCMD_wait_for_input(HANDLE hIn); RETURN_CODE WCMD_wait_for_console_input(void); -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); BOOL WCMD_read_console(const HANDLE hInput, WCHAR *inputBuffer, const DWORD inputBufferLength, LPDWORD numRead);
enum read_parse_line {RPL_SUCCESS, RPL_EOF, RPL_SYNTAXERROR}; enum read_parse_line WCMD_ReadAndParseLine(CMD_NODE **output); -void node_dispose_tree(CMD_NODE *cmds); +void node_dispose_tree(CMD_NODE *cmds); RETURN_CODE node_execute(CMD_NODE *node);
RETURN_CODE WCMD_call_batch(const WCHAR *, WCHAR *); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cf1c627cf81..46b89544221 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -658,31 +658,6 @@ RETURN_CODE WCMD_wait_for_console_input(void) return WCMD_wait_for_input(console_input); }
-/*************************************************************************** - * WCMD_ReadFile - * - * Read characters in from a console/file, returning result in Unicode - */ -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead) -{ - DWORD numRead; - char *buffer; - - /* Try to read from console as Unicode */ - if (VerifyConsoleIoHandle(hIn) && ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL)) return TRUE; - - /* We assume it's a file handle and read then convert from assumed OEM codepage */ - if (!(buffer = get_file_buffer())) - return FALSE; - - if (!ReadFile(hIn, buffer, maxChars, &numRead, NULL)) - return FALSE; - - *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, intoBuf, maxChars); - - return TRUE; -} - /******************************************************************* * WCMD_output_asis *