Jacek Caban : mshtml: Recognize UTF-8 BOM.

Alexandre Julliard julliard at winehq.org
Fri Mar 9 12:34:20 CST 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Mar  9 10:51:48 2012 +0100

mshtml: Recognize UTF-8 BOM.

---

 dlls/mshtml/navigate.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 69329c4..d3070b0 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -44,6 +44,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define CONTENT_LENGTH "Content-Length"
+#define UTF8_STR "utf-8"
 #define UTF16_STR "utf-16"
 
 static const WCHAR emptyW[] = {0};
@@ -1092,6 +1093,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream)
                && (BYTE)This->nsstream->buf[0] == 0xff
                && (BYTE)This->nsstream->buf[1] == 0xfe)
                 This->nschannel->charset = heap_strdupA(UTF16_STR);
+            if(This->nsstream->buf_size >= 3
+               && (BYTE)This->nsstream->buf[0] == 0xef
+               && (BYTE)This->nsstream->buf[1] == 0xbb
+               && (BYTE)This->nsstream->buf[2] == 0xbf)
+                This->nschannel->charset = heap_strdupA(UTF8_STR);
 
             if(!This->nschannel->content_type) {
                 WCHAR *mime;




More information about the wine-cvs mailing list