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

Timestamp:

May 14, 2002, 11:28:19 AM (23 years ago)

Author:

sandervl

Message:

CustForce2GBFileSize function added to force GetVolumeInformation to tell the app all partitions are FAT

File:

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

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.36 2002-05-10 14:55:10 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.37 2002-05-14 09:28:19 sandervl Exp $ */
 
 /*
  * Win32 Disk API functions for OS/2
  *
- * Copyright 1998 Sander van Leeuwen
+ * Copyright 1998-2002 Sander van Leeuwen
  *
  *
@@ -46 +46 @@
 BOOL WIN32API SetVolumeLabelW(LPCWSTR lpRootPathName, LPCWSTR lpVolumeName)
 {
-  char *asciiroot, *asciivolname;
-  BOOL  rc;
+    char *asciiroot, *asciivolname;
+    BOOL  rc;
 
     dprintf(("KERNEL32:  OS2SetVolumeLabelW\n"));
@@ -64 +64 @@
                                 PDWORD lpClusters)
 {
-  BOOL rc;
-  DWORD dwSectorsPerCluster;    // address of sectors per cluster ter
-  DWORD dwBytesPerSector;   // address of bytes per sector
-  DWORD dwNumberOfFreeClusters; // address of number of free clusters
-  DWORD dwTotalNumberOfClusters;    // address of total number of clusters
-
-  rc = OSLibGetDiskFreeSpace((LPSTR)lpszRootPathName, &dwSectorsPerCluster, &dwBytesPerSector,
-                             &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
-  if(rc)
-  {
-    if (lpSectorsPerCluster!=NULL)
-      *lpSectorsPerCluster = dwSectorsPerCluster;
-    if (lpBytesPerSector!=NULL)
-      *lpBytesPerSector = dwBytesPerSector;
-    if (lpFreeClusters!=NULL)
-      *lpFreeClusters = dwNumberOfFreeClusters;
-    if (lpClusters!=NULL)
-      *lpClusters = dwTotalNumberOfClusters;
+    BOOL rc;
+    DWORD dwSectorsPerCluster;    // address of sectors per cluster ter
+    DWORD dwBytesPerSector;   // address of bytes per sector
+    DWORD dwNumberOfFreeClusters; // address of number of free clusters
+    DWORD dwTotalNumberOfClusters;    // address of total number of clusters
+
+    rc = OSLibGetDiskFreeSpace((LPSTR)lpszRootPathName, &dwSectorsPerCluster, &dwBytesPerSector,
+                                &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
+    if(rc)
+    {
+        if (lpSectorsPerCluster!=NULL)
+            *lpSectorsPerCluster = dwSectorsPerCluster;
+        if (lpBytesPerSector!=NULL)
+            *lpBytesPerSector = dwBytesPerSector;
+        if (lpFreeClusters!=NULL)
+            *lpFreeClusters = dwNumberOfFreeClusters;
+        if (lpClusters!=NULL)
+            *lpClusters = dwTotalNumberOfClusters;
 
     /* CW: Windows Media Player setup complains about wrong clustersize when odin is installed on
@@ -90 +90 @@
        TVFSTOHPFS = 1
        */
-    if(lpSectorsPerCluster!=NULL) 
-    {
-      if(*lpSectorsPerCluster==1024 && PROFILE_GetOdinIniBool("DRIVESPACE","CLUSTERTO32",0)) 
-      {/* TVFS returns 1024 sectors per cluster */
-        dprintf(("KERNEL32:  GetDiskFreeSpaceA, TVFS-Drive detected. Faking clustersize to 32.\n"));
-        *lpSectorsPerCluster=32;
-        if (lpFreeClusters!=NULL)
-          *lpFreeClusters = dwNumberOfFreeClusters<<0x5;
-        if (lpClusters!=NULL)
-          *lpClusters = dwTotalNumberOfClusters<<0x5;
-      }
-    }
-  }
-  return rc;
+        if(lpSectorsPerCluster!=NULL) 
+        {
+            if(*lpSectorsPerCluster==1024 && PROFILE_GetOdinIniBool("DRIVESPACE","CLUSTERTO32",0)) 
+            {/* TVFS returns 1024 sectors per cluster */
+                dprintf(("KERNEL32:  GetDiskFreeSpaceA, TVFS-Drive detected. Faking clustersize to 32.\n"));
+                *lpSectorsPerCluster=32;
+                if (lpFreeClusters!=NULL)
+                    *lpFreeClusters = dwNumberOfFreeClusters<<0x5;
+                if (lpClusters!=NULL)
+                    *lpClusters = dwTotalNumberOfClusters<<0x5;
+            }
+        }
+    }
+    return rc;
 }
 //******************************************************************************
@@ -113 +113 @@
                                 PDWORD  lpClusters)
 {
-  BOOL  rc;
-  char *astring;
-
-  astring = UnicodeToAsciiString((LPWSTR)lpszRootPathName);
-  rc = GetDiskFreeSpaceA(astring, lpSectorsPerCluster, lpBytesPerSector, lpFreeClusters, lpClusters);
-  FreeAsciiString(astring);
-  return(rc);
+    BOOL  rc;
+    char *astring;
+
+    astring = UnicodeToAsciiString((LPWSTR)lpszRootPathName);
+    rc = GetDiskFreeSpaceA(astring, lpSectorsPerCluster, lpBytesPerSector, lpFreeClusters, lpClusters);
+    FreeAsciiString(astring);
+    return(rc);
 }
 
@@ -202 +202 @@
                                   PULARGE_INTEGER lpTotalNumberOfFreeBytes )
 {
- BOOL  rc;
- char *astring;
+    BOOL  rc;
+    char *astring;
 
     dprintf(("KERNEL32:  OS2GetDiskFreeSpaceExW\n"));
@@ -216 +216 @@
 UINT WIN32API GetDriveTypeA(LPCSTR lpszDrive)
 {
-   UINT rc;
-   ULONG driveIndex;
+    UINT rc;
+    ULONG driveIndex;
 
     if(lpszDrive == 0) {
@@ -259 +259 @@
 UINT WIN32API GetDriveTypeW(LPCWSTR lpszDrive)
 {
- UINT  rc;
- char *astring;
+    UINT  rc;
+    char *astring;
 
     if(lpszDrive == (LPCWSTR)-1) {
@@ -270 +270 @@
     FreeAsciiString(astring);
     return(rc);
+}
+//******************************************************************************
+static int fForce2GBFileSize = FALSE;
+//******************************************************************************
+void WIN32API CustForce2GBFileSize()
+{
+    fForce2GBFileSize = TRUE;
 }
 //******************************************************************************
@@ -369 +376 @@
                 strcpy(lpFileSystemNameBuffer, "FAT16");
             }
+            if(fForce2GBFileSize) {
+                if(strcmp(lpFileSystemNameBuffer, "CDFS") &&
+                   strcmp(lpFileSystemNameBuffer, "UDF")) 
+                {//everything is FAT -> 2 GB file size limit
+                    strcpy(lpFileSystemNameBuffer, "FAT16");
+                }
+            }
             dprintf2(("Final file system name: %s", lpFileSystemNameBuffer));
         }
@@ -414 +428 @@
                                     DWORD   nFileSystemNameSize)
 {
-  char *asciiroot,
-       *asciivol,
-       *asciifs;
-  BOOL  rc;
-
-  // transform into ascii
-  asciivol  = (char *)malloc(nVolumeNameSize+1);
-  asciifs   = (char *)malloc(nFileSystemNameSize+1);
-
-  // clear ascii buffers
-  memset (asciivol, 0, (nVolumeNameSize + 1));
-  memset (asciifs,  0, (nFileSystemNameSize + 1));
-
-  if (lpRootPathName != NULL) // NULL is valid!
-    asciiroot = UnicodeToAsciiString((LPWSTR)lpRootPathName);
-  else
-    asciiroot = NULL;
-
-  rc = GetVolumeInformationA(asciiroot,
-                             asciivol,
-                             nVolumeNameSize,
-                             lpVolumeSerialNumber,
-                             lpMaximumComponentLength,
-                             lpFileSystemFlags,
-                             asciifs,
-                             nFileSystemNameSize);
+    char *asciiroot,
+         *asciivol,
+         *asciifs;
+    BOOL  rc;
+
+    // transform into ascii
+    asciivol  = (char *)malloc(nVolumeNameSize+1);
+    asciifs   = (char *)malloc(nFileSystemNameSize+1);
+
+    // clear ascii buffers
+    memset (asciivol, 0, (nVolumeNameSize + 1));
+    memset (asciifs,  0, (nFileSystemNameSize + 1));
+
+    if (lpRootPathName != NULL) // NULL is valid!
+        asciiroot = UnicodeToAsciiString((LPWSTR)lpRootPathName);
+    else
+        asciiroot = NULL;
+
+    rc = GetVolumeInformationA(asciiroot, asciivol, nVolumeNameSize, lpVolumeSerialNumber,
+                               lpMaximumComponentLength, lpFileSystemFlags, asciifs, nFileSystemNameSize);
 
     if (lpVolumeNameBuffer != NULL)  /* @@@PH 98/06/07 */
-      AsciiToUnicodeN(asciivol, lpVolumeNameBuffer, nVolumeNameSize);
+        AsciiToUnicodeN(asciivol, lpVolumeNameBuffer, nVolumeNameSize);
 
     if (lpFileSystemNameBuffer != NULL)  /* @@@PH 98/06/07 */
-      AsciiToUnicodeN(asciifs, lpFileSystemNameBuffer, nFileSystemNameSize);
-
-
-  if (asciiroot != NULL)
-    FreeAsciiString(asciiroot);
-
-  free(asciifs);
-  free(asciivol);
-  return(rc);
+        AsciiToUnicodeN(asciifs, lpFileSystemNameBuffer, nFileSystemNameSize);
+
+    if (asciiroot != NULL)
+        FreeAsciiString(asciiroot);
+
+    free(asciifs);
+    free(asciivol);
+    return(rc);
 }
 //******************************************************************************
@@ -473 +480 @@
 UINT WIN32API GetLogicalDriveStringsW(UINT nBufferLength, LPWSTR lpBuffer)
 {
-  char *asciibuffer = (char *)malloc(nBufferLength+1);
-  DWORD rc;
+    char *asciibuffer = (char *)malloc(nBufferLength+1);
+    DWORD rc;
 
     dprintf(("KERNEL32:  OS2GetLogicalDriveStringsW\n"));
@@ -562 +569 @@
     DWORD    DeviceType;
     char     szVolume[256];
+
+    //tetsetsetetsetsetset
+    SetLastError(ERROR_NO_MORE_FILES);
+    return FALSE;
+    //tetsetsetetsetsetset
 
     if(!VERSION_IS_WIN2000_OR_HIGHER()) {