https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getvolumeinformationbyhandlew
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getlongpathnamea
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-gettempfilenamea
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getvolumeinformationw
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-localfiletimetofiletime
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-lockfile
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-readfileex
---
 mingw-w64-headers/include/fileapi.h | 33 ++++++++++++++++-------------
 mingw-w64-headers/include/winbase.h |  5 ++++-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/mingw-w64-headers/include/fileapi.h 
b/mingw-w64-headers/include/fileapi.h
index b44505a7..373ca9fb 100644
--- a/mingw-w64-headers/include/fileapi.h
+++ b/mingw-w64-headers/include/fileapi.h
@@ -80,22 +80,11 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG 
lDistanceToMove, PLON
 #endif
 #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
   WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW (DWORD nBufferLength, LPWSTR 
lpBuffer);
-  WINBASEAPI DWORD WINAPI GetLongPathNameA (LPCSTR lpszShortPath, LPSTR 
lpszLongPath, DWORD cchBuffer);
-  WINBASEAPI DWORD WINAPI GetLongPathNameW (LPCWSTR lpszShortPath, LPWSTR 
lpszLongPath, DWORD cchBuffer);
   WINBASEAPI DWORD WINAPI GetShortPathNameW (LPCWSTR lpszLongPath, LPWSTR 
lpszShortPath, DWORD cchBuffer);
-  WINBASEAPI UINT WINAPI GetTempFileNameA (LPCSTR lpPathName, LPCSTR 
lpPrefixString, UINT uUnique, LPSTR lpTempFileName);
-  WINBASEAPI UINT WINAPI GetTempFileNameW (LPCWSTR lpPathName, LPCWSTR 
lpPrefixString, UINT uUnique, LPWSTR lpTempFileName);
-  WINBASEAPI WINBOOL WINAPI GetVolumeInformationW (LPCWSTR lpRootPathName, 
LPWSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, 
LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPWSTR 
lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
   WINBASEAPI WINBOOL WINAPI GetVolumePathNameW (LPCWSTR lpszFileName, LPWSTR 
lpszVolumePathName, DWORD cchBufferLength);
-  WINBASEAPI WINBOOL WINAPI LocalFileTimeToFileTime (CONST FILETIME 
*lpLocalFileTime, LPFILETIME lpFileTime);
-  WINBASEAPI WINBOOL WINAPI LockFile (HANDLE hFile, DWORD dwFileOffsetLow, 
DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToLockLow, DWORD 
nNumberOfBytesToLockHigh);
   WINBASEAPI DWORD WINAPI QueryDosDeviceW (LPCWSTR lpDeviceName, LPWSTR 
lpTargetPath, DWORD ucchMax);
-  WINBASEAPI WINBOOL WINAPI ReadFileEx (HANDLE hFile, LPVOID lpBuffer, DWORD 
nNumberOfBytesToRead, LPOVERLAPPED lpOverlapped, 
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
   WINBASEAPI WINBOOL WINAPI ReadFileScatter (HANDLE hFile, 
FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead, LPDWORD 
lpReserved, LPOVERLAPPED lpOverlapped);
-  WINBASEAPI WINBOOL WINAPI SetFileTime (HANDLE hFile, CONST FILETIME 
*lpCreationTime, CONST FILETIME *lpLastAccessTime, CONST FILETIME 
*lpLastWriteTime);
   WINBASEAPI WINBOOL WINAPI SetFileValidData (HANDLE hFile, LONGLONG 
ValidDataLength);
-  WINBASEAPI WINBOOL WINAPI UnlockFile (HANDLE hFile, DWORD dwFileOffsetLow, 
DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToUnlockLow, DWORD 
nNumberOfBytesToUnlockHigh);
-  WINBASEAPI WINBOOL WINAPI WriteFileEx (HANDLE hFile, LPCVOID lpBuffer, DWORD 
nNumberOfBytesToWrite, LPOVERLAPPED lpOverlapped, 
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
   WINBASEAPI WINBOOL WINAPI WriteFileGather (HANDLE hFile, 
FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToWrite, LPDWORD 
lpReserved, LPOVERLAPPED lpOverlapped);
   WINBASEAPI WINBOOL WINAPI GetVolumeNameForVolumeMountPointW (LPCWSTR 
lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength);
   WINBASEAPI WINBOOL WINAPI GetVolumePathNamesForVolumeNameW (LPCWSTR 
lpszVolumeName, LPWCH lpszVolumePathNames, DWORD cchBufferLength, PDWORD 
lpcchReturnLength);
@@ -123,15 +112,29 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, 
LONG lDistanceToMove, PLON
 
 
 #if _WIN32_WINNT >= 0x0600
-  WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleA (HANDLE hFile, LPSTR 
lpszFilePath, DWORD cchFilePath, DWORD dwFlags);
-  WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleW (HANDLE hFile, LPWSTR 
lpszFilePath, DWORD cchFilePath, DWORD dwFlags);
   WINBASEAPI WINBOOL WINAPI GetVolumeInformationByHandleW (HANDLE hFile, 
LPWSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, 
LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPWSTR 
lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
-
-#define GetFinalPathNameByHandle __MINGW_NAME_AW(GetFinalPathNameByHandle)
 #endif
 #endif
 
 #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
+  WINBASEAPI DWORD WINAPI GetLongPathNameA (LPCSTR lpszShortPath, LPSTR 
lpszLongPath, DWORD cchBuffer);
+  WINBASEAPI DWORD WINAPI GetLongPathNameW (LPCWSTR lpszShortPath, LPWSTR 
lpszLongPath, DWORD cchBuffer);
+  WINBASEAPI UINT WINAPI GetTempFileNameA (LPCSTR lpPathName, LPCSTR 
lpPrefixString, UINT uUnique, LPSTR lpTempFileName);
+  WINBASEAPI UINT WINAPI GetTempFileNameW (LPCWSTR lpPathName, LPCWSTR 
lpPrefixString, UINT uUnique, LPWSTR lpTempFileName);
+  WINBASEAPI WINBOOL WINAPI GetVolumeInformationW (LPCWSTR lpRootPathName, 
LPWSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, 
LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPWSTR 
lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
+  WINBASEAPI WINBOOL WINAPI LocalFileTimeToFileTime (CONST FILETIME 
*lpLocalFileTime, LPFILETIME lpFileTime);
+  WINBASEAPI WINBOOL WINAPI LockFile (HANDLE hFile, DWORD dwFileOffsetLow, 
DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToLockLow, DWORD 
nNumberOfBytesToLockHigh);
+  WINBASEAPI WINBOOL WINAPI ReadFileEx (HANDLE hFile, LPVOID lpBuffer, DWORD 
nNumberOfBytesToRead, LPOVERLAPPED lpOverlapped, 
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+  WINBASEAPI WINBOOL WINAPI SetFileTime (HANDLE hFile, CONST FILETIME 
*lpCreationTime, CONST FILETIME *lpLastAccessTime, CONST FILETIME 
*lpLastWriteTime);
+  WINBASEAPI WINBOOL WINAPI UnlockFile (HANDLE hFile, DWORD dwFileOffsetLow, 
DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToUnlockLow, DWORD 
nNumberOfBytesToUnlockHigh);
+  WINBASEAPI WINBOOL WINAPI WriteFileEx (HANDLE hFile, LPCVOID lpBuffer, DWORD 
nNumberOfBytesToWrite, LPOVERLAPPED lpOverlapped, 
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
+
+#if _WIN32_WINNT >= 0x0600
+  WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleA (HANDLE hFile, LPSTR 
lpszFilePath, DWORD cchFilePath, DWORD dwFlags);
+  WINBASEAPI DWORD WINAPI GetFinalPathNameByHandleW (HANDLE hFile, LPWSTR 
lpszFilePath, DWORD cchFilePath, DWORD dwFlags);
+
+#define GetFinalPathNameByHandle __MINGW_NAME_AW(GetFinalPathNameByHandle)
+#endif
   typedef struct _WIN32_FILE_ATTRIBUTE_DATA {
     DWORD dwFileAttributes;
     FILETIME ftCreationTime;
diff --git a/mingw-w64-headers/include/winbase.h 
b/mingw-w64-headers/include/winbase.h
index 3fa8d85c..fe318100 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -2217,7 +2217,6 @@ extern "C" {
   WINBASEAPI VOID WINAPI SetFileApisToOEM (VOID);
   WINBASEAPI VOID WINAPI SetFileApisToANSI (VOID);
   WINBASEAPI WINBOOL WINAPI AreFileApisANSI (VOID);
-  WINBASEAPI WINBOOL WINAPI GetVolumeInformationA (LPCSTR lpRootPathName, 
LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, 
LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPSTR 
lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
   WINADVAPI WINBOOL WINAPI ClearEventLogA (HANDLE hEventLog, LPCSTR 
lpBackupFileName);
   WINADVAPI WINBOOL WINAPI ClearEventLogW (HANDLE hEventLog, LPCWSTR 
lpBackupFileName);
   WINADVAPI WINBOOL WINAPI BackupEventLogA (HANDLE hEventLog, LPCSTR 
lpBackupFileName);
@@ -2292,6 +2291,10 @@ extern "C" {
 
 #endif
 
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
+  WINBASEAPI WINBOOL WINAPI GetVolumeInformationA (LPCSTR lpRootPathName, 
LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize, LPDWORD lpVolumeSerialNumber, 
LPDWORD lpMaximumComponentLength, LPDWORD lpFileSystemFlags, LPSTR 
lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
+#endif
+
 #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || _WIN32_WINNT >= 
_WIN32_WINNT_WIN10
   WINBASEAPI WINBOOL WINAPI ReadDirectoryChangesW (HANDLE hDirectory, LPVOID 
lpBuffer, DWORD nBufferLength, WINBOOL bWatchSubtree, DWORD dwNotifyFilter, 
LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped, 
LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine);
 #endif
-- 
2.17.1



_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to