From 90b123c27b7a831600a23b877874d789a72c8bfd Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Mon, 5 Apr 2021 15:47:33 +0300 Subject: [PATCH] ci: fix self compilation on windows --- vlib/os/os_c.v | 6 +++--- vlib/v/builder/msvc.v | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vlib/os/os_c.v b/vlib/os/os_c.v index 13c7f0d5a8..5c4e2cc77c 100644 --- a/vlib/os/os_c.v +++ b/vlib/os/os_c.v @@ -21,7 +21,7 @@ fn C.open(&char, int, ...int) int fn C.fdopen(fd int, mode &char) &C.FILE -fn C.CopyFile(&u32, &u32, int) int +fn C.CopyFile(&u16, &u16, bool) int // fn C.lstat(charptr, voidptr) u64 @@ -432,13 +432,13 @@ pub fn get_raw_line() string { max_line_chars := 256 buf := malloc(max_line_chars * 2) h_input := C.GetStdHandle(C.STD_INPUT_HANDLE) - mut bytes_read := 0 + mut bytes_read := u32(0) if is_atty(0) > 0 { x := C.ReadConsole(h_input, buf, max_line_chars * 2, &bytes_read, 0) if !x { return tos(buf, 0) } - return string_from_wide2(&u16(buf), bytes_read) + return string_from_wide2(&u16(buf), int(bytes_read)) } mut offset := 0 for { diff --git a/vlib/v/builder/msvc.v b/vlib/v/builder/msvc.v index e027737bf6..5f9ee8ead2 100644 --- a/vlib/v/builder/msvc.v +++ b/vlib/v/builder/msvc.v @@ -39,14 +39,14 @@ fn find_windows_kit_internal(key RegKey, versions []string) ?string { $if windows { unsafe { for version in versions { - required_bytes := 0 // TODO mut + required_bytes := u32(0) // TODO mut result := C.RegQueryValueEx(key, version.to_wide(), 0, 0, 0, &required_bytes) length := required_bytes / 2 if result != 0 { continue } alloc_length := (required_bytes + 2) - mut value := &u16(malloc(alloc_length)) + mut value := &u16(malloc(int(alloc_length))) if isnil(value) { continue }