ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for N = -1 in wstring_to_utf8

Browse Source
This commit is contained in:
gingerBill
2022-10-18 10:28:17 +01:00
parent 9bdbb45517
commit 80ce1b7d85
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sys/windows/util.odin
+4 -4
View File
@@ -62,19 +62,19 @@ utf8_to_wstring :: proc(s: string, allocator := context.temp_allocator) -> wstri
wstring_to_utf8 :: proc(s: wstring, N: int, allocator := context.temp_allocator) -> (res: string, err: runtime.Allocator_Error) { wstring_to_utf8 :: proc(s: wstring, N: int, allocator := context.temp_allocator) -> (res: string, err: runtime.Allocator_Error) {
context.allocator = allocator context.allocator = allocator
if N <= 0 { if N == 0 {
return return
} }
n := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, i32(N), nil, 0, nil, nil) n := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, i32(N) if N > 0 else -1, nil, 0, nil, nil)
if n == 0 { if n == 0 {
return return
} }
// If N == -1 the call to WideCharToMultiByte assume the wide string is null terminated // If N < 0 the call to WideCharToMultiByte assume the wide string is null terminated
// and will scan it to find the first null terminated character. The resulting string will // and will scan it to find the first null terminated character. The resulting string will
// also be null terminated. // also be null terminated.
// If N != -1 it assumes the wide string is not null terminated and the resulting string // If N > 0 it assumes the wide string is not null terminated and the resulting string
// will not be null terminated. // will not be null terminated.
text := make([]byte, n) or_return text := make([]byte, n) or_return