Changeset 21916 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/hmdisk.cpp (modified) (18 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/hmdisk.cpp

@@ -18 +18 @@
 #include "hmdisk.h"
 #include "mmap.h"
-#include <win\winioctl.h>
-#include <win\ntddscsi.h>
-#include <win\wnaspi32.h>
+#include <win/winioctl.h>
+#include <win/ntddscsi.h>
+#include <win/wnaspi32.h>
 #include "oslibdos.h"
 #include "osliblvm.h"
@@ -43 +43 @@
 typedef struct
 {
-    BOOL      fCDIoSupported;    
+    BOOL      fCDIoSupported;
     ULONG     driveLetter;
     ULONG     driveType;
@@ -163 +163 @@
     szDrive[2] = '\0';
 
-    //if volume name, query 
-    if(!strncmp(lpFileName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1)) 
+    //if volume name, query
+    if(!strncmp(lpFileName, VOLUME_NAME_PREFIX, sizeof(VOLUME_NAME_PREFIX)-1))
     {
         int length;
@@ -171 +171 @@
             return ERROR_FILE_NOT_FOUND;    //not allowed
         }
-        if(OSLibLVMStripVolumeName(lpFileName, szVolumeName, sizeof(szVolumeName))) 
+        if(OSLibLVMStripVolumeName(lpFileName, szVolumeName, sizeof(szVolumeName)))
         {
             BOOL fLVMVolume;
@@ -184 +184 @@
                 return ERROR_FILE_NOT_FOUND;    //not found
             }
-            if(szDrive[0] == 0) 
+            if(szDrive[0] == 0)
             {
                 //volume isn't mounted
-                
+
                 //Note: this only works on Warp 4.5 and up
-                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber+1); 
+                sprintf(szDiskName, "\\\\.\\Physical_Disk%d", volext.Extents[0].DiskNumber+1);
                 fPhysicalDisk    = TRUE;
                 dwPhysicalDiskNr = volext.Extents[0].DiskNumber + 1;
@@ -211 +211 @@
         else return ERROR_FILE_NOT_FOUND;
     }
-    else 
-    if(strncmp(lpFileName, "\\\\.\\PHYSICALDRIVE", 17) == 0) 
+    else
+    if(strncmp(lpFileName, "\\\\.\\PHYSICALDRIVE", 17) == 0)
     {
         if(!fPhysicalDiskAccess) {
@@ -304 +304 @@
         drvInfo->fLocked   = FALSE;
 
-        //save volume start & length if volume must be accessed through the physical disk 
+        //save volume start & length if volume must be accessed through the physical disk
         //(no other choice for unmounted volumes)
         drvInfo->fPhysicalDisk    = fPhysicalDisk;
@@ -348 +348 @@
         if(pHMHandleData->hHMHandle && drvInfo->dwShare == 0) {
             dprintf(("Locking drive"));
-            if(OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            if(OSLibDosDevIOCtl(pHMHandleData->hHMHandle,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0))
             {
                 dprintf(("Sharing violation while attempting to lock the drive"));
@@ -411 +411 @@
         if(hFile && drvInfo->dwShare == 0) {
             dprintf(("Locking drive"));
-            if(OSLibDosDevIOCtl(hFile,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0)) 
+            if(OSLibDosDevIOCtl(hFile,IOCTL_DISK,DSK_LOCKDRIVE,0,0,0,0,0,0))
             {
                 dprintf(("Sharing violation while attempting to lock the drive"));
@@ -522 +522 @@
 {
 #ifdef DEBUG
-    char *msg = NULL;
+    const char *msg = NULL;
 
     switch(dwIoControlCode)
@@ -890 +890 @@
         //label has changed
         //TODO: Find better way to determine if floppy was removed or switched
-        if(drvInfo->driveType != DRIVE_FIXED) 
+        if(drvInfo->driveType != DRIVE_FIXED)
         {
             rc = OSLibDosQueryVolumeSerialAndName(1 + drvInfo->driveLetter - 'A', &volumelabel, NULL, 0);
@@ -1439 +1439 @@
         return (ret == ERROR_SUCCESS);
     }
-   
+
     case IOCTL_CDROM_RAW_READ:
     {
 #pragma pack(1)
-       struct 
+       struct
        {
         ULONG       ID_code;
@@ -1497 +1497 @@
 
         if(lpBytesReturned) {
-            *lpBytesReturned = dwDataSize; 
+            *lpBytesReturned = dwDataSize;
         }
 
@@ -1633 +1633 @@
     case IOCTL_SCSI_GET_CAPABILITIES:
     {
-        PIO_SCSI_CAPABILITIES pPacket = (PIO_SCSI_CAPABILITIES)lpOutBuffer; 
+        PIO_SCSI_CAPABILITIES pPacket = (PIO_SCSI_CAPABILITIES)lpOutBuffer;
 
         if(nOutBufferSize < sizeof(IO_SCSI_CAPABILITIES) ||
@@ -1677 +1677 @@
             return FALSE;
         }
-        
+
         if(!drvInfo || drvInfo->fCDIoSupported == FALSE) {
             dprintf(("os2cdrom.dmd CD interface not supported!!"));
@@ -1842 +1842 @@
         if((nNumberOfBytesToRead+offset) & 0xfff)
             nrpages++;
-    
+
         map->commitRange((ULONG)lpBuffer, offset & ~0xfff, TRUE, nrpages);
         map->Release();
@@ -2106 +2106 @@
         if((nNumberOfBytesToWrite+offset) & 0xfff)
             nrpages++;
-    
+
         map->commitRange((ULONG)lpBuffer, offset & ~0xfff, TRUE, nrpages);
         map->Release();
@@ -2202 +2202 @@
 
     dprintf2(("KERNEL32: HMDeviceDiskClass::GetFileSize %s(%08xh,%08xh)\n",
-              lpHMDeviceName, pHMHandleData, lpdwFileSizeHigh)); 
+              lpHMDeviceName, pHMHandleData, lpdwFileSizeHigh));
 
     //If we didn't get an OS/2 handle for the disk before, get one now

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk