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

Timestamp:

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

Author:

sandervl

Message:

hard disk access updates & fixes

File:

• trunk/src/kernel32/osliblvm.cpp (modified) (15 diffs)

trunk/src/kernel32/osliblvm.cpp

@@ -1 @@
-/* $Id: osliblvm.cpp,v 1.1 2002-05-09 13:55:34 sandervl Exp $ */
+/* $Id: osliblvm.cpp,v 1.2 2002-05-10 14:55:13 sandervl Exp $ */
 
 /*
@@ -329 +329 @@
 //******************************************************************************
 //******************************************************************************
-static Volume_Information_Record OSLibLVMFindVolumeFromDriveLetter(ULONG driveLetter,
-                                                                   Volume_Control_Record *pVolRec,
-                                                                   CARDINAL32 *lasterror) 
+static Volume_Information_Record OSLibLVMFindVolumeByDriveLetter(ULONG driveLetter,
+                                                                 Volume_Control_Record *pVolRec,
+                                                                 CARDINAL32 *lasterror) 
 {
     Volume_Control_Array      *volctrl;
@@ -367 +367 @@
 //******************************************************************************
 //******************************************************************************
-static Volume_Information_Record OSLibLVMFindVolumeFromName(LPSTR pszVolName,
-                                                            Volume_Control_Record *pVolRec,
-                                                            CARDINAL32 *lasterror) 
+static Volume_Information_Record OSLibLVMFindVolumeByName(LPSTR pszVolName,
+                                                          Volume_Control_Record *pVolRec,
+                                                          CARDINAL32 *lasterror) 
 {
     Volume_Control_Array      *volctrl;
@@ -405 +405 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibLVMGetPartitionInfo(ULONG driveLetter, PPARTITION_INFORMATION pPartition)
+BOOL OSLibLVMGetPartitionInfo(ULONG driveLetter, LPSTR lpszVolumeName, PPARTITION_INFORMATION pPartition)
 {
     Volume_Information_Record  volinfo;
@@ -412 +412 @@
     CARDINAL32                 lasterror;
 
-    volinfo = OSLibLVMFindVolumeFromDriveLetter(driveLetter, &volctrl, &lasterror);
-    if(lasterror != LVM_ENGINE_NO_ERROR) {
-        DebugInt3();
-        return FALSE;
-    }
-
-    //We will not return information about LVM volumes (too dangerous as
-    //they contain extra information in the volume and can be spanned)
-    if(volinfo.Compatibility_Volume == FALSE) {
+    if(lpszVolumeName && lpszVolumeName[0]) {
+         volinfo = OSLibLVMFindVolumeByName(lpszVolumeName, &volctrl, &lasterror);
+    }
+    else volinfo = OSLibLVMFindVolumeByDriveLetter(driveLetter, &volctrl, &lasterror);
+    if(lasterror != LVM_ENGINE_NO_ERROR) {
+        DebugInt3();
         return FALSE;
     }
 
     partctrl = Get_Partitions(volctrl.Volume_Handle, &lasterror);
-    if(lasterror != LVM_ENGINE_NO_ERROR) {
+    if(lasterror != LVM_ENGINE_NO_ERROR || partctrl.Count == 0) {
         return FALSE;
     }
@@ -445 +442 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibLVMGetVolumeExtents(ULONG driveLetter, PVOLUME_DISK_EXTENTS pVolExtent)
+BOOL OSLibLVMGetVolumeExtents(ULONG driveLetter, LPSTR lpszVolumeName, PVOLUME_DISK_EXTENTS pVolExtent,
+                              BOOL *pfLVMVolume)
 {
     Volume_Information_Record  volinfo;
     Volume_Control_Record      volctrl;
+    Drive_Control_Array        diskinfo;
     Partition_Information_Array partctrl;
     CARDINAL32                 lasterror;
-
-    volinfo = OSLibLVMFindVolumeFromDriveLetter(driveLetter, &volctrl, &lasterror);
-    if(lasterror != LVM_ENGINE_NO_ERROR) {
-        DebugInt3();
-        return FALSE;
-    }
-    //We will not return information about LVM volumes (too dangerous as
-    //they contain extra information in the volume and can be spanned)
-    if(volinfo.Compatibility_Volume == FALSE) {
+    BOOL                       ret = TRUE;
+
+    if(lpszVolumeName && lpszVolumeName[0]) {
+         volinfo = OSLibLVMFindVolumeByName(lpszVolumeName, &volctrl, &lasterror);
+    }
+    else volinfo = OSLibLVMFindVolumeByDriveLetter(driveLetter, &volctrl, &lasterror);
+    if(lasterror != LVM_ENGINE_NO_ERROR) {
+        DebugInt3();
         return FALSE;
     }
 
     partctrl = Get_Partitions(volctrl.Volume_Handle, &lasterror);
-    if(lasterror != LVM_ENGINE_NO_ERROR) {
+    if(lasterror != LVM_ENGINE_NO_ERROR || partctrl.Count == 0) {
         return FALSE;
     }
@@ -475 +473 @@
     pVolExtent->Extents[0].ExtentLength.u.LowPart    = partctrl.Partition_Array[0].Usable_Partition_Size << 9;
 
+    dprintf(("pVolExtent->NumberOfDiskExtents       %d", pVolExtent->NumberOfDiskExtents));
+    dprintf(("pVolExtent->Extents[0].DiskNumber     %d",  pVolExtent->Extents[0].DiskNumber));
+    dprintf(("pVolExtent->Extents[0].StartingOffset %08x%08x", pVolExtent->Extents[0].StartingOffset.u.HighPart, pVolExtent->Extents[0].StartingOffset.u.LowPart));
+    dprintf(("pVolExtent->Extents[0].ExtentLength   %08x%08x", pVolExtent->Extents[0].ExtentLength.u.HighPart, pVolExtent->Extents[0].ExtentLength.u.LowPart));
+
+    //find number of disk on which this volume is located
+    diskinfo = Get_Drive_Control_Data(&lasterror);
+    if(lasterror != LVM_ENGINE_NO_ERROR) {
+        return FALSE;
+    }
+    for(int i=0;i<diskinfo.Count;i++) {
+        if(diskinfo.Drive_Control_Data[i].Drive_Handle == partctrl.Partition_Array[0].Drive_Handle) {
+            pVolExtent->Extents[0].DiskNumber = diskinfo.Drive_Control_Data[i].Drive_Number;
+            break;
+        }
+    }
+    if(i == diskinfo.Count) {
+        ret = FALSE;
+    }
+    if(pfLVMVolume) {
+        *pfLVMVolume = (volinfo.Compatibility_Volume == FALSE);
+    }
+    Free_Engine_Memory((ULONG)diskinfo.Drive_Control_Data);
     Free_Engine_Memory((ULONG)partctrl.Partition_Array);
-    return TRUE;
+    return ret;
 }
 //******************************************************************************
@@ -487 +508 @@
     CARDINAL32                 lasterror;
 
-    volinfo = OSLibLVMFindVolumeFromName((char *)lpszVolume, &volctrl, &lasterror);
+    volinfo = OSLibLVMFindVolumeByName((char *)lpszVolume, &volctrl, &lasterror);
     if(lasterror != LVM_ENGINE_NO_ERROR) {
         DebugInt3();
@@ -512 +533 @@
 }
 //******************************************************************************
+// OSLibLVMQueryDriveFromVolumeName
+//
+//   Returns:
+//            - drive letter corresponding to volume name
+//            - -1 if volume wasn't found
+//            - 0 if volume is present, but not mounted
+//   
 //******************************************************************************
 CHAR OSLibLVMQueryDriveFromVolumeName(LPCSTR lpszVolume)
@@ -519 +547 @@
     CARDINAL32                 lasterror;
 
-    volinfo = OSLibLVMFindVolumeFromName((char *)lpszVolume, NULL, &lasterror);
-    if(lasterror != LVM_ENGINE_NO_ERROR) {
-        DebugInt3();
-        return 0;
+    volinfo = OSLibLVMFindVolumeByName((char *)lpszVolume, NULL, &lasterror);
+    if(lasterror != LVM_ENGINE_NO_ERROR) {
+        DebugInt3();
+        return -1;  //not found
     }
     return volinfo.Current_Drive_Letter;
@@ -533 +561 @@
     CARDINAL32                lasterror;
 
-    volinfo = OSLibLVMFindVolumeFromName(lpszVolume, NULL, &lasterror);
+    volinfo = OSLibLVMFindVolumeByName(lpszVolume, NULL, &lasterror);
     if(lasterror != LVM_ENGINE_NO_ERROR) {
         DebugInt3();
@@ -551 +579 @@
     int                        i;
 
-    volinfo = OSLibLVMFindVolumeFromName(lpszVolume, &volctrl, &lasterror);
+    volinfo = OSLibLVMFindVolumeByName(lpszVolume, &volctrl, &lasterror);
     if(lasterror != LVM_ENGINE_NO_ERROR) {
         DebugInt3();
@@ -576 +604 @@
     //We only support drive letters as mountpoint names
     if('A' <= *lpszVolumeMountPoint && *lpszVolumeMountPoint <= 'Z') {
-        drive = *lpszVolumeMountPoint - 'A' + 1;
+        drive = *lpszVolumeMountPoint - 'A';
     }
     else
     if('a' <= *lpszVolumeMountPoint && *lpszVolumeMountPoint <= 'z') {
-        drive = *lpszVolumeMountPoint - 'a' + 1;
+        drive = *lpszVolumeMountPoint - 'a';
     }
     else {
@@ -592 +620 @@
     CARDINAL32                lasterror;
 
-    volinfo = OSLibLVMFindVolumeFromDriveLetter(drive, NULL, &lasterror);
+    volinfo = OSLibLVMFindVolumeByDriveLetter(drive, NULL, &lasterror);
     if(lasterror != LVM_ENGINE_NO_ERROR) {
         DebugInt3();
@@ -603 +631 @@
 //******************************************************************************
 //******************************************************************************
-
+BOOL OSLibLVMStripVolumeName(LPCSTR lpszWin32VolumeName, LPSTR lpszOS2VolumeName, DWORD cchBufferLength)
+{
+    int length;
+
+    //strip volume name prefix (\\\\?\\Volume\\)
+    length = strlen(lpszWin32VolumeName);
+
+    strncpy(lpszOS2VolumeName, &lpszWin32VolumeName[sizeof(VOLUME_NAME_PREFIX)-1+1], cchBufferLength-1);  //-zero term + starting '{'
+    length -= sizeof(VOLUME_NAME_PREFIX)-1+1;
+    if(lpszOS2VolumeName[length-2] == '}') 
+    {
+        lpszOS2VolumeName[length-2] = 0;
+        return TRUE;
+    }
+    else
+    if(lpszOS2VolumeName[length-1] == '}') 
+    {
+        lpszOS2VolumeName[length-1] = 0;
+        return TRUE;
+    }
+    return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+