Commit 6259aeaa authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

winex11.drv: Link the windows JFIF format to the X image/jpeg format.

parent e4663206
...@@ -293,6 +293,7 @@ static WINE_CLIPFORMAT ClipFormats[] = ...@@ -293,6 +293,7 @@ static WINE_CLIPFORMAT ClipFormats[] =
/* Maps X properties to Windows formats */ /* Maps X properties to Windows formats */
static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0};
static const WCHAR wszGIF[] = {'G','I','F',0}; static const WCHAR wszGIF[] = {'G','I','F',0};
static const WCHAR wszJFIF[] = {'J','F','I','F',0};
static const WCHAR wszPNG[] = {'P','N','G',0}; static const WCHAR wszPNG[] = {'P','N','G',0};
static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0};
static const struct static const struct
...@@ -304,6 +305,7 @@ static const struct ...@@ -304,6 +305,7 @@ static const struct
{ wszRichTextFormat, XATOM_text_rtf }, { wszRichTextFormat, XATOM_text_rtf },
{ wszRichTextFormat, XATOM_text_richtext }, { wszRichTextFormat, XATOM_text_richtext },
{ wszGIF, XATOM_image_gif }, { wszGIF, XATOM_image_gif },
{ wszJFIF, XATOM_image_jpeg },
{ wszPNG, XATOM_image_png }, { wszPNG, XATOM_image_png },
{ wszHTMLFormat, XATOM_text_html }, { wszHTMLFormat, XATOM_text_html },
}; };
......
...@@ -635,6 +635,7 @@ enum x11drv_atoms ...@@ -635,6 +635,7 @@ enum x11drv_atoms
XATOM_XdndTypeList, XATOM_XdndTypeList,
XATOM_WCF_DIB, XATOM_WCF_DIB,
XATOM_image_gif, XATOM_image_gif,
XATOM_image_jpeg,
XATOM_image_png, XATOM_image_png,
XATOM_text_html, XATOM_text_html,
XATOM_text_plain, XATOM_text_plain,
......
...@@ -172,6 +172,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = ...@@ -172,6 +172,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
"XdndTypeList", "XdndTypeList",
"WCF_DIB", "WCF_DIB",
"image/gif", "image/gif",
"image/jpeg",
"image/png", "image/png",
"text/html", "text/html",
"text/plain", "text/plain",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment