[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit ddf13fde09fddb5a2638019143b2fccf014b8311
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Mar 9 10:51:48 2012 +0100

    mshtml: Recognize UTF-8 BOM.
    (cherry picked from commit c17015d10a460427bb3516c9b24b582c2df0b322)

diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index e5262ef..6d9787b 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};
@@ -1090,6 +1091,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;

-- 
Debian Wine packaging