Commit 7b54917f authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

wine.inf: Do not install .NET registry keys and fake dlls.

parent 1e721a48
...@@ -38,7 +38,6 @@ AddReg=\ ...@@ -38,7 +38,6 @@ AddReg=\
ControlPanel,\ ControlPanel,\
CurrentVersion,\ CurrentVersion,\
Debugger,\ Debugger,\
Dotnet,\
DirectX,\ DirectX,\
Fonts,\ Fonts,\
MCI,\ MCI,\
...@@ -63,7 +62,6 @@ AddReg=\ ...@@ -63,7 +62,6 @@ AddReg=\
ControlPanel,\ ControlPanel,\
CurrentVersion,\ CurrentVersion,\
Debugger,\ Debugger,\
Dotnet,\
DirectX,\ DirectX,\
Fonts,\ Fonts,\
MCI,\ MCI,\
...@@ -91,7 +89,6 @@ AddReg=\ ...@@ -91,7 +89,6 @@ AddReg=\
CurrentVersion,\ CurrentVersion,\
CurrentVersionWow64,\ CurrentVersionWow64,\
Debugger,\ Debugger,\
Dotnet,\
DirectX,\ DirectX,\
Fonts,\ Fonts,\
MCI,\ MCI,\
...@@ -114,7 +111,6 @@ AddReg=\ ...@@ -114,7 +111,6 @@ AddReg=\
CurrentVersionWow64,\ CurrentVersionWow64,\
Debugger,\ Debugger,\
DirectX,\ DirectX,\
Dotnet,\
MCI,\ MCI,\
Misc,\ Misc,\
Tapi,\ Tapi,\
...@@ -514,32 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15" ...@@ -514,32 +510,6 @@ HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionHeight,2,"15"
HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13" HKCU,Control Panel\Desktop\WindowMetrics,SmCaptionWidth,2,"13"
HKCU,Control Panel\Mouse,Beep,2,"No" HKCU,Control Panel\Mouse,Beep,2,"No"
[DotNet]
HKLM,Software\Microsoft\.NETFramework,"InstallRoot",2,"%10%\Microsoft.NET\Framework\"
HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16
HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16
HKLM,Software\Microsoft\.NETFramework\policy\v2.0,"50727",2,"50727-50727"
HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16
HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,SP,0x10003,2
HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Version,2,2.2.30729
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,SP,0x10003,2
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0,Version,2,3.2.30729
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.0\Setup,InstallSuccess,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,SP,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5,Version,2,3.5.30729.01
HKLM,Software\Microsoft\NET Framework Setup\NDP\v3.5\1033,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,Version,2,4.0.30319
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Client,TargetVersion,2,4.0.0
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Install,0x10003,1
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,Version,2,4.0.30319
HKLM,Software\Microsoft\NET Framework Setup\NDP\v4\Full,TargetVersion,2,4.0.0
[DirectX] [DirectX]
HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904" HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904"
HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00 HKLM,Software\Microsoft\DirectX,"InstalledVersion",1,00,00,00,09,00,00,00,00
...@@ -696,16 +666,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AA ...@@ -696,16 +666,6 @@ HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AA
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},,2,".NET Framework"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"ComponentID",2,".NETFramework"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Locale",2,""
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{7131646D-CD3C-40F4-97B9-CD9E4E6262EF},"Version",2,"2,0,50727,0"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},,2,".NET Framework"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"ComponentID",2,".NETFramework"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Locale",2,""
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{CB2F7EDD-9D1F-43C1-90FC-4F52EAE172A1},"Version",2,"1,0,4322,1"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp"
HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1
...@@ -2537,6 +2497,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ...@@ -2537,6 +2497,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,iexplore.exe 11,,iexplore.exe
11,,winetest.exe,- 11,,winetest.exe,-
12,,mountmgr.sys,- 12,,mountmgr.sys,-
; skip .NET fake dlls in Wine Mono package
11,,aspnet_regiis.exe,-
11,,ngen.exe,-
11,,fusion.dll,-
11,,regsvcs.exe,-
11,,regasm.exe,-
11,,servicemodelreg.exe,-
11,,presentationfontcache.exe,-
; registration order matters for these ; registration order matters for these
11,,msxml.dll 11,,msxml.dll
11,,msxml2.dll 11,,msxml2.dll
...@@ -2565,6 +2533,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ...@@ -2565,6 +2533,14 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,notepad.exe 11,,notepad.exe
11,,winetest.exe,- 11,,winetest.exe,-
12,,mountmgr.sys 12,,mountmgr.sys
; skip .NET fake dlls in Wine Mono package
11,,aspnet_regiis.exe,-
11,,ngen.exe,-
11,,fusion.dll,-
11,,regsvcs.exe,-
11,,regasm.exe,-
11,,servicemodelreg.exe,-
11,,presentationfontcache.exe,-
; registration order matters for these ; registration order matters for these
11,,msxml.dll 11,,msxml.dll
11,,msxml2.dll 11,,msxml2.dll
...@@ -2572,17 +2548,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" ...@@ -2572,17 +2548,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msxml4.dll 11,,msxml4.dll
11,,msxml6.dll 11,,msxml6.dll
11,,shdocvw.dll 11,,shdocvw.dll
10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe
10,Microsoft.NET\Framework\v1.1.4322,ngen.exe
10,Microsoft.NET\Framework\v1.1.4322,fusion.dll
10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe
10,Microsoft.NET\Framework\v2.0.50727,ngen.exe
10,Microsoft.NET\Framework\v2.0.50727,fusion.dll
10,Microsoft.NET\Framework\v2.0.50727,regasm.exe
10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe
10,Microsoft.NET\Framework\v3.0\wpf,presentationfontcache.exe
10,Microsoft.NET\Framework\v4.0.30319,ngen.exe
10,Microsoft.NET\Framework\v4.0.30319,fusion.dll
11,gecko\plugin,npmshtml.dll 11,gecko\plugin,npmshtml.dll
11,wbem,mofcomp.exe 11,wbem,mofcomp.exe
16422,Internet Explorer,iexplore.exe 16422,Internet Explorer,iexplore.exe
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment