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

Timestamp:

Apr 13, 2002, 9:47:24 AM (23 years ago)

Author:

bird

Message:

Moved the cdrom hot fix a bit to prevent memory leaks.

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.98 2002-04-13 07:41:31 bird Exp $ */
+/* $Id: oslibdos.cpp,v 1.99 2002-04-13 07:47:24 bird Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2967 +2967 @@
   BOOL  flagTiledData = FALSE;
 
-#define MEM_TILED_CEILING 0x1fffffff
-
-  // bounce buffer support
-  // 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);
-    if (rc)
-      goto _exit_ioctl;
-
-    flagTiledParm = TRUE;
-  }
-
-  if (pTiledData && (((DWORD)pTiledData + max(dwDataMaxLen, *pdwDataLen)) > MEM_TILED_CEILING))
-  {
-    rc = DosAllocMem(&pTiledData, dwDataMaxLen, PAG_READ | PAG_WRITE);
-    if (rc)
-        goto _exit_ioctl;
-
-    flagTiledData = TRUE;
-  }
-
-  // copy data from real buffers to
-  // bounce buffers if necessary
-  if (pTiledParm != pParm)
-    memcpy(pTiledParm, pParm, *pdwParmLen);
-
-  if (pTiledData != pData)
-    memcpy(pTiledData, pData, *pdwDataLen);
-
 #if 1
     /*
@@ -3054 +3020 @@
 
 #endif
+
+#define MEM_TILED_CEILING 0x1fffffff
+
+  // bounce buffer support
+  // 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);
+    if (rc)
+      goto _exit_ioctl;
+
+    flagTiledParm = TRUE;
+  }
+
+  if (pTiledData && (((DWORD)pTiledData + max(dwDataMaxLen, *pdwDataLen)) > MEM_TILED_CEILING))
+  {
+    rc = DosAllocMem(&pTiledData, dwDataMaxLen, PAG_READ | PAG_WRITE);
+    if (rc)
+        goto _exit_ioctl;
+
+    flagTiledData = TRUE;
+  }
+
+  // copy data from real buffers to
+  // bounce buffers if necessary
+  if (pTiledParm != pParm)
+    memcpy(pTiledParm, pParm, *pdwParmLen);
+
+  if (pTiledData != pData)
+    memcpy(pTiledData, pData, *pdwDataLen);
+
 
   rc = DosDevIOCtl( (HFILE)hFile, dwCat, dwFunc,