diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 3db0a706285..aa6484b7659 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -782,7 +782,7 @@ debug_channels (comm debugstr dll int resource stress thunk toolhelp win32) @ stdcall WriteConsoleOutputW(long ptr long long ptr) WriteConsoleOutputW @ stdcall WriteConsoleW(long ptr long ptr ptr) WriteConsoleW @ stdcall WriteFile(long ptr long ptr ptr) WriteFile -@ stub WriteFileEx +@ stdcall WriteFileEx(long ptr long ptr ptr) WriteFileEx @ stdcall WritePrivateProfileSectionA(str str str) WritePrivateProfileSectionA @ stdcall WritePrivateProfileSectionW(wstr wstr wstr) WritePrivateProfileSectionW @ stdcall WritePrivateProfileStringA(str str str str) WritePrivateProfileStringA diff --git a/files/file.c b/files/file.c index 4d78cf69690..c1026c88a14 100644 --- a/files/file.c +++ b/files/file.c @@ -1348,6 +1348,19 @@ static BOOL FILE_StartAsyncRead( HANDLE hFile, LPOVERLAPPED overlapped, LPVOID b return TRUE; } +/*********************************************************************** + * ReadFileEx (KERNEL32.@) + */ +BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID lpBuffer, DWORD numtoread, + LPOVERLAPPED lpOverlapped, + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + + FIXME("file %d to buf %p num %ld %p func %p stub\n", + hFile, lpBuffer, numtoread, lpOverlapped, lpCompletionRoutine); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} /*********************************************************************** * ReadFile (KERNEL32.@) @@ -1512,6 +1525,18 @@ static BOOL FILE_StartAsyncWrite(HANDLE hFile, LPOVERLAPPED overlapped, LPCVOID return TRUE; } +/*********************************************************************** + * WriteFileEx (KERNEL32.@) + */ +BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID lpBuffer, DWORD numtowrite, + LPOVERLAPPED lpOverlapped, + LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + FIXME("file %d to buf %p num %ld %p func %p stub\n", + hFile, lpBuffer, numtowrite, lpOverlapped, lpCompletionRoutine); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} /*********************************************************************** * WriteFile (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 22fd0084a82..67f0670ce1b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1508,22 +1508,23 @@ DWORD WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD); #define QueryDosDevice WINELIB_NAME_AW(QueryDosDevice) BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); -BOOL WINAPI ReadConsoleA(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); -BOOL WINAPI ReadConsoleW(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); +BOOL WINAPI ReadConsoleA(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); +BOOL WINAPI ReadConsoleW(HANDLE,LPVOID,DWORD,LPDWORD,LPVOID); #define ReadConsole WINELIB_NAME_AW(ReadConsole) BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWORD *,DWORD *); BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,LPVOID,DWORD,DWORD *,DWORD *); #define ReadEventLog WINELIB_NAME_AW(ReadEventLog) -BOOL WINAPI ReadFile(HANDLE,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); +BOOL WINAPI ReadFile(HANDLE,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); +BOOL WINAPI ReadFileEx(HANDLE,LPVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); HANDLE WINAPI RegisterEventSourceA(LPCSTR,LPCSTR); HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR); #define RegisterEventSource WINELIB_NAME_AW(RegisterEventSource) -BOOL WINAPI ReleaseMutex(HANDLE); -BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG); +BOOL WINAPI ReleaseMutex(HANDLE); +BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG); BOOL WINAPI ReportEventA(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCSTR *,LPVOID); BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCWSTR *,LPVOID); #define ReportEvent WINELIB_NAME_AW(ReportEvent) -BOOL WINAPI ResetEvent(HANDLE); +BOOL WINAPI ResetEvent(HANDLE); DWORD WINAPI ResumeThread(HANDLE); BOOL WINAPI RevertToSelf(void); DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); diff --git a/win32/file.c b/win32/file.c index b6c4c21867f..36eb56b5c02 100644 --- a/win32/file.c +++ b/win32/file.c @@ -29,20 +29,6 @@ DEFAULT_DEBUG_CHANNEL(file); -/*********************************************************************** - * ReadFileEx (KERNEL32.@) - */ -BOOL WINAPI ReadFileEx(HFILE hFile, LPVOID lpBuffer, DWORD numtoread, - LPOVERLAPPED lpOverlapped, - LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) -{ - - FIXME("file %d to buf %p num %ld %p func %p stub\n", - hFile, lpBuffer, numtoread, lpOverlapped, lpCompletionRoutine); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /************************************************************************** * SetFileAttributes (KERNEL.421) */