[PATCH 0/1] MR11043: wscript: Support UTF-16LE scripts with BOM

[Anders Kjersem (＠anders)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11043

[PATCH 1/1] Support UTF-16LE scripts with BOM

[Anders Kjersem]

From: Anders Kjersem <[e-mail]>

---
 programs/wscript/main.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/programs/wscript/main.c b/programs/wscript/main.c
index a971ceeec8d..9b1fa25ff85 100644
--- a/programs/wscript/main.c
+++ b/programs/wscript/main.c
@@ -525,9 +525,18 @@ static BSTR get_script_str(const WCHAR *filename)
     if(!file_map)
         return NULL;
 
-    len = MultiByteToWideChar(CP_ACP, 0, file_map, size, NULL, 0);
-    ret = SysAllocStringLen(NULL, len);
-    MultiByteToWideChar(CP_ACP, 0, file_map, size, ret, len);
+    if(size >= 2 && (BYTE)file_map[0] == 0xff && (BYTE)file_map[1] == 0xfe) // UTF-16LE
+    {
+        ret = SysAllocStringLen(NULL, size - 2);
+        if (ret)
+            CopyMemory(ret, file_map + 2, size - 2);
+    }
+    else
+    {
+        len = MultiByteToWideChar(CP_ACP, 0, file_map, size, NULL, 0);
+        ret = SysAllocStringLen(NULL, len);
+        MultiByteToWideChar(CP_ACP, 0, file_map, size, ret, len);
+    }
 
     UnmapViewOfFile(file_map);
     return ret;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11043

[Nikolay Sivov (＠nsivov)]

Please add a test for this to wscript/tests.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11043#note_141969