ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Using UTF-8 as default charset in bind_mon_to_wstr.

This commit is contained in:
Qian Hong 2014-09-20 00:48:00 +08:00 committed by Alexandre Julliard
parent e0905d780e
commit 2eeffe8acd
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mshtml/navigate.c
View File

@ -938,7 +938,6 @@ static const BSCallbackVtbl BufferBSCVtbl = {
HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret)
{ {
BufferBSC *bsc; BufferBSC *bsc;
int cp = CP_ACP;
WCHAR *text; WCHAR *text;
HRESULT hres; HRESULT hres;
@ -981,19 +980,17 @@ HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret)
break; break;
case BOM_UTF8: case BOM_UTF8:
cp = CP_UTF8;
/* fallthrough */
default: { default: {
DWORD len; DWORD len;
len = MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, NULL, 0); len = MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, NULL, 0);
text = heap_alloc((len+1)*sizeof(WCHAR)); text = heap_alloc((len+1)*sizeof(WCHAR));
if(!text) { if(!text) {
hres = E_OUTOFMEMORY; hres = E_OUTOFMEMORY;
break; break;
} }
MultiByteToWideChar(cp, 0, bsc->buf, bsc->bsc.readed, text, len); MultiByteToWideChar(CP_UTF8, 0, bsc->buf, bsc->bsc.readed, text, len);
text[len] = 0; text[len] = 0;
} }
} }