Changeset 7585 for trunk/src

Timestamp:

Dec 8, 2001, 5:06:49 PM (24 years ago)

Author:

sandervl

Message:

Clear GENERIC_WRITE flag if application tries to open readonly device (e.g. cdrom). This is not allowed in OS/2

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.36 2001-12-08 14:28:53 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.37 2001-12-08 16:06:49 sandervl Exp $ */
 
 /*
@@ -108 +108 @@
     HFILE hFile;
     HFILE hTemplate;
+    DWORD dwDriveType;
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::CreateFile %s(%s,%08x,%08x,%08x)\n",
@@ -121 +122 @@
         return ERROR_INVALID_PARAMETER;
     }
-  
+
+    dwDriveType = GetDriveTypeA(lpFileName);
+
     //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
     //OS/2 fails in that case with error ERROR_NOT_READY
@@ -132 +135 @@
                                pHMHandleData->dwFlags,
                                hTemplate);
+
+    //It is not allowed to open a readonly device with GENERIC_WRITE in OS/2; 
+    //try with readonly again if that happened
+    //NOTE: Some applications open it with GENERIC_WRITE as Windows 2000 requires
+    //      this for some aspi functions
+    if(hFile == INVALID_HANDLE_ERROR && dwDriveType == DRIVE_CDROM && 
+       (pHMHandleData->dwAccess & GENERIC_WRITE)) 
+    {
+        pHMHandleData->dwAccess &= ~GENERIC_WRITE;
+        hFile = OSLibDosCreateFile((LPSTR)lpFileName,
+                                   pHMHandleData->dwAccess,
+                                   pHMHandleData->dwShare,
+                                   (LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                                   pHMHandleData->dwCreation,
+                                   pHMHandleData->dwFlags,
+                                   hTemplate);
+    }
     SetErrorMode(oldmode);
 
@@ -164 +184 @@
         }
 
-        drvInfo->driveType = GetDriveTypeA(lpFileName);
+        drvInfo->driveType = dwDriveType;
         if(drvInfo->driveType == DRIVE_CDROM) 
         {