mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-03 01:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors in package win32

Browse Source
This commit is contained in:
gingerBill
2020-04-30 17:48:35 +01:00
parent f63b9806d2
commit 117ade0700
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/mem/mem.odin
View File

@@ -53,9 +53,8 @@ compare :: inline proc "contextless" (a, b: []byte) -> int {
return len(a) <= len(b) ? -1 : +1;
} else if len(a) == 0 && len(b) == 0 {
return 0;
} else {
return res;
}
return res;
}
compare_byte_ptrs :: proc "contextless" (a, b: ^byte, n: int) -> int #no_bounds_check {

16
core/odin/parser/parser.odin
View File

@@ -214,17 +214,17 @@ consume_comment_group :: proc(p: ^Parser, n: int) -> (comments: ^ast.Comment_Gro
for p.curr_tok.kind == .Comment &&
p.curr_tok.pos.line <= end_line+n {
comment: tokenizer.Token;
comment, end_line = consume_comment(p);
comment, end_line = consume_comment(p);
append(&list, comment);
}
}
if len(list) > 0 {
comments = new(ast.Comment_Group);
comments.list = list[:];
append(&p.file.comments, comments);
}
if len(list) > 0 {
comments = new(ast.Comment_Group);
comments.list = list[:];
append(&p.file.comments, comments);
}
return;
return;
}
consume_comment_groups :: proc(p: ^Parser, prev: tokenizer.Token) {

2
core/sys/win32/general.odin
View File

@@ -22,7 +22,7 @@ HKL :: distinct Handle;
Wparam :: distinct Uint_Ptr;
Lparam :: distinct Long_Ptr;
Lresult :: distinct Long_Ptr;
Wnd_Proc :: distinct #type proc "c" (Hwnd, u32, Wparam, Lparam) -> Lresult;
Wnd_Proc :: distinct #type proc "std" (Hwnd, u32, Wparam, Lparam) -> Lresult;
Monitor_Enum_Proc :: distinct #type proc "std" (Hmonitor, Hdc, ^Rect, Lparam) -> bool;

6
core/sys/win32/user32.odin
View File

@@ -136,8 +136,10 @@ foreign user32 {
@(link_name="PeekMessageW") peek_message_w :: proc(msg: ^Msg, hwnd: Hwnd, msg_filter_min, msg_filter_max, remove_msg: u32) -> Bool ---;
@(link_name="PostMessageA") post_message_a :: proc(hwnd: Hwnd, msg, wparam, lparam: u32) -> Bool ---;
@(link_name="PostMessageW") post_message_w :: proc(hwnd: Hwnd, msg, wparam, lparam: u32) -> Bool ---;
@(link_name="PostMessageA") post_message_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
@(link_name="PostMessageW") post_message_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
@(link_name="SendMessageA") send_message_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
@(link_name="SendMessageW") send_message_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Bool ---;
@(link_name="DefWindowProcA") def_window_proc_a :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Lresult ---;
@(link_name="DefWindowProcW") def_window_proc_w :: proc(hwnd: Hwnd, msg: u32, wparam: Wparam, lparam: Lparam) -> Lresult ---;