[ros-diffs] [spetreolle] 58941: [FUSION] Remove baseaddress to fix address conflicts. Reenable creation of InstallRoot .NET key in its REG_SZ form.

Author: spetreolle
Date: Sun May  5 13:09:46 2013
New Revision: 58941

URL: http://svn.reactos.org/svn/reactos?rev=58941&view=rev
Log:
[FUSION]
Remove baseaddress to fix address conflicts.
Reenable creation of InstallRoot .NET key in its REG_SZ form.


Modified:
    trunk/reactos/boot/bootdata/hivesft.inf
    trunk/reactos/cmake/baseaddress.cmake

Modified: trunk/reactos/boot/bootdata/hivesft.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesft.inf	[iso-8859-1] Sun May  5 13:09:46 2013
@@ -69,9 +69,6 @@

HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","68",2,"netlogon.dll"

HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll"
 
-; .NET
-HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallRoot",0x00020000,"%SystemRoot%\Microsoft
.NET\Framework\"
-
 HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012
 
 ; WBem
@@ -115,7 +112,7 @@
 ; FIXME - usetup doesn't handle extra paths

HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd
/c md ""%programfiles%\Internet Explorer\"" && move
%windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" &&
""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer"
 ; Create .NET Framework InstallRoot key, reg_sz & full path
-;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd
/c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d
%SystemRoot%\Microsoft.NET\Framework\"
+HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd
/c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d
%SystemRoot%\Microsoft.NET\Framework\"
 

HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012

HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012

Modified: trunk/reactos/cmake/baseaddress.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re…
==============================================================================
--- trunk/reactos/cmake/baseaddress.cmake	[iso-8859-1] (original)
+++ trunk/reactos/cmake/baseaddress.cmake	[iso-8859-1] Sun May  5 13:09:46 2013
@@ -123,7 +123,8 @@
 set(baseaddress_faultrep             0x744f0000)
 set(baseaddress_fmifs                0x744d0000)
 set(baseaddress_fontext              0x744a0000)
-set(baseaddress_fusion               0x74470000)
+#fusion has to have dynamic address
+#set(baseaddress_fusion               0x74470000)
 set(baseaddress_getuname             0x74440000)
 set(baseaddress_hhctrl               0x74400000)
 set(baseaddress_hlink                0x743c0000)