Vitaliy Margolen : mshtml: Don' t overwrite file types that could be changed by user.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eed3bd38956a8cce2090595e2157d8bc56261680
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eed3bd38956a8cce2090595e21...

Author: Vitaliy Margolen <wine-patches(a)kievinfo.com>
Date:   Sun May  4 00:18:42 2008 -0600

mshtml: Don't overwrite file types that could be changed by user.

---

 dlls/mshtml/mshtml.inf |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf
index e0098ce..f288236 100644
--- a/dlls/mshtml/mshtml.inf
+++ b/dlls/mshtml/mshtml.inf
@@ -290,7 +290,7 @@ HKCR,"MIME\Database\Content Type\image/gif","CLSID",,"%CLSID_HTMLDocument%"
 HKCR,"MIME\Database\Content Type\image/gif","Extension",,".gif"
 HKCR,"MIME\Database\Content Type\image/gif","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%"
 HKCR,"MIME\Database\Content Type\image/gif\Bits","0",1,04,00,00,00,FF,FF,FF,FF,47,49,46,38
-HKCR,".gif",,,"giffile"
+HKCR,".gif",,2,"giffile"
 HKCR,".gif","Content Type",,"image/gif"
 HKCR,"giffile",,,"GIF Image"
 HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%"
@@ -329,7 +329,7 @@ HKCR,"MIME\Database\Content Type\image/x-icon","Image Filter CLSID",,"%CLSID_IIm
 HKCR,".ico","Content Type",,"image/x-icon"
 
 ;; JPE
-HKCR,".jpe",,,"jpegfile"
+HKCR,".jpe",,2,"jpegfile"
 HKCR,".jpe","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
@@ -344,7 +344,7 @@ HKCR,"MIME\Database\Content Type\image/jpeg","CLSID",,"%CLSID_HTMLDocument%"
 HKCR,"MIME\Database\Content Type\image/jpeg","Extension",,".jpg"
 HKCR,"MIME\Database\Content Type\image/jpeg\Bits","0",1,02,00,00,00,FF,FF,FF,D8
 HKCR,"MIME\Database\Content Type\image/jpeg","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%"
-HKCR,".jpeg",,,"jpegfile"
+HKCR,".jpeg",,2,"jpegfile"
 HKCR,".jpeg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
@@ -355,7 +355,7 @@ HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8"
 
 ;; JPG
-HKCR,".jpg",,,"jpegfile"
+HKCR,".jpg",,2,"jpegfile"
 HKCR,".jpg","Content Type",,"image/jpeg"
 HKCR,"jpegfile",,,"JPEG Image"
 HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%"
@@ -367,9 +367,9 @@ HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 
 ;; MHTML
 HKCR,"MIME\Database\Content Type\message/rfc822","CLSID",,"%CLSID_MHTMLDocument%"
-HKCR,".mhtml",,,"mhtmlfile"
+HKCR,".mhtml",,2,"mhtmlfile"
 HKCR,".mhtml","Content Type",,"message/rfc822"
-HKCR,".mht",,,"mhtmlfile"
+HKCR,".mht",,2,"mhtmlfile"
 HKCR,".mht","Content Type",,"message/rfc822"
 HKCR,"mhtmlfile",,,"MHTML Document"
 HKCR,"mhtmlfile\BrowseInPlace",,,""
@@ -380,7 +380,7 @@ HKCR,"MIME\Database\Content Type\image/pjpeg","CLSID",,"%CLSID_HTMLDocument%"
 HKCR,"MIME\Database\Content Type\image/pjpeg","Extension",,".jpg"
 HKCR,"MIME\Database\Content Type\image/pjpeg\Bits","0",1,02,00,00,00,FF,FF,FF,D8
 HKCR,"MIME\Database\Content Type\image/pjpeg","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%"
-HKCR,".jfif",,,"pjpegfile"
+HKCR,".jfif",,2,"pjpegfile"
 HKCR,".jfif","Content Type",,"image/jpeg"
 HKCR,"pjpegfile",,,"JPEG Image"
 HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%"
@@ -393,7 +393,7 @@ HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL"
 ;; PNG
 HKCR,"MIME\Database\Content Type\image/png","Extension",,".png"
 HKCR,"MIME\Database\Content Type\image/x-png","Extension",,".png"
-HKCR,".png",,,"pngfile"
+HKCR,".png",,2,"pngfile"
 HKCR,".png","Content Type",,"image/png"
 HKCR,"pngfile",,,"PNG Image"
 HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%"