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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6259aeaacbe5293bdeb6a56d27df75a3d4e8c6f1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6259aeaacbe5293bdeb6a56d27df75a3d4e8c6f1

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Fri Jun 19 13:54:33 2009 -0500

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

---

 dlls/winex11.drv/clipboard.c   |    2 ++
 dlls/winex11.drv/x11drv.h      |    1 +
 dlls/winex11.drv/x11drv_main.c |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c
index 22445d7..3806080 100644
--- a/dlls/winex11.drv/clipboard.c
+++ b/dlls/winex11.drv/clipboard.c
@@ -293,6 +293,7 @@ static WINE_CLIPFORMAT ClipFormats[]  =
 /* 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 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 wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0};
 static const struct
@@ -304,6 +305,7 @@ static const struct
     { wszRichTextFormat, XATOM_text_rtf },
     { wszRichTextFormat, XATOM_text_richtext },
     { wszGIF, XATOM_image_gif },
+    { wszJFIF, XATOM_image_jpeg },
     { wszPNG, XATOM_image_png },
     { wszHTMLFormat, XATOM_text_html },
 };
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 03d7307..95706eb 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -635,6 +635,7 @@ enum x11drv_atoms
     XATOM_XdndTypeList,
     XATOM_WCF_DIB,
     XATOM_image_gif,
+    XATOM_image_jpeg,
     XATOM_image_png,
     XATOM_text_html,
     XATOM_text_plain,
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 924dc66..8299457 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -172,6 +172,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
     "XdndTypeList",
     "WCF_DIB",
     "image/gif",
+    "image/jpeg",
     "image/png",
     "text/html",
     "text/plain",