Changeset 77231 in vbox for trunk/src/VBox/Runtime/r3/nt/fs-nt.cpp

Timestamp:

Feb 8, 2019 11:18:13 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128738

Message:

IPRT: Return VERR_FILE_TOO_BIG if we exceed the FAT file limit while writing or when calling RTFileSetSize. (The previous IsBeyondLimit() code never ever worked AFAIK.)

File:

• trunk/src/VBox/Runtime/r3/nt/fs-nt.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/nt/fs-nt.cpp

@@ -196 +196 @@
 
 
+int rtNtQueryFsType(HANDLE hHandle, PRTFSTYPE penmType)
+{
+    /*
+     * Get the file system name.
+     */
+    union
+    {
+        FILE_FS_ATTRIBUTE_INFORMATION FsAttrInfo;
+        uint8_t abBuf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 4096];
+    } u;
+    IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
+    NTSTATUS rcNt = NtQueryVolumeInformationFile(hHandle, &Ios, &u, sizeof(u), FileFsAttributeInformation);
+    if (NT_SUCCESS(rcNt))
+    {
+#define IS_FS(a_szName) rtNtCompWideStrAndAscii(u.FsAttrInfo.FileSystemName, u.FsAttrInfo.FileSystemNameLength, RT_STR_TUPLE(a_szName))
+        if (IS_FS("NTFS"))
+            *penmType = RTFSTYPE_NTFS;
+        else if (IS_FS("FAT"))
+            *penmType = RTFSTYPE_FAT;
+        else if (IS_FS("FAT32"))
+            *penmType = RTFSTYPE_FAT;
+        else if (IS_FS("exFAT"))
+            *penmType = RTFSTYPE_EXFAT;
+        else if (IS_FS("UDF"))
+            *penmType = RTFSTYPE_UDF;
+        else if (IS_FS("CDFS"))
+            *penmType = RTFSTYPE_ISO9660;
+        else if (IS_FS("HPFS"))
+            *penmType = RTFSTYPE_HPFS;
+        else if (IS_FS("VBoxSharedFolderFS"))
+            *penmType = RTFSTYPE_VBOXSHF;
+#undef IS_FS
+        return VINF_SUCCESS;
+    }
+
+    *penmType = RTFSTYPE_UNKNOWN;
+    return RTErrConvertFromNtStatus(rcNt);
+}
+
+
 RTR3DECL(int) RTFsQueryType(const char *pszFsPath, PRTFSTYPE penmType)
 {
@@ -220 +260 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Get the file system name.
-         */
-        union
-        {
-            FILE_FS_ATTRIBUTE_INFORMATION FsAttrInfo;
-            uint8_t abBuf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 4096];
-        } u;
-        IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
-        NTSTATUS rcNt = NtQueryVolumeInformationFile(hFile, &Ios, &u, sizeof(u), FileFsAttributeInformation);
-        if (NT_SUCCESS(rcNt))
-        {
-#define IS_FS(a_szName) \
-    rtNtCompWideStrAndAscii(u.FsAttrInfo.FileSystemName, u.FsAttrInfo.FileSystemNameLength, RT_STR_TUPLE(a_szName))
-            if (IS_FS("NTFS"))
-                *penmType = RTFSTYPE_NTFS;
-            else if (IS_FS("FAT"))
-                *penmType = RTFSTYPE_FAT;
-            else if (IS_FS("FAT32"))
-                *penmType = RTFSTYPE_FAT;
-            else if (IS_FS("VBoxSharedFolderFS"))
-                *penmType = RTFSTYPE_VBOXSHF;
-#undef IS_FS
-        }
-        else
-            rc = RTErrConvertFromNtStatus(rcNt);
-
-        RTNtPathClose(hFile);
-    }
-    return rc;
-}
-
+        rc = rtNtQueryFsType(hFile, penmType);
+        RTNtPathClose(hFile);
+    }
+    return rc;
+}
+