diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin
index 30eecf8a1..995e8e0e5 100644
--- a/core/sys/windows/util.odin
+++ b/core/sys/windows/util.odin
@@ -170,15 +170,15 @@ wstring_to_utf8_alloc :: proc(s: wstring, N: int, allocator := context.temp_allo
 	return string(text[:n]), nil
 }
 
-wstring_to_utf8_buf :: proc(buf: []u8, s: wstring) -> (res: string) {
-	n := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, -1, nil, 0, nil, nil)
+wstring_to_utf8_buf :: proc(buf: []u8, s: wstring, N := -1) -> (res: string) {
+	n := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, i32(N), nil, 0, nil, nil)
 	if n == 0 {
 		return
 	} else if int(n) > len(buf) {
 		return
 	}
 
-	n2 := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, -1, raw_data(buf), n, nil, nil)
+	n2 := WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, s, i32(N), raw_data(buf), n, nil, nil)
 	if n2 == 0 {
 		return
 	} else if int(n2) > len(buf) {
@@ -196,6 +196,21 @@ wstring_to_utf8_buf :: proc(buf: []u8, s: wstring) -> (res: string) {
 
 wstring_to_utf8 :: proc{wstring_to_utf8_alloc, wstring_to_utf8_buf}
 
+/*
+Converts a UTF-16 string into a regular UTF-8 `string` and allocates the result.
+If the input is null-terminated, only the part of the input string leading up
+to it will be converted.
+
+*Allocates Using Provided Allocator*
+
+Inputs:
+- s: The string to be converted
+- allocator: (default: context.allocator)
+
+Returns:
+- res: A cloned and converted string
+- err: An optional allocator error if one occured, `nil` otherwise
+*/
 utf16_to_utf8_alloc :: proc(s: []u16, allocator := context.temp_allocator) -> (res: string, err: runtime.Allocator_Error) {
 	if len(s) == 0 {
 		return "", nil
@@ -203,11 +218,25 @@ utf16_to_utf8_alloc :: proc(s: []u16, allocator := context.temp_allocator) -> (r
 	return wstring_to_utf8(raw_data(s), len(s), allocator)
 }
 
+/*
+Converts a UTF-16 string into a regular UTF-8 `string`, using `buf` as its backing.
+If the input is null-terminated, only the part of the input string leading up
+to it will be converted.
+
+*Uses `buf` for backing*
+
+Inputs:
+- s: The string to be converted
+- buf: Backing buffer for result string
+
+Returns:
+- res: A converted string, backed byu `buf`
+*/
 utf16_to_utf8_buf :: proc(buf: []u8, s: []u16) -> (res: string) {
 	if len(s) == 0 {
 		return
 	}
-	return wstring_to_utf8(buf, raw_data(s))
+	return wstring_to_utf8(buf, raw_data(s), len(s))
 }
 
 utf16_to_utf8 :: proc{utf16_to_utf8_alloc, utf16_to_utf8_buf}
diff --git a/tests/core/sys/windows/util.odin b/tests/core/sys/windows/util.odin
new file mode 100644
index 000000000..0201395f6
--- /dev/null
+++ b/tests/core/sys/windows/util.odin
@@ -0,0 +1,33 @@
+#+build windows
+package test_core_sys_windows
+
+import "base:intrinsics"
+import "core:testing"
+import win32 "core:sys/windows"
+
+UTF16_Vector :: struct {
+	wstr: win32.wstring,
+	ustr: string,
+}
+
+utf16_vectors := []UTF16_Vector{
+	{
+		intrinsics.constant_utf16_cstring("Hellope, World!"),
+		"Hellope, World!",
+	},
+	{
+		intrinsics.constant_utf16_cstring("Hellope\x00, World!"),
+		"Hellope",
+	},
+}
+
+@(test)
+utf16_to_utf8_buf_test :: proc(t: ^testing.T) {
+	for test in utf16_vectors {
+		buf := make([]u8, len(test.ustr))
+		defer delete(buf)
+
+		res := win32.utf16_to_utf8_buf(buf[:], test.wstr[:len(test.ustr)])
+		testing.expect_value(t, res, test.ustr)
+	}
+}
\ No newline at end of file