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

Timestamp:

Sep 4, 2000, 8:24:43 PM (25 years ago)

Author:

sandervl

Message:

GetDiskFreeSpace(Ex) changes/fixes

File:

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

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.15 2000-09-03 09:32:13 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.16 2000-09-04 18:24:42 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include "unicode.h"
 #include "oslibdos.h"
+#include "exceptutil.h"
 
 #define DBG_LOCALLOG  DBG_disk
@@ -61 +62 @@
     DWORD dwNumberOfFreeClusters;       // address of number of free clusters
     DWORD dwTotalNumberOfClusters;      // address of total number of clusters
-    dprintf(("KERNEL32:  OS2GetDiskFreeSpaceA %s, 0x%08X, 0x%08X, 0x%08X, 0x%08X,\n",
+    dprintf(("KERNEL32:  GetDiskFreeSpaceA %s, 0x%08X, 0x%08X, 0x%08X, 0x%08X,\n",
              arg1!=NULL?arg1:"NULL", arg2,arg3,arg4,arg5));
-    rc = O32_GetDiskFreeSpace(arg1, &dwSectorsPerCluster, &dwBytesPerSector,
-                              &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
+
+    rc = OSLibGetDiskFreeSpace((LPSTR)arg1, &dwSectorsPerCluster, &dwBytesPerSector,
+                               &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
     if(rc)
     {
@@ -88 +90 @@
     dprintf(("KERNEL32:  OS2GetDiskFreeSpaceW\n"));
     astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = O32_GetDiskFreeSpace(astring, arg2, arg3, arg4, arg5);
+    rc = GetDiskFreeSpaceA(astring, arg2, arg3, arg4, arg5);
     FreeAsciiString(astring);
     return(rc);
@@ -148 +150 @@
     DWORD dwTotalNumberOfClusters;      // address of total number of clusters
 
-    rc = O32_GetDiskFreeSpace(lpDirectoryName, &dwSectorsPerCluster, &dwBytesPerSector,
-                              &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
+    rc = GetDiskFreeSpaceA(lpDirectoryName, &dwSectorsPerCluster, &dwBytesPerSector,
+                           &dwNumberOfFreeClusters, &dwTotalNumberOfClusters);
     if(rc)
     {
-        //TODO: Fill in high part (overflow possible)!!!!!!
         if(lpFreeBytesAvailableToCaller!=NULL) {
-                lpFreeBytesAvailableToCaller->LowPart  = dwNumberOfFreeClusters*dwSectorsPerCluster*dwBytesPerSector;
-                lpFreeBytesAvailableToCaller->HighPart = 0;
+                Mul32x32to64(lpFreeBytesAvailableToCaller, dwNumberOfFreeClusters, (dwSectorsPerCluster*dwBytesPerSector));
+                dprintf(("lpFreeBytesAvailableToCaller %x%x", lpFreeBytesAvailableToCaller->LowPart, lpFreeBytesAvailableToCaller->HighPart));
         }
         if(lpTotalNumberOfBytes!=NULL) {
-                lpTotalNumberOfBytes->LowPart  = dwTotalNumberOfClusters*dwSectorsPerCluster*dwBytesPerSector;
-                lpTotalNumberOfBytes->HighPart = 0;
+                Mul32x32to64(lpTotalNumberOfBytes, dwTotalNumberOfClusters, (dwSectorsPerCluster*dwBytesPerSector));
+                dprintf(("lpTotalNumberOfBytes %x%x", lpTotalNumberOfBytes->LowPart, lpTotalNumberOfBytes->HighPart));
         }
         if(lpTotalNumberOfFreeBytes!=NULL) {
-                lpTotalNumberOfFreeBytes->LowPart  = dwNumberOfFreeClusters*dwSectorsPerCluster*dwBytesPerSector;
-                lpTotalNumberOfFreeBytes->HighPart = 0;
+                memcpy(lpTotalNumberOfFreeBytes, lpFreeBytesAvailableToCaller, sizeof(*lpFreeBytesAvailableToCaller));
+                dprintf(("lpTotalNumberOfFreeBytes %x%x", lpTotalNumberOfFreeBytes->LowPart, lpTotalNumberOfFreeBytes->HighPart));
         }
     }