Changeset 9304 for trunk/src

Timestamp:

Sep 27, 2002, 4:35:56 PM (23 years ago)

Author:

sandervl

Message:

FindFirst/NextVolumeA fixes for ignoring LVM volumes

Location:

trunk/src/kernel32

Files:

• disk.cpp (modified) (3 diffs)
• hmdisk.cpp (modified) (2 diffs)
• osliblvm.cpp (modified) (4 diffs)
• osliblvm.h (modified) (2 diffs)

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.38 2002-09-26 16:06:06 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.39 2002-09-27 14:35:56 sandervl Exp $ */
 
 /*
@@ -518 +518 @@
     pVolInfo->lastvol               = 0;
 
-    if(OSLibLVMQueryVolumeName(pVolInfo->hLVMVolumeControlData, pVolInfo->lastvol, szVolume, sizeof(szVolume)) == FALSE) {
+    if(OSLibLVMQueryVolumeName(pVolInfo->hLVMVolumeControlData, &pVolInfo->lastvol, szVolume, sizeof(szVolume)) == FALSE) {
         SetLastError(ERROR_NO_MORE_FILES);
         goto fail;
@@ -580 +580 @@
         return FALSE;
     }
-    if(OSLibLVMQueryVolumeName(pVolInfo->hLVMVolumeControlData, pVolInfo->lastvol, 
+    if(OSLibLVMQueryVolumeName(pVolInfo->hLVMVolumeControlData, &pVolInfo->lastvol, 
                                szVolume, sizeof(szVolume)) == FALSE) {
         SetLastError(ERROR_NO_MORE_FILES);

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.55 2002-09-27 13:58:24 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.56 2002-09-27 14:35:56 sandervl Exp $ */
 
 /*
@@ -2069 +2069 @@
 #if 1
     //Verified in NT4
-    dprintf(("GetFileSize doesn't work for drive objects"));
+    dprintf(("WARNING: GetFileSize doesn't work for drive objects; returning error (same as Windows)"));
     SetLastError(ERROR_INVALID_PARAMETER);
     return -1; //INVALID_SET_FILE_POINTER

trunk/src/kernel32/osliblvm.cpp

@@ -1 @@
-/* $Id: osliblvm.cpp,v 1.3 2002-09-26 16:06:07 sandervl Exp $ */
+/* $Id: osliblvm.cpp,v 1.4 2002-09-27 14:35:56 sandervl Exp $ */
 
 /*
@@ -305 +305 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG volindex, 
+BOOL OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 
                              LPSTR lpszVolumeName, DWORD cchBufferLength)
 {
@@ -316 +316 @@
         return FALSE;
     }
-    if(volindex >= volctrl->Count) {
+    if(*pVolIndex >= volctrl->Count) {
         return FALSE;   //no more volumes
     }
-    while(volindex < volctrl->Count) {
-        volinfo = Get_Volume_Information(volctrl->Volume_Control_Data[volindex].Volume_Handle, &lasterror);
+    while(*pVolIndex < volctrl->Count) {
+        volinfo = Get_Volume_Information(volctrl->Volume_Control_Data[*pVolIndex].Volume_Handle, &lasterror);
         if(lasterror != LVM_ENGINE_NO_ERROR) {
             DebugInt3();
@@ -329 +329 @@
         if(volinfo.Compatibility_Volume == TRUE) break;
         dprintf(("Ignoring LVM volume %s", volinfo.Volume_Name));
-        volindex++;
-    }
-    if(volindex >= volctrl->Count) {
+        (*pVolIndex)++;
+    }
+    if(*pVolIndex >= volctrl->Count) {
         return FALSE;   //no more volumes
     }

trunk/src/kernel32/osliblvm.h

@@ -1 @@
-/* $Id: osliblvm.h,v 1.3 2002-09-26 16:06:07 sandervl Exp $ */
+/* $Id: osliblvm.h,v 1.4 2002-09-27 14:35:56 sandervl Exp $ */
 /*
  * OS/2 LVM (Logical Volume Management) functions
@@ -327 +327 @@
 HANDLE OSLibLVMQueryVolumeControlData();
 void   OSLibLVMFreeVolumeControlData(HANDLE hVolumeControlData);
-BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG volindex, 
+BOOL   OSLibLVMQueryVolumeName(HANDLE hVolumeControlData, ULONG *pVolIndex, 
                                LPSTR lpszVolumeName, DWORD cchBufferLength);