Changeset 6029 for trunk/src

Timestamp:

Jun 16, 2001, 6:10:13 PM (24 years ago)

Author:

sandervl

Message:

disk updates

Location:

trunk/src/kernel32

Files:

• hmdisk.cpp (modified) (7 diffs)
• hmdisk.h (modified) (2 diffs)
• oslibdos.cpp (modified) (3 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.7 2001-05-23 17:00:44 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.8 2001-06-16 16:10:12 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <misc.h>
 #include "hmdisk.h"
+#include "mmap.h"
 #include "oslibdos.h"
 #include <win\winioctl.h>
@@ -111 +112 @@
         }
         else pHMHandleData->hHMHandle  = hFile;
-        
-        pHMHandleData->dwUserData = GetDriveTypeA(lpFileName);
+
+        pHMHandleData->dwUserData = *lpFileName; //save drive letter
+        if(pHMHandleData->dwUserData >= 'a') {
+            pHMHandleData->dwUserData = pHMHandleData->dwUserData - ((int)'a' - (int)'A');
+        }
         return (NO_ERROR);
     }
@@ -288 +292 @@
     case IOCTL_DISK_EJECT_MEDIA:
     case IOCTL_DISK_FORMAT_TRACKS:
+    case IOCTL_DISK_GET_DRIVE_LAYOUT:
+        break;
+
     case IOCTL_DISK_GET_DRIVE_GEOMETRY:
-    case IOCTL_DISK_GET_DRIVE_LAYOUT:
     case IOCTL_DISK_GET_MEDIA_TYPES:
+    {
+        PDISK_GEOMETRY pGeom = (PDISK_GEOMETRY)lpOutBuffer;
+        if(nOutBufferSize < sizeof(DISK_GEOMETRY)) {
+            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            return FALSE;
+        }
+        if(lpBytesReturned) {
+            *lpBytesReturned = 0;
+        }
+        if(OSLibDosGetDiskGeometry(pHMHandleData->dwUserData, pGeom) == FALSE) {
+            return FALSE;
+        }
+        if(lpBytesReturned) {
+            *lpBytesReturned = sizeof(DISK_GEOMETRY);
+        }
+        return TRUE;
+    }
+
     case IOCTL_DISK_GET_PARTITION_INFO:
     case IOCTL_DISK_LOAD_MEDIA:
@@ -356 +380 @@
         srb.common.SRB_Cmd = SC_HA_INQUIRY;
         rc = SendASPI32Command(&srb);
+
+        char drivename[3];
+        drivename[0] = (char)pHMHandleData->dwUserData;
+        drivename[1] = ':';
+        drivename[2] = 0;
 
         for(i=0;i<LOBYTE(numAdapters);i++) {
@@ -368 +397 @@
                     if(rc == SS_COMP) {
                         if(srb.devtype.SRB_DeviceType == SS_DEVTYPE_CDROM &&
-                                                   pHMHandleData->dwUserData == DRIVE_CDROM)
+                           GetDriveTypeA(drivename) == DRIVE_CDROM)
                         {
                             goto done;
@@ -402 +431 @@
     return FALSE;
 }
-//******************************************************************************
-//******************************************************************************
+/*****************************************************************************
+ * Name      : BOOL HMDeviceDiskClass::ReadFile
+ * Purpose   : read data from handle / device
+ * Parameters: PHMHANDLEDATA pHMHandleData,
+ *             LPCVOID       lpBuffer,
+ *             DWORD         nNumberOfBytesToRead,
+ *             LPDWORD       lpNumberOfBytesRead,
+ *             LPOVERLAPPED  lpOverlapped
+ * Variables :
+ * Result    : Boolean
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Wed, 1998/02/11 20:44]
+ *****************************************************************************/
+
+BOOL HMDeviceDiskClass::ReadFile(PHMHANDLEDATA pHMHandleData,
+                                 LPCVOID       lpBuffer,
+                                 DWORD         nNumberOfBytesToRead,
+                                 LPDWORD       lpNumberOfBytesRead,
+                                 LPOVERLAPPED  lpOverlapped)
+{
+  LPVOID       lpRealBuf;
+  Win32MemMap *map;
+  DWORD        offset, bytesread;
+  BOOL         bRC;
+
+  dprintf2(("KERNEL32: HMDeviceDiskClass::ReadFile %s(%08x,%08x,%08x,%08x,%08x) - stub?\n",
+           lpHMDeviceName,
+           pHMHandleData,
+           lpBuffer,
+           nNumberOfBytesToRead,
+           lpNumberOfBytesRead,
+           lpOverlapped));
+
+  //SvL: It's legal for this pointer to be NULL
+  if(lpNumberOfBytesRead)
+    *lpNumberOfBytesRead = 0;
+  else
+    lpNumberOfBytesRead = &bytesread;
+
+  if((pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && !lpOverlapped) {
+    dprintf(("FILE_FLAG_OVERLAPPED flag set, but lpOverlapped NULL!!"));
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+  }
+  if(!(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) && lpOverlapped) {
+    dprintf(("Warning: lpOverlapped != NULL & !FILE_FLAG_OVERLAPPED; sync operation"));
+  }
+
+  //SvL: DosRead doesn't like writing to memory addresses returned by
+  //     DosAliasMem -> search for original memory mapped pointer and use
+  //     that one + commit pages if not already present
+  map = Win32MemMapView::findMapByView((ULONG)lpBuffer, &offset, MEMMAP_ACCESS_WRITE);
+  if(map) {
+    lpRealBuf = (LPVOID)((ULONG)map->getMappingAddr() + offset);
+    DWORD nrpages = nNumberOfBytesToRead/4096;
+    if(offset & 0xfff)
+        nrpages++;
+    if(nNumberOfBytesToRead & 0xfff)
+        nrpages++;
+
+    map->commitPage(offset & ~0xfff, TRUE, nrpages);
+  }
+  else  lpRealBuf = (LPVOID)lpBuffer;
+
+  if(pHMHandleData->dwFlags & FILE_FLAG_OVERLAPPED) {
+    dprintf(("ERROR: Overlapped IO not yet implememented!!"));
+  }
+//  else {
+    bRC = OSLibDosRead(pHMHandleData->hHMHandle,
+                           (PVOID)lpRealBuf,
+                           nNumberOfBytesToRead,
+                           lpNumberOfBytesRead);
+//  }
+
+  if(bRC == 0) {
+      dprintf(("KERNEL32: HMDeviceDiskClass::ReadFile returned %08xh %x", bRC, GetLastError()));
+      dprintf(("%x -> %d", lpBuffer, IsBadWritePtr((LPVOID)lpBuffer, nNumberOfBytesToRead)));
+  }
+
+  return bRC;
+}
+/*****************************************************************************
+ * Name      : DWORD HMDeviceDiskClass::SetFilePointer
+ * Purpose   : set file pointer
+ * Parameters: PHMHANDLEDATA pHMHandleData
+ *             LONG          lDistanceToMove
+ *             PLONG         lpDistanceToMoveHigh
+ *             DWORD         dwMoveMethod
+ * Variables :
+ * Result    : API returncode
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Wed, 1999/06/17 20:44]
+ *****************************************************************************/
+
+DWORD HMDeviceDiskClass::SetFilePointer(PHMHANDLEDATA pHMHandleData,
+                                        LONG          lDistanceToMove,
+                                        PLONG         lpDistanceToMoveHigh,
+                                        DWORD         dwMoveMethod)
+{
+  DWORD ret;
+
+  dprintf2(("KERNEL32: HMDeviceDiskClass::SetFilePointer %s(%08xh,%08xh,%08xh,%08xh)\n",
+           lpHMDeviceName,
+           pHMHandleData,
+           lDistanceToMove,
+           lpDistanceToMoveHigh,
+           dwMoveMethod));
+
+  ret = OSLibDosSetFilePointer(pHMHandleData->hHMHandle,
+                               lDistanceToMove,
+                               (DWORD *)lpDistanceToMoveHigh,
+                               dwMoveMethod);
+
+  if(ret == -1) {
+    dprintf(("SetFilePointer failed (error = %d)", GetLastError()));
+  }
+  return ret;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/hmdisk.h

@@ -1 @@
-/* $Id: hmdisk.h,v 1.3 2001-04-26 13:22:45 sandervl Exp $ */
+/* $Id: hmdisk.h,v 1.4 2001-06-16 16:10:12 sandervl Exp $ */
 
 #ifndef __HMDISK_H__
@@ -32 +32 @@
   virtual BOOL   CloseHandle(PHMHANDLEDATA pHMHandleData);
 
+  /* this is a handler method for calls to ReadFile() */
+  virtual BOOL   ReadFile   (PHMHANDLEDATA pHMHandleData,
+                             LPCVOID       lpBuffer,
+                             DWORD         nNumberOfBytesToRead,
+                             LPDWORD       lpNumberOfBytesRead,
+                             LPOVERLAPPED  lpOverlapped);
+
+  /* this is a handler method for calls to SetFilePointer() */
+  virtual DWORD SetFilePointer(PHMHANDLEDATA pHMHandleData,
+                               LONG          lDistanceToMove,
+                               PLONG         lpDistanceToMoveHigh,
+                               DWORD         dwMoveMethod);
+
   /* this is a handler method for calls to DeviceIoControl() */
   virtual BOOL   DeviceIoControl    (PHMHANDLEDATA pHMHandleData, DWORD dwIoControlCode,

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.64 2001-06-12 17:03:33 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.65 2001-06-16 16:10:12 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -27 +27 @@
 #include <win32api.h>
 #include <winconst.h>
+#include <win\winioctl.h>
 #include <misc.h>
 #include "initterm.h"
@@ -2339 +2340 @@
 }
 //******************************************************************************
+//******************************************************************************
+BOOL  OSLibDosGetDiskGeometry(DWORD cDisk, PVOID pdiskgeom)
+{
+   PDISK_GEOMETRY pGeom = (PDISK_GEOMETRY)pdiskgeom;
+   BYTE  param[2] = {0, 0};
+   ULONG parsize = 2;
+   BIOSPARAMETERBLOCK bpb;
+   ULONG datasize = sizeof(bpb);
+   APIRET rc;
+
+   param[1] = cDisk - 'A';
+   rc = DosDevIOCtl(-1, IOCTL_DISK, DSK_GETDEVICEPARAMS, param, 2, &parsize, &bpb, sizeof(bpb), &datasize);
+   if(rc == 0)
+   {
+        pGeom->SectorsPerTrack   = bpb.usSectorsPerTrack;
+        pGeom->BytesPerSector    = bpb.usBytesPerSector;
+        pGeom->TracksPerCylinder = 80;  //TODO:!!!!!
+        pGeom->Cylinders.u.LowPart  = bpb.cCylinders;
+        pGeom->Cylinders.u.HighPart = 0;
+        switch(bpb.bDeviceType) {
+        case DEVTYPE_48TPI:
+            pGeom->MediaType = F5_360_512;  //?????
+            break;
+        case DEVTYPE_96TPI:
+            pGeom->MediaType = F5_1Pt2_512; //?????
+            break;
+        case DEVTYPE_35:
+            pGeom->MediaType = F3_720_512;
+            break;
+        case DEVTYPE_8SD:
+        case DEVTYPE_8DD:
+            pGeom->MediaType = RemovableMedia;
+            break;
+        case DEVTYPE_FIXED:
+            pGeom->MediaType = FixedMedia;
+            break;
+        case DEVTYPE_TAPE:
+            pGeom->MediaType = RemovableMedia;
+            break;
+        case DEVTYPE_UNKNOWN: //others, include 1.44 3.5 inch disk drive
+            pGeom->MediaType = F3_1Pt44_512;
+            break;
+        case 8: //RW optical disk
+            pGeom->MediaType = RemovableMedia;
+            break;
+        case 9: //2.88 3.5 inch disk
+            pGeom->MediaType = F3_2Pt88_512;
+            break;
+        }
+        SetLastError(ERROR_SUCCESS_W);
+        return TRUE;
+   }
+   SetLastError(error2WinError(rc));
+   return FALSE;
+}
+//******************************************************************************
 //Returns bit map where with the mapping of the logical drives
 //******************************************************************************

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.29 2001-06-12 17:03:34 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.30 2001-06-16 16:10:13 sandervl Exp $ */
 
 /*
@@ -216 +216 @@
 ULONG OSLibGetLogicalDrives();
 ULONG OSLibDosQueryCurrentDisk();
+
+BOOL  OSLibDosGetDiskGeometry(DWORD cDisk, void *pGeom);
 
 #ifdef OS2DEF_INCLUDED