Changeset 8980 for trunk/src

Timestamp:

Aug 9, 2002, 3:17:22 PM (23 years ago)

Author:

sandervl

Message:

Lock drive when sharing is disabled (CreateFile for drives); unlock when closed

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.51 2002-08-08 15:38:23 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.52 2002-08-09 13:17:22 sandervl Exp $ */
 
 /*
@@ -54 +54 @@
     BOOL      fCDPlaying;
     BOOL      fShareViolation;
+    DWORD     fLocked;
     LARGE_INTEGER StartingOffset;
     LARGE_INTEGER PartitionSize;
@@ -280 +281 @@
         drvInfo->dwFlags   = pHMHandleData->dwFlags;
         drvInfo->hTemplate = hTemplate;
+        drvInfo->fLocked   = FALSE;
 
         //save volume start & length if volume must be accessed through the physical disk 
@@ -318 +320 @@
         {
             SetFilePointer(pHMHandleData, 0, NULL, FILE_BEGIN);
+        }
+        //If the disk handle was valid, then we must lock it if the drive
+        //was opened without share flags
+        if(pHMHandleData->hHMHandle && drvInfo->dwShare == 0) {
+            dprintf(("Locking drive"));
+            if(OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            {
+                dprintf(("Sharing violation while attempting to lock the drive"));
+                OSLibDosClose(pHMHandleData->hHMHandle);
+                free(drvInfo);
+                return ERROR_SHARING_VIOLATION;
+            }
+            drvInfo->fLocked = TRUE;
         }
         return (NO_ERROR);
@@ -368 +383 @@
         }
         OSLibDosQueryVolumeSerialAndName(1 + drvInfo->driveLetter - 'A', &drvInfo->dwVolumelabel, NULL, 0);
+
+        //If the disk handle was valid, then we must lock it if the drive
+        //was opened without share flags
+        if(hFile && drvInfo->dwShare == 0) {
+            dprintf(("Locking drive"));
+            if(OSLibDosDevIOCtl(hFile,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            {
+                dprintf(("Sharing violation while attempting to lock the drive"));
+                OSLibDosClose(hFile);
+                return 0;
+            }
+            drvInfo->fLocked = TRUE;
+        }
         return hFile;
     }
@@ -379 +407 @@
 
     if(pHMHandleData->hHMHandle) {
+        DRIVE_INFO *drvInfo = (DRIVE_INFO*)pHMHandleData->dwUserData;
+        if(drvInfo && drvInfo->fLocked) {
+            dprintf(("Unlocking drive"));
+            OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
+        }
         ret = OSLibDosClose(pHMHandleData->hHMHandle);
     }
@@ -727 +760 @@
         }
 
-        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0);
-
         ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
 
@@ -768 +799 @@
            }
         }
-        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
         SetErrorMode(oldmode);
         SetLastError(ERROR_SUCCESS);
@@ -774 +804 @@
 
 writecheckfail:
-        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
         SetErrorMode(oldmode);
         return FALSE;
@@ -843 +872 @@
             if(rc) {
                 dprintf(("IOCTL_DISK_GET_DRIVE_GEOMETRY: OSLibDosQueryVolumeSerialAndName failed with rc %d", GetLastError()));
-                if(pHMHandleData->hHMHandle) OSLibDosClose(pHMHandleData->hHMHandle);
+                if(pHMHandleData->hHMHandle) {
+                    if(drvInfo->fLocked) {
+                        dprintf(("Unlocking drive"));
+                        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
+                        drvInfo->fLocked = FALSE;
+                    }
+                    OSLibDosClose(pHMHandleData->hHMHandle);
+                }
                 pHMHandleData->hHMHandle = 0;
                 SetLastError(ERROR_MEDIA_CHANGED);
@@ -1891 +1927 @@
     else  lpRealBuf = (LPVOID)lpBuffer;
 
-    OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0);
-
     if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
         dprintf(("ERROR: Overlapped IO not yet implememented!!"));
@@ -1903 +1937 @@
 //  }
 
-    OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
     dprintf2(("KERNEL32: HMDeviceDiskClass::WriteFile returned %08xh\n",
                bRC));