From 2281942fb3ac5889abc6e95df27a80e71fe32c0e Mon Sep 17 00:00:00 2001 From: Karroffel Date: Wed, 8 Mar 2017 02:50:13 +0100 Subject: Added methods for opening dynamic libraries to OS --- platform/windows/os_windows.cpp | 26 ++++++++++++++++++++++++++ platform/windows/os_windows.h | 4 ++++ 2 files changed, 30 insertions(+) (limited to 'platform/windows') diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index f1a9ba5598..75dc2ef696 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1582,6 +1582,32 @@ bool OS_Windows::get_borderless_window() { return video_mode.borderless_window; } +Error open_dynamic_library(const String p_path, void* &p_library_handle) { + p_library_handle = (void *) LoadLibrary(p_path.utf8().get_data()); + if (!p_library_handle) { + ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + String::num(GetLastError())); + ERR_FAIL_V(ERR_CANT_OPEN); + } + return OK; +} + +Error close_dynamic_library(void* p_library_handle) { + if (!FreeLibrary((HMODULE) p_library_handle)) { + return FAILED; + } + return OK; +} + +Error get_dynamic_library_symbol_handle(void* p_library_handle, const String p_name, void* &p_symbol_handle) { + char *error; + p_symbol_handle = (void *) GetProcAddress((HMODULE) p_library_handle, p_name.utf8().get_data()); + if (!p_symbol_handle) { + ERR_EXPLAIN("Can't resolve symbol " + p_name + ". Error: " + String::num(GetLastError())); + ERR_FAIL_V(ERR_CANT_RESOLVE); + } + return OK; +} + void OS_Windows::request_attention() { FLASHWINFO info; diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 25c3102ee6..ed197b7685 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -222,6 +222,10 @@ public: virtual void set_borderless_window(int p_borderless); virtual bool get_borderless_window(); + virtual Error open_dynamic_library(const String p_path, void* &p_library_handle); + virtual Error close_dynamic_library(void* p_library_handle); + virtual Error get_dynamic_library_symbol_handle(void* p_library_handle, const String p_name, void* &p_symbol_handle); + virtual MainLoop *get_main_loop() const; virtual String get_name(); -- cgit v1.2.3 From fd553087867187220d4f6b8217854dd8e9be2667 Mon Sep 17 00:00:00 2001 From: Karroffel Date: Mon, 3 Apr 2017 16:11:38 +0200 Subject: added dlscript module This module was written by bojidar-bg and me, with the help of ClikCode and touilleMan. This adds a module to Godot that enables the use of dynamic libraries as a source for scripts. That also allows third party libraries to be linked to Godot more easily and without creating modules. For a readme see https://github.com/GodotNativeTools/godot_headers/blob/master/README.md --- platform/windows/os_windows.cpp | 12 ++++++------ platform/windows/os_windows.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'platform/windows') diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 75dc2ef696..cfc97d57da 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1582,8 +1582,8 @@ bool OS_Windows::get_borderless_window() { return video_mode.borderless_window; } -Error open_dynamic_library(const String p_path, void* &p_library_handle) { - p_library_handle = (void *) LoadLibrary(p_path.utf8().get_data()); +Error OS_Windows::open_dynamic_library(const String p_path, void *&p_library_handle) { + p_library_handle = (void *)LoadLibrary(p_path.utf8().get_data()); if (!p_library_handle) { ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + String::num(GetLastError())); ERR_FAIL_V(ERR_CANT_OPEN); @@ -1591,16 +1591,16 @@ Error open_dynamic_library(const String p_path, void* &p_library_handle) { return OK; } -Error close_dynamic_library(void* p_library_handle) { - if (!FreeLibrary((HMODULE) p_library_handle)) { +Error OS_Windows::close_dynamic_library(void *p_library_handle) { + if (!FreeLibrary((HMODULE)p_library_handle)) { return FAILED; } return OK; } -Error get_dynamic_library_symbol_handle(void* p_library_handle, const String p_name, void* &p_symbol_handle) { +Error OS_Windows::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle) { char *error; - p_symbol_handle = (void *) GetProcAddress((HMODULE) p_library_handle, p_name.utf8().get_data()); + p_symbol_handle = (void *)GetProcAddress((HMODULE)p_library_handle, p_name.utf8().get_data()); if (!p_symbol_handle) { ERR_EXPLAIN("Can't resolve symbol " + p_name + ". Error: " + String::num(GetLastError())); ERR_FAIL_V(ERR_CANT_RESOLVE); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index ed197b7685..050067ad7d 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -222,9 +222,9 @@ public: virtual void set_borderless_window(int p_borderless); virtual bool get_borderless_window(); - virtual Error open_dynamic_library(const String p_path, void* &p_library_handle); - virtual Error close_dynamic_library(void* p_library_handle); - virtual Error get_dynamic_library_symbol_handle(void* p_library_handle, const String p_name, void* &p_symbol_handle); + virtual Error open_dynamic_library(const String p_path, void *&p_library_handle); + virtual Error close_dynamic_library(void *p_library_handle); + virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle); virtual MainLoop *get_main_loop() const; -- cgit v1.2.3