Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[akhaldi] 48985: [CMAKE] - Add regsvr32 to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 4 22:25:29 2010 New Revision: 48985 URL: http://svn.reactos.org/svn/reactos?rev=48985&view=rev Log: [CMAKE] - Add regsvr32 to build. Added: branches/cmake-bringup/importlibs/libfmifs.a (with props) branches/cmake-bringup/importlibs/liblsasrv.a (with props) branches/cmake-bringup/importlibs/libmsi.a (with props) Modified: branches/cmake-bringup/base/system/CMakeLists.txt Modified: branches/cmake-bringup/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/CMake… ============================================================================== --- branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:25:29 2010 @@ -5,7 +5,7 @@ add_subdirectory(format) add_subdirectory(lsass) add_subdirectory(msiexec) -#add_subdirectory(regsvr32) +add_subdirectory(regsvr32) add_subdirectory(rundll32) add_subdirectory(runonce) add_subdirectory(services) Added: branches/cmake-bringup/importlibs/libfmifs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libfmi… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libfmifs.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/liblsasrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liblsa… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/liblsasrv.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/libmsi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libmsi.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

14 years, 2 months

[akhaldi] 48984: [CMAKE] - More work on the base modules. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 4 22:19:49 2010 New Revision: 48984 URL: http://svn.reactos.org/svn/reactos?rev=48984&view=rev Log: [CMAKE] - More work on the base modules. By Alexey Komarov. Added: branches/cmake-bringup/base/system/autochk/CMakeLists.txt (with props) branches/cmake-bringup/base/system/bootok/CMakeLists.txt (with props) branches/cmake-bringup/base/system/expand/CMakeLists.txt (with props) branches/cmake-bringup/base/system/format/CMakeLists.txt (with props) branches/cmake-bringup/base/system/lsass/CMakeLists.txt (with props) branches/cmake-bringup/base/system/msiexec/CMakeLists.txt (with props) branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt (with props) branches/cmake-bringup/base/system/rundll32/CMakeLists.txt (with props) branches/cmake-bringup/base/system/runonce/CMakeLists.txt (with props) branches/cmake-bringup/base/system/services/CMakeLists.txt (with props) branches/cmake-bringup/base/system/smss/CMakeLists.txt (with props) branches/cmake-bringup/base/system/userinit/CMakeLists.txt (with props) branches/cmake-bringup/base/system/winlogon/CMakeLists.txt (with props) branches/cmake-bringup/importlibs/libnotifyhook.a (with props) branches/cmake-bringup/importlibs/librpcrt4.a (with props) branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt (with props) branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt (with props) Modified: branches/cmake-bringup/base/CMakeLists.txt branches/cmake-bringup/base/system/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/CMakeLists.txt branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -3,4 +3,4 @@ #add_subdirectory(services) add_subdirectory(setup) add_subdirectory(shell) -#add_subdirectory(system) +add_subdirectory(system) Modified: branches/cmake-bringup/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/CMake… ============================================================================== --- branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,14 +1,14 @@ -#add_subdirectory(autochk) -#add_subdirectory(bootok) -#add_subdirectory(expand) -#add_subdirectory(format) -#add_subdirectory(lsass) -#add_subdirectory(msiexec) +add_subdirectory(autochk) +add_subdirectory(bootok) +add_subdirectory(expand) +add_subdirectory(format) +add_subdirectory(lsass) +add_subdirectory(msiexec) #add_subdirectory(regsvr32) -#add_subdirectory(rundll32) -#add_subdirectory(runonce) -#add_subdirectory(services) -#add_subdirectory(smss) -#add_subdirectory(userinit) -#add_subdirectory(winlogon) +add_subdirectory(rundll32) +add_subdirectory(runonce) +add_subdirectory(services) +add_subdirectory(smss) +add_subdirectory(userinit) +add_subdirectory(winlogon) Added: branches/cmake-bringup/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/autoc… ============================================================================== --- branches/cmake-bringup/base/system/autochk/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,6 @@ + +add_executable(autochk WIN32 autochk.c autochk.rc) + +set_module_type(autochk nativecui) + +target_link_libraries(autochk mingw_common nt) Propchange: branches/cmake-bringup/base/system/autochk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/booto… ============================================================================== --- branches/cmake-bringup/base/system/bootok/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(bootok bootok.c bootok.rc) + +set_module_type(bootok win32cui) + +add_importlibs(bootok advapi32 msvcrt) Propchange: branches/cmake-bringup/base/system/bootok/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/expand/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expan… ============================================================================== --- branches/cmake-bringup/base/system/expand/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_executable(expand expand.c expand.rc) + +set_module_type(expand win32cui) + +add_importlibs(expand lz32 setupapi user32 msvcrt) Propchange: branches/cmake-bringup/base/system/expand/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… ============================================================================== --- branches/cmake-bringup/base/system/format/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,9 @@ + +include_directories(.) +set_rc_compiler() + +add_executable(format format.c format.rc) + +set_module_type(format win32cui) + +add_importlibs(format ntdll user32 fmifs msvcrt) Propchange: branches/cmake-bringup/base/system/format/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/lsass… ============================================================================== --- branches/cmake-bringup/base/system/lsass/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,10 @@ + +set_unicode() + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +add_executable(lsass lsass.c lsass.rc) + +set_module_type(lsass win32gui) + +add_importlibs(lsass advapi32 lsasrv msvcrt) Propchange: branches/cmake-bringup/base/system/lsass/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,13 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/wine) +add_definitions(-D__WINESRC__) + +add_executable(msiexec + msiexec.c + service.c + rsrc.rc) + +set_module_type(msiexec win32gui) + +add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt) +target_link_libraries(msiexec uuid wine) Propchange: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsv… ============================================================================== --- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,10 @@ + +set_unicode() +include_directories(.) +set_rc_compiler() + +add_executable(regsvr32 regsvr32.c regsvr32.rc) + +set_module_type(regsvr32 win32gui) + +add_importlibs(regsvr32 user32 shell32 ole32 msvcrt) Propchange: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/rundl… ============================================================================== --- branches/cmake-bringup/base/system/rundll32/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/rundll32/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,10 @@ + +set_unicode() +include_directories(.) +set_rc_compiler() + +add_executable(rundll32 rundll32.c rundll32.rc) + +set_module_type(rundll32 win32gui) + +add_importlibs(rundll32 user32 msvcrt) Propchange: branches/cmake-bringup/base/system/rundll32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon… ============================================================================== --- branches/cmake-bringup/base/system/runonce/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,8 @@ + +set_unicode() + +add_executable(runonce runonce.c runonce.rc) + +set_module_type(runonce win32gui) + +add_importlibs(runonce advapi32 user32 msvcrt) Propchange: branches/cmake-bringup/base/system/runonce/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,26 @@ + +set_unicode() +include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +list(APPEND SOURCE + config.c + database.c + driver.c + groupdb.c + rpcserver.c + services.c + services.rc) + +add_executable(services ${CMAKE_CURRENT_BINARY_DIR}/services_services.h.gch ${SOURCE}) + +target_link_libraries(services + svcctl_server + pseh) + +add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE}) + +set_module_type(services win32cui) + +add_importlibs(services user32 advapi32 rpcrt4 msvcrt) + Propchange: branches/cmake-bringup/base/system/services/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/… ============================================================================== --- branches/cmake-bringup/base/system/smss/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,31 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +list(APPEND SOURCE + client.c + debug.c + init.c + initdosdev.c + initenv.c + initheap.c + initmv.c + initobdir.c + initpage.c + initreg.c + initrun.c + initss.c + initwkdll.c + print.c + smapi.c + smapicomp.c + smapiexec.c + smapiquery.c + smss.c + smss.rc) + +add_executable(smss WIN32 ${CMAKE_CURRENT_BINARY_DIR}/smss_smss.h.gch ${SOURCE}) + +add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE}) + +set_module_type(smss nativecui) +add_importlibs(smss ntdll) +target_link_libraries(smss mingw_common nt smlib) Propchange: branches/cmake-bringup/base/system/smss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/useri… ============================================================================== --- branches/cmake-bringup/base/system/userinit/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/userinit/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,11 @@ + +set_unicode() +include_directories(.) +set_rc_compiler() + +add_executable(userinit userinit.c userinit.rc) + +set_module_type(userinit win32gui) + +add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt) +target_link_libraries(userinit wine) Propchange: branches/cmake-bringup/base/system/userinit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/CMakeLists.txt (added) +++ branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,18 @@ + +list(APPEND SOURCE + environment.c + sas.c + screensaver.c + setup.c + winlogon.c + wlx.c + winlogon.rc) + +add_executable(winlogon ${CMAKE_CURRENT_BINARY_DIR}/winlogon_winlogon.h.gch ${SOURCE}) + +add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE}) + +set_module_type(winlogon win32gui) + +add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt) +target_link_libraries(winlogon wine) Propchange: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/importlibs/libnotifyhook.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnot… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libnotifyhook.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/cmake-bringup/importlibs/librpcrt4.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librpc… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/librpcrt4.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -6,6 +6,7 @@ add_subdirectory(freetype) add_subdirectory(fullfat) add_subdirectory(icu4ros) +#add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) Added: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,37 @@ +add_definitions(-DOPT_I386) +add_definitions(-DREAL_IS_FLOAT) +add_definitions(-DNOXFERMEM) +add_definitions(-DHAVE_CONFIG_H) +add_definitions(-DEOVERFLOW=75) +add_definitions(-Dlseek=_lseek) +add_definitions(-Dread=_read) +add_definitions(-Dstrdup=_strdup) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) + +add_library(libmpg123 + compat.c + dct64.c + dct64_i386.c + equalizer.c + feature.c + format.c + frame.c + icy.c + icy2utf8.c + id3.c + index.c + layer1.c + layer2.c + layer3.c + libmpg123.c + ntom.c + optimize.c + parse.c + readers.c + stringbuf.c + synth.c + synth_8bit.c + synth_real.c + synth_s32.c + tabinit.c) Propchange: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -15,6 +15,7 @@ add_subdirectory(lsalib) add_subdirectory(nls) add_subdirectory(ntdllsys) +add_subdirectory(ppcmmu) add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) Added: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ppcmmu/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:19:49 2010 @@ -1,0 +1,9 @@ + +list(APPEND SOURCE dummy.c) + +if(ARCH MATCHES powerpc) +list(APPEND SOURCE + mmuutil.c) +endif(ARCH MATCHES powerpc) + +add_library(ppcmmu ${SOURCE}) Propchange: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[akhaldi] 48983: [CMAKE] - Disable emitting debug info and applying the linker script for now. - Enable explorer build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 4 22:06:46 2010 New Revision: 48983 URL: http://svn.reactos.org/svn/reactos?rev=48983&view=rev Log: [CMAKE] - Disable emitting debug info and applying the linker script for now. - Enable explorer build. Modified: branches/cmake-bringup/base/shell/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Mon Oct 4 22:06:46 2010 @@ -1,4 +1,4 @@ add_subdirectory(cmd) -#add_subdirectory(explorer) +add_subdirectory(explorer) #add_subdirectory(explorer_new) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=489… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Oct 4 22:06:46 2010 @@ -11,7 +11,8 @@ link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -lstdc++ -lsupc++ -lgcc -lmingwex -lmingw32 <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at") +# -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds # Compiler Core add_definitions(-pipe -fms-extensions) @@ -21,7 +22,7 @@ set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") # Debugging (Note: DWARF-4 on 4.5.1 when we ship) -add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) +#add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) # Tuning add_definitions(-march=pentium -mtune=i686)

14 years, 2 months

[gadamopoulos] 48982: [win32k] - Reduce duplicated code in co_UserCreateWindowEx, co_IntSetParent and co_WinPosSetWindowPos - based on wine

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Oct 4 21:44:58 2010 New Revision: 48982 URL: http://svn.reactos.org/svn/reactos?rev=48982&view=rev Log: [win32k] - Reduce duplicated code in co_UserCreateWindowEx, co_IntSetParent and co_WinPosSetWindowPos - based on wine Modified: trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon Oct 4 21:44:58 2010 @@ -114,7 +114,10 @@ IntUnlinkWindow(PWINDOW_OBJECT Wnd); VOID FASTCALL -IntLinkWindow(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndParent, PWINDOW_OBJECT WndPrevSibling); +IntLinkWindow(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndPrevSibling); + +VOID FASTCALL +IntLinkHwnd(PWINDOW_OBJECT Wnd, HWND hWndPrev); PWINDOW_OBJECT FASTCALL IntGetAncestor(PWINDOW_OBJECT Wnd, UINT Type); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Oct 4 21:44:58 2010 @@ -997,17 +997,16 @@ return FALSE; } -VOID FASTCALL + +static VOID FASTCALL IntLinkWnd( PWND Wnd, - PWND WndParent, - PWND WndPrevSibling) /* set to NULL if top sibling */ -{ - Wnd->spwndParent = WndParent; - if ((Wnd->spwndPrev = WndPrevSibling)) - { - /* link after WndPrevSibling */ - if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) + PWND WndInsertAfter) /* set to NULL if top sibling */ +{ + if ((Wnd->spwndPrev = WndInsertAfter)) + { + /* link after WndInsertAfter */ + if ((Wnd->spwndNext = WndInsertAfter->spwndNext)) Wnd->spwndNext->spwndPrev = Wnd; Wnd->spwndPrev->spwndNext = Wnd; @@ -1015,53 +1014,129 @@ else { /* link at top */ - if ((Wnd->spwndNext = WndParent->spwndChild)) + if ((Wnd->spwndNext = Wnd->spwndParent->spwndChild)) Wnd->spwndNext->spwndPrev = Wnd; - - WndParent->spwndChild = Wnd; - } - -} - -/* link the window into siblings and parent. children are kept in place. */ + + Wnd->spwndParent->spwndChild = Wnd; + } +} + +/* + link the window into siblings list + children and parent are kept in place. +*/ VOID FASTCALL IntLinkWindow( PWINDOW_OBJECT Wnd, - PWINDOW_OBJECT WndParent, - PWINDOW_OBJECT WndPrevSibling /* set to NULL if top sibling */ + PWINDOW_OBJECT WndInsertAfter /* set to NULL if top sibling */ ) { - PWINDOW_OBJECT Parent; - IntLinkWnd(Wnd->Wnd, - WndParent->Wnd, - WndPrevSibling ? WndPrevSibling->Wnd : NULL); - - Wnd->spwndParent = WndParent; - if ((Wnd->spwndPrev = WndPrevSibling)) - { - /* link after WndPrevSibling */ - if ((Wnd->spwndNext = WndPrevSibling->spwndNext)) + WndInsertAfter ? WndInsertAfter->Wnd : NULL); + + if ((Wnd->spwndPrev = WndInsertAfter)) + { + /* link after WndInsertAfter */ + if ((Wnd->spwndNext = WndInsertAfter->spwndNext)) Wnd->spwndNext->spwndPrev = Wnd; + Wnd->spwndPrev->spwndNext = Wnd; } else { /* link at top */ - Parent = Wnd->spwndParent; - if ((Wnd->spwndNext = WndParent->spwndChild)) + if ((Wnd->spwndNext = Wnd->spwndParent->spwndChild)) Wnd->spwndNext->spwndPrev = Wnd; - else if (Parent) - { - Parent->spwndChild = Wnd; - return; - } - if(Parent) - { - Parent->spwndChild = Wnd; - } - } - + + Wnd->spwndParent->spwndChild = Wnd; + } +} + + +VOID FASTCALL IntLinkHwnd(PWINDOW_OBJECT Wnd, HWND hWndPrev) +{ + if (hWndPrev == HWND_NOTOPMOST) + { + if (!(Wnd->Wnd->ExStyle & WS_EX_TOPMOST) && + (Wnd->Wnd->ExStyle2 & WS_EX2_LINKED)) return; /* nothing to do */ + Wnd->Wnd->ExStyle &= ~WS_EX_TOPMOST; + hWndPrev = HWND_TOP; /* fallback to the HWND_TOP case */ + } + + IntUnlinkWindow(Wnd); /* unlink it from the previous location */ + + if (hWndPrev == HWND_BOTTOM) + { + /* Link in the bottom of the list */ + PWINDOW_OBJECT WndInsertAfter; + + WndInsertAfter = Wnd->spwndParent->spwndChild; + while( WndInsertAfter && WndInsertAfter->spwndNext) + WndInsertAfter = WndInsertAfter->spwndNext; + + IntLinkWindow(Wnd, WndInsertAfter); + Wnd->Wnd->ExStyle &= ~WS_EX_TOPMOST; + } + else if (hWndPrev == HWND_TOPMOST) + { + /* Link in the top of the list */ + IntLinkWindow(Wnd, NULL); + + Wnd->Wnd->ExStyle |= WS_EX_TOPMOST; + } + else if (hWndPrev == HWND_TOP) + { + /* Link it after the last topmost window */ + PWINDOW_OBJECT WndInsertBefore; + + WndInsertBefore = Wnd->spwndParent->spwndChild; + + if (!(Wnd->Wnd->ExStyle & WS_EX_TOPMOST)) /* put it above the first non-topmost window */ + { + while (WndInsertBefore != NULL && WndInsertBefore->spwndNext != NULL) + { + if (!(WndInsertBefore->Wnd->ExStyle & WS_EX_TOPMOST)) break; + if (WndInsertBefore == Wnd->spwndOwner) /* keep it above owner */ + { + Wnd->Wnd->ExStyle |= WS_EX_TOPMOST; + break; + } + WndInsertBefore = WndInsertBefore->spwndNext; + } + } + + IntLinkWindow(Wnd, WndInsertBefore ? WndInsertBefore->spwndPrev : NULL); + } + else + { + /* Link it after hWndPrev */ + PWINDOW_OBJECT WndInsertAfter; + + WndInsertAfter = UserGetWindowObject(hWndPrev); + /* Are we called with an erroneous handle */ + if(WndInsertAfter == NULL) + { + /* Link in a default position */ + IntLinkHwnd(Wnd, HWND_TOP); + return; + } + + IntLinkWindow(Wnd, WndInsertAfter); + + /* Fix the WS_EX_TOPMOST flag */ + if (!(WndInsertAfter->Wnd->ExStyle & WS_EX_TOPMOST)) + { + Wnd->Wnd->ExStyle &= ~WS_EX_TOPMOST; + } + else + { + if(WndInsertAfter->spwndNext && + WndInsertAfter->spwndNext->Wnd->ExStyle & WS_EX_TOPMOST) + { + Wnd->Wnd->ExStyle |= WS_EX_TOPMOST; + } + } + } } HWND FASTCALL @@ -1096,17 +1171,13 @@ PWINDOW_OBJECT FASTCALL co_IntSetParent(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndNewParent) { - PWINDOW_OBJECT WndOldParent, Sibling, InsertAfter; -// HWND hWnd, hWndNewParent; + PWINDOW_OBJECT WndOldParent; BOOL WasVisible; ASSERT(Wnd); ASSERT(WndNewParent); ASSERT_REFS_CO(Wnd); ASSERT_REFS_CO(WndNewParent); - -// hWnd = Wnd->hSelf; -// hWndNewParent = WndNewParent->hSelf; /* Some applications try to set a child as a parent */ if (IntIsChildWindow(Wnd, WndNewParent)) @@ -1121,10 +1192,6 @@ */ WasVisible = co_WinPosShowWindow(Wnd, SW_HIDE); -// /* Validate that window and parent still exist */ -// if (!IntIsWindow(hWnd) || !IntIsWindow(hWndNewParent)) -// return NULL; - /* Window must belong to current process */ if (Wnd->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) return NULL; @@ -1135,28 +1202,16 @@ if (WndNewParent != WndOldParent) { + /* Unlink the window from the siblings list */ IntUnlinkWindow(Wnd); - InsertAfter = NULL; - if (0 == (Wnd->Wnd->ExStyle & WS_EX_TOPMOST)) - { - /* Not a TOPMOST window, put after TOPMOSTs of new parent */ - Sibling = WndNewParent->spwndChild; - while (NULL != Sibling && 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) - { - InsertAfter = Sibling; - Sibling = Sibling->spwndNext; - } - } - if (NULL == InsertAfter) - { - IntLinkWindow(Wnd, WndNewParent, InsertAfter /*prev sibling*/); - } - else - { -// UserReferenceObject(InsertAfter); - IntLinkWindow(Wnd, WndNewParent, InsertAfter /*prev sibling*/); -// UserDereferenceObject(InsertAfter); - } + + /* Set the new parent */ + Wnd->spwndParent = WndNewParent; + Wnd->Wnd->spwndParent = WndNewParent->Wnd; + + /* Link the window with its new siblings*/ + IntLinkHwnd(Wnd, HWND_TOP); + } /* @@ -1173,24 +1228,7 @@ * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */ - /* - * Validate that the old parent still exist, since it migth have been - * destroyed during the last callbacks to user-mode - */ -// if(WndOldParent) -// { -// if(!IntIsWindow(WndOldParent->hSelf)) -// { -// UserDereferenceObject(WndOldParent); -// return NULL; -// } - - /* don't dereference the window object here, it must be done by the caller - of IntSetParent() */ -// return WndOldParent; -// } - - return WndOldParent;//NULL; + return WndOldParent; } BOOL FASTCALL @@ -1219,7 +1257,7 @@ return TRUE; } -/* unlink the window from siblings and parent. children are kept in place. */ +/* unlink the window from siblings. children and parent are kept in place. */ VOID FASTCALL IntUnlinkWnd(PWND Wnd) { @@ -1232,27 +1270,27 @@ if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) Wnd->spwndParent->spwndChild = Wnd->spwndNext; - Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; -} - - -/* unlink the window from siblings and parent. children are kept in place. */ + Wnd->spwndPrev = Wnd->spwndNext = NULL; +} + + +/* unlink the window from siblings. children and parent are kept in place. */ VOID FASTCALL IntUnlinkWindow(PWINDOW_OBJECT Wnd) { - PWINDOW_OBJECT WndParent = Wnd->spwndParent; - - IntUnlinkWnd(Wnd->Wnd); - - if (Wnd->spwndNext) - Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; - - if (Wnd->spwndPrev) - Wnd->spwndPrev->spwndNext = Wnd->spwndNext; - else if (WndParent && WndParent->spwndChild == Wnd) - WndParent->spwndChild = Wnd->spwndNext; - - Wnd->spwndPrev = Wnd->spwndNext = Wnd->spwndParent = NULL; + + IntUnlinkWnd(Wnd->Wnd); + + if (Wnd->spwndNext) + Wnd->spwndNext->spwndPrev = Wnd->spwndPrev; + + if (Wnd->spwndPrev) + Wnd->spwndPrev->spwndNext = Wnd->spwndNext; + + if (Wnd->spwndParent && Wnd->spwndParent->spwndChild == Wnd) + Wnd->spwndParent->spwndChild = Wnd->spwndNext; + + Wnd->spwndPrev = Wnd->spwndNext = NULL; } BOOL FASTCALL @@ -2037,43 +2075,11 @@ /* Link the window*/ if (NULL != ParentWindow) { - /* link the window into the parent's child list */ + /* link the window into the siblings list */ if ((dwStyle & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) - { - PWINDOW_OBJECT PrevSibling; - - PrevSibling = ParentWindow->spwndChild; - - if(PrevSibling) - { - while (PrevSibling->spwndNext) - PrevSibling = PrevSibling->spwndNext; - } - - /* link window as bottom sibling */ - IntLinkWindow(Window, ParentWindow, PrevSibling /*prev sibling*/); - } + IntLinkHwnd(Window, HWND_BOTTOM); else - { - /* link window as top sibling (but after topmost siblings) */ - PWINDOW_OBJECT InsertAfter, Sibling; - if (!(Cs->dwExStyle & WS_EX_TOPMOST)) - { - InsertAfter = NULL; - Sibling = ParentWindow->spwndChild; - while (Sibling && (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) - { - InsertAfter = Sibling; - Sibling = Sibling->spwndNext; - } - } - else - { - InsertAfter = NULL; - } - - IntLinkWindow(Window, ParentWindow, InsertAfter /* prev sibling */); - } + IntLinkHwnd(Window, HWND_TOP); } /* Send the NCCREATE message */ @@ -2099,7 +2105,6 @@ if (Result == (LRESULT)-1) { DPRINT1("co_UserCreateWindowEx(): WM_CREATE message failed\n"); - IntUnlinkWindow(Window); RETURN((PWND)0); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Oct 4 21:44:58 2010 @@ -1082,79 +1082,8 @@ /* Relink windows. (also take into account shell window in hwndShellWindow) */ if (!(WinPos.flags & SWP_NOZORDER) && WinPos.hwnd != UserGetShellWindow()) { - PWINDOW_OBJECT ParentWindow; - PWINDOW_OBJECT Sibling; - PWINDOW_OBJECT InsertAfterWindow; - - if ((ParentWindow = Window->spwndParent)) - { - if (HWND_TOPMOST == WinPos.hwndInsertAfter) - { - InsertAfterWindow = NULL; - } - else if (HWND_TOP == WinPos.hwndInsertAfter - || HWND_NOTOPMOST == WinPos.hwndInsertAfter) - { - InsertAfterWindow = NULL; - Sibling = ParentWindow->spwndChild; - while ( NULL != Sibling && - 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST) ) - { - InsertAfterWindow = Sibling; - Sibling = Sibling->spwndNext; - } - if (NULL != InsertAfterWindow) - { - UserReferenceObject(InsertAfterWindow); - } - } - else if (WinPos.hwndInsertAfter == HWND_BOTTOM) - { - if(ParentWindow->spwndChild) - { - InsertAfterWindow = ParentWindow->spwndChild; - - if(InsertAfterWindow) - { - while (InsertAfterWindow->spwndNext) - InsertAfterWindow = InsertAfterWindow->spwndNext; - } - - UserReferenceObject(InsertAfterWindow); - } - else - InsertAfterWindow = NULL; - } - else - InsertAfterWindow = IntGetWindowObject(WinPos.hwndInsertAfter); - /* Do nothing if hwndInsertAfter is HWND_BOTTOM and Window is already - the last window */ - if (InsertAfterWindow != Window) - { - IntUnlinkWindow(Window); - IntLinkWindow(Window, ParentWindow, InsertAfterWindow); - } - if (InsertAfterWindow != NULL) - UserDereferenceObject(InsertAfterWindow); - - if ( (HWND_TOPMOST == WinPos.hwndInsertAfter) || - (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) && - NULL != Window->spwndPrev && - 0 != (Window->spwndPrev->Wnd->ExStyle & WS_EX_TOPMOST)) || - (NULL != Window->spwndNext && - 0 != (Window->spwndNext->Wnd->ExStyle & WS_EX_TOPMOST)) ) - { - Window->Wnd->ExStyle |= WS_EX_TOPMOST; - } - else - { - Window->Wnd->ExStyle &= ~ WS_EX_TOPMOST; - } - - } - } - - if (!Window->Wnd) return FALSE; + IntLinkHwnd(Window, WndInsertAfter); + } OldWindowRect = Window->Wnd->rcWindow; OldClientRect = Window->Wnd->rcClient;

14 years, 2 months

[sir_richard] 48981: [NTOS]: Implement MiMapViewInSystemSpace, all it took was another 250 lines and we can now map ARM3 sections into memory. Accessing them causes a fault, which we correctly hand...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 20:19:03 2010 New Revision: 48981 URL: http://svn.reactos.org/svn/reactos?rev=48981&view=rev Log: [NTOS]: Implement MiMapViewInSystemSpace, all it took was another 250 lines and we can now map ARM3 sections into memory. Accessing them causes a fault, which we correctly handle with the prototype PTE fault code. [NTOS]: Added a bogus allocation flag that can be used with Nt/MmCreateSection and MmMapViewInSystemSpace to take the ARM3 path instead. Only for internal testing at the moment. Now we need to look at how to allow mapping these into user-space as well... Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Oct 4 20:19:03 2010 @@ -244,6 +244,11 @@ // Prototype PTEs that don't yet have a pagefile association // #define MI_PTE_LOOKUP_NEEDED 0xFFFFF + +// +// System views are binned into 64K chunks +// +#define MI_SYSTEM_VIEW_BUCKET_SIZE 65536 // // FIXFIX: These should go in ex.h after the pool merge Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Oct 4 20:19:03 2010 @@ -175,14 +175,14 @@ Session->SystemSpaceViewStart = MiSystemViewStart; /* Create a bitmap to describe system space */ - BitmapSize = sizeof(RTL_BITMAP) + ((((MmSystemViewSize / 65536) + 31) / 32) * sizeof(ULONG)); + BitmapSize = sizeof(RTL_BITMAP) + ((((MmSystemViewSize / MI_SYSTEM_VIEW_BUCKET_SIZE) + 31) / 32) * sizeof(ULONG)); Session->SystemSpaceBitMap = ExAllocatePoolWithTag(NonPagedPool, BitmapSize, ' mM'); ASSERT(Session->SystemSpaceBitMap); RtlInitializeBitMap(Session->SystemSpaceBitMap, (PULONG)(Session->SystemSpaceBitMap + 1), - MmSystemViewSize / 65536); + MmSystemViewSize / MI_SYSTEM_VIEW_BUCKET_SIZE); /* Set system space fully empty to begin with */ RtlClearAllBits(Session->SystemSpaceBitMap); @@ -205,6 +205,262 @@ /* Success */ return TRUE; +} + +PVOID +NTAPI +MiInsertInSystemSpace(IN PMMSESSION Session, + IN ULONG Buckets, + IN PCONTROL_AREA ControlArea) +{ + PVOID Base; + ULONG Entry, Hash, i; + PAGED_CODE(); + + /* Only global mappings supported for now */ + ASSERT(Session == &MmSession); + + /* Stay within 4GB and don't go past the number of hash entries available */ + ASSERT(Buckets < MI_SYSTEM_VIEW_BUCKET_SIZE); + ASSERT(Session->SystemSpaceHashEntries < Session->SystemSpaceHashSize); + + /* Find space where to map this view */ + i = RtlFindClearBitsAndSet(Session->SystemSpaceBitMap, Buckets, 0); + ASSERT(i != 0xFFFFFFFF); + Base = (PVOID)((ULONG_PTR)Session->SystemSpaceViewStart + (i * MI_SYSTEM_VIEW_BUCKET_SIZE)); + + /* Get the hash entry for this allocation */ + Entry = ((ULONG_PTR)Base & ~(MI_SYSTEM_VIEW_BUCKET_SIZE - 1)) + Buckets; + Hash = (Entry >> 16) % Session->SystemSpaceHashKey; + + /* Loop hash entries until a free one is found */ + while (Session->SystemSpaceViewTable[Hash].Entry) + { + /* Unless we overflow, in which case loop back at hash o */ + if (++Hash >= Session->SystemSpaceHashSize) Hash = 0; + } + + /* Add this entry into the hash table */ + Session->SystemSpaceViewTable[Hash].Entry = Entry; + Session->SystemSpaceViewTable[Hash].ControlArea = ControlArea; + + /* Hash entry found, increment total and return the base address */ + Session->SystemSpaceHashEntries++; + return Base; +} + +NTSTATUS +NTAPI +MiAddMappedPtes(IN PMMPTE FirstPte, + IN PFN_NUMBER PteCount, + IN PCONTROL_AREA ControlArea) +{ + MMPTE TempPte; + PMMPTE PointerPte, ProtoPte, LastProtoPte, LastPte; + PSUBSECTION Subsection; + + /* ARM3 doesn't support this yet */ + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + ASSERT(ControlArea->FilePointer == NULL); + + /* Sanity checks */ + ASSERT(PteCount != 0); + ASSERT(ControlArea->NumberOfMappedViews >= 1); + ASSERT(ControlArea->NumberOfUserReferences >= 1); + ASSERT(ControlArea->NumberOfSectionReferences != 0); + ASSERT(ControlArea->u.Flags.BeingCreated == 0); + ASSERT(ControlArea->u.Flags.BeingDeleted == 0); + ASSERT(ControlArea->u.Flags.BeingPurged == 0); + + /* Get the PTEs for the actual mapping */ + PointerPte = FirstPte; + LastPte = FirstPte + PteCount; + + /* Get the prototype PTEs that desribe the section mapping in the subsection */ + Subsection = (PSUBSECTION)(ControlArea + 1); + ProtoPte = Subsection->SubsectionBase; + LastProtoPte = &Subsection->SubsectionBase[Subsection->PtesInSubsection]; + + /* Loop the PTEs for the mapping */ + while (PointerPte < LastPte) + { + /* We may have run out of prototype PTEs in this subsection */ + if (ProtoPte >= LastProtoPte) + { + /* But we don't handle this yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* The PTE should be completely clear */ + ASSERT(PointerPte->u.Long == 0); + + /* Build the prototype PTE and write it */ + MI_MAKE_PROTOTYPE_PTE(&TempPte, ProtoPte); + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + + /* Keep going */ + PointerPte++; + ProtoPte++; + } + + /* No failure path */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +MiFillSystemPageDirectory(IN PVOID Base, + IN SIZE_T NumberOfBytes) +{ + PMMPDE PointerPde, LastPde, SystemMapPde; + MMPDE TempPde; + PFN_NUMBER PageFrameIndex; + KIRQL OldIrql; + PAGED_CODE(); + + /* Find the PDEs needed for this mapping */ + PointerPde = MiAddressToPde(Base); + LastPde = MiAddressToPde((PVOID)((ULONG_PTR)Base + NumberOfBytes - 1)); + + /* Find the system double-mapped PDE that describes this mapping */ + SystemMapPde = &MmSystemPagePtes[((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE)]; + + /* Use the PDE template and loop the PDEs */ + TempPde = ValidKernelPde; + while (PointerPde <= LastPde) + { + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check if we don't already have this PDE mapped */ + if (SystemMapPde->u.Hard.Valid == 0) + { + /* Grab a page for it */ + PageFrameIndex = MiRemoveZeroPage(MI_GET_NEXT_COLOR()); + ASSERT(PageFrameIndex); + TempPde.u.Hard.PageFrameNumber = PageFrameIndex; + + /* Initialize its PFN entry, with the parent system page directory page table */ + MiInitializePfnForOtherProcess(PageFrameIndex, + PointerPde, + MmSystemPageDirectory[(PointerPde - MiAddressToPde(NULL)) / PDE_COUNT]); + + /* Make the system PDE entry valid */ + MI_WRITE_VALID_PTE(SystemMapPde, TempPde); + + /* The system PDE entry might be the PDE itself, so check for this */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It's different, so make the real PDE valid too */ + MI_WRITE_VALID_PTE(PointerPde, TempPde); + } + } + + /* Release the lock and keep going with the next PDE */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + SystemMapPde++; + PointerPde++; + } +} + +NTSTATUS +NTAPI +MiCheckPurgeAndUpMapCount(IN PCONTROL_AREA ControlArea, + IN BOOLEAN FailIfSystemViews) +{ + KIRQL OldIrql; + + /* Flag not yet supported */ + ASSERT(FailIfSystemViews == FALSE); + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* State not yet supported */ + ASSERT(ControlArea->u.Flags.BeingPurged == 0); + + /* Increase the reference counts */ + ControlArea->NumberOfMappedViews++; + ControlArea->NumberOfUserReferences++; + ASSERT(ControlArea->NumberOfSectionReferences != 0); + + /* Release the PFN lock and return success */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +MiMapViewInSystemSpace(IN PVOID Section, + IN PMMSESSION Session, + OUT PVOID *MappedBase, + IN OUT PSIZE_T ViewSize) +{ + PVOID Base; + PCONTROL_AREA ControlArea; + ULONG Buckets, SectionSize; + NTSTATUS Status; + PAGED_CODE(); + + /* Only global mappings for now */ + ASSERT(Session == &MmSession); + + /* Get the control area, check for any flags ARM3 doesn't yet support */ + ControlArea = ((PSECTION)Section)->Segment->ControlArea; + ASSERT(ControlArea->u.Flags.Image == 0); + ASSERT(ControlArea->FilePointer == NULL); + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + ASSERT(ControlArea->u.Flags.WasPurged == 0); + + /* Increase the reference and map count on the control area, no purges yet */ + Status = MiCheckPurgeAndUpMapCount(ControlArea, FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Get the section size at creation time */ + SectionSize = ((PSECTION)Section)->SizeOfSection.LowPart; + + /* If the caller didn't specify a view size, assume the whole section */ + if (!(*ViewSize)) *ViewSize = SectionSize; + + /* Check if the caller wanted a larger section than the view */ + if (*ViewSize > SectionSize) + { + /* We should probably fail. FIXME TODO */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Get the number of 64K buckets required for this mapping */ + Buckets = *ViewSize / MI_SYSTEM_VIEW_BUCKET_SIZE; + if (*ViewSize & (MI_SYSTEM_VIEW_BUCKET_SIZE - 1)) Buckets++; + + /* Check if the view is more than 4GB large */ + if (Buckets >= MI_SYSTEM_VIEW_BUCKET_SIZE) + { + /* We should probably fail */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Insert this view into system space and get a base address for it */ + Base = MiInsertInSystemSpace(Session, Buckets, ControlArea); + ASSERT(Base); + + /* Create the PDEs needed for this mapping, and double-map them if needed */ + MiFillSystemPageDirectory(Base, Buckets * MI_SYSTEM_VIEW_BUCKET_SIZE); + + /* Create the actual prototype PTEs for this mapping */ + Status = MiAddMappedPtes(MiAddressToPte(Base), + BYTES_TO_PAGES(*ViewSize), + ControlArea); + ASSERT(NT_SUCCESS(Status)); + + /* Return the base adress of the mapping and success */ + *MappedBase = Base; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Oct 4 20:19:03 2010 @@ -54,6 +54,23 @@ #pragma alloc_text(INIT, MmInitSectionImplementation) #endif +NTSTATUS +NTAPI +MiMapViewInSystemSpace(IN PVOID Section, +IN PVOID Session, +OUT PVOID *MappedBase, +IN OUT PSIZE_T ViewSize); + +NTSTATUS +NTAPI +MmCreateArm3Section(OUT PVOID *SectionObject, +IN ACCESS_MASK DesiredAccess, +IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, +IN PLARGE_INTEGER InputMaximumSize, +IN ULONG SectionPageProtection, +IN ULONG AllocationAttributes, +IN HANDLE FileHandle OPTIONAL, +IN PFILE_OBJECT FileObject OPTIONAL); /* TYPES *********************************************************************/ @@ -4264,6 +4281,16 @@ PROS_SECTION_OBJECT Section; PMMSUPPORT AddressSpace; NTSTATUS Status; + + if ((ULONG_PTR)SectionObject & 1) + { + PAGED_CODE(); + extern PVOID MmSession; + return MiMapViewInSystemSpace((PVOID)((ULONG_PTR)SectionObject & ~1), + &MmSession, + MappedBase, + ViewSize); + } DPRINT("MmMapViewInSystemSpace() called\n"); @@ -4386,6 +4413,20 @@ { ULONG Protection; PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; + + /* Check if an ARM3 section is being created instead */ + if (AllocationAttributes & 0xC0000000) + { + DPRINT1("arm 3 path\n"); + return MmCreateArm3Section(Section, + DesiredAccess, + ObjectAttributes, + MaximumSize, + SectionPageProtection, + AllocationAttributes &~ 0xC0000000, + FileHandle, + File); + } /* * Check the protection

14 years, 2 months

[sir_richard] 48980: [NTOS]: Implement MmCreateArm3Section, which creates ARM3-backed sections, but only for pagefile-backed memory at the moment. It uses MiCreatePagingFileMap and creates the expe...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 19:31:16 2010 New Revision: 48980 URL: http://svn.reactos.org/svn/reactos?rev=48980&view=rev Log: [NTOS]: Implement MmCreateArm3Section, which creates ARM3-backed sections, but only for pagefile-backed memory at the moment. It uses MiCreatePagingFileMap and creates the expected Segment, Subsection, ControlArea and Section objects described in Windows kernel internals literrature. It's surprisingly easy and only takes 200 lines of code. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Oct 4 19:31:16 2010 @@ -205,6 +205,210 @@ /* Success */ return TRUE; +} + +NTSTATUS +NTAPI +MiCreatePagingFileMap(OUT PSEGMENT *Segment, + IN PSIZE_T MaximumSize, + IN ULONG ProtectionMask, + IN ULONG AllocationAttributes) +{ + SIZE_T SizeLimit; + PFN_NUMBER PteCount; + PMMPTE PointerPte; + MMPTE TempPte; + PCONTROL_AREA ControlArea; + PSEGMENT NewSegment; + PSUBSECTION Subsection; + PAGED_CODE(); + + /* No large pages in ARM3 yet */ + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + + /* Pagefile-backed sections need a known size */ + if (!(*MaximumSize)) return STATUS_INVALID_PARAMETER_4; + + /* Calculate the maximum size possible, given the Prototype PTEs we'll need */ + SizeLimit = MAXULONG_PTR - sizeof(SEGMENT); + SizeLimit /= sizeof(MMPTE); + SizeLimit <<= PAGE_SHIFT; + + /* Fail if this size is too big */ + if (*MaximumSize > SizeLimit) return STATUS_SECTION_TOO_BIG; + + /* Calculate how many Prototype PTEs will be needed */ + PteCount = (*MaximumSize + PAGE_SIZE - 1) >> PAGE_SHIFT; + + /* For commited memory, we must have a valid protection mask */ + if (AllocationAttributes & SEC_COMMIT) ASSERT(ProtectionMask != 0); + + /* The segment contains all the Prototype PTEs, allocate it in paged pool */ + NewSegment = ExAllocatePoolWithTag(PagedPool, + sizeof(SEGMENT) + + sizeof(MMPTE) * (PteCount - 1), + 'tSmM'); + ASSERT(NewSegment); + *Segment = NewSegment; + + /* Now allocate the control area, which has the subsection structure */ + ControlArea = ExAllocatePoolWithTag(NonPagedPool, + sizeof(CONTROL_AREA) + sizeof(SUBSECTION), + 'tCmM'); + ASSERT(ControlArea); + + /* And zero it out, filling the basic segmnet pointer and reference fields */ + RtlZeroMemory(ControlArea, sizeof(CONTROL_AREA) + sizeof(SUBSECTION)); + ControlArea->Segment = NewSegment; + ControlArea->NumberOfSectionReferences = 1; + ControlArea->NumberOfUserReferences = 1; + + /* Convert allocation attributes to control area flags */ + if (AllocationAttributes & SEC_BASED) ControlArea->u.Flags.Based = 1; + if (AllocationAttributes & SEC_RESERVE) ControlArea->u.Flags.Reserve = 1; + if (AllocationAttributes & SEC_COMMIT) ControlArea->u.Flags.Commit = 1; + + /* The subsection follows, write the mask, PTE count and point back to the CA */ + Subsection = (PSUBSECTION)(ControlArea + 1); + Subsection->ControlArea = ControlArea; + Subsection->PtesInSubsection = PteCount; + Subsection->u.SubsectionFlags.Protection = ProtectionMask; + + /* Zero out the segment's prototype PTEs, and link it with the control area */ + PointerPte = &NewSegment->ThePtes[0]; + RtlZeroMemory(NewSegment, sizeof(SEGMENT)); + NewSegment->PrototypePte = PointerPte; + NewSegment->ControlArea = ControlArea; + + /* Save some extra accounting data for the segment as well */ + NewSegment->u1.CreatingProcess = PsGetCurrentProcess(); + NewSegment->SizeOfSegment = PteCount * PAGE_SIZE; + NewSegment->TotalNumberOfPtes = PteCount; + NewSegment->NonExtendedPtes = PteCount; + + /* The subsection's base address is the first Prototype PTE in the segment */ + Subsection->SubsectionBase = PointerPte; + + /* Start with an empty PTE, unless this is a commit operation */ + TempPte.u.Long = 0; + if (AllocationAttributes & SEC_COMMIT) + { + /* In which case, write down the protection mask in the Prototype PTEs */ + TempPte.u.Soft.Protection = ProtectionMask; + + /* For accounting, also mark these pages as being committed */ + NewSegment->NumberOfCommittedPages = PteCount; + } + + /* The template PTE itself for the segment should also have the mask set */ + NewSegment->SegmentPteTemplate.u.Soft.Protection = ProtectionMask; + + /* Write out the prototype PTEs, for now they're simply demand zero */ + RtlFillMemoryUlong(PointerPte, PteCount * sizeof(MMPTE), TempPte.u.Long); + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +MmCreateArm3Section(OUT PVOID *SectionObject, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN PLARGE_INTEGER InputMaximumSize, + IN ULONG SectionPageProtection, + IN ULONG AllocationAttributes, + IN HANDLE FileHandle OPTIONAL, + IN PFILE_OBJECT FileObject OPTIONAL) +{ + SECTION Section; + PSECTION NewSection; + PSUBSECTION Subsection; + PSEGMENT NewSegment; + NTSTATUS Status; + PCONTROL_AREA ControlArea; + ULONG ProtectionMask; + + /* ARM3 does not yet support this */ + ASSERT(FileHandle == NULL); + ASSERT(FileObject == NULL); + ASSERT((AllocationAttributes & SEC_LARGE_PAGES) == 0); + + /* Make the same sanity checks that the Nt interface should've validated */ + ASSERT((AllocationAttributes & ~(SEC_COMMIT | SEC_RESERVE | SEC_BASED | + SEC_LARGE_PAGES | SEC_IMAGE | SEC_NOCACHE | + SEC_NO_CHANGE)) == 0); + ASSERT((AllocationAttributes & (SEC_COMMIT | SEC_RESERVE | SEC_IMAGE)) != 0); + ASSERT(!((AllocationAttributes & SEC_IMAGE) && + (AllocationAttributes & (SEC_COMMIT | SEC_RESERVE | + SEC_NOCACHE | SEC_NO_CHANGE)))); + ASSERT(!((AllocationAttributes & SEC_COMMIT) && (AllocationAttributes & SEC_RESERVE))); + ASSERT(!((SectionPageProtection & PAGE_NOCACHE) || + (SectionPageProtection & PAGE_WRITECOMBINE) || + (SectionPageProtection & PAGE_GUARD) || + (SectionPageProtection & PAGE_NOACCESS))); + + /* Convert section flag to page flag */ + if (AllocationAttributes & SEC_NOCACHE) SectionPageProtection |= PAGE_NOCACHE; + + /* Check to make sure the protection is correct. Nt* does this already */ + ProtectionMask = MiMakeProtectionMask(SectionPageProtection); + if (ProtectionMask == MM_INVALID_PROTECTION) return STATUS_INVALID_PAGE_PROTECTION; + + /* A handle must be supplied with SEC_IMAGE, and this is the no-handle path */ + if (AllocationAttributes & SEC_IMAGE) return STATUS_INVALID_FILE_FOR_SECTION; + + /* So this must be a pagefile-backed section, create the mappings needed */ + Status = MiCreatePagingFileMap(&NewSegment, + (PSIZE_T)InputMaximumSize, + ProtectionMask, + AllocationAttributes); + ASSERT(NT_SUCCESS(Status)); + + /* Set the initial section object data */ + Section.InitialPageProtection = SectionPageProtection; + Section.Segment = NULL; + Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; + Section.Segment = NewSegment; + + /* THe mapping created a control area and segment, save the flags */ + ControlArea = NewSegment->ControlArea; + Section.u.LongFlags = ControlArea->u.LongFlags; + + /* ARM3 cannot support these right now, make sure they're not being set */ + ASSERT(ControlArea->u.Flags.Image == 0); + ASSERT(ControlArea->FilePointer == NULL); + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + ASSERT(ControlArea->u.Flags.WasPurged == 0); + + /* A pagefile-backed mapping only has one subsection, and this is all ARM3 supports */ + Subsection = (PSUBSECTION)(ControlArea + 1); + ASSERT(Subsection->NextSubsection == NULL); + + /* Create the actual section object, with enough space for the prototype PTEs */ + Status = ObCreateObject(ExGetPreviousMode(), + MmSectionObjectType, + ObjectAttributes, + ExGetPreviousMode(), + NULL, + sizeof(SECTION), + sizeof(SECTION) + + NewSegment->TotalNumberOfPtes * sizeof(MMPTE), + sizeof(CONTROL_AREA) + sizeof(SUBSECTION), + (PVOID*)&NewSection); + ASSERT(NT_SUCCESS(Status)); + + /* Now copy the local section object from the stack into this new object */ + RtlCopyMemory(NewSection, &Section, sizeof(SECTION)); + NewSection->Address.StartingVpn = 0; + + /* Return the object and the creation status */ + *SectionObject = (PVOID)NewSection; + return Status; } /* SYSTEM CALLS ***************************************************************/

14 years, 2 months

[sir_richard] 48979: [NTOS]: Implement/fixup the code paths during page faults that are needed to succesfuly resolve a demand page associated with a pagefile backed ARM3 section (which uses Prototy...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 18:51:07 2010 New Revision: 48979 URL: http://svn.reactos.org/svn/reactos?rev=48979&view=rev Log: [NTOS]: Implement/fixup the code paths during page faults that are needed to succesfuly resolve a demand page associated with a pagefile backed ARM3 section (which uses Prototype PTEs). A lot of the code was already there but assumed we were using Prototype PTEs only for the shared user data page. By combining that code with the typical demand-zero fault code, we obtain the needed paths. For now, only tested with ARM3 sections that are page-filed backed (not image or data-file backed) mapped into system view space (MmMapViewOfSectionInSystemSpace), not user-mode addresses (which need VADs). The code to actually create/map these doesn't exist in trunk yet, the purpose of this checkin is to test the new fault changes to make sure they don't cause negative effects to already-working faults. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Oct 4 18:51:07 2010 @@ -176,15 +176,14 @@ { PFN_NUMBER PageFrameNumber = 0; MMPTE TempPte; - BOOLEAN NeedZero = FALSE; + BOOLEAN NeedZero = FALSE, HaveLock = FALSE; ULONG Color; DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", Address, Process); /* Must currently only be called by paging path */ - ASSERT(OldIrql == MM_NOIRQL); - if (Process) + if ((Process) && (OldIrql == MM_NOIRQL)) { /* Sanity check */ ASSERT(MI_IS_PAGE_TABLE_ADDRESS(PointerPte)); @@ -194,45 +193,64 @@ /* Get process color */ Color = MI_GET_NEXT_PROCESS_COLOR(Process); + ASSERT(Color != 0xFFFFFFFF); /* We'll need a zero page */ NeedZero = TRUE; } else { + /* Check if we need a zero page */ + NeedZero = (OldIrql != MM_NOIRQL); + /* Get the next system page color */ Color = MI_GET_NEXT_COLOR(); } - - // - // Lock the PFN database - // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check if the PFN database should be acquired */ + if (OldIrql == MM_NOIRQL) + { + /* Acquire it and remember we should release it after */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + HaveLock = TRUE; + } + + /* We either manually locked the PFN DB, or already came with it locked */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + /* Do we need a zero page? */ ASSERT(PointerPte->u.Hard.Valid == 0); - - /* Do we need a zero page? */ - if (NeedZero) + if ((NeedZero) && (Process)) { /* Try to get one, if we couldn't grab a free page and zero it */ PageFrameNumber = MiRemoveZeroPageSafe(Color); - if (PageFrameNumber) NeedZero = FALSE; - } - - /* Did we get a page? */ - if (!PageFrameNumber) - { - /* We either failed to find a zero page, or this is a system request */ + if (PageFrameNumber) + { + /* We got a genuine zero page, stop worrying about it */ + NeedZero = FALSE; + } + else + { + /* We'll need a free page and zero it manually */ + PageFrameNumber = MiRemoveAnyPage(Color); + } + } + else if (!NeedZero) + { + /* Process or system doesn't want a zero page, grab anything */ PageFrameNumber = MiRemoveAnyPage(Color); - DPRINT("New pool page: %lx\n", PageFrameNumber); + } + else + { + /* System wants a zero page, obtain one */ + PageFrameNumber = MiRemoveZeroPage(Color); } /* Initialize it */ MiInitializePfn(PageFrameNumber, PointerPte, TRUE); - // - // Release PFN lock - // - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + /* Release PFN lock if needed */ + if (HaveLock) KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); // // Increment demand zero faults @@ -283,24 +301,53 @@ IN PMMPFN Pfn1) { MMPTE TempPte; + PMMPTE OriginalPte; + ULONG Protection; PFN_NUMBER PageFrameIndex; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(PointerProtoPte->u.Hard.Valid == 1); - /* Quick-n-dirty */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0xFFFFF); - /* Get the page */ PageFrameIndex = PFN_FROM_PTE(PointerProtoPte); + + /* Get the PFN entry and set it as a prototype PTE */ + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1->u3.e1.PrototypePte = 1; + + /* FIXME: Increment the share count for the page table */ + + /* Check where we should be getting the protection information from */ + if (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) + { + /* Get the protection from the PTE, there's no real Proto PTE data */ + Protection = PointerPte->u.Soft.Protection; + } + else + { + /* Get the protection from the original PTE link */ + OriginalPte = &Pfn1->OriginalPte; + Protection = OriginalPte->u.Soft.Protection; + } /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - /* Build the user PTE */ - ASSERT(Address < MmSystemRangeStart); - MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, MM_READONLY, PageFrameIndex); + /* Remove caching bits */ + Protection &= ~(MM_NOCACHE | MM_NOACCESS); + + /* Check if this is a kernel or user address */ + if (Address < MmSystemRangeStart) + { + /* Build the user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, PointerPte, Protection, PageFrameIndex); + } + else + { + /* Build the kernel PTE */ + MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, Protection, PageFrameIndex); + } /* Write the PTE */ MI_WRITE_VALID_PTE(PointerPte, TempPte); @@ -325,25 +372,56 @@ MMPTE TempPte; PMMPFN Pfn1; PFN_NUMBER PageFrameIndex; + NTSTATUS Status; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(PointerPte->u.Soft.Prototype == 1); - /* Read the prototype PTE -- it must be valid since we only handle shared data */ + /* Read the prototype PTE and check if it's valid */ TempPte = *PointerProtoPte; - ASSERT(TempPte.u.Hard.Valid == 1); - - /* One more user of this mapped page */ - PageFrameIndex = PFN_FROM_PTE(&TempPte); - Pfn1 = MiGetPfnEntry(PageFrameIndex); - Pfn1->u2.ShareCount++; - - /* Call it a transition */ - InterlockedIncrement(&KeGetCurrentPrcb()->MmTransitionCount); + if (TempPte.u.Hard.Valid == 1) + { + /* One more user of this mapped page */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn1->u2.ShareCount++; + + /* Call it a transition */ + InterlockedIncrement(&KeGetCurrentPrcb()->MmTransitionCount); + + /* Complete the prototype PTE fault -- this will release the PFN lock */ + return MiCompleteProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + OldIrql, + NULL); + } + + /* Make sure there's some protection mask */ + if (TempPte.u.Long == 0) + { + /* Release the lock */ + DPRINT1("Access on reserved section?\n"); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return STATUS_ACCESS_VIOLATION; + } + + /* This is the only thing we support right now */ + ASSERT(TempPte.u.Soft.PageFileHigh == 0); + ASSERT(TempPte.u.Proto.ReadOnly == 0); + ASSERT(PointerPte > MiHighestUserPte); + ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); + + /* Resolve the demand zero fault */ + Status = MiResolveDemandZeroFault(Address, PointerProtoPte, Process, OldIrql); + ASSERT(NT_SUCCESS(Status)); /* Complete the prototype PTE fault -- this will release the PFN lock */ + ASSERT(PointerPte->u.Hard.Valid == 0); return MiCompleteProtoPteFault(StoreInstruction, Address, PointerPte, @@ -388,39 +466,76 @@ { /* This should never happen */ ASSERT(!MI_IS_PHYSICAL_ADDRESS(PointerProtoPte)); + + /* Check if this is a kernel-mode address */ + SuperProtoPte = MiAddressToPte(PointerProtoPte); + if (Address >= MmSystemRangeStart) + { + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - /* We currently only handle the shared user data PTE path */ - ASSERT(Address < MmSystemRangeStart); - ASSERT(PointerPte->u.Soft.Prototype == 1); - ASSERT(PointerPte->u.Soft.PageFileHigh == 0xFFFFF); - ASSERT(Vad == NULL); - - /* Lock the PFN database */ - LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* For the shared data page, this should be true */ - SuperProtoPte = MiAddressToPte(PointerProtoPte); - ASSERT(SuperProtoPte->u.Hard.Valid == 1); - ASSERT(TempPte.u.Hard.Valid == 0); - - /* Resolve the fault -- this will release the PFN lock */ - Status = MiResolveProtoPteFault(StoreInstruction, - Address, - PointerPte, - PointerProtoPte, - NULL, - NULL, - NULL, - Process, - LockIrql, - TrapInformation); - ASSERT(Status == STATUS_SUCCESS); - - /* Complete this as a transition fault */ - ASSERT(OldIrql == KeGetCurrentIrql()); - ASSERT(OldIrql <= APC_LEVEL); - ASSERT(KeAreAllApcsDisabled() == TRUE); - return STATUS_PAGE_FAULT_TRANSITION; + /* Has the PTE been made valid yet? */ + if (!SuperProtoPte->u.Hard.Valid) + { + UNIMPLEMENTED; + while (TRUE); + } + else + { + ASSERT(PointerPte->u.Hard.Valid == 0); + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return Status; + } + } + else + { + /* We currently only handle the shared user data PTE path */ + ASSERT(PointerPte->u.Soft.Prototype == 1); + ASSERT(PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED); + ASSERT(Vad == NULL); + + /* Lock the PFN database */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* For the shared data page, this should be true */ + ASSERT(SuperProtoPte->u.Hard.Valid == 1); + ASSERT(TempPte.u.Hard.Valid == 0); + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + NULL, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return STATUS_PAGE_FAULT_TRANSITION; + } } // @@ -469,7 +584,7 @@ IN PVOID TrapInformation) { KIRQL OldIrql = KeGetCurrentIrql(), LockIrql; - PMMPTE PointerPte, ProtoPte; + PMMPTE PointerPte, ProtoPte = NULL; PMMPDE PointerPde; MMPTE TempPte; PETHREAD CurrentThread; @@ -645,9 +760,6 @@ /* Check one kind of prototype PTE */ if (TempPte.u.Soft.Prototype) { - /* The one used for protected pool... */ - ASSERT(MmProtectFreedNonPagedPool == TRUE); - /* Make sure protected pool is on, and that this is a pool address */ if ((MmProtectFreedNonPagedPool) && (((Address >= MmNonPagedPoolStart) && @@ -663,12 +775,41 @@ Mode, 4); } + + /* Get the prototype PTE! */ + ProtoPte = MiProtoPteToPte(&TempPte); } // // We don't implement transition PTEs // ASSERT(TempPte.u.Soft.Transition == 0); + + /* Check for no-access PTE */ + if (TempPte.u.Soft.Protection == MM_NOACCESS) + { + /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 1); + } + + /* Check for demand page */ + if ((StoreInstruction) && !(ProtoPte) && !(TempPte.u.Hard.Valid)) + { + /* Get the protection code */ + if (!(TempPte.u.Soft.Protection & MM_READWRITE)) + { + /* Bad boy, bad boy, whatcha gonna do, whatcha gonna do when ARM3 comes for you! */ + KeBugCheckEx(ATTEMPTED_WRITE_TO_READONLY_MEMORY, + (ULONG_PTR)Address, + TempPte.u.Long, + (ULONG_PTR)TrapInformation, + 14); + } + } // // Now do the real fault handling @@ -676,7 +817,7 @@ Status = MiDispatchFault(StoreInstruction, Address, PointerPte, - NULL, + ProtoPte, FALSE, NULL, TrapInformation,

14 years, 2 months

[sir_richard] 48978: [NTOS]: Initialize system views by calling MiInitializeSystemSpaceMap. This sets up the lock, bitmap, and hash table.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 18:36:37 2010 New Revision: 48978 URL: http://svn.reactos.org/svn/reactos?rev=48978&view=rev Log: [NTOS]: Initialize system views by calling MiInitializeSystemSpaceMap. This sets up the lock, bitmap, and hash table. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Mon Oct 4 18:36:37 2010 @@ -1674,6 +1674,9 @@ MiHighPagedPoolThreshold = (60 * _1MB) >> PAGE_SHIFT; MiHighPagedPoolThreshold = min(MiHighPagedPoolThreshold, (Size * 2) / 5); ASSERT(MiLowPagedPoolThreshold < MiHighPagedPoolThreshold); + + /* Setup the global session space */ + MiInitializeSystemSpaceMap(NULL); } NTSTATUS Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Oct 4 18:36:37 2010 @@ -70,6 +70,8 @@ (CHAR)MM_INVALID_PROTECTION }; +MMSESSION MmSession; + /* PRIVATE FUNCTIONS **********************************************************/ ULONG @@ -153,6 +155,58 @@ /* Return the final MM PTE protection mask */ return ProtectMask; } + +BOOLEAN +NTAPI +MiInitializeSystemSpaceMap(IN PVOID InputSession OPTIONAL) +{ + SIZE_T AllocSize, BitmapSize; + PMMSESSION Session; + + /* For now, always use the global session */ + ASSERT(InputSession == NULL); + Session = &MmSession; + + /* Initialize the system space lock */ + Session->SystemSpaceViewLockPointer = &Session->SystemSpaceViewLock; + KeInitializeGuardedMutex(Session->SystemSpaceViewLockPointer); + + /* Set the start address */ + Session->SystemSpaceViewStart = MiSystemViewStart; + + /* Create a bitmap to describe system space */ + BitmapSize = sizeof(RTL_BITMAP) + ((((MmSystemViewSize / 65536) + 31) / 32) * sizeof(ULONG)); + Session->SystemSpaceBitMap = ExAllocatePoolWithTag(NonPagedPool, + BitmapSize, + ' mM'); + ASSERT(Session->SystemSpaceBitMap); + RtlInitializeBitMap(Session->SystemSpaceBitMap, + (PULONG)(Session->SystemSpaceBitMap + 1), + MmSystemViewSize / 65536); + + /* Set system space fully empty to begin with */ + RtlClearAllBits(Session->SystemSpaceBitMap); + + /* Set default hash flags */ + Session->SystemSpaceHashSize = 31; + Session->SystemSpaceHashKey = Session->SystemSpaceHashSize - 1; + Session->SystemSpaceHashEntries = 0; + + /* Calculate how much space for the hash views we'll need */ + AllocSize = sizeof(MMVIEW) * Session->SystemSpaceHashSize; + ASSERT(AllocSize < PAGE_SIZE); + + /* Allocate and zero the view table */ + Session->SystemSpaceViewTable = ExAllocatePoolWithTag(NonPagedPool, + AllocSize, + ' mM'); + ASSERT(Session->SystemSpaceViewTable != NULL); + RtlZeroMemory(Session->SystemSpaceViewTable, AllocSize); + + /* Success */ + return TRUE; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS

14 years, 2 months

[sir_richard] 48977: [NTOS]: Define MI_MAKE_PROTOTYPE_PTE macro to make a real prototype PTE from a PTE. Define counter-part MiProtoPteToPte to recover the true PTE from a given Prototype PTE. [NTO...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 18:34:41 2010 New Revision: 48977 URL: http://svn.reactos.org/svn/reactos?rev=48977&view=rev Log: [NTOS]: Define MI_MAKE_PROTOTYPE_PTE macro to make a real prototype PTE from a PTE. Define counter-part MiProtoPteToPte to recover the true PTE from a given Prototype PTE. [NTOS]: Define MI_PTE_LOOKUP_NEEDED instead of using 0xFFFF. The name was found in checked build assertion strings. [NTOS]: Add MM_VIEW (used for System-mapped Section Views) and MM_SESSSION (used to define the system/session view mappings) structure definitions. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Mon Oct 4 18:34:41 2010 @@ -26,7 +26,7 @@ MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Oct 4 18:34:41 2010 @@ -232,6 +232,18 @@ #define MI_GET_PAGE_COLOR(x) ((x) & MmSecondaryColorMask) #define MI_GET_NEXT_COLOR(x) (MI_GET_PAGE_COLOR(++MmSystemPageColor)) #define MI_GET_NEXT_PROCESS_COLOR(x) (MI_GET_PAGE_COLOR(++(x)->NextPageColor)) + +// +// Decodes a Prototype PTE into the underlying PTE +// +#define MiProtoPteToPte(x) \ + (PMMPTE)((ULONG_PTR)MmPagedPoolStart + \ + ((x)->u.Proto.ProtoAddressHigh | (x)->u.Proto.ProtoAddressLow)) + +// +// Prototype PTEs that don't yet have a pagefile association +// +#define MI_PTE_LOOKUP_NEEDED 0xFFFFF // // FIXFIX: These should go in ex.h after the pool merge @@ -358,6 +370,25 @@ PFN_NUMBER StartFrame; PFN_NUMBER LastFrame; } MI_LARGE_PAGE_RANGES, *PMI_LARGE_PAGE_RANGES; + +typedef struct _MMVIEW +{ + ULONG_PTR Entry; + PCONTROL_AREA ControlArea; +} MMVIEW, *PMMVIEW; + +typedef struct _MMSESSION +{ + KGUARDED_MUTEX SystemSpaceViewLock; + PKGUARDED_MUTEX SystemSpaceViewLockPointer; + PCHAR SystemSpaceViewStart; + PMMVIEW SystemSpaceViewTable; + ULONG SystemSpaceHashSize; + ULONG SystemSpaceHashEntries; + ULONG SystemSpaceHashKey; + ULONG BitmapFailures; + PRTL_BITMAP SystemSpaceBitMap; +} MMSESSION, *PMMSESSION; extern MMPTE HyperTemplatePte; extern MMPDE ValidKernelPde; @@ -565,6 +596,31 @@ } // +// Builds a Prototype PTE for the address of the PTE +// +FORCEINLINE +VOID +MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, + IN PMMPTE PointerPte) +{ + ULONG_PTR Offset; + + /* Mark this as a prototype */ + NewPte->u.Long = 0; + NewPte->u.Proto.Prototype = 1; + + /* + * Prototype PTEs are only valid in paged pool by design, this little trick + * lets us only use 28 bits for the adress of the PTE + */ + Offset = (ULONG_PTR)PointerPte - (ULONG_PTR)MmPagedPoolStart; + + /* 7 bits go in the "low", and the other 21 bits go in the "high" */ + NewPte->u.Proto.ProtoAddressLow = Offset & 0x7F; + NewPte->u.Proto.ProtoAddressHigh = Offset & 0xFFFFF80; +} + +// // Returns if the page is physically resident (ie: a large page) // FIXFIX: CISC/x86 only? // @@ -1107,6 +1163,12 @@ IN PMMADDRESS_NODE Node ); +BOOLEAN +NTAPI +MiInitializeSystemSpaceMap( + IN PVOID InputSession OPTIONAL +); + // // MiRemoveZeroPage will use inline code to zero out the page manually if only // free pages are available. In some scenarios, we don't/can't run that piece of

14 years, 2 months

[sir_richard] 48976: [NTOS]: Go ahead and now fill out the OriginalPte field for PFNs initialized with MiInitializePfn(ForOtherProcess). They should only belong to ARM3 so they'll never have SwapEn...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Oct 4 18:22:50 2010 New Revision: 48976 URL: http://svn.reactos.org/svn/reactos?rev=48976&view=rev Log: [NTOS]: Go ahead and now fill out the OriginalPte field for PFNs initialized with MiInitializePfn(ForOtherProcess). They should only belong to ARM3 so they'll never have SwapEntry/RMAP associated with them. This functionality is important for future Prototype PTE support, among other things, as it lets us get the original PTE value written for a given PFN entry. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Mon Oct 4 18:22:50 2010 @@ -713,6 +713,16 @@ { /* Only valid from MmCreateProcessAddressSpace path */ ASSERT(PsGetCurrentProcess()->Vm.WorkingSetSize == 0); + + /* Make this a demand zero PTE */ + MI_MAKE_SOFTWARE_PTE(&Pfn1->OriginalPte, MM_READWRITE); + } + else + { + /* Copy the PTE data */ + Pfn1->OriginalPte = *PointerPte; + ASSERT(!((Pfn1->OriginalPte.u.Soft.Prototype == 0) && + (Pfn1->OriginalPte.u.Soft.Transition == 1))); } /* Otherwise this is a fresh page -- set it up */ @@ -870,11 +880,9 @@ /* Setup the PTE */ Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1->PteAddress = PointerPte; - -#if 0 // When using ARM3 PFN + /* Make this a software PTE */ MI_MAKE_SOFTWARE_PTE(&Pfn1->OriginalPte, MM_READWRITE); -#endif /* Setup the page */ ASSERT(Pfn1->u3.e2.ReferenceCount == 0);

14 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010