Changeset 657 for trunk/src/kernel32/os2native.cpp

Timestamp:

Aug 24, 1999, 2:23:54 PM (26 years ago)

Author:

sandervl

Message:

VirtualQuery implemented + preliminary memory mapped code

File:

• trunk/src/kernel32/os2native.cpp (modified) (12 diffs)

trunk/src/kernel32/os2native.cpp

@@ -1 @@
-/* $Id: os2native.cpp,v 1.5 1999-08-22 11:11:10 sandervl Exp $ */
+/* $Id: os2native.cpp,v 1.6 1999-08-24 12:23:24 sandervl Exp $ */
 
 /*
@@ -8 +8 @@
  * Copyright 1998 Peter FitzSimmons
  *
+ *
+ * TODO: VirtualProtectEx/VirtualQueryEx don't work for different processes!
+ * TODO: SetLastError should be called!
+ * TODO: WRITECOPY type not properly supported (never return as flag when queried)
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -37 +41 @@
 #define PAGE_GUARD            0x100
 #define PAGE_NOCACHE          0x200
-#define MEM_COMMIT           0x1000
-#define MEM_RESERVE          0x2000
-#define MEM_DECOMMIT         0x4000
-#define MEM_RELEASE          0x8000
-#define MEM_TOP_DOWN       0x100000             //Ignored
+
+#define MEM_COMMIT              0x00001000
+#define MEM_RESERVE             0x00002000
+#define MEM_DECOMMIT            0x00004000
+#define MEM_RELEASE             0x00008000
+#define MEM_FREE                0x00010000
+#define MEM_PRIVATE             0x00020000
+#define MEM_MAPPED              0x00040000
+#define MEM_TOP_DOWN            0x00100000
+
+#define SEC_FILE                0x00800000
+#define SEC_IMAGE               0x01000000
+#define SEC_RESERVE             0x04000000
+#define SEC_COMMIT              0x08000000
+#define SEC_NOCACHE             0x10000000
+
+#ifndef PAGE_SIZE
+#define PAGE_SIZE 4096
+#endif
 
 extern ULONG flAllocMem;    /* Tue 03.03.1998: knut */
@@ -81 +99 @@
   if(fdwProtect & PAGE_READONLY)     flag |= PAG_READ;
   if(fdwProtect & PAGE_READWRITE)    flag |= (PAG_READ | PAG_WRITE);
-  if(fdwProtect & PAGE_EXECUTE_READ) flag |= PAG_EXECUTE;
+  if(fdwProtect & PAGE_WRITECOPY)    flag |= (PAG_READ | PAG_WRITE);
+
+  if(fdwProtect & PAGE_EXECUTE_READWRITE) flag |= (PAG_EXECUTE | PAG_WRITE | PAG_READ);
+  if(fdwProtect & PAGE_EXECUTE_READ) flag |= (PAG_EXECUTE | PAG_READ);
+  if(fdwProtect & PAGE_EXECUTE)      flag |= PAG_EXECUTE;
+
   if(fdwProtect & PAGE_GUARD)        flag |= PAG_GUARD;
 
   //just do this if other options are used
-  if(!(flag & (PAG_READ | PAG_WRITE | PAG_EXECUTE)) || flag == 0)
+  if(!(flag & (PAG_READ | PAG_WRITE | PAG_EXECUTE)) || flag == 0) {
+        dprintf(("VirtualAlloc: Unknown protection flags, default to read/write"));
         flag |= PAG_READ | PAG_WRITE;
+  }
 
   if(fdwAllocationType & MEM_COMMIT && lpvAddress != NULL) {
@@ -168 +193 @@
 //******************************************************************************
 BOOL WIN32API VirtualProtect(LPVOID lpvAddress, DWORD cbSize, DWORD fdwNewProtect,
-                                DWORD *pfdwOldProtect)
+                             DWORD *pfdwOldProtect)
 {
  APIRET rc;
@@ -188 +213 @@
   if(pageFlags & PAG_READ && !(pageFlags & PAG_WRITE))
         *pfdwOldProtect |= PAGE_READONLY;
-  if(pageFlags & (PAG_READ | PAG_WRITE))
+  if(pageFlags & (PAG_WRITE))
         *pfdwOldProtect |= PAGE_READWRITE;
+
+  if(pageFlags & (PAG_WRITE | PAG_EXECUTE))
+        *pfdwOldProtect |= PAGE_EXECUTE_READWRITE;
+  else
   if(pageFlags & PAG_EXECUTE)
         *pfdwOldProtect |= PAGE_EXECUTE_READ;
+
   if(pageFlags & PAG_GUARD)
         *pfdwOldProtect |= PAGE_GUARD;
@@ -198 +228 @@
   if(fdwNewProtect & PAGE_READONLY)     pageFlags |= PAG_READ;
   if(fdwNewProtect & PAGE_READWRITE)    pageFlags |= (PAG_READ | PAG_WRITE);
-  if(fdwNewProtect & PAGE_EXECUTE_READ) pageFlags |= PAG_EXECUTE;
+  if(fdwNewProtect & PAGE_WRITECOPY)    pageFlags |= (PAG_READ | PAG_WRITE);
+  if(fdwNewProtect & PAGE_EXECUTE_READ) pageFlags |= (PAG_EXECUTE | PAG_READ);
   if(fdwNewProtect & PAGE_EXECUTE_READWRITE)
-        pageFlags |= (PAG_EXECUTE | PAG_WRITE);
+        pageFlags |= (PAG_EXECUTE | PAG_WRITE | PAG_READ);
+  if(fdwNewProtect & PAGE_EXECUTE_WRITECOPY)
+        pageFlags |= (PAG_EXECUTE | PAG_WRITE | PAG_READ);
   if(fdwNewProtect & PAGE_GUARD)        pageFlags |= PAG_GUARD;
 //Not supported in OS/2??
@@ -224 +257 @@
 }
 //******************************************************************************
-#define PMEMORY_BASIC_INFORMATION void *
 //******************************************************************************
 DWORD WIN32API VirtualQuery(LPVOID lpvAddress, PMEMORY_BASIC_INFORMATION pmbiBuffer,
-                               DWORD cbLength)
-{
-  dprintf(("VirtualQuery - stub\n"));
-  return(0);
+                            DWORD cbLength)
+{
+ ULONG  cbRangeSize, dAttr;
+ APIRET rc;
+
+  if(lpvAddress == NULL || pmbiBuffer == NULL || cbLength == 0) {
+        return 0;
+  }
+  cbRangeSize = cbLength;
+  rc = DosQueryMem(lpvAddress, &cbRangeSize, &dAttr);
+  if(rc) {
+        dprintf(("VirtualQuery - DosQueryMem %x %x returned %d\n", lpvAddress, cbLength, rc));
+        return 0;
+  }
+  memset(pmbiBuffer, 0, sizeof(MEMORY_BASIC_INFORMATION));
+  pmbiBuffer->BaseAddress = lpvAddress;
+  pmbiBuffer->RegionSize  = cbRangeSize;
+  if(dAttr & PAG_READ && !(dAttr & PAG_WRITE))
+        pmbiBuffer->Protect |= PAGE_READONLY;
+  if(dAttr & PAG_WRITE)
+        pmbiBuffer->Protect |= PAGE_READWRITE;
+
+  if(dAttr & (PAG_WRITE | PAG_EXECUTE))
+        pmbiBuffer->Protect |= PAGE_EXECUTE_READWRITE;
+  else
+  if(dAttr & PAG_EXECUTE)
+        pmbiBuffer->Protect |= PAGE_EXECUTE_READ;
+
+  if(dAttr & PAG_GUARD)
+        pmbiBuffer->Protect |= PAGE_GUARD;
+
+  if(dAttr & PAG_FREE)
+        pmbiBuffer->State = MEM_FREE;
+  else
+  if(dAttr & PAG_COMMIT)
+        pmbiBuffer->State = MEM_COMMIT;
+  else  pmbiBuffer->State = MEM_RESERVE;
+  
+  if(!(dAttr & PAG_SHARED))
+        pmbiBuffer->Type = MEM_PRIVATE;
+
+  //TODO: This is not correct: AllocationProtect should contain the protection
+  //      flags used in the initial call to VirtualAlloc
+  pmbiBuffer->AllocationProtect = pmbiBuffer->Protect;
+  if(dAttr & PAG_BASE) {
+        pmbiBuffer->AllocationBase = lpvAddress;
+  }
+  else {
+        while(lpvAddress > 0) {
+                rc = DosQueryMem(lpvAddress, &cbRangeSize, &dAttr);
+                if(rc) {
+                        dprintf(("VirtualQuery - DosQueryMem %x %x returned %d\n", lpvAddress, cbLength, rc));
+                        break;
+                }
+                if(dAttr & PAG_BASE) {
+                        pmbiBuffer->AllocationBase = lpvAddress;
+                        break;
+                }
+                lpvAddress = (LPVOID)((ULONG)lpvAddress - PAGE_SIZE);
+        }
+  }
+  return sizeof(MEMORY_BASIC_INFORMATION);
 }
 //******************************************************************************
@@ -307 +397 @@
                                   LPDWORD pfdwOldProtect)
 {
-  dprintf(("KERNEL32: VirtualProtectEx(%08x,%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+  dprintf(("KERNEL32: VirtualProtectEx(%08x,%08xh,%08xh,%08xh,%08xh) not implemented for different processes.\n",
            hProcess,
            lpvAddress,
@@ -314 +404 @@
            pfdwOldProtect));
 
-  return (FALSE);
+  return VirtualProtect(lpvAddress, cbSize, fdwNewProtect, pfdwOldProtect);
 }
 
@@ -339 +429 @@
                                  DWORD   cbLength)
 {
-  dprintf(("KERNEL32: VirtualQueryEx(%08x,%08xh,%08xh,%08xh) not implemented.\n",
+  dprintf(("KERNEL32: VirtualQueryEx(%08x,%08xh,%08xh,%08xh) not implemented for different processes.\n",
            hProcess,
            lpvAddress,
@@ -345 +435 @@
            cbLength));
 
-  return (0);
-}
-
+  return VirtualQuery(lpvAddress, pmbiBuffer, cbLength);
+}
+