Jacek Caban : mshtml: Use UTF-8 encoding in NewURI by default.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Sep 26 15:38:59 2014 +0200

mshtml: Use UTF-8 encoding in NewURI by default.

---

 dlls/mshtml/nsio.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c
index 9335428..b5c766c 100644
--- a/dlls/mshtml/nsio.c
+++ b/dlls/mshtml/nsio.c
@@ -3343,7 +3343,10 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
         }
     }
 
-    MultiByteToWideChar(CP_ACP, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR));
+    if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8"))
+        FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset));
+
+    MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR));
 
     if(base_wine_uri) {
         hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);