Changeset 8397 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

May 9, 2002, 3:55:35 PM (23 years ago)

Author:

sandervl

Message:

volume api updates (LVM)

File:

• trunk/src/kernel32/hmdisk.cpp (modified) (8 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.42 2002-04-13 06:21:39 bird Exp $ */
+/* $Id: hmdisk.cpp,v 1.43 2002-05-09 13:55:33 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
 #include <os2win.h>
 #include <string.h>
+#include <versionos2.h>
 
 #include <misc.h>
 #include "hmdisk.h"
 #include "mmap.h"
-#include "oslibdos.h"
 #include <win\winioctl.h>
 #include <win\ntddscsi.h>
 #include <win\wnaspi32.h>
 #include <win\aspi.h>
+#include "oslibdos.h"
+#include "osliblvm.h"
 
 #define DBG_LOCALLOG    DBG_hmdisk
@@ -50 +52 @@
 {
     HMDeviceRegisterEx("\\\\.\\PHYSICALDRIVE", this, NULL);
+    HMDeviceRegisterEx(VOLUME_NAME_PREFIX, this, NULL);
 }
 
@@ -83 +86 @@
     //\\.\PHYSICALDRIVEn    -> length 18
     if(namelength != 6 && namelength != 18) {
+        if(VERSION_IS_WIN2000_OR_HIGHER()) {
+            if(!strncmp(lpDeviceName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1)) {
+                return TRUE;
+            }
+        }
         return FALSE;
     }
@@ -124 +132 @@
 
     char szDrive[4];
-    szDrive[0] = *lpFileName;
     szDrive[1] = ':';
     szDrive[2] = '\0';
+
+    //if volume name, query 
+    if(VERSION_IS_WIN2000_OR_HIGHER() && !strncmp(lpFileName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1)) {
+        char *pszVolume;
+        int   length;
+
+        //strip volume name prefix (\\\\?\\Volume\\)
+        length = strlen(lpFileName);
+        pszVolume = (char *)alloca(length);
+
+        strcpy(pszVolume, &lpFileName[sizeof(VOLUME_NAME_PREFIX)-1+1]);  //-zero term + starting '{'
+        length -= sizeof(VOLUME_NAME_PREFIX)-1+1;
+        if(pszVolume[length-2] == '}') {
+            pszVolume[length-2] = 0;
+            szDrive[0] = OSLibLVMQueryDriveFromVolumeName(pszVolume);
+        }
+        else return ERROR_FILE_NOT_FOUND;
+
+    }
+    else {
+        szDrive[0] = *lpFileName;
+    }
     dwDriveType = GetDriveTypeA(szDrive);
 
@@ -550 +579 @@
         msg = "IOCTL_CDROM_FIND_NEW_DEVICES";
         break;
+    case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS:
+        msg = "IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS";
+        break;
     }
     if(msg) {
@@ -713 +745 @@
 
     case IOCTL_DISK_GET_PARTITION_INFO:
+    {
+        PPARTITION_INFORMATION pPartition = (PPARTITION_INFORMATION)lpOutBuffer;
+        if(nOutBufferSize < sizeof(PARTITION_INFORMATION) || !pPartition) {
+            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            return FALSE;
+        }
+        if(lpBytesReturned) {
+            *lpBytesReturned = sizeof(PARTITION_INFORMATION);
+        }
+        if(OSLibLVMGetPartitionInfo(drvInfo->driveLetter, pPartition)) {
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY); //wrong error, but who cares
+            return FALSE;
+        }
+
+        SetLastError(ERROR_SUCCESS);
+        return TRUE;
+    }
+
     case IOCTL_DISK_LOAD_MEDIA:
     case IOCTL_DISK_MEDIA_REMOVAL:
@@ -723 +773 @@
         break;
 
+
+    case IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS:
+    {
+        PVOLUME_DISK_EXTENTS pVolExtent = (PVOLUME_DISK_EXTENTS)lpOutBuffer;
+        if(nOutBufferSize < sizeof(VOLUME_DISK_EXTENTS) || !pVolExtent) {
+            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            return FALSE;
+        }
+        if(OSLibLVMGetVolumeExtents(drvInfo->driveLetter, pVolExtent)) {
+            SetLastError(ERROR_NOT_ENOUGH_MEMORY); //wrong error, but who cares
+            return FALSE;
+        }
+
+        if(lpBytesReturned) {
+            *lpBytesReturned = sizeof(VOLUME_DISK_EXTENTS);
+        }
+        SetLastError(ERROR_SUCCESS);
+        return TRUE;
+    }
 
     // -----------