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

Timestamp:

Dec 17, 2001, 5:23:19 PM (24 years ago)

Author:

sandervl

Message:

GetVolumeInformation changes: jfs -> ntfs, everthing except udf & cdfs as fat16

File:

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

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.25 2001-09-07 10:51:38 phaller Exp $ */
+/* $Id: disk.cpp,v 1.26 2001-12-17 16:23:19 sandervl Exp $ */
 
 /*
@@ -310 +310 @@
         }
         rc = OSLibDosQueryVolumeFS(drive, lpFileSystemNameBuffer, nFileSystemNameSize);
-        if(lpFileSystemNameBuffer) {
+        if(lpFileSystemNameBuffer) 
+        {
             dprintf2(("File system name: %s", lpFileSystemNameBuffer));
+            if(!strcmp(lpFileSystemNameBuffer, "JFS")) 
+            {
+                strcpy(lpFileSystemNameBuffer, "NTFS");
+            }
+            else
+            if(!strcmp(lpFileSystemNameBuffer, "CDFS") ||
+               !strcmp(lpFileSystemNameBuffer, "UDF")) 
+            {
+                //do nothing
+            }
+            else 
+            {//pretend everything else is FAT16 (HPFS and FAT have the same file size limit)
+                strcpy(lpFileSystemNameBuffer, "FAT16");
+            }
+            dprintf2(("Final file system name: %s", lpFileSystemNameBuffer));
         }
     }
     if(lpMaximumComponentLength) {
-        if(!strcmp(lpFileSystemNameBuffer, "FAT")) {
+        if(!strcmp(lpFileSystemNameBuffer, "FAT16")) {
             *lpMaximumComponentLength = 12;
         }
@@ -322 +338 @@
     if(lpFileSystemFlags)
     {
-        if(strcmp(lpFileSystemNameBuffer, "FAT")) {
+        if(strcmp(lpFileSystemNameBuffer, "FAT16")) {
             *lpFileSystemFlags = FS_CASE_IS_PRESERVED;
         }
@@ -407 +423 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetLogicalDriveStringsA(UINT arg1, LPSTR  arg2)
-{
-    dprintf(("KERNEL32:  OS2GetLogicalDriveStringsA\n"));
-    return O32_GetLogicalDriveStrings(arg1, arg2);
+UINT WIN32API GetLogicalDriveStringsA(UINT cchBuffer, LPSTR lpszBuffer)
+{
+    dprintf(("KERNEL32: GetLogicalDriveStringsA", cchBuffer, lpszBuffer));
+    return O32_GetLogicalDriveStrings(cchBuffer, lpszBuffer);
 }
 //******************************************************************************