Index: reactos/boot/bootdata/hivecls.inf
===================================================================
--- reactos/boot/bootdata/hivecls.inf	(revision 73479)
+++ reactos/boot/bootdata/hivecls.inf	(working copy)
@@ -121,20 +121,38 @@
 HKCR,"fonfile","",0x00000000,"Font file"
 HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-209"
 HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155"
-HKCR,"fonfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1"
+HKCR,"fonfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
+HKCR,".fnt","",0x00000000,"fntfile"
+HKCR,"fntfile","",0x00000000,"Font file"
+HKCR,"fntfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-209"
+HKCR,"fntfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155"
+HKCR,"fntfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
+
 HKCR,".ttf","",0x00000000,"ttffile"
 HKCR,"ttffile","",0x00000000,"TrueType Font file"
 HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-210"
 HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
-HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1"
+HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
+HKCR,".ttc","",0x00000000,"ttcfile"
+HKCR,"ttcfile","",0x00000000,"TrueType Font Collection file"
+HKCR,"ttcfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-210"
+HKCR,"ttcfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
+HKCR,"ttcfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
+
 HKCR,".otf","",0x00000000,"otffile"
 HKCR,"otffile","",0x00000000,"OpenType Font file"
 HKCR,"otffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-211"
 HKCR,"otffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
-HKCR,"otffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1"
+HKCR,"otffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
 
+HKCR,".otc","",0x00000000,"otcfile"
+HKCR,"otcfile","",0x00000000,"OpenType Font file"
+HKCR,"otcfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-211"
+HKCR,"otcfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156"
+HKCR,"otcfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe ""%1"""
+
 ; Help Files
 HKCR,".hlp","",0x00000000,"hlpfile"
 HKCR,"hlpfile","",0x00000000,"Help File"