[BOOTDATA]

- Add support for opening ICO, EMF, TIF and WMF files with the shell image viewer since it already implements what is needed (via gdiplus).
- Add some missing "Content Type" (MIME type) and "PerceivedType" values for the image extensions.

[SHIMGVW]
- Enable the resource strings for EMF, TIF and WMF files since we actually support them.

Should be merged for 0.4 branch.

svn path=/trunk/; revision=70528
This commit is contained in:
Hermès Bélusca-Maïto 2016-01-07 15:14:40 +00:00
parent b6c06cfb06
commit 8ec9b6100f
21 changed files with 104 additions and 63 deletions

View file

@ -155,12 +155,25 @@ HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Expl
; Icons
HKCR,".ico","",0x00000000,"icofile"
HKCR,".ico","Content Type",0x00000000,"image/x-icon"
HKCR,".ico","PerceivedType",0x00000000,"image"
HKCR,"icofile","",0x00000000,"Icon"
HKCR,"icofile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-213"
HKCR,"icofile\DefaultIcon","",0x00000000,"%1"
HKCR,"icofile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; EMF Images
HKCR,".emf","",0x00000000,"emffile"
HKCR,".emf","PerceivedType",0x00000000,"image"
HKCR,"emffile","",0x00000000,"EMF Image"
HKCR,"emffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-301"
HKCR,"emffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
HKCR,"emffile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; GIF Images
HKCR,".gif","",0x00000000,"giffile"
HKCR,".gif","Content Type",0x00000000,"image/gif"
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"
@ -168,7 +181,11 @@ HKCR,"giffile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explo
; JPEG Images
HKCR,".jpg","",0x00000000,"jpegfile"
HKCR,".jpg","Content Type",0x00000000,"image/jpeg"
HKCR,".jpg","PerceivedType",0x00000000,"image"
HKCR,".jpeg","",0x00000000,"jpegfile"
HKCR,".jpeg","Content Type",0x00000000,"image/jpeg"
HKCR,".jpeg","PerceivedType",0x00000000,"image"
HKCR,"jpegfile","",0x00000000,"JPEG Image"
HKCR,"jpegfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-303"
HKCR,"jpegfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
@ -176,20 +193,44 @@ HKCR,"jpegfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\syst
; Bitmap Images
HKCR,".bmp","",0x00000000,"bmpfile"
HKCR,"bmpfile","",0x00000000,"Bitmap Image"
HKCR,".bmp","Content Type",0x00000000,"image/bmp"
HKCR,".bmp","PerceivedType",0x00000000,"image"
HKCR,".bmp\shellnew","",0x00000000,""
HKCR,".bmp\shellnew","NullFile",0x00020000,""
HKCR,"bmpfile","",0x00000000,"Bitmap Image"
HKCR,"bmpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-304"
HKCR,"bmpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,1"
HKCR,"bmpfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; PNG Images
HKCR,".png","",0x00000000,"pngfile"
HKCR,".png","Content Type",0x00000000,"image/png"
HKCR,".png","PerceivedType",0x00000000,"image"
HKCR,"pngfile","",0x00000000,"PNG Image"
HKCR,"pngfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-305"
HKCR,"pngfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,2"
HKCR,"pngfile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; TIF Images
HKCR,".tif","",0x00000000,"TIFImage.Document"
HKCR,".tif","Content Type",0x00000000,"image/tiff"
HKCR,".tif","PerceivedType",0x00000000,"image"
HKCR,".tiff","",0x00000000,"TIFImage.Document"
HKCR,".tiff","Content Type",0x00000000,"image/tiff"
HKCR,".tiff","PerceivedType",0x00000000,"image"
HKCR,"TIFImage.Document","",0x00000000,"TIF Image"
HKCR,"TIFImage.Document","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-306"
HKCR,"TIFImage.Document\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
HKCR,"TIFImage.Document\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; WMF Images
HKCR,".wmf","",0x00000000,"wmffile"
HKCR,".wmf","PerceivedType",0x00000000,"image"
HKCR,"wmffile","",0x00000000,"WMF Image"
HKCR,"wmffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shimgvw.dll,-307"
HKCR,"wmffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shimgvw.dll,0"
HKCR,"wmffile\shell\open\command","",0x00020000,"rundll32.exe %SystemRoot%\system32\shimgvw.dll,ImageView_Fullscreen %1"
; Configuration Files
HKCR,".ini","",0x00000000,"inifile"
HKCR,"inifile","",0x00000000,"Configuration Settings"

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -23,11 +23,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF-Bilddatei"
IDS_EMF_FILE "EMF-Bilddatei"
IDS_GIF_FILE "GIF-Bilddatei"
IDS_JPG_FILE "JPEG-Bilddatei"
IDS_BMP_FILE "Bitmap-Bilddatei"
IDS_PNG_FILE "PNG-Bilddatei"
// IDS_TIF_FILE "TIF-Bilddatei"
// IDS_WMF_FILE "WMF-Bilddatei"
IDS_TIF_FILE "TIF-Bilddatei"
IDS_WMF_FILE "WMF-Bilddatei"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -20,11 +20,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "Imagen EMF"
IDS_EMF_FILE "Imagen EMF"
IDS_GIF_FILE "Imagen GIF"
IDS_JPG_FILE "Imagen JPEG"
IDS_BMP_FILE "Imagen de mapa de bits"
IDS_PNG_FILE "Imagen PNG"
// IDS_TIF_FILE "Imagen TIF"
// IDS_WMF_FILE "Imagen WMF"
IDS_TIF_FILE "Imagen TIF"
IDS_WMF_FILE "Imagen WMF"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "Image EMF"
IDS_EMF_FILE "Image EMF"
IDS_GIF_FILE "Image GIF"
IDS_JPG_FILE "Image JPEG"
IDS_BMP_FILE "Image Bitmap"
IDS_PNG_FILE "Image PNG"
// IDS_TIF_FILE "Image TIF"
// IDS_WMF_FILE "Image WMF"
IDS_TIF_FILE "Image TIF"
IDS_WMF_FILE "Image WMF"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -20,11 +20,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -23,11 +23,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -25,11 +25,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "Imagine EMF"
IDS_EMF_FILE "Imagine EMF"
IDS_GIF_FILE "Imagine GIF"
IDS_JPG_FILE "Imagine JPEG"
IDS_BMP_FILE "Imagine bitmap"
IDS_BMP_FILE "Imagine Bitmap"
IDS_PNG_FILE "Imagine PNG"
// IDS_TIF_FILE "Imagine TIF"
// IDS_WMF_FILE "Imagine WMF"
IDS_TIF_FILE "Imagine TIF"
IDS_WMF_FILE "Imagine WMF"
END

View file

@ -18,11 +18,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF изображение"
IDS_EMF_FILE "EMF изображение"
IDS_GIF_FILE "GIF изображение"
IDS_JPG_FILE "JPEG изображение"
IDS_BMP_FILE "Bitmap изображение"
IDS_PNG_FILE "PNG изображение"
// IDS_TIF_FILE "TIF изображение"
// IDS_WMF_FILE "WMF изображение"
IDS_TIF_FILE "TIF изображение"
IDS_WMF_FILE "WMF изображение"
END

View file

@ -22,11 +22,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -22,11 +22,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -20,11 +20,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Resmi"
IDS_EMF_FILE "EMF Resmi"
IDS_GIF_FILE "GIF Resmi"
IDS_JPG_FILE "JPEG Resmi"
IDS_BMP_FILE "Bit Eşlem Resmi"
IDS_BMP_FILE "Bitmap Resmi"
IDS_PNG_FILE "PNG Resmi"
// IDS_TIF_FILE "TIF Resmi"
// IDS_WMF_FILE "WMF Resmi"
IDS_TIF_FILE "TIF Resmi"
IDS_WMF_FILE "WMF Resmi"
END

View file

@ -26,11 +26,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF Image"
IDS_GIF_FILE "GIF Image"
IDS_JPG_FILE "JPEG Image"
IDS_BMP_FILE "Bitmap Image"
IDS_PNG_FILE "PNG Image"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF Image"
IDS_WMF_FILE "WMF Image"
END

View file

@ -20,11 +20,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF 图像"
IDS_GIF_FILE "GIF 图像"
IDS_JPG_FILE "JPEG 图像"
IDS_BMP_FILE "Bitmap 图像"
IDS_PNG_FILE "PNG 图像"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF 图像"
IDS_WMF_FILE "WMF 图像"
END

View file

@ -20,11 +20,11 @@ END
STRINGTABLE
BEGIN
// IDS_EMF_FILE "EMF Image"
IDS_EMF_FILE "EMF 影象"
IDS_GIF_FILE "GIF 影象"
IDS_JPG_FILE "JPEG 影象"
IDS_BMP_FILE "Bitmap 影象"
IDS_PNG_FILE "PNG 影象"
// IDS_TIF_FILE "TIF Image"
// IDS_WMF_FILE "WMF Image"
IDS_TIF_FILE "TIF 影象"
IDS_WMF_FILE "WMF 影象"
END

View file

@ -41,13 +41,13 @@
#define IDS_PREVIEW 550
/* Friendly File Type Names */
// #define IDS_EMF_FILE 301
#define IDS_EMF_FILE 301
#define IDS_GIF_FILE 302
#define IDS_JPG_FILE 303
#define IDS_BMP_FILE 304
#define IDS_PNG_FILE 305
// #define IDS_TIF_FILE 306
// #define IDS_WMF_FILE 307
#define IDS_TIF_FILE 306
#define IDS_WMF_FILE 307
/* Tooltips strings */
#define IDS_TOOLTIP_NEXT_PIC 400