3 files changed, 43 insertions, 19 deletions

diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp
index bb51474a8c..df1605ae9e 100644
--- a/platform/windows/export/export.cpp
+++ b/platform/windows/export/export.cpp
@@ -26,28 +26,25 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "export.h"
 #include "editor/editor_export.h"
 #include "platform/windows/logo.h"
 
 void register_windows_exporter() {
 
-#if 0
+	Ref<EditorExportPlatformPC> platform;
+	platform.instance();
+
 	Image img(_windows_logo);
-	Ref<ImageTexture> logo = memnew( ImageTexture );
+	Ref<ImageTexture> logo;
+	logo.instance();
 	logo->create_from_image(img);
+	platform->set_logo(logo);
+	platform->set_name("Windows Desktop");
+	platform->set_extension("exe");
+	platform->set_release_32("windows_32_release.exe");
+	platform->set_debug_32("windows_32_debug.exe");
+	platform->set_release_64("windows_64_release.exe");
+	platform->set_debug_64("windows_64_debug.exe");
 
-	{
-		Ref<EditorExportPlatformPC> exporter = Ref<EditorExportPlatformPC>( memnew(EditorExportPlatformPC) );
-		exporter->set_binary_extension("exe");
-		exporter->set_release_binary32("windows_32_release.exe");
-		exporter->set_debug_binary32("windows_32_debug.exe");
-		exporter->set_release_binary64("windows_64_release.exe");
-		exporter->set_debug_binary64("windows_64_debug.exe");
-		exporter->set_name("Windows Desktop");
-		exporter->set_logo(logo);
-		EditorImportExport::get_singleton()->add_export_platform(exporter);
-	}
-
-#endif
+	EditorExport::get_singleton()->add_export_platform(platform);
 }
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 83a6aa6079..cfc97d57da 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 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);
+	}
+	return OK;
+}
+
+Error OS_Windows::close_dynamic_library(void *p_library_handle) {
+	if (!FreeLibrary((HMODULE)p_library_handle)) {
+		return FAILED;
+	}
+	return OK;
+}
+
+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());
+	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;
@@ -2167,9 +2193,6 @@ void OS_Windows::run() {
 	if (!main_loop)
 		return;
 
-	// Process all events before the main initialization so the cursor will get initialized properly
-	process_events(); // get rid of pending events
-
 	main_loop->init();
 
 	uint64_t last_ticks = get_ticks_usec();
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 25c3102ee6..050067ad7d 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();