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

Timestamp:

Jul 13, 2002, 5:58:21 PM (23 years ago)

Author:

sandervl

Message:

moved OS2 memory functions into seperate file

File:

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

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.106 2002-06-26 11:08:47 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.107 2002-07-13 15:58:20 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -424 +424 @@
 }
 //******************************************************************************
-//TODO: Assumes entire memory range has the same protection flags!
-//TODO: Check if this works for code aliases...
-//******************************************************************************
-DWORD OSLibDosAliasMem(LPVOID pb, ULONG cb, LPVOID *ppbAlias, ULONG fl)
-{
- DWORD rc;
- DWORD attr;
- DWORD size = cb;
-
-  cb = (cb-1) & ~0xfff;
-  cb+= PAGE_SIZE;
-
-  rc = DosQueryMem(pb, &size, &attr);
-  if(rc) {
-        dprintf(("OSLibDosAliasMem: DosQueryMem %x %x return %d", pb, size, rc));
-        return rc;
-  }
-  size = (size-1) & ~0xfff;
-  size+= PAGE_SIZE;
-  if(size != cb) {
-        dprintf(("ERROR: OSLibDosAliasMem: size != cb (%x!=%x)!!!!!!!!", size, cb));
-        //ignore this and continue return 5;
-        attr = fl; //just use original protection flags (NOT CORRECT)
-  }
-  attr &= (PAG_READ|PAG_WRITE|PAG_EXECUTE|PAG_GUARD|PAG_DEFAULT);
-  if(attr != fl) {
-        rc = DosSetMem(pb, size, fl);
-        if(rc) {
-                dprintf(("OSLibDosAliasMem: DosSetMem %x %x return %d", pb, size, rc));
-                attr = fl;
-                //just continue for now
-                //return rc;
-        }
-  }
-  rc = DosAliasMem(pb, cb, ppbAlias, 2);
-  if(rc) {
-        dprintf(("OSLibDosAliasMem: DosAliasMem %x %x returned %d", pb, cb, rc));
-        return rc;
-  }
-  if(attr != fl) {
-        rc = DosSetMem(pb, size, attr);
-        if(rc) {
-                dprintf(("OSLibDosAliasMem: DosSetMem (2) %x %x return %d", pb, size, rc));
-                return rc;
-        }
-  }
-  return 0;
-}
-//******************************************************************************
-//NT returns addresses aligned at 64k, so we do too.
-//******************************************************************************
-// tries to retrieve an aligned block recursivly
-APIRET OdinAlignMemR(LPVOID *lpMemAddr, DWORD size, DWORD offset, DWORD flags)
-{
-  LPVOID memaddr;
-  APIRET rc, rc2;
-
-  DosEnterCritSec();
-  DosFreeMem(*lpMemAddr);
-  rc2 = DosAllocMem(&memaddr, 64 * 1024 - offset, PAG_READ | flAllocMem);
-  rc  = DosAllocMem(lpMemAddr, size, flags | flAllocMem);
-  DosExitCritSec();
-
-  dprintf2(("OdinAlignMem: DosAllocMem returned %d, %d  and pointers %x, %x for size %x and offset %x", rc, rc2, *lpMemAddr, memaddr, size, offset ));
-
-  if(rc2) {
-    // giving up - return as received
-    return rc;
-  }
-
-  if(rc) {
-    // seems to be out of memory
-    DosFreeMem(memaddr);
-    return rc;
-  }
-
-  if((DWORD) *lpMemAddr & 0xFFFF)
-    rc = OdinAlignMemR(lpMemAddr, size, (DWORD) *lpMemAddr & 0xFFFF, flags);
-
-  DosFreeMem(memaddr);
-  return rc;
-}
-//******************************************************************************
-//******************************************************************************
-DWORD OSLibDosAllocMem(LPVOID *lplpMemAddr, DWORD cbSize, DWORD flFlags)
-{
-    PVOID   pvMemAddr;
-    DWORD   offset;
-    APIRET  rc;
-
-    /*
-     * Let's try use the exteneded DosAllocMem API of Win32k.sys.
-     */
-    if (libWin32kInstalled())
-    {
-        rc = DosAllocMemEx(lplpMemAddr, cbSize, flFlags | flAllocMem | OBJ_ALIGN64K);
-        if (rc != ERROR_NOT_SUPPORTED)  /* This call was stubbed until recently. */
-            return rc;
-    }
-
-    /*
-     * If no or old Win32k fall back to old method.
-     */
-
-    rc = DosAllocMem(&pvMemAddr, cbSize, flFlags | flAllocMem);
-    if(rc) {
-        return rc;
-    }
-
-    // already 64k aligned ?
-    if((DWORD) pvMemAddr & 0xFFFF)
-        rc = OdinAlignMemR(&pvMemAddr, cbSize, (DWORD) pvMemAddr & 0xFFFF, flFlags);
-
-    if(!rc)
-        *lplpMemAddr = pvMemAddr;
-
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
-DWORD OSLibDosFreeMem(LPVOID lpMemAddr)
-{
-  return DosFreeMem(lpMemAddr);
-}
-//******************************************************************************
-//NOTE: If name == NULL, allocated gettable unnamed shared memory
-//OS/2 returns error 123 (invalid name) if the shared memory name includes
-//colons. We need to replace them with underscores.
-//******************************************************************************
-DWORD OSLibDosAllocSharedMem(LPVOID *lplpMemAddr, DWORD size, DWORD flags, LPSTR name)
-{
- APIRET rc;
- char  *sharedmemname = NULL, *tmp;
-
-  if(name) {
-        sharedmemname = (char *)malloc(strlen(name) + 16);
-        strcpy(sharedmemname, "\\SHAREMEM\\");
-        strcat(sharedmemname, name);
-  }
-  else  flags |= OBJ_GETTABLE;
-
-  //SvL: Colons are unacceptable in shared memory names (for whatever reason)
-  tmp = sharedmemname;
-  while(*tmp != 0) {
-        if(*tmp == ':') {
-            *tmp = '_';
-        }
-        tmp++;
-  }
-
-  rc = DosAllocSharedMem(lplpMemAddr, sharedmemname, size, flags);
-  if(name) {
-        free(sharedmemname);
-  }
-  return rc;
-}
-//******************************************************************************
-//NOTE: If name == NULL, assume gettable unnamed shared memory
-//******************************************************************************
-DWORD OSLibDosGetNamedSharedMem(LPVOID *lplpMemAddr, LPSTR name)
-{
- APIRET rc;
- char  *sharedmemname = NULL, *tmp;
-
-  if(name) {
-        sharedmemname = (char *)malloc(strlen(name) + 16);
-        strcpy(sharedmemname, "\\SHAREMEM\\");
-        strcat(sharedmemname, name);
-
-        //SvL: Colons are unacceptable in shared memory names (for whatever reason)
-        tmp = sharedmemname;
-        while(*tmp != 0) {
-            if(*tmp == ':') {
-                *tmp = '_';
-            }
-            tmp++;
-        }
-        rc = DosGetNamedSharedMem(lplpMemAddr, sharedmemname, PAG_READ|PAG_WRITE);
-        if(name) {
-                free(sharedmemname);
-        }
-  }
-  else  rc = DosGetSharedMem((LPVOID)*(DWORD *)lplpMemAddr, PAG_READ|PAG_WRITE);
-
-  return rc;
-}
-//******************************************************************************
-//******************************************************************************
-DWORD OSLibDosQueryMem(LPVOID lpMemAddr, DWORD *lpRangeSize, DWORD *lpAttr)
-{
-  return DosQueryMem(lpMemAddr, lpRangeSize, lpAttr);
-}
-//******************************************************************************
-//******************************************************************************
-DWORD OSLibDosSetMem(LPVOID lpMemAddr, DWORD size, DWORD flags)
-{
- APIRET rc;
-
-  rc = DosSetMem(lpMemAddr, size, flags);
-  switch(rc) {
-        case ERROR_INVALID_ADDRESS:
-                return OSLIB_ERROR_INVALID_ADDRESS;
-        case ERROR_ACCESS_DENIED:
-                return OSLIB_ERROR_ACCESS_DENIED;
-        default:
-                return rc;
-  }
-}
-//******************************************************************************
 //******************************************************************************
 DWORD OSLibDosOpen(char *lpszFileName, DWORD flags)
@@ -642 +433 @@
  char lOemFileName[260];
 
- CharToOemA(lpszFileName, lOemFileName);
-
+  CharToOemA(lpszFileName, lOemFileName);
 
   if(flags & OSLIB_ACCESS_READONLY)