Author: tkreuzer
Date: Sun Dec 30 11:52:05 2012
New Revision: 58049
URL: http://svn.reactos.org/svn/reactos?rev=58049&view=rev
Log:
[NTOSKRNL]
Fix value of MmUserProbeAddress, which is MI_USER_PROBE_ADDRESS (0x7FFF0000) and not MI_HIGHEST_USER_ADDRESS (0x7FFEFFFF)!
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/mminit.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] Sun Dec 30 11:52:05 2012
@@ -2043,7 +2043,7 @@
// Define the basic user vs. kernel address space separation
//
MmSystemRangeStart = (PVOID)MI_DEFAULT_SYSTEM_RANGE_START;
- MmUserProbeAddress = (ULONG_PTR)MI_HIGHEST_USER_ADDRESS;
+ MmUserProbeAddress = (ULONG_PTR)MI_USER_PROBE_ADDRESS;
MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS;
/* Highest PTE and PDE based on the addresses above */
Author: tkreuzer
Date: Sat Dec 29 21:40:41 2012
New Revision: 58047
URL: http://svn.reactos.org/svn/reactos?rev=58047&view=rev
Log:
[NTOSKRNL]
In NtAllocateVirtualMemory, when MEM_RESET is passed, silence the DPRINT and also return STATUS_SUCCESS, since MEM_RESET is only an optimization (tells the memory manager that the contents shouldn't be written to the pagefile) and it won't hurt (except the performance) to pretend success. On the other hand paging out is probably never done anyway due to broken Mm.
This fixes spamming the log by Firefox. It does not fix the hangs that firfox suffers from.
Modified:
trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Dec 29 21:40:41 2012
@@ -3861,8 +3861,9 @@
}
if ((AllocationType & MEM_RESET) == MEM_RESET)
{
- DPRINT1("MEM_RESET not supported\n");
- Status = STATUS_INVALID_PARAMETER;
+ /// @todo HACK: pretend success
+ DPRINT("MEM_RESET not supported\n");
+ Status = STATUS_SUCCESS;
goto FailPathNoLock;
}
if (Process->VmTopDown == 1)
Author: hbelusca
Date: Sat Dec 29 20:16:21 2012
New Revision: 58044
URL: http://svn.reactos.org/svn/reactos?rev=58044&view=rev
Log:
[WPP]
Apply Wine commit "wpp: Fix path separator on Windows platforms." by Hermès Bélusca-Maïto (9dbd1969fca9c31155c6d85ea8129d249467926b)
Indeed, Windows systems use ':' as part of paths and therefore, use another separator character.
This enables compiling ReactOS from source files located in a different disk partition as the generated (output) files.
CORE-6442 #resolve #comment Committed in r58044.
Modified:
trunk/reactos/tools/wpp/preproc.c
Modified: trunk/reactos/tools/wpp/preproc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=58…
==============================================================================
--- trunk/reactos/tools/wpp/preproc.c [iso-8859-1] (original)
+++ trunk/reactos/tools/wpp/preproc.c [iso-8859-1] Sat Dec 29 20:16:21 2012
@@ -447,7 +447,7 @@
* Include management
*-------------------------------------------------------------------------
*/
-#if defined(_Windows) || defined(__MSDOS__)
+#if defined(_WIN32) || defined(__MSDOS__)
#define INCLUDESEPARATOR ";"
#else
#define INCLUDESEPARATOR ":"
Author: hbelusca
Date: Sat Dec 29 19:23:02 2012
New Revision: 58043
URL: http://svn.reactos.org/svn/reactos?rev=58043&view=rev
Log:
[CONFIGURE]
Fix MSVC configure build (problem of expansion of environment variables).
Modified:
trunk/reactos/configure.cmd
Modified: trunk/reactos/configure.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=58043&r1…
==============================================================================
--- trunk/reactos/configure.cmd [iso-8859-1] (original)
+++ trunk/reactos/configure.cmd [iso-8859-1] Sat Dec 29 19:23:02 2012
@@ -1,4 +1,11 @@
@echo off
+
+:: This is needed so as to avoid static expansion of environment variables
+:: inside if (...) conditionals.
+:: See http://stackoverflow.com/questions/305605/weird-scope-issue-in-bat-file
+:: for more explanation.
+:: Precisely needed for configuring Visual Studio Environment.
+setlocal enabledelayedexpansion
:: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR%
if /I "%1" == "arm_hosttools" (
@@ -46,7 +53,7 @@
set USE_WDK_HEADERS=0
) else if defined VCINSTALLDIR (
- :: VS command prompt does not put this in enviroment vars
+ :: VS command prompt does not put this in environment vars
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
@@ -59,30 +66,30 @@
exit /b
)
- echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH%
+ echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH!
if /I "%1" == "VSSolution" (
- if "%BUILD_ENVIRONMENT%" == "VS8" (
- if "%ARCH%" == "amd64" (
+ if "!BUILD_ENVIRONMENT!" == "VS8" (
+ if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 8 2005 Win64"
) else (
set CMAKE_GENERATOR="Visual Studio 8 2005"
)
- ) else if "%BUILD_ENVIRONMENT%" == "VS9" (
- if "%ARCH%" == "amd64" (
+ ) else if "!BUILD_ENVIRONMENT!" == "VS9" (
+ if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
) else (
set CMAKE_GENERATOR="Visual Studio 9 2008"
)
- ) else if "%BUILD_ENVIRONMENT%" == "VS10" (
- if "%ARCH%" == "amd64" (
+ ) else if "!BUILD_ENVIRONMENT!" == "VS10" (
+ if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 10 Win64"
) else (
set CMAKE_GENERATOR="Visual Studio 10"
)
- ) else if "%BUILD_ENVIRONMENT%" == "VS11" (
- if "%ARCH%" == "amd64" (
+ ) else if "!BUILD_ENVIRONMENT!" == "VS11" (
+ if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 11 Win64"
- ) else if "%ARCH%" == "arm" (
+ ) else if "!ARCH!" == "arm" (
set CMAKE_GENERATOR="Visual Studio 11 ARM"
) else (
set CMAKE_GENERATOR="Visual Studio 11"
@@ -111,7 +118,7 @@
:: Checkpoint
if not defined ARCH (
- echo unknown build architecture
+ echo Unknown build architecture
exit /b
)