Skip to content

Commit

Permalink
Fix procedure casting; SUBSYSTEM to CONSOLE in linker
Browse files Browse the repository at this point in the history
  • Loading branch information
gingerBill committed Dec 9, 2016
1 parent 0d69dfc commit e8b4228
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 14 deletions.
48 changes: 36 additions & 12 deletions code/demo.odin
Original file line number Diff line number Diff line change
@@ -1,31 +1,55 @@
#import "win32.odin"
#import "fmt.odin"

Dll :: struct {
Handle :: type rawptr
name: string
handle: Handle
}

main :: proc() {
get_proc :: proc(lib: win32.HMODULE, name: string) -> proc() {
buf: [4096]byte
copy(buf[:], name as []byte)
load_library :: proc(name: string) -> (Dll, bool) {
buf: [4096]byte
copy(buf[:], name as []byte)

proc_handle := win32.GetProcAddress(lib, ^buf[0])
return proc_handle as proc()
lib := win32.LoadLibraryA(^buf[0])
if lib == nil {
return nil, false
}
return Dll{name, lib as Dll.Handle}, true
}

lib := win32.LoadLibraryA(("example.dll\x00" as string).data)
if lib == nil {
free_library :: proc(dll: Dll) {
win32.FreeLibrary(dll.handle as win32.HMODULE)
}

get_proc_address :: proc(dll: Dll, name: string) -> (rawptr, bool) {
buf: [4096]byte
copy(buf[:], name as []byte)

addr := win32.GetProcAddress(dll.handle as win32.HMODULE, ^buf[0]) as rawptr
if addr == nil {
return nil, false
}
return addr, true
}


main :: proc() {
lib, lib_ok := load_library("example.dll")
if !lib_ok {
fmt.println("Could not load library")
return
}
defer win32.FreeLibrary(lib)
defer free_library(lib)


proc_handle := get_proc(lib, "some_thing")
if proc_handle == nil {
proc_addr, addr_ok := get_proc_address(lib, "some_thing")
if !addr_ok {
fmt.println("Could not load 'some_thing'")
return
}

some_thing := (proc_handle as proc())
some_thing := (proc_addr as proc())
fmt.println(some_thing)
some_thing()
}
2 changes: 1 addition & 1 deletion core/win32.odin
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ StretchDIBits :: proc(hdc: HDC,

LoadLibraryA :: proc(c_str: ^u8) -> HMODULE #foreign
FreeLibrary :: proc(h: HMODULE) #foreign
GetProcAddress :: proc(h: HMODULE, c_str: ^u8) -> proc() #foreign
GetProcAddress :: proc(h: HMODULE, c_str: ^u8) -> rawptr #foreign

GetClientRect :: proc(hwnd: HWND, rect: ^RECT) -> BOOL #foreign

Expand Down
4 changes: 4 additions & 0 deletions src/checker/expr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1880,6 +1880,10 @@ bool check_is_castable_to(Checker *c, Operand *operand, Type *y) {
if (is_type_proc(xb) && is_type_rawptr(yb)) {
return true;
}
// rawptr -> proc
if (is_type_rawptr(xb) && is_type_proc(yb)) {
return true;
}

return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ int main(int argc, char **argv) {
exit_code = win32_exec_command_line_app("msvc-link", true,
"link %.*s.obj -OUT:%.*s.%s %s "
"/defaultlib:libcmt "
"/nologo /incremental:no /opt:ref /subsystem:WINDOWS "
"/nologo /incremental:no /opt:ref /subsystem:CONSOLE "
" %.*s "
" %s "
"",
Expand Down

0 comments on commit e8b4228

Please sign in to comment.