Rémi Bernon : windowscodecs: Support JXR/WMP detection and formats.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fae839e49a17361d08d4471d4164721c66ce97d8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fae839e49a17361d08d4471d4...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Wed Sep 23 13:49:42 2020 +0200

windowscodecs: Support JXR/WMP detection and formats.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Esme Povirk <esme(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/windowscodecs/regsvr.c | 53 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 00be59c98f..38c252c276 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1192,6 +1192,48 @@ static struct decoder_pattern const jpeg_patterns[] = {
     {0}
 };
 
+static const BYTE wmp_magic_v0[] = {0x49, 0x49, 0xbc, 0x00};
+static const BYTE wmp_magic_v1[] = {0x49, 0x49, 0xbc, 0x01};
+
+static GUID const * const wmp_formats[] = {
+    &GUID_WICPixelFormat128bppRGBAFixedPoint,
+    &GUID_WICPixelFormat128bppRGBAFloat,
+    &GUID_WICPixelFormat128bppRGBFloat,
+    &GUID_WICPixelFormat16bppBGR555,
+    &GUID_WICPixelFormat16bppBGR565,
+    &GUID_WICPixelFormat16bppGray,
+    &GUID_WICPixelFormat16bppGrayFixedPoint,
+    &GUID_WICPixelFormat16bppGrayHalf,
+    &GUID_WICPixelFormat24bppBGR,
+    &GUID_WICPixelFormat24bppRGB,
+    &GUID_WICPixelFormat32bppBGR,
+    &GUID_WICPixelFormat32bppBGR101010,
+    &GUID_WICPixelFormat32bppBGRA,
+    &GUID_WICPixelFormat32bppCMYK,
+    &GUID_WICPixelFormat32bppGrayFixedPoint,
+    &GUID_WICPixelFormat32bppGrayFloat,
+    &GUID_WICPixelFormat32bppRGBE,
+    &GUID_WICPixelFormat40bppCMYKAlpha,
+    &GUID_WICPixelFormat48bppRGB,
+    &GUID_WICPixelFormat48bppRGBFixedPoint,
+    &GUID_WICPixelFormat48bppRGBHalf,
+    &GUID_WICPixelFormat64bppCMYK,
+    &GUID_WICPixelFormat64bppRGBA,
+    &GUID_WICPixelFormat64bppRGBAFixedPoint,
+    &GUID_WICPixelFormat64bppRGBAHalf,
+    &GUID_WICPixelFormat80bppCMYKAlpha,
+    &GUID_WICPixelFormat8bppGray,
+    &GUID_WICPixelFormat96bppRGBFixedPoint,
+    &GUID_WICPixelFormatBlackWhite,
+    NULL
+};
+
+static struct decoder_pattern const wmp_patterns[] = {
+    {4,0,wmp_magic_v0,mask_all,0},
+    {4,0,wmp_magic_v1,mask_all,0},
+    {0}
+};
+
 static const BYTE png_magic[] = {137,80,78,71,13,10,26,10};
 
 static GUID const * const png_formats[] = {
@@ -1336,6 +1378,17 @@ static struct regsvr_decoder const decoder_list[] = {
 	jpeg_formats,
 	jpeg_patterns
     },
+    {   &CLSID_WICWmpDecoder,
+	"The Wine Project",
+	"JPEG-XR Decoder",
+	"1.0.0.0",
+	&GUID_VendorMicrosoft,
+	&GUID_ContainerFormatWmp,
+	"image/jxr",
+	".jxr;.hdp;.wdp",
+	wmp_formats,
+	wmp_patterns
+    },
     {   &CLSID_WICPngDecoder,
 	"The Wine Project",
 	"PNG Decoder",