Changeset 7034 for trunk/src/kernel32/oslibdos.cpp

Timestamp:

Oct 12, 2001, 11:10:01 PM (24 years ago)

Author:

achimha

Message:

use bounce buffer if end of buffer crosses boundary, not start

File:

• trunk/src/kernel32/oslibdos.cpp (modified) (4 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.77 2001-10-12 18:10:59 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.78 2001-10-12 21:10:01 achimha Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2591 +2591 @@
   
   // bounce buffer support
-  if ( (DWORD)pTiledParm > MEM_TILED_CEILING)
+  // make sure no parameter or data buffer can pass the tiled memory region
+  // barrier (usually 512MB). OS/2 kernel does not correctly translate these
+  // addresses to a 16:16 address used in device driver land. In fact,
+  // DosDevIOCtl is not a high memory enabled API!
+
+  if (pTiledParm && (((DWORD)pTiledParm + max(dwParmMaxLen, *pdwParmLen)) > MEM_TILED_CEILING))
   {
     rc = DosAllocMem(&pTiledParm, dwParmMaxLen, PAG_READ | PAG_WRITE);
@@ -2600 +2605 @@
   }
   
-  if ( (DWORD)pTiledData > MEM_TILED_CEILING)
+  if (pTiledData && (((DWORD)pTiledData + max(dwDataMaxLen, *pdwDataLen)) > MEM_TILED_CEILING))
   {
     rc = DosAllocMem(&pTiledData, dwDataMaxLen, PAG_READ | PAG_WRITE);
@@ -2631 +2636 @@
     DosFreeMem(pTiledData);
   
-  SetLastError(error2WinError(rc,ERROR_INVALID_HANDLE));
+  SetLastError(error2WinError(rc, ERROR_INVALID_HANDLE));
   return (DWORD)rc;
 }