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

Timestamp:

May 10, 2002, 4:55:13 PM (23 years ago)

Author:

sandervl

Message:

hard disk access updates & fixes

File:

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

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.35 2002-05-09 13:55:33 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.36 2002-05-10 14:55:10 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include "oslibdos.h"
 #include "osliblvm.h"
-#include "exceptutil.h"
+#include "asmutil.h"
 #include "profile.h"
 #include "hmdisk.h"
@@ -240 +240 @@
             pszVolume = (char *)alloca(length);
 
-            strcpy(pszVolume, &lpszDrive[sizeof(VOLUME_NAME_PREFIX)-1+1]);  //-zero term + starting '{'
-            length -= sizeof(VOLUME_NAME_PREFIX)-1+1;
-            if(pszVolume[length-2] == '}') {
-                pszVolume[length-2] = 0;
+            if(OSLibLVMStripVolumeName(lpszDrive, pszVolume, length)) 
+            {
                 rc = OSLibLVMGetDriveType(pszVolume);
                 dprintf(("KERNEL32:  GetDriveType %s = %d (LVM)", lpszDrive, rc));
@@ -314 +312 @@
             pszVolume = (char *)alloca(length);
 
-            strcpy(pszVolume, &lpRootPathName[sizeof(VOLUME_NAME_PREFIX)-1]);
-            length -= sizeof(VOLUME_NAME_PREFIX)-1;
-            if(pszVolume[length-1] == '}') {
+            if(OSLibLVMStripVolumeName(lpRootPathName, pszVolume, length)) 
+            {
+                pszVolume[length-2] = 0;
                 fVolumeName = TRUE;
                 goto proceed;
@@ -361 +359 @@
             else
             if(!strcmp(lpFileSystemNameBuffer, "CDFS") ||
-               !strcmp(lpFileSystemNameBuffer, "UDF"))
+               !strcmp(lpFileSystemNameBuffer, "UDF") ||
+               !strcmp(lpFileSystemNameBuffer, "NTFS") ||
+               !strcmp(lpFileSystemNameBuffer, "FAT32"))
             {
                 //do nothing
@@ -738 +738 @@
                                                 DWORD cchBufferLength)
 {
-    if(!VERSION_IS_WIN2000_OR_HIGHER()) {
-        SetLastError(ERROR_NOT_SUPPORTED);
-        return FALSE;
-    }
-
-    dprintf(("GetVolumeNameForVolumeMountPointA: %s", lpszVolumeMountPoint));
-    if(OSLibLVMGetVolumeNameForVolumeMountPoint(lpszVolumeMountPoint, lpszVolumeName, 
+    LPSTR pszvol;
+
+    pszvol = (char *)alloca(cchBufferLength);
+    if(pszvol == NULL) {
+        DebugInt3();
+        return FALSE;
+    }
+
+    if(!VERSION_IS_WIN2000_OR_HIGHER()) {
+        SetLastError(ERROR_NOT_SUPPORTED);
+        return FALSE;
+    }
+
+    if(OSLibLVMGetVolumeNameForVolumeMountPoint(lpszVolumeMountPoint, pszvol, 
                                                 cchBufferLength) == TRUE) 
     {
+        int length = strlen(pszvol);
+        if(length + sizeof(VOLUME_NAME_PREFIX) - 1 + 3 > cchBufferLength) {
+            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            return FALSE;
+        }
+        sprintf(lpszVolumeName, VOLUME_NAME_PREFIX"{%s}\\", pszvol);
+
+        dprintf(("GetVolumeNameForVolumeMountPointA %s returned %s", lpszVolumeMountPoint, lpszVolumeName));
         SetLastError(ERROR_SUCCESS);
         return TRUE;
     }
+    dprintf(("GetVolumeNameForVolumeMountPointA: %s not found!!", lpszVolumeMountPoint));
     SetLastError(ERROR_FILE_NOT_FOUND);
     return FALSE;