[ros-diffs] [tkreuzer] 55551: [FREELDR] Revert to using the old heap code, as it broke 2nd stage on some systems

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sun Feb 12 00:01:02 UTC 2012


Author: tkreuzer
Date: Sun Feb 12 00:01:01 2012
New Revision: 55551

URL: http://svn.reactos.org/svn/reactos?rev=55551&view=rev
Log:
[FREELDR]
Revert to using the old heap code, as it broke 2nd stage on some systems

Added:
    trunk/reactos/boot/freeldr/freeldr/mm/heap.c   (props changed)
      - copied unchanged from r55517, trunk/reactos/boot/freeldr/freeldr/mm/heap.c
    trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c
      - copied unchanged from r55550, trunk/reactos/boot/freeldr/freeldr/mm/heap.c
    trunk/reactos/boot/freeldr/freeldr/rtl/bget.c   (props changed)
      - copied unchanged from r55517, trunk/reactos/boot/freeldr/freeldr/rtl/bget.c
Modified:
    trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
    trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
    trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c

Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt?rev=55551&r1=55550&r2=55551&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Feb 12 00:01:01 2012
@@ -155,6 +155,7 @@
 list(APPEND FREELDR_BASE_SOURCE
     bootmgr.c # This file is compiled with custom definitions
     freeldr.c
+    rtl/bget.c
     rtl/libsupp.c)
 
 if (NOT MSVC)

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild?rev=55551&r1=55550&r2=55551&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sun Feb 12 00:01:01 2012
@@ -51,6 +51,7 @@
 		<file>binhive.c</file>
 	</directory>
 	<directory name="rtl">
+		<file>bget.c</file>
 		<file>libsupp.c</file>
 	</directory>
 	<directory name="ui">

Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 12 00:01:01 2012
@@ -1,0 +1,13 @@
+/branches/GSoC_2011/GSoC_Network/boot/freeldr/freeldr/mm/heap.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/boot/freeldr/freeldr/mm/heap.c:51550
+/branches/GSoC_2011/TcpIpDriver/boot/freeldr/freeldr/mm/heap.c:51551-53074,53076-53119
+/branches/GSoC_Network/boot/freeldr/freeldr/mm/heap.c:51545-51546
+/branches/cmake-bringup/boot/freeldr/freeldr/mm/heap.c:50484,50693,50719,51544-52564
+/branches/header-work/boot/freeldr/freeldr/mm/heap.c:45691-47721
+/branches/reactos-yarotows/boot/freeldr/freeldr/mm/heap.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/boot/freeldr/freeldr/mm/heap.c:49994-49995
+/branches/ros-amd64-bringup/boot/freeldr/freeldr/mm/heap.c:36852
+/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/heap.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
+/branches/shell32_new-bringup/boot/freeldr/freeldr/mm/heap.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/boot/freeldr/freeldr/mm/heap.c:48720,48840-48841,49424-49426,49454
+/branches/wlan-bringup/boot/freeldr/freeldr/mm/heap.c:54809-54998

Propchange: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Feb 12 00:01:01 2012
@@ -1,0 +1,13 @@
+/branches/GSoC_2011/GSoC_Network/boot/freeldr/freeldr/rtl/bget.c:51548
+/branches/GSoC_2011/GSoC_TcpIpDriver/boot/freeldr/freeldr/rtl/bget.c:51550
+/branches/GSoC_2011/TcpIpDriver/boot/freeldr/freeldr/rtl/bget.c:51551-53074,53076-53119
+/branches/GSoC_Network/boot/freeldr/freeldr/rtl/bget.c:51545-51546
+/branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c:50484,50693,50719,51544-52564
+/branches/header-work/boot/freeldr/freeldr/rtl/bget.c:45691-47721
+/branches/reactos-yarotows/boot/freeldr/freeldr/rtl/bget.c:45219-46371,46373-48025,48027-49273
+/branches/reactx/reactos/boot/freeldr/freeldr/rtl/bget.c:49994-49995
+/branches/ros-amd64-bringup/boot/freeldr/freeldr/rtl/bget.c:36852
+/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/rtl/bget.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
+/branches/shell32_new-bringup/boot/freeldr/freeldr/rtl/bget.c:51893-53652,53661,53700
+/branches/tcp-rewrite-branch/boot/freeldr/freeldr/rtl/bget.c:48720,48840-48841,49424-49426,49454
+/branches/wlan-bringup/boot/freeldr/freeldr/rtl/bget.c:54809-54998

Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c?rev=55551&r1=55550&r2=55551&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sun Feb 12 00:01:01 2012
@@ -203,7 +203,7 @@
 	//BOOLEAN Status;
 
 	/* Cleanup heap */
-	HeapCleanupAll();
+	//HeapCleanupAll();
 
 	//
 	// Creating a suitable memory map for Windows can be tricky, so let's




More information about the Ros-diffs mailing list