system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 03:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd: Improve handle type recognition in WCMD_ReadFile.

Browse source
This commit is contained in:
Frédéric Delanoy 2011-10-05 14:02:43 +02:00 committed by Alexandre Julliard
parent e2fd09c2e7
commit 63e11558b6
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
programs/cmd/wcmdmain.c
View file

@ -233,6 +233,11 @@ void WCMD_leave_paged_mode(void)
pagedMessage = NULL;
}
static inline BOOL is_console_handle(HANDLE h)
{
return (((DWORD_PTR)h) & 3) == 3;
}
/***************************************************************************
* WCMD_Readfile
*
@ -240,30 +245,23 @@ void WCMD_leave_paged_mode(void)
*/
BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead)
{
BOOL res;
DWORD numRead;
char *buffer;
/* Try to read from console as Unicode */
res = ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL);
if (is_console_handle(hIn))
/* Try to read from console as Unicode */
return ReadConsoleW(hIn, intoBuf, maxChars, charsRead, NULL);
/* If reading from console has failed we assume its file
i/o so read in and convert from OEM codepage */
if (!res) {
/* We assume it's a file handle and read then convert from assumed OEM codepage */
if (!(buffer = get_file_buffer()))
return FALSE;
DWORD numRead;
char *buffer;
if (!ReadFile(hIn, buffer, maxChars, &numRead, NULL))
return FALSE;
if (!(buffer = get_file_buffer()))
return FALSE;
*charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, intoBuf, maxChars);
/* Read from file (assume OEM codepage) */
res = ReadFile(hIn, buffer, maxChars, &numRead, NULL);
/* Convert from OEM */
*charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead,
intoBuf, maxChars);
}
return res;
return TRUE;
}
/*******************************************************************