Changeset 21916 for trunk/src/kernel32/oslibmem.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/oslibmem.cpp (modified) (11 diffs)

trunk

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

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

trunk/src/kernel32/oslibmem.cpp

@@ -31 +31 @@
 #include <win32api.h>
 #include <winconst.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include <dbglog.h>
 #include <vmutex.h>
@@ -91 +91 @@
         tmp = allocrecords;
         while(tmp->next) {
-            if(tmp->next->baseaddr > baseaddr) {      
+            if(tmp->next->baseaddr > baseaddr) {
                 break;
             }
@@ -121 +121 @@
         tmp = allocrecords;
         while(tmp->next) {
-            if(tmp->next->baseaddr == baseaddr) {      
+            if(tmp->next->baseaddr == baseaddr) {
                 break;
             }
@@ -181 +181 @@
     DWORD pAlias = (DWORD)*ppbAlias;
 
-    while(pAlias < (DWORD)*ppbAlias + cb) 
+    while(pAlias < (DWORD)*ppbAlias + cb)
     {
         rc = DosQueryMem((PVOID)pAlias, &size, &attr);
@@ -189 +189 @@
             return rc;
         }
-        //Don't bother if the pages are not committed. DosSetMem will return 
-        //ERROR_ACCESS_DENIED. 
+        //Don't bother if the pages are not committed. DosSetMem will return
+        //ERROR_ACCESS_DENIED.
         if(attr & PAG_COMMIT) {
             rc = DosSetMem((PVOID)pAlias, size, fl);
@@ -325 +325 @@
         fMemFlags = 0;
     }
-    
+
     /*
      * Let's try use the extended DosAllocMem API of Win32k.sys.
@@ -358 +358 @@
     }
     // already 64k aligned ?
-    if((ULONG) pvMemAddr & 0xFFFF) 
+    if((ULONG) pvMemAddr & 0xFFFF)
     {
         ULONG addr64kb;
@@ -371 +371 @@
             return rc;
         }
-        
+
         PVOID baseAddr = (PVOID)addr64kb; // sunlover20040613: save returned address for a possible Free on failure
-        
+
         dprintf(("Allocate aligned memory %x -> %x", addr64kb, (addr64kb + 0xFFFF) & ~0xFFFF));
 
@@ -409 +409 @@
 
     *lpAttr = 0;
-    
+
     if(FindAllocRec((ULONG)lpMemAddr, &ulBase, &ulSize, lpAttr) == TRUE) {
         return (PVOID)ulBase;
     }
-    
+
     ulSize = PAGE_SIZE;
     rc = DosQueryMem(lpMemAddr, &ulSize, &ulAttr);
@@ -463 +463 @@
 
     //Find base within previous 64kb (alignment can add filler pages)
-    for(int i=0;i<16;i++) {
+    int i;
+    for(i=0;i<16;i++) {
         rc = DosQueryMem((PVOID)ulAddr, &ulSize, &ulAttr);
         if(rc != NO_ERROR) {
@@ -482 +483 @@
     }
     FreeAllocRec((ULONG)lpMemAddr);
-    
+
     RasRemoveObject (rthVirtual, (ULONG)lpMemAddr);
 

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