diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 426fe8b1595..49e4f45da27 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -250,7 +250,7 @@ HKCR,.wri,,2,"wrifile"
 HKCR,*\shellex\ContextMenuHandlers,,16
 HKCR,chm.file,,2,"Compiled HTML Help File"
 HKCR,chm.file\DefaultIcon,,2,"%10%\hh.exe,0"
-HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1"
+HKCR,chm.file\shell\open\command,,2,"""%10%\hh.exe"" ""%1"""
 HKCR,cplfile,,2,"Control Panel Item"
 HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel"
 HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*"
@@ -263,13 +263,13 @@ HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,""
 HKCR,folder\shell\open\ddeexec\application,,2,"Folders"
 HKCR,folder\shellex\ContextMenuHandlers,,16
 HKCR,hlpfile,,2,"Help File"
-HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1"
-HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
+HKCR,hlpfile\shell\open\command,,2,"""%11%\winhlp32.exe"" ""%1"""
+HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
 HKCR,inffile,,2,"Setup Information"
 HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1"
 HKCR,inifile,,2,"Configuration Settings"
-HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1"
-HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1"
+HKCR,inifile\shell\open\command,,2,"""%11%\notepad.exe"" ""%1"""
+HKCR,inifile\shell\print\command,,2,"""%11%\notepad.exe"" /p ""%1"""
 HKCR,lnkfile,,2,"Shortcut"
 HKCR,lnkfile,"NeverShowExt",2,""
 HKCR,lnkfile,"IsShortcut",2,"yes"
@@ -286,21 +286,21 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch"
 HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe"
 HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1"""
 HKCR,pdffile,,2,"PDF Document"
-HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
+HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
 HKCR,rtffile,,2,"Rich Text Document"
-HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1"
-HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"
+HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" ""%1"""
+HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p ""%1"""
 HKCR,txtfile,,2,"Text Document"
-HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1"
-HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1"
-HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1"
-HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"
+HKCR,txtfile\shell\open\command,,2,"""%11%\notepad.exe"" ""%1"""
+HKCR,txtfile\shell\print\command,,2,"""%11%\notepad.exe"" /p ""%1"""
+HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" ""%1"""
+HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p ""%1"""
 HKCR,xmlfile,,2,"XML Document"
-HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
-HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
-HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
-HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" %1"
-HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1"
+HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
+HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
+HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
+HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
+HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1"""
 
 HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932
 HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"InternetEncoding",0x10003,50221