Jacek Caban : kernel32: Import WriteFile from kernelbase.

Alexandre Julliard julliard at winehq.org
Tue Nov 17 15:04:08 CST 2020


Module: wine
Branch: master
Commit: 6a1a8bdf353ce4829308a7c2307edf417f1676a3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6a1a8bdf353ce4829308a7c2307edf417f1676a3

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Nov 17 18:58:26 2020 +0100

kernel32: Import WriteFile from kernelbase.

Console special-case is no longer needed.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/file.c        | 11 -----------
 dlls/kernel32/kernel32.spec |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 897d8abd14a..fc83e618c3a 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -306,17 +306,6 @@ BOOL WINAPI KERNEL32_ReadFile( HANDLE file, LPVOID buffer, DWORD count,
 }
 
 
-/*************************************************************************
- *           WriteFile   (KERNEL32.@)
- */
-BOOL WINAPI KERNEL32_WriteFile( HANDLE file, LPCVOID buffer, DWORD count,
-                                LPDWORD result, LPOVERLAPPED overlapped )
-{
-    if (is_console_handle( file )) return WriteConsoleA( file, buffer, count, result, NULL );
-    return WriteFile( file, buffer, count, result, overlapped );
-}
-
-
 /***********************************************************************
  *           DosDateTimeToFileTime   (KERNEL32.@)
  */
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 5508a10f9a0..d0a273fe39e 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1630,7 +1630,7 @@
 @ stdcall -import WriteConsoleOutputCharacterW(long ptr long long ptr)
 @ stdcall -import WriteConsoleOutputW(long ptr long long ptr)
 @ stdcall -import WriteConsoleW(long ptr long ptr ptr)
-@ stdcall WriteFile(long ptr long ptr ptr) KERNEL32_WriteFile
+@ stdcall -import WriteFile(long ptr long ptr ptr)
 @ stdcall -import WriteFileEx(long ptr long ptr ptr)
 @ stdcall -import WriteFileGather(long ptr long ptr ptr)
 @ stdcall WritePrivateProfileSectionA(str str str)




More information about the wine-cvs mailing list