Module: wine Branch: master Commit: 2976879c24036dfdd7b9ef22c0f320be3af10d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2976879c24036dfdd7b9ef22c0...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 11 20:33:46 2009 +0100
mshtml: Move some Content-Type registry keys to mshtml.inf.
---
dlls/mshtml/mshtml.inf | 31 +++++++++++++++++++++++++++++++ tools/wine.inf.in | 16 ---------------- 2 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index f288236..dd5a266 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -272,6 +272,10 @@ HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:47
[FileAssoc.Reg]
+;; AVI +HKCR,"MIME\Database\Content Type\video/avi","Extension",,".avi" +HKCR,".avi","Content Type",,"video/avi" + ;; BMP HKCR,"MIME\Database\Content Type\image/bmp","Extension",,".bmp" HKCR,"MIME\Database\Content Type\image/bmp","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" @@ -285,6 +289,14 @@ HKCR,".css","Content Type",,"text/css" ;; DIB HKCR,".dib","Content Type",,"image/bmp"
+;; DLL +HKCR,".dll","Content Type",,"application/x-msdownload" +HKCR,".dll",,,"dllfile" + +;; EXE +HKCR,".exe","Content Type",,"application/x-msdownload" +HKCR,".exe",,,"exefile" + ;; GIF HKCR,"MIME\Database\Content Type\image/gif","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\image/gif","Extension",,".gif" @@ -321,6 +333,10 @@ HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,,"" HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" +HKCR,".htm",,,"htmlfile" +HKCR,".htm","Content Type",,"text/html" +HKCR,".html",,,"htmlfile" +HKCR,".html","Content Type",,"text/html"
;; ICO HKCR,"MIME\Database\Content Type\image/x-icon","CLSID",,"%CLSID_HTMLDocument%" @@ -403,12 +419,21 @@ HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9"
+;; TIFF +HKCR,"MIME\Database\Content Type\image/tiff","Extension",,".tiff" +HKCR,".tif","Content Type",,"image/tiff" +HKCR,".tiff","Content Type",,"image/tiff" + ;; TXT HKCR,"MIME\Database\Content Type\text/plain","CLSID",,"%CLSID_HTMLDocument%" HKCR,"MIME\Database\Content Type\text/plain","Extension",,".txt" HKCR,"MIME\Database\Content Type\text/plain","Encoding",1,07,00,00,00 +HKCR,".txt",,,"txtfile" HKCR,".txt","Content Type",,"text/plain"
+;; WAV +HKCR,".wav","Content Type",,"audio/wav" + ;; XBM HKCR,"MIME\Database\Content Type\image/xbm","Extension",,".xbm" HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument%" @@ -420,3 +445,9 @@ HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;; HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9" + +;; XML +HKCR,".xml",,,"xmlfile" +HKCR,".xml","Content Type",,"text/xml" +HKCR,".xsl",,,"xslfile" +HKCR,".xsl","Content Type",,"text/xml" diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1550919..cdd5218 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -96,31 +96,15 @@ FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control"
[Classes] -HKCR,.avi,"Content Type",2,"video/avi" HKCR,.chm,,2,"chm.file" HKCR,.cpl,,2,"cplfile" -HKCR,.dll,"Content Type",2,"application/x-msdownload" -HKCR,.exe,,2,"exefile" -HKCR,.exe,"Content Type",2,"application/x-msdownload" HKCR,.hlp,,2,"hlpfile" -HKCR,.htm,,2,"htmlfile" -HKCR,.htm,"Content Type",2,"text/html" -HKCR,.html,,2,"htmlfile" -HKCR,.html,"Content Type",2,"text/html" HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" -HKCR,.jfif,"Content Type",2,"image/jpeg" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.rtf,,2,"rtffile" -HKCR,.tif,"Content Type",2,"image/tiff" -HKCR,.tiff,"Content Type",2,"image/tiff" -HKCR,.txt,,2,"txtfile" HKCR,.wri,,2,"wrifile" -HKCR,.wav,"Content Type",2,"audio/wav" -HKCR,.xml,,2,"xmlfile" -HKCR,.xml,"Content Type",2,"text/xml" -HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" HKCR,cplfile,,2,"Control Panel Item"