Changeset 18584

Timestamp:

Feb 28, 2002, 8:27:48 PM (23 years ago)

Author:

sandervl

Message:

PF: Implemented IOCTL_DISK_IS_WRITABLE ioctl & fixes writing to floppy (DASD mode)

Location:

tags/trunk/src/kernel32

Files:

• hmdisk.cpp (modified) (10 diffs)
• oslibdos.h (modified) (2 diffs)

tags/trunk/src/kernel32/hmdisk.cpp ¶

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.39 2002-02-27 15:23:06 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.40 2002-02-28 19:27:48 sandervl Exp $ */
 
 /*
@@ -331 +331 @@
 
   ret = OSLibDosDevIOCtl(pHMHandleData->hHMHandle,
-                         0x08,       // IOCTL_DISK
-                         0x40,       // DSK_UNLOCKEJECTMEDIA
+                         IOCTL_DISK,
+                         DSK_UNLOCKEJECTMEDIA,
                          &ParameterBlock,
                          sizeof( ParameterBlock ),
@@ -398 +398 @@
     case IOCTL_DISK_GET_DRIVE_GEOMETRY:
         msg = "IOCTL_DISK_GET_DRIVE_GEOMETRY";
+        break;
+    case IOCTL_DISK_IS_WRITABLE:
+        msg = "IOCTL_DISK_IS_WRITABLE";
         break;
     case IOCTL_DISK_GET_DRIVE_LAYOUT:
@@ -576 +579 @@
         break;
 
+    case IOCTL_DISK_IS_WRITABLE:
+    {
+        APIRET rc;
+        DWORD ret;
+        ULONG  ulBytesRead    = 0;      /* Number of bytes read by DosRead */
+        ULONG  ulWrote        = 0;      /* Number of bytes written by DosWrite */
+        ULONG  ulLocal        = 0;      /* File pointer position after DosSetFilePtr */
+        UCHAR  uchFileData[1] = {'0'};    /* Data to write to file */
+
+        if(!pHMHandleData->hHMHandle) 
+        {
+            pHMHandleData->hHMHandle = OpenDisk(drvInfo);
+            if(!pHMHandleData->hHMHandle) {
+                dprintf(("No disk inserted; aborting"));
+                SetLastError(ERROR_NOT_READY);
+                return FALSE;
+            }
+        }
+        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0);
+          
+        ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
+
+        /* Read the first byte of the disk */
+        rc = OSLibDosRead(pHMHandleData->hHMHandle,    /* File Handle */
+                          uchFileData,                 /* String to be read */
+                          1L,                          /* Length of string to be read */
+                          &ulBytesRead);               /* Bytes actually read */
+
+        if (rc == 0)
+        {
+            dprintf(("IOCTL_DISK_IS_WRITABLE:OSLibDosRead failed with rc %08xh %x", rc,GetLastError()));
+            SetLastError(ERROR_ACCESS_DENIED);
+            goto writecheckfail;
+        }
+
+        /* Move the file pointer back */
+        rc = OSLibDosSetFilePtr (pHMHandleData->hHMHandle,           /* File Handle */
+                                 -1,OSLIB_SETPTR_FILE_CURRENT);
+        if (rc == -1)
+        {
+            dprintf(("IOCTL_DISK_IS_WRITABLE:OSLibDosSetFilePtr failed with rc %d", rc));
+            SetLastError(ERROR_ACCESS_DENIED);
+            goto writecheckfail;
+        }
+  
+        rc =  OSLibDosWrite(pHMHandleData->hHMHandle,   /* File handle */
+                            (PVOID) uchFileData,        /* String to be written */
+                            1,                          /* Size of string to be written */
+                            &ulWrote);                  /* Bytes actually written */
+
+        dprintf2(("IOCTL_DISK_IS_WRITABLE:OSLibDosWrite returned with rc %x %x", rc,GetLastError()));
+        if (rc == 0)
+        {
+           if (GetLastError() == ERROR_WRITE_PROTECT)
+           {
+               SetLastError(ERROR_WRITE_PROTECT);
+               goto writecheckfail;
+           }
+        }
+        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
+        SetErrorMode(oldmode);
+        SetLastError(ERROR_SUCCESS);
+        return TRUE;
+
+writecheckfail:
+        OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
+        SetErrorMode(oldmode);
+        return FALSE;
+    }
     case IOCTL_DISK_GET_DRIVE_GEOMETRY:
     case IOCTL_STORAGE_GET_MEDIA_TYPES:
@@ -600 +672 @@
             }
         }
-
+        
         //Applications can use this IOCTL to check if the floppy has been changed
         //OSLibDosGetDiskGeometry won't fail when that happens so we read the
@@ -975 +1047 @@
         parm.ucCommandInfo = 0;
         parm.usDriveUnit = drvInfo->driveLetter - 'A';
-        //IOCTL_DISK (0x08), DSK_GETLOCKSTATUS (0x66)
 //            rc = OSLibDosDevIOCtl(pHMHandleData->hHMHandle, 0x08, 0x66, &parm, sizeof(parm), &parsize,
         //TODO: this doesn't work for floppies for some reason...
-        rc = OSLibDosDevIOCtl(-1, 0x08, 0x66, &parm, sizeof(parm), &parsize,
+        rc = OSLibDosDevIOCtl(-1, IOCTL_DISK, DSK_GETLOCKSTATUS, &parm, sizeof(parm), &parsize,
                               &status, sizeof(status), &datasize);
         if(rc != NO_ERROR) {
@@ -1360 +1431 @@
   BOOL         bRC;
 
-  dprintf2(("KERNEL32: HMDeviceDiskClass::WriteFile %s(%08x,%08x,%08x,%08x,%08x) - stub?\n",
+   dprintf2(("KERNEL32: HMDeviceDiskClass::WriteFile %s(%08x,%08x,%08x,%08x,%08x) - stub?\n",
            lpHMDeviceName,
            pHMHandleData,
@@ -1388 +1459 @@
   }
   if(!(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && lpOverlapped) {
-    dprintf(("Warning: lpOverlapped != NULL & !FILE_FLAG_OVERLAPPED; sync operation"));
+      dprintf(("Warning: lpOverlapped != NULL & !FILE_FLAG_OVERLAPPED; sync operation"));
   }
   if(lpCompletionRoutine) {
@@ -1429 +1500 @@
   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!!"));
@@ -1439 +1512 @@
 //  }
 
+  OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_UNLOCKDRIVE,0,0,0,0,0,0);
   dprintf2(("KERNEL32: HMDeviceDiskClass::WriteFile returned %08xh\n",
            bRC));

tags/trunk/src/kernel32/oslibdos.h ¶

@@ -1 @@
-/* $Id: oslibdos.h,v 1.43 2002-01-04 14:11:23 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.44 2002-02-28 19:27:48 sandervl Exp $ */
 
 /*
@@ -213 +213 @@
 DWORD OSLibDosQueryVolumeFS(int drive, LPSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
 DWORD OSLibDosQueryVolumeSerialAndName(int drive, LPDWORD lpVolumeSerialNumber, LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize);
+
+/* Disk/Diskette Control */
+
+#ifndef __OS2_H__
+#define IOCTL_DISK                         8
+
+#define DSK_LOCKDRIVE                      0x0000
+#define DSK_UNLOCKDRIVE                    0x0001
+#define DSK_REDETERMINEMEDIA               0x0002
+#define DSK_SETLOGICALMAP                  0x0003
+#define DSK_BEGINFORMAT                    0X0004
+#define DSK_BLOCKREMOVABLE                 0x0020
+#define DSK_GETLOGICALMAP                  0x0021
+#define DSK_UNLOCKEJECTMEDIA               0X0040
+#define DSK_SETDEVICEPARAMS                0x0043
+#define DSK_WRITETRACK                     0x0044
+#define DSK_FORMATVERIFY                   0x0045
+#define DSK_DISKETTECONTROL                0X005D
+#define DSK_QUERYMEDIASENSE                0X0060
+#define DSK_GETDEVICEPARAMS                0x0063
+#define DSK_READTRACK                      0x0064
+#define DSK_VERIFYTRACK                    0x0065
+#define DSK_GETLOCKSTATUS                  0X0066
+#endif
+
 DWORD OSLibDosDevIOCtl( DWORD hFile, DWORD dwCat, DWORD dwFunc,
                         PVOID pParm, DWORD dwParmMaxLen, DWORD *pdwParmLen,