Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/mmapdup.cpp

    r10073 r21916  
    2828#include <stdlib.h>
    2929#include <string.h>
    30 #include <win\virtual.h>
     30#include <win/virtual.h>
    3131#include <odincrt.h>
    3232#include <handlemanager.h>
    … …  
    3434#include "oslibdos.h"
    3535#include "oslibmem.h"
    36 #include <winimagepeldr.h>
    37 #include <custombuild.h> 
     36#include "winimagepeldr.h"
     37#include <custombuild.h>
    3838
    3939#define DBG_LOCALLOG    DBG_mmapdup
    … …  
    4848//
    4949//******************************************************************************
    50 Win32MemMapDup::Win32MemMapDup(Win32MemMap *parent, HANDLE hFile, ULONG size, 
     50Win32MemMapDup::Win32MemMapDup(Win32MemMap *parent, HANDLE hFile, ULONG size,
    5151                               ULONG fdwProtect, LPSTR lpszName) :
    5252          Win32MemMap(hFile, size, fdwProtect, lpszName)
    … …  
    123123    if((fdwAccess & FILE_MAP_READ) && !(mProtFlags & (PAGE_READWRITE|PAGE_READONLY)))
    124124        goto parmfail;
    125    
     125
    126126    if (fdwAccess != FILE_MAP_ALL_ACCESS)
    127127        if((fdwAccess & FILE_MAP_COPY) && !(mProtFlags & PAGE_WRITECOPY))
    … …  
    222222BOOL Win32MemMapDup::commitPage(ULONG ulFaultAddr, ULONG offset, BOOL fWriteAccess, int nrpages)
    223223{
    224     if(mProtFlags & PAGE_WRITECOPY) 
     224    if(mProtFlags & PAGE_WRITECOPY)
    225225    {//this is a COW map, call commitGuardPage
    226226        return commitGuardPage(ulFaultAddr, offset, fWriteAccess);
    … …  
    245245//
    246246//******************************************************************************
    247 BOOL Win32MemMapDup::commitGuardPage(ULONG ulFaultAddr, ULONG ulOffset, 
     247BOOL Win32MemMapDup::commitGuardPage(ULONG ulFaultAddr, ULONG ulOffset,
    248248                                     BOOL fWriteAccess)
    249249{
Note: See TracChangeset for help on using the changeset viewer.