Jacek Caban : mshtml: Moved BOM enum to binding.h.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 9 13:14:34 CDT 2014
Module: wine
Branch: master
Commit: 7e4db7df488f946406d920224bfc14f07c72050b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4db7df488f946406d920224bfc14f07c72050b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Oct 9 16:07:33 2014 +0200
mshtml: Moved BOM enum to binding.h.
---
dlls/mshtml/binding.h | 8 +++++++-
dlls/mshtml/navigate.c | 8 ++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h
index 63ac882..764ae61 100644
--- a/dlls/mshtml/binding.h
+++ b/dlls/mshtml/binding.h
@@ -25,6 +25,12 @@ typedef enum {
METHOD_POST
} REQUEST_METHOD;
+typedef enum {
+ BOM_NONE,
+ BOM_UTF8,
+ BOM_UTF16
+} binding_bom_t;
+
typedef struct {
nsIHttpChannel nsIHttpChannel_iface;
nsIUploadChannel nsIUploadChannel_iface;
@@ -71,7 +77,7 @@ struct BSCallback {
ULONG readed;
DWORD bindf;
BOOL bindinfo_ready;
- int bom;
+ binding_bom_t bom;
IMoniker *mon;
IBinding *binding;
diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c
index 195f82e..8234c02 100644
--- a/dlls/mshtml/navigate.c
+++ b/dlls/mshtml/navigate.c
@@ -52,12 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
static const WCHAR emptyW[] = {0};
static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0};
-enum {
- BOM_NONE,
- BOM_UTF8,
- BOM_UTF16
-};
-
struct nsProtocolStream {
nsIInputStream nsIInputStream_iface;
@@ -1203,6 +1197,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream)
break;
case BOM_UTF16:
This->nschannel->charset = heap_strdupA(UTF16_STR);
+ case BOM_NONE:
+ /* FIXME: Get charset from HTTP headers */;
}
if(!This->nschannel->content_type) {
More information about the wine-cvs
mailing list