Jacek Caban : shdocvw: Moved more registration to .rgs file.
Alexandre Julliard
julliard at winehq.org
Fri Apr 8 10:50:59 CDT 2011
Module: wine
Branch: master
Commit: 439f9109fcd5c7049f894899a55b92c7daa4d1ad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=439f9109fcd5c7049f894899a55b92c7daa4d1ad
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Apr 8 11:57:24 2011 +0200
shdocvw: Moved more registration to .rgs file.
---
dlls/shdocvw/shdocvw.inf | 21 +--------------
dlls/shdocvw/shdocvw.rc | 3 ++
dlls/shdocvw/shdocvw.rgs | 63 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf
index ea6effa..2cf9d6e 100644
--- a/dlls/shdocvw/shdocvw.inf
+++ b/dlls/shdocvw/shdocvw.inf
@@ -3,11 +3,11 @@ Signature="$CHICAGO$"
[RegisterDll]
-AddReg=Classes.Reg, URL.Reg
+AddReg=Classes.Reg
[UnregisterDll]
-DelReg=Classes.Reg, URL.Reg
+DelReg=Classes.Reg
[RegisterIE]
@@ -30,23 +30,6 @@ HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page"
HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe"""
HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24"
-HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,16
-HKCR,"InternetShortcut","EditFlags",2,"2"
-HKCR,"InternetShortcut","IsShortcut",,
-HKCR,"InternetShortcut","NeverShowExt",,
-HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0"
-HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l"
-HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"""
-HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4"""
-
-[URL.Reg]
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix",,,"http://"
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","ftp",,"ftp://"
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","gopher",,"gopher://"
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","home",,"http://"
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","mosaic",,"http://"
-HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://"
-
[Settings.Reg]
HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org"
diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc
index 1c73163..943d7a5 100644
--- a/dlls/shdocvw/shdocvw.rc
+++ b/dlls/shdocvw/shdocvw.rc
@@ -91,5 +91,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* @makedep: shdocvw.inf */
REGINST REGINST shdocvw.inf
+/* @makedep: shdocvw.rgs */
+2 WINE_REGISTRY shdocvw.rgs
+
/* @makedep: ietoolbar.bmp */
IDB_IETOOLBAR BITMAP ietoolbar.bmp
diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/shdocvw/shdocvw.rgs
new file mode 100644
index 0000000..a983458
--- /dev/null
+++ b/dlls/shdocvw/shdocvw.rgs
@@ -0,0 +1,63 @@
+HKLM
+{
+ NoRemove 'Software'
+ {
+ NoRemove 'Microsoft'
+ {
+ NoRemove 'Windows'
+ {
+ NoRemove 'CurrentVersion'
+ {
+ NoRemove 'URL'
+ {
+ DefaultPrefix = s 'http://'
+ Prefixes
+ {
+ val 'ftp' = s 'ftp://'
+ val 'gopher' = s 'gopher://'
+ val 'home' = s 'http://'
+ val 'mosaic' = s 'http://'
+ val 'www' = s 'http://'
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+HKCR
+{
+ NoRemove CLSID
+ {
+ '{fbf23b40-e3f0-101b-8488-00aa003e56f8}'
+ {
+ shellex
+ {
+ MayChangeDefaultMenu {}
+ }
+ }
+ }
+ 'InternetShortcut'
+ {
+ val 'EditFlags' = s '2'
+ val 'IsShortcut' = s ''
+ val 'NeverShowExt' = s ''
+ DefaultIcon = s 'url.dll,0'
+ shell
+ {
+ open
+ {
+ command = s 'rundll32.exe shdocvw.dll,OpenURL %%l'
+ }
+ print
+ {
+ command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1""'
+ }
+ printto
+ {
+ command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1"" ""%%2"" ""%%3"" ""%%4""'
+ }
+ }
+ }
+}
More information about the wine-cvs
mailing list