[PATCH 1/1] vbscript: Handle CP_UTF8 in Chr()/Asc().

[Nikolay Sivov]

From: Nikolay Sivov

---
 dlls/vbscript/global.c   | 30 ++++++++++++++++++------------
 dlls/vbscript/vbscript.c | 15 ++++++++++++---
 dlls/vbscript/vbscript.h |  1 +
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index d60374f9e87..d07d46415e6 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1842,10 +1842,12 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA

if(!SysStringLen(str))
         hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL);
+    else if (This->ctx->codepage == CP_UTF8)
+        hres = return_short(res, *str);
     else {
         unsigned char buf[2];
         short val = 0;
-        int n = WideCharToMultiByte(CP_ACP, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL);
+        int n = WideCharToMultiByte(This->ctx->codepage, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL);
         switch(n) {
         case 1:
             val = buf[0];
@@ -1865,9 +1867,6 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA
     return hres;
 }

-/* The function supports only single-byte and double-byte character sets. It
- * ignores language specified by IActiveScriptSite::GetLCID. The argument needs
- * to be in range of short or unsigned short. */
 static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
     int cp, c, len = 0;
@@ -1882,7 +1881,7 @@ static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA
     if(FAILED(hres))
         return hres;

-    cp = GetACP();
+    cp = This->ctx->codepage;
     if(!GetCPInfo(cp, &cpi))
         cpi.MaxCharSize = 1;

@@ -1892,13 +1891,20 @@ static HRESULT Global_Chr(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA
         return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL);
     }

-    if(c>>8)
-        buf[len++] = c>>8;
-    if(!len || IsDBCSLeadByteEx(cp, buf[0]))
-        buf[len++] = c;
-    if(!MultiByteToWideChar(CP_ACP, 0, buf, len, &ch, 1)) {
-        WARN("invalid arg %d, cp %d\n", c, cp);
-        return E_FAIL;
+    if (cp == CP_UTF8)
+    {
+        ch = c;
+    }
+    else
+    {
+        if(c>>8)
+            buf[len++] = c>>8;
+        if(!len || IsDBCSLeadByteEx(cp, buf[0]))
+            buf[len++] = c;
+        if(!MultiByteToWideChar(cp, 0, buf, len, &ch, 1)) {
+            WARN("invalid arg %d, cp %d\n", c, cp);
+            return E_FAIL;
+        }
     }

if(res) {
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 428149d7132..10355e85ba0 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -590,9 +590,18 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript
     This->ctx->site = pass;
     IActiveScriptSite_AddRef(This->ctx->site);

-    hres = IActiveScriptSite_GetLCID(This->ctx->site, &lcid);
-    if(hres == S_OK)
-        This->ctx->lcid = lcid;
+    if(FAILED(IActiveScriptSite_GetLCID(This->ctx->site, &lcid)) && !lcid)
+        lcid = GetSystemDefaultLCID();
+    This->ctx->lcid = lcid;
+
+    if(!GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
+            (WCHAR *)&This->ctx->codepage, sizeof(This->ctx->codepage)/sizeof(WCHAR)))
+    {
+        GetLocaleInfoW(GetSystemDefaultLCID(), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER,
+                (WCHAR *)&This->ctx->codepage, sizeof(This->ctx->codepage)/sizeof(WCHAR));
+    }
+    if (!This->ctx->codepage)
+        This->ctx->codepage = CP_UTF8;

if(This->is_initialized)
         change_state(This, SCRIPTSTATE_INITIALIZED);
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index 3690fc4f0e2..8286b37bbab 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -183,6 +183,7 @@ static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i)
 struct _script_ctx_t {
     IActiveScriptSite *site;
     LCID lcid;
+    UINT codepage;

IInternetHostSecurityManager *secmgr;
     DWORD safeopt;