Jacek Caban : kernel32: Import ReadFile from kernelbase.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 16:10:23 CST 2020
Module: wine
Branch: master
Commit: dc72519cd234055ac79b5a7e51b8fbcc4cda1e85
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc72519cd234055ac79b5a7e51b8fbcc4cda1e85
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 19 17:59:43 2020 +0100
kernel32: Import ReadFile from kernelbase.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/file.c | 30 ------------------------------
dlls/kernel32/kernel32.spec | 2 +-
2 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index fc83e618c3a..92022063ecc 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -276,36 +276,6 @@ UINT WINAPI SetHandleCount( UINT count )
}
-/*************************************************************************
- * ReadFile (KERNEL32.@)
- */
-BOOL WINAPI KERNEL32_ReadFile( HANDLE file, LPVOID buffer, DWORD count,
- LPDWORD result, LPOVERLAPPED overlapped )
-{
- if (result) *result = 0;
-
- if (is_console_handle( file ))
- {
- DWORD conread, mode;
-
- if (!ReadConsoleA( file, buffer, count, &conread, NULL) || !GetConsoleMode( file, &mode ))
- return FALSE;
- /* ctrl-Z (26) means end of file on window (if at beginning of buffer)
- * but Unix uses ctrl-D (4), and ctrl-Z is a bad idea on Unix :-/
- * So map both ctrl-D ctrl-Z to EOF.
- */
- if ((mode & ENABLE_PROCESSED_INPUT) && conread > 0 &&
- (((char *)buffer)[0] == 26 || ((char *)buffer)[0] == 4))
- {
- conread = 0;
- }
- if (result) *result = conread;
- return TRUE;
- }
- return ReadFile( file, buffer, count, result, overlapped );
-}
-
-
/***********************************************************************
* DosDateTimeToFileTime (KERNEL32.@)
*/
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index d0a273fe39e..949b262a592 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1205,7 +1205,7 @@
@ stdcall -import ReadConsoleOutputW(long ptr long long ptr)
@ stdcall -import ReadConsoleW(long ptr long ptr ptr)
@ stdcall -import ReadDirectoryChangesW(long ptr long long long ptr ptr ptr)
-@ stdcall ReadFile(long ptr long ptr ptr) KERNEL32_ReadFile
+@ stdcall -import ReadFile(long ptr long ptr ptr)
@ stdcall -import ReadFileEx(long ptr long ptr ptr)
@ stdcall -import ReadFileScatter(long ptr long ptr ptr)
@ stdcall -import ReadProcessMemory(long ptr ptr long ptr)
More information about the wine-cvs
mailing list