Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION]

Browse source 
Remove baseaddress to fix address conflicts.
Reenable creation of InstallRoot .NET key in its REG_SZ form.


svn path=/trunk/; revision=58941
This commit is contained in:
Sylvain Petreolle 2013-05-05 13:09:46 +00:00
parent 5cd67c3c36
commit c6f4a6973a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/boot/bootdata/hivesft.inf
View file

@ -69,9 +69,6 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","18",2,"secur32.dll"
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 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012
; 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

3
reactos/cmake/baseaddress.cmake
View file

@ -123,7 +123,8 @@ set(baseaddress_dxdiagn 0x74520000)
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)