[BOOTDATA] Improve 'Open With' registry information (#586)

* use ""%1""
* double-quoted %1
* remove doubled quotes with rundll32

diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf
index 25b6a47..67f6576 100644 (file)
--- a/boot/bootdata/hivecls.inf
+++ b/boot/bootdata/hivecls.inf
@@ -8,6 +8,14 @@ HKLM,"SOFTWARE\Classes",,0x00000010
 HKCR,"*","",0x00000000,""
 HKCR,"SystemFileAssociations","",0x00000000,""
 
+; Open With List
+HKCR,"*\OpenWithList\excel.exe","",0x00000000,""
+HKCR,"*\OpenWithList\iexplore.exe","",0x00000000,""
+HKCR,"*\OpenWithList\mspaint.exe","",0x00000000,""
+HKCR,"*\OpenWithList\notepad.exe","",0x00000000,""
+HKCR,"*\OpenWithList\winword.exe","",0x00000000,""
+HKCR,"*\OpenWithList\wordpad.exe","",0x00000000,""
+
 ; Folders
 HKCR,"Folder","",0x00000000,"Folder"
 ;HKCR,"Folder\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4"
@@ -24,7 +32,7 @@ HKCR,".clp","Content Type",0x00000000,"application/x-msclip"
 HKCR,"clpfile","",0x00000000,"Clipboard Element"
 HKCR,"clpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\clipbrd.exe,-121"
 HKCR,"clpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\clipbrd.exe,1"
-HKCR,"clpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\clipbrd.exe %1"
+HKCR,"clpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\clipbrd.exe ""%1"""
 
 ; Event Log File
 HKCR,".evt","",0x00000000,"evtfile"
@@ -65,7 +73,7 @@ HKCR,"batfile","",0x00000000,"ReactOS Batch File"
 HKCR,"batfile","EditFlags",0x00010001,0x00000010
 HKCR,"batfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-201"
 HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153"
-HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*"
 
 ; ReactOS Command Script Files
@@ -74,7 +82,7 @@ HKCR,"cmdfile","",0x00000000,"ReactOS Command Script"
 HKCR,"cmdfile","EditFlags",0x00010001,0x00000010
 HKCR,"cmdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-202"
 HKCR,"cmdfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153"
-HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*"
 
 ; DOS Applications
@@ -208,13 +216,13 @@ HKCR,".hlp","",0x00000000,"hlpfile"
 HKCR,"hlpfile","",0x00000000,"Help File"
 HKCR,"hlpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-212"
 HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24"
-HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\winhlp32.exe %1"
+HKCR,"hlpfile\shell\open\command","",0x00020000,"%SystemRoot%\winhlp32.exe ""%1"""
 
 HKCR,".chm","",0x00000000,"chm.file"
 HKCR,"chm.file","",0x00000000,%CHMFILE%
 ;;HKCR,"chm.file","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\hhctrl.ocx,-452"
 HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0"
-HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1"
+HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe ""%1"""
 
 ; HTA Files
 HKCR,".hta","",0x00000000,"htafile"
@@ -234,7 +242,7 @@ HKCR,".html","PerceivedType",0x00000000,"text"
 HKCR,"htmlfile","",0x00000000,"HTML Document"
 HKCR,"htmlfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\mshtml.dll,-7501"
 HKCR,"htmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\ieframe.dll,0"
-HKCR,"htmlfile\shell\open\command","",0x00020000,"""%ProgramFiles%\Internet Explorer\iexplore.exe"" %1"
+HKCR,"htmlfile\shell\open\command","",0x00020000,"""%ProgramFiles%\Internet Explorer\iexplore.exe"" ""%1"""
 
 ; Icons
 HKCR,".ico","",0x00000000,"icofile"
@@ -260,7 +268,7 @@ HKCR,".gif","PerceivedType",0x00000000,"image"
 HKCR,"giffile","",0x00000000,"GIF Image"
 HKCR,"giffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-302"
 HKCR,"giffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,2"
-HKCR,"giffile\shell\open\command","",0x00020000,"""%ProgramFiles%\Internet Explorer\iexplore.exe"" %1"
+HKCR,"giffile\shell\open\command","",0x00020000,"""%ProgramFiles%\Internet Explorer\iexplore.exe"" ""%1"""
 
 ; JPEG Images
 HKCR,".jpg","",0x00000000,"jpegfile"
@@ -378,7 +386,7 @@ HKCR,".txt\shellnew","NullFile",0x00020000,""
 HKCR,"txtfile","",0x00000000,"Text Document"
 HKCR,"txtfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\notepad.exe,-512"
 HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152"
-HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 HKCR,"txtfile\shell\print\command","",0x00000000,"notepad.exe /p ""%1"""
 
 ; XML Documents
@@ -387,7 +395,7 @@ HKCR,".xml","Content Type",0x00000000,"text/xml"
 HKCR,"xmlfile","",0x00000000,%XMLFILE%
 ;;HKCR,"xmlfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-1"
 HKCR,"xmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,0"
-HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"xmlfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 
 ; XSL Stylesheets
 HKCR,".xsl","",0x00000000,"xslfile"
@@ -395,7 +403,7 @@ HKCR,".xsl","Content Type",0x00000000,"text/xml"
 HKCR,"xslfile","",0x00000000,%XSLFILE%
 ;;HKCR,"xslfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\msxml3r.dll,-2"
 HKCR,"xslfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\msxml3.dll,1"
-HKCR,"xslfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"xslfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 
 ; MSI files
 HKCR,".msi","",0x00000000,"Msi.Package"
@@ -428,7 +436,7 @@ HKCR,".reg","",0x00000000,"regfile"
 HKCR,"regfile","",0x00000000,"Registration File"
 HKCR,"regfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\regedit.exe,-31000"
 HKCR,"regfile\DefaultIcon","",0x00020000,"%SystemRoot%\regedit.exe,1"
-HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1"
+HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
 HKCR,"regfile\shell\open","",0x00000000,%MERGE%
 HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe ""%1"""
 
@@ -437,8 +445,8 @@ HKCR,".rdp","",0x00000000,"rdpfile"
 HKCR,"rdpfile","",0x00000000,"Remote Desktop Connection"
 ;HKCR,"rdpfile","FriendlyTypeName",0x00020000,"%SystemRoot%\mstsc.exe,-4004"
 HKCR,"rdpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\mstsc.exe,0"
-HKCR,"rdpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe %1"
-;HKCR,"rdpfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe -edit %1"
+HKCR,"rdpfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe ""%1"""
+;HKCR,"rdpfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\mstsc.exe -edit ""%1"""
 
 ; Screen Savers
 HKCR,".scr","",0x00000000,"scrfile"
@@ -495,7 +503,7 @@ HKCR,".wav","Content Type",0x00000000,"audio/wav"
 HKCR,".wav","PerceivedType",0x00000000,"audio"
 HKCR,"SoundRec","",0x00000000,%WAVFILE%
 HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225"
-HKCR,"SoundRec\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1"
+HKCR,"SoundRec\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe ""%1"""
 
 ; Midi Sounds
 HKCR,".mid","",0x00000000,"MIDFile"
@@ -506,13 +514,13 @@ HKCR,".midi","Content Type",0x00000000,"audio/mid"
 HKCR,".midi","PerceivedType",0x00000000,"audio"
 HKCR,"MIDFile","",0x00000000,%MIDFILE%
 HKCR,"MIDFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225"
-HKCR,"MIDFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1"
+HKCR,"MIDFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe ""%1"""
 
 ; Audio CD
 HKCR,".cda","",0x00000000,"CDAFile"
 HKCR,"CDAFile","",0x00000000,%CDAFILE%
 HKCR,"CDAFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225"
-HKCR,"CDAFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1"
+HKCR,"CDAFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe ""%1"""
 
 ; Avi Files
 HKCR,".avi","",0x00000000,"AVIFile"
@@ -520,7 +528,7 @@ HKCR,".avi","Content Type",0x00000000,"video/avi"
 HKCR,".avi","PerceivedType",0x00000000,"video"
 HKCR,"AVIFile","",0x00000000,%AVIFILE%
 HKCR,"AVIFile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-224"
-HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1"
+HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe ""%1"""
 
 HKCR,"CLSID",,0x00000012
 
@@ -559,11 +567,6 @@ HKCR,"NDS\Clsid","",0x00000002,"{323991f0-7bad-11cf-b03d-00aa006e0975}"
 
 HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553}"
 
-; Applications
-HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1"
-HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1"
-HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1"
-
 ; Misc Perceived types
 HKCR,".asm","PerceivedType",0x00000000,"text"
 HKCR,".asmx","PerceivedType",0x00000000,"text"

diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index c96b3af..e96e5de 100644 (file)
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -3,26 +3,121 @@ Signature="$ReactOS$"
 
 [AddReg]
 
-HKLM,"SOFTWARE\Classes\Applications\iexplore.exe","",0x00000000,""
-HKLM,"SOFTWARE\Classes\Applications\iexplore.exe\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
+; Applications
+HKLM,"SOFTWARE\Classes\Applications\notepad.exe\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe ""%1"""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\shell\open\command","",0x00020000,"%SystemRoot%\system32\mspaint.exe ""%1"""
+HKLM,"SOFTWARE\Classes\Applications\wordpad.exe\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.exe ""%1"""
+HKLM,"SOFTWARE\Classes\Applications\iexplore.exe\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe ""%1"""
+
+; Applications NoOpenWith
+HKLM,"SOFTWARE\Classes\Applications\accwiz.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\artgalry.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\awdvstub.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\cag.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\cchat.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\cdfview.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\clipbrd.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\cmmgr32.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\cryptext.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\datainst.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\depends.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\drwatson.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\dsquery.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\explorer.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\faxcover.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\finder.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\fontview.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\fpidcwiz.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\graflink.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\grpconv.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\helpctr.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\hh.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\inetcpl.cpl","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\isignup.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\kodakprv.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mmc.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mnyimprt.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msconf.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msdxm.ocx","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mshta.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msiexec.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msimn.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msinfo32.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\msrating.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\netshell.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\ntbackup.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\oledb32.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\orgchart.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\osa.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\outlook.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\perfmon.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\rasphone.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\regedit.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\rnaui.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\shdocvw.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\shell32.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\shscrap.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\snapview.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\themes.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\ttxmpc97.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\url.dll","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\wab.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\wb32.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\winhlp32.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\wltmime.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\wpnpinst.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\wscript.exe","NoOpenWith",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\zipfldr.dll","NoOpenWith",0x00000000,""
+
+; Applications NoStartPage
+HKLM,"SOFTWARE\Classes\Applications\explorer.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\icwconn1.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\inoculan.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mobsync.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\navwnt.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\realmon.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\sndvol32.exe","NoStartPage",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\xpsviewer.exe","NoStartPage",0x00000000,""
+
+; mspaint.exe SupportedTypes
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".bmp",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".dib",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jpg",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jpeg",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jpe",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jfif",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".gif",0x00000000,""
+; HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".emf",0x00000000,"" ; NOT SUPPORTED YET
+; HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".wmf",0x00000000,"" ; NOT SUPPORTED YET
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".tif",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".tiff",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".png",0x00000000,""
+
+; mplay32.exe SupportedTypes
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".wav",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".mid",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".midi",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".cda",0x00000000,""
+HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".avi",0x00000000,""
 
 HKLM,"SOFTWARE\Classes\ftp","",0x00000000,"URL:File Transfer Protocol"
 HKLM,"SOFTWARE\Classes\ftp\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
 HKLM,"SOFTWARE\Classes\ftp\URL Protocol","",0x00000000,""
-HKLM,"SOFTWARE\Classes\ftp\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
+HKLM,"SOFTWARE\Classes\ftp\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""
 
 HKLM,"SOFTWARE\Classes\gopher","",0x00000000,"URL:Gopher Protocol"
 HKLM,"SOFTWARE\Classes\gopher\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
 HKLM,"SOFTWARE\Classes\gopher\URL Protocol","",0x00000000,""
 ;see http
 ;HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome"
-HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
+HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""
 
 HKLM,"SOFTWARE\Classes\http","",0x00000000,"URL:HyperText Transfer Protocol"
 HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0"
 HKLM,"SOFTWARE\Classes\http\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
 HKLM,"SOFTWARE\Classes\http\URL Protocol","",0x00000000,""
-HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
+HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""
 ;TODO : iexplore should use DDE
 ;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec","",0x00000000,"""%1"",,-1,0,,,,"
 ;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec","NoActivateHandler",0x00000000,""
@@ -35,7 +130,7 @@ HKLM,"SOFTWARE\Classes\https\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9
 HKLM,"SOFTWARE\Classes\https\URL Protocol","",0x00000000,""
 ;see http
 ;HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome"
-HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1"
+HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""
 
 ; Register system default web browser
 HKLM,"SOFTWARE\Clients\StartMenuInternet","",0x00000000,"IEXPLORE.EXE"