Changeset 5398 for trunk/src/kernel32

Timestamp:

Mar 29, 2001, 7:39:51 PM (24 years ago)

Author:

sandervl

Message:

CreateFile fix for disks

File:

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

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.4 2000-11-14 14:27:02 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.5 2001-03-29 17:39:51 sandervl Exp $ */
 
 /*
@@ -65 +65 @@
 //TODO: PHYSICALDRIVEn!!
 //******************************************************************************
-DWORD HMDeviceDiskClass::CreateFile (LPCSTR lpFileName,
-                          PHMHANDLEDATA pHMHandleData,
-                          PVOID         lpSecurityAttributes,
-                          PHMHANDLEDATA pHMHandleDataTemplate)
-{
-  HFILE hFile;
-  HFILE hTemplate;
-
-  dprintf2(("KERNEL32: HMDeviceDiskClass::CreateFile %s(%s,%08x,%08x,%08x)\n",
-           lpHMDeviceName,
-           lpFileName,
-           pHMHandleData,
-           lpSecurityAttributes,
-           pHMHandleDataTemplate));
-
-  if(strncmp(lpFileName,       // "support" for local unc names
+DWORD HMDeviceDiskClass::CreateFile (LPCSTR        lpFileName,
+                                     PHMHANDLEDATA pHMHandleData,
+                                     PVOID         lpSecurityAttributes,
+                                     PHMHANDLEDATA pHMHandleDataTemplate)
+{
+    HFILE hFile;
+    HFILE hTemplate;
+
+    dprintf2(("KERNEL32: HMDeviceDiskClass::CreateFile %s(%s,%08x,%08x,%08x)\n",
+             lpHMDeviceName,
+             lpFileName,
+             pHMHandleData,
+             lpSecurityAttributes,
+             pHMHandleDataTemplate));
+
+    //TODO: check in NT if CREATE_ALWAYS is allowed!!
+    if(pHMHandleData->dwCreation != OPEN_EXISTING) {
+        dprintf(("Invalid creation flags %x!!", pHMHandleData->dwCreation));
+        return ERROR_INVALID_PARAMETER;
+    }
+    if(strncmp(lpFileName,       // "support" for local unc names
              "\\\\.\\",
              4) == 0)
-  {
+    {
         lpFileName+=4;
-  }
-
-  hFile = OSLibDosCreateFile((LPSTR)lpFileName,
-                             pHMHandleData->dwAccess,
-                             pHMHandleData->dwShare,
-                             (LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
-                             pHMHandleData->dwCreation,
-                             pHMHandleData->dwFlags,
-                             hTemplate);
-
-  if (hFile != INVALID_HANDLE_ERROR)
-  {
+    }
+
+    //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
+    OSLibDosDisableHardError(TRUE);
+    hFile = OSLibDosCreateFile((LPSTR)lpFileName,
+                               pHMHandleData->dwAccess,
+                               pHMHandleData->dwShare,
+                               (LPSECURITY_ATTRIBUTES)lpSecurityAttributes,
+                               pHMHandleData->dwCreation,
+                               pHMHandleData->dwFlags,
+                               hTemplate);
+    OSLibDosDisableHardError(FALSE);
+
+    if (hFile != INVALID_HANDLE_ERROR || GetLastError() == ERROR_NOT_READY)
+    {
+        if(hFile == INVALID_HANDLE_ERROR) SetLastError(NO_ERROR);
+
         pHMHandleData->hHMHandle  = hFile;
-    pHMHandleData->dwUserData = GetDriveTypeA(lpFileName);
+        pHMHandleData->dwUserData = GetDriveTypeA(lpFileName);
         return (NO_ERROR);
-  }
-  else {
-    dprintf(("CreateFile failed; error %d", GetLastError()));
+    }
+    else {
+        dprintf(("CreateFile failed; error %d", GetLastError()));
         return(GetLastError());
-  }
+    }
 }
 //******************************************************************************
@@ -110 +121 @@
 DWORD HMDeviceDiskClass::CloseHandle(PHMHANDLEDATA pHMHandleData)
 {
-  return OSLibDosClose(pHMHandleData->hHMHandle);
+    if(pHMHandleData->hHMHandle) {
+        return OSLibDosClose(pHMHandleData->hHMHandle);
+    }
+    return TRUE;
 }
 //******************************************************************************
@@ -119 +133 @@
                              LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
 {
-   switch(dwIoControlCode)
-   {
+    switch(dwIoControlCode)
+    {
     case FSCTL_DELETE_REPARSE_POINT:
     case FSCTL_DISMOUNT_VOLUME:
@@ -161 +175 @@
 
     case IOCTL_SCSI_GET_ADDRESS:
-        {
-         HINSTANCE hInstAspi;
-     DWORD (WIN32API *GetASPI32SupportInfo)();
-         DWORD (CDECL *SendASPI32Command)(LPSRB lpSRB);
-         DWORD numAdapters, rc;
-         SRB   srb;
-         int   i, j, k;
-
-            if(!lpOutBuffer || nOutBufferSize < 8) {
+    {
+        HINSTANCE hInstAspi;
+        DWORD (WIN32API *GetASPI32SupportInfo)();
+        DWORD (CDECL *SendASPI32Command)(LPSRB lpSRB);
+        DWORD numAdapters, rc;
+        SRB   srb;
+        int   i, j, k;
+
+        if(!lpOutBuffer || nOutBufferSize < 8) {
             SetLastError(ERROR_INSUFFICIENT_BUFFER);  //todo: right error?
-                    return(FALSE);
+            return(FALSE);
         }
         SCSI_ADDRESS *addr = (SCSI_ADDRESS *)lpOutBuffer;
@@ -223 +237 @@
         SetLastError(ERROR_INVALID_PARAMETER); //todo
         return FALSE;
-        }
+    }
 
     case IOCTL_SCSI_RESCAN_BUS:
@@ -231 +245 @@
         break;
 
-   }
-   dprintf(("HMDeviceDiskClass::DeviceIoControl: unimplemented dwIoControlCode=%08lx\n", dwIoControlCode));
-   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-   return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
+    }
+    dprintf(("HMDeviceDiskClass::DeviceIoControl: unimplemented dwIoControlCode=%08lx\n", dwIoControlCode));
+    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+    return FALSE;
+}
+//******************************************************************************
+//******************************************************************************