mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-07 08:08:50 +00:00
Remove unneeded semicolons from the core library
This commit is contained in:
gingerBill
+101
-101
@@ -3,161 +3,161 @@ package os
|
||||
|
||||
import win32 "core:sys/windows"
|
||||
|
||||
Handle :: distinct uintptr;
|
||||
File_Time :: distinct u64;
|
||||
Errno :: distinct int;
|
||||
Handle :: distinct uintptr
|
||||
File_Time :: distinct u64
|
||||
Errno :: distinct int
|
||||
|
||||
|
||||
INVALID_HANDLE :: ~Handle(0);
|
||||
INVALID_HANDLE :: ~Handle(0)
|
||||
|
||||
|
||||
|
||||
O_RDONLY :: 0x00000;
|
||||
O_WRONLY :: 0x00001;
|
||||
O_RDWR :: 0x00002;
|
||||
O_CREATE :: 0x00040;
|
||||
O_EXCL :: 0x00080;
|
||||
O_NOCTTY :: 0x00100;
|
||||
O_TRUNC :: 0x00200;
|
||||
O_NONBLOCK :: 0x00800;
|
||||
O_APPEND :: 0x00400;
|
||||
O_SYNC :: 0x01000;
|
||||
O_ASYNC :: 0x02000;
|
||||
O_CLOEXEC :: 0x80000;
|
||||
O_RDONLY :: 0x00000
|
||||
O_WRONLY :: 0x00001
|
||||
O_RDWR :: 0x00002
|
||||
O_CREATE :: 0x00040
|
||||
O_EXCL :: 0x00080
|
||||
O_NOCTTY :: 0x00100
|
||||
O_TRUNC :: 0x00200
|
||||
O_NONBLOCK :: 0x00800
|
||||
O_APPEND :: 0x00400
|
||||
O_SYNC :: 0x01000
|
||||
O_ASYNC :: 0x02000
|
||||
O_CLOEXEC :: 0x80000
|
||||
|
||||
|
||||
ERROR_NONE: Errno : 0;
|
||||
ERROR_FILE_NOT_FOUND: Errno : 2;
|
||||
ERROR_PATH_NOT_FOUND: Errno : 3;
|
||||
ERROR_ACCESS_DENIED: Errno : 5;
|
||||
ERROR_INVALID_HANDLE: Errno : 6;
|
||||
ERROR_NOT_ENOUGH_MEMORY: Errno : 8;
|
||||
ERROR_NO_MORE_FILES: Errno : 18;
|
||||
ERROR_HANDLE_EOF: Errno : 38;
|
||||
ERROR_NETNAME_DELETED: Errno : 64;
|
||||
ERROR_FILE_EXISTS: Errno : 80;
|
||||
ERROR_INVALID_PARAMETER: Errno : 87;
|
||||
ERROR_BROKEN_PIPE: Errno : 109;
|
||||
ERROR_BUFFER_OVERFLOW: Errno : 111;
|
||||
ERROR_INSUFFICIENT_BUFFER: Errno : 122;
|
||||
ERROR_MOD_NOT_FOUND: Errno : 126;
|
||||
ERROR_PROC_NOT_FOUND: Errno : 127;
|
||||
ERROR_DIR_NOT_EMPTY: Errno : 145;
|
||||
ERROR_ALREADY_EXISTS: Errno : 183;
|
||||
ERROR_ENVVAR_NOT_FOUND: Errno : 203;
|
||||
ERROR_MORE_DATA: Errno : 234;
|
||||
ERROR_OPERATION_ABORTED: Errno : 995;
|
||||
ERROR_IO_PENDING: Errno : 997;
|
||||
ERROR_NOT_FOUND: Errno : 1168;
|
||||
ERROR_PRIVILEGE_NOT_HELD: Errno : 1314;
|
||||
WSAEACCES: Errno : 10013;
|
||||
WSAECONNRESET: Errno : 10054;
|
||||
ERROR_NONE: Errno : 0
|
||||
ERROR_FILE_NOT_FOUND: Errno : 2
|
||||
ERROR_PATH_NOT_FOUND: Errno : 3
|
||||
ERROR_ACCESS_DENIED: Errno : 5
|
||||
ERROR_INVALID_HANDLE: Errno : 6
|
||||
ERROR_NOT_ENOUGH_MEMORY: Errno : 8
|
||||
ERROR_NO_MORE_FILES: Errno : 18
|
||||
ERROR_HANDLE_EOF: Errno : 38
|
||||
ERROR_NETNAME_DELETED: Errno : 64
|
||||
ERROR_FILE_EXISTS: Errno : 80
|
||||
ERROR_INVALID_PARAMETER: Errno : 87
|
||||
ERROR_BROKEN_PIPE: Errno : 109
|
||||
ERROR_BUFFER_OVERFLOW: Errno : 111
|
||||
ERROR_INSUFFICIENT_BUFFER: Errno : 122
|
||||
ERROR_MOD_NOT_FOUND: Errno : 126
|
||||
ERROR_PROC_NOT_FOUND: Errno : 127
|
||||
ERROR_DIR_NOT_EMPTY: Errno : 145
|
||||
ERROR_ALREADY_EXISTS: Errno : 183
|
||||
ERROR_ENVVAR_NOT_FOUND: Errno : 203
|
||||
ERROR_MORE_DATA: Errno : 234
|
||||
ERROR_OPERATION_ABORTED: Errno : 995
|
||||
ERROR_IO_PENDING: Errno : 997
|
||||
ERROR_NOT_FOUND: Errno : 1168
|
||||
ERROR_PRIVILEGE_NOT_HELD: Errno : 1314
|
||||
WSAEACCES: Errno : 10013
|
||||
WSAECONNRESET: Errno : 10054
|
||||
|
||||
// Windows reserves errors >= 1<<29 for application use
|
||||
ERROR_FILE_IS_PIPE: Errno : 1<<29 + 0;
|
||||
ERROR_FILE_IS_NOT_DIR: Errno : 1<<29 + 1;
|
||||
ERROR_NEGATIVE_OFFSET: Errno : 1<<29 + 2;
|
||||
ERROR_FILE_IS_PIPE: Errno : 1<<29 + 0
|
||||
ERROR_FILE_IS_NOT_DIR: Errno : 1<<29 + 1
|
||||
ERROR_NEGATIVE_OFFSET: Errno : 1<<29 + 2
|
||||
|
||||
// "Argv" arguments converted to Odin strings
|
||||
args := _alloc_command_line_arguments();
|
||||
args := _alloc_command_line_arguments()
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
last_write_time :: proc(fd: Handle) -> (File_Time, Errno) {
|
||||
file_info: win32.BY_HANDLE_FILE_INFORMATION;
|
||||
file_info: win32.BY_HANDLE_FILE_INFORMATION
|
||||
if !win32.GetFileInformationByHandle(win32.HANDLE(fd), &file_info) {
|
||||
return 0, Errno(win32.GetLastError());
|
||||
return 0, Errno(win32.GetLastError())
|
||||
}
|
||||
lo := File_Time(file_info.ftLastWriteTime.dwLowDateTime);
|
||||
hi := File_Time(file_info.ftLastWriteTime.dwHighDateTime);
|
||||
return lo | hi << 32, ERROR_NONE;
|
||||
lo := File_Time(file_info.ftLastWriteTime.dwLowDateTime)
|
||||
hi := File_Time(file_info.ftLastWriteTime.dwHighDateTime)
|
||||
return lo | hi << 32, ERROR_NONE
|
||||
}
|
||||
|
||||
last_write_time_by_name :: proc(name: string) -> (File_Time, Errno) {
|
||||
data: win32.WIN32_FILE_ATTRIBUTE_DATA;
|
||||
data: win32.WIN32_FILE_ATTRIBUTE_DATA
|
||||
|
||||
wide_path := win32.utf8_to_wstring(name);
|
||||
wide_path := win32.utf8_to_wstring(name)
|
||||
if !win32.GetFileAttributesExW(wide_path, win32.GetFileExInfoStandard, &data) {
|
||||
return 0, Errno(win32.GetLastError());
|
||||
return 0, Errno(win32.GetLastError())
|
||||
}
|
||||
|
||||
l := File_Time(data.ftLastWriteTime.dwLowDateTime);
|
||||
h := File_Time(data.ftLastWriteTime.dwHighDateTime);
|
||||
return l | h << 32, ERROR_NONE;
|
||||
l := File_Time(data.ftLastWriteTime.dwLowDateTime)
|
||||
h := File_Time(data.ftLastWriteTime.dwHighDateTime)
|
||||
return l | h << 32, ERROR_NONE
|
||||
}
|
||||
|
||||
|
||||
|
||||
heap_alloc :: proc(size: int) -> rawptr {
|
||||
return win32.HeapAlloc(win32.GetProcessHeap(), win32.HEAP_ZERO_MEMORY, uint(size));
|
||||
return win32.HeapAlloc(win32.GetProcessHeap(), win32.HEAP_ZERO_MEMORY, uint(size))
|
||||
}
|
||||
heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr {
|
||||
if new_size == 0 {
|
||||
heap_free(ptr);
|
||||
return nil;
|
||||
heap_free(ptr)
|
||||
return nil
|
||||
}
|
||||
if ptr == nil {
|
||||
return heap_alloc(new_size);
|
||||
return heap_alloc(new_size)
|
||||
}
|
||||
|
||||
return win32.HeapReAlloc(win32.GetProcessHeap(), win32.HEAP_ZERO_MEMORY, ptr, uint(new_size));
|
||||
return win32.HeapReAlloc(win32.GetProcessHeap(), win32.HEAP_ZERO_MEMORY, ptr, uint(new_size))
|
||||
}
|
||||
heap_free :: proc(ptr: rawptr) {
|
||||
if ptr == nil {
|
||||
return;
|
||||
return
|
||||
}
|
||||
win32.HeapFree(win32.GetProcessHeap(), 0, ptr);
|
||||
win32.HeapFree(win32.GetProcessHeap(), 0, ptr)
|
||||
}
|
||||
|
||||
get_page_size :: proc() -> int {
|
||||
// NOTE(tetra): The page size never changes, so why do anything complicated
|
||||
// if we don't have to.
|
||||
@static page_size := -1;
|
||||
@static page_size := -1
|
||||
if page_size != -1 {
|
||||
return page_size;
|
||||
return page_size
|
||||
}
|
||||
|
||||
info: win32.SYSTEM_INFO;
|
||||
win32.GetSystemInfo(&info);
|
||||
page_size = int(info.dwPageSize);
|
||||
return page_size;
|
||||
info: win32.SYSTEM_INFO
|
||||
win32.GetSystemInfo(&info)
|
||||
page_size = int(info.dwPageSize)
|
||||
return page_size
|
||||
}
|
||||
|
||||
|
||||
|
||||
exit :: proc "contextless" (code: int) -> ! {
|
||||
win32.ExitProcess(win32.DWORD(code));
|
||||
win32.ExitProcess(win32.DWORD(code))
|
||||
}
|
||||
|
||||
|
||||
|
||||
current_thread_id :: proc "contextless" () -> int {
|
||||
return int(win32.GetCurrentThreadId());
|
||||
return int(win32.GetCurrentThreadId())
|
||||
}
|
||||
|
||||
|
||||
|
||||
_alloc_command_line_arguments :: proc() -> []string {
|
||||
arg_count: i32;
|
||||
arg_list_ptr := win32.CommandLineToArgvW(win32.GetCommandLineW(), &arg_count);
|
||||
arg_list := make([]string, int(arg_count));
|
||||
arg_count: i32
|
||||
arg_list_ptr := win32.CommandLineToArgvW(win32.GetCommandLineW(), &arg_count)
|
||||
arg_list := make([]string, int(arg_count))
|
||||
for _, i in arg_list {
|
||||
wc_str := (^win32.wstring)(uintptr(arg_list_ptr) + size_of(win32.wstring)*uintptr(i))^;
|
||||
wc_str := (^win32.wstring)(uintptr(arg_list_ptr) + size_of(win32.wstring)*uintptr(i))^
|
||||
olen := win32.WideCharToMultiByte(win32.CP_UTF8, 0, wc_str, -1,
|
||||
nil, 0, nil, nil);
|
||||
nil, 0, nil, nil)
|
||||
|
||||
buf := make([]byte, int(olen));
|
||||
buf := make([]byte, int(olen))
|
||||
n := win32.WideCharToMultiByte(win32.CP_UTF8, 0, wc_str, -1,
|
||||
raw_data(buf), olen, nil, nil);
|
||||
raw_data(buf), olen, nil, nil)
|
||||
if n > 0 {
|
||||
n -= 1;
|
||||
n -= 1
|
||||
}
|
||||
arg_list[i] = string(buf[:n]);
|
||||
arg_list[i] = string(buf[:n])
|
||||
}
|
||||
|
||||
return arg_list;
|
||||
return arg_list
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -170,46 +170,46 @@ _alloc_command_line_arguments :: proc() -> []string {
|
||||
TODO: Narrow down this range once Win 11 is published and the last Win 10 builds
|
||||
become available.
|
||||
*/
|
||||
WINDOWS_11_BUILD_CUTOFF :: 22_000;
|
||||
WINDOWS_11_BUILD_CUTOFF :: 22_000
|
||||
|
||||
get_windows_version_w :: proc() -> win32.OSVERSIONINFOEXW {
|
||||
osvi : win32.OSVERSIONINFOEXW;
|
||||
osvi.dwOSVersionInfoSize = size_of(win32.OSVERSIONINFOEXW);
|
||||
win32.RtlGetVersion(&osvi);
|
||||
return osvi;
|
||||
osvi : win32.OSVERSIONINFOEXW
|
||||
osvi.dwOSVersionInfoSize = size_of(win32.OSVERSIONINFOEXW)
|
||||
win32.RtlGetVersion(&osvi)
|
||||
return osvi
|
||||
}
|
||||
|
||||
is_windows_xp :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1)
|
||||
}
|
||||
|
||||
is_windows_vista :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
|
||||
}
|
||||
|
||||
is_windows_7 :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1)
|
||||
}
|
||||
|
||||
is_windows_8 :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 2)
|
||||
}
|
||||
|
||||
is_windows_8_1 :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3)
|
||||
}
|
||||
|
||||
is_windows_10 :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber < WINDOWS_11_BUILD_CUTOFF);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber < WINDOWS_11_BUILD_CUTOFF)
|
||||
}
|
||||
|
||||
is_windows_11 :: proc() -> bool {
|
||||
osvi := get_windows_version_w();
|
||||
return (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber >= WINDOWS_11_BUILD_CUTOFF);
|
||||
osvi := get_windows_version_w()
|
||||
return (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber >= WINDOWS_11_BUILD_CUTOFF)
|
||||
}
|
||||
Reference in New Issue
Block a user