Changeset 7704 for trunk/src/kernel32/disk.cpp

Timestamp:

Dec 30, 2001, 12:04:19 PM (24 years ago)

Author:

sandervl

Message:

GetVolumeInformation: report FAT32 as FAT32, use original volume name to determine maximum file name length

File:

• trunk/src/kernel32/disk.cpp (modified) (6 diffs)

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.26 2001-12-17 16:23:19 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.27 2001-12-30 11:04:19 sandervl Exp $ */
 
 /*
@@ -273 +273 @@
 {
    CHAR   tmpstring[256];
+   CHAR   szOrgFileSystemName[256] = "";
    ULONG  drive;
    BOOL   rc;
@@ -304 +305 @@
         }
     }
-    if(lpFileSystemNameBuffer || lpMaximumComponentLength || lpFileSystemFlags) {
+    if(lpFileSystemNameBuffer || lpMaximumComponentLength || lpFileSystemFlags) 
+    {
         if(!lpFileSystemNameBuffer) {
             lpFileSystemNameBuffer = tmpstring;
@@ -310 +312 @@
         }
         rc = OSLibDosQueryVolumeFS(drive, lpFileSystemNameBuffer, nFileSystemNameSize);
+        //save original file system name
+        if(rc == ERROR_SUCCESS) strcpy(szOrgFileSystemName, lpFileSystemNameBuffer);
+
         if(lpFileSystemNameBuffer) 
         {
@@ -319 +324 @@
             else
             if(!strcmp(lpFileSystemNameBuffer, "CDFS") ||
-               !strcmp(lpFileSystemNameBuffer, "UDF")) 
+               !strcmp(lpFileSystemNameBuffer, "UDF") || 
+               !strcmp(lpFileSystemNameBuffer, "FAT32") ||
+               !strcmp(lpFileSystemNameBuffer, "NTFS")) //in case somebody ever writes one
             {
                 //do nothing
@@ -331 +338 @@
     }
     if(lpMaximumComponentLength) {
-        if(!strcmp(lpFileSystemNameBuffer, "FAT16")) {
-            *lpMaximumComponentLength = 12;
-        }
-        else    *lpMaximumComponentLength = 255; //TODO: Always correct? (CDFS?)
+        if(!strcmp(szOrgFileSystemName, "FAT16") || !strcmp(szOrgFileSystemName, "FAT")) {
+             *lpMaximumComponentLength = 12;  //8.3
+        }
+        else *lpMaximumComponentLength = 255; //TODO: Always correct? (CDFS?)
     }
     if(lpFileSystemFlags)
     {
         if(strcmp(lpFileSystemNameBuffer, "FAT16")) {
-            *lpFileSystemFlags = FS_CASE_IS_PRESERVED;
+             *lpFileSystemFlags = FS_CASE_IS_PRESERVED;
         }
         else
         if(!strcmp(lpFileSystemNameBuffer, "CDFS")) {
-            *lpFileSystemFlags = FS_CASE_SENSITIVE; //NT4 returns this
+             *lpFileSystemFlags = FS_CASE_SENSITIVE; //NT4 returns this
         }
         else
         if(!strcmp(lpFileSystemNameBuffer, "UDF")) {//TODO: correct?
-            *lpFileSystemFlags = FS_CASE_SENSITIVE | FS_UNICODE_STORED_ON_DISK;
-        }
-        else    *lpFileSystemFlags = 0;
+             *lpFileSystemFlags = FS_CASE_SENSITIVE | FS_UNICODE_STORED_ON_DISK;
+        }
+        else *lpFileSystemFlags = 0;
 
         dprintf2(("File system flags: %x", lpFileSystemFlags));