lifegpc/GARbro
1
0
Fork 0
mirror of https://github.com/lifegpc/GARbro.git synced 2026-07-08 01:31:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

(ReadCString): support UTF-16 encoding.

Browse Source
This commit is contained in:
morkt
2023-09-14 19:07:00 +04:00
parent 3a11f5fc7a
commit a49710e366
3 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
GameRes/ArcView.cs
View File

@@ -42,6 +42,13 @@ namespace GameRes
encoding.DecoderFallback = DecoderFallback.ExceptionFallback;
return encoding;
}
public static bool IsUtf16 (this Encoding enc)
{
// enc.WindowsCodePage property might throw an exception for some encodings, while
// CodePage is just a direct field access.
return (enc.CodePage == 1200 || enc.CodePage == 1201); // enc is UnicodeEncoding
}
}
public static class StreamExtension
@@ -440,9 +447,7 @@ namespace GameRes
{
byte* s = m_mem + (offset - m_offset);
uint string_length = 0;
// enc.WindowsCodePage property might throw an exception for some encodings, while
// CodePage is just a direct field access.
if (enc.CodePage == 1200 || enc.CodePage == 1201) // for UTF-16 encodings stop marker is 2-bytes long
if (enc.IsUtf16()) // for UTF-16 encodings stop marker is 2-bytes long
{
ushort* u = (ushort*)s;
while (string_length + 1 < size && 0 != u[string_length >> 1])