From b5fa32153234943a64c873559a0ee6a7c9e58096 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 19 Nov 2015 08:17:59 +0100 Subject: [PATCH] Buildfixes --- gfx/common/win32_common.h | 2 -- ui/drivers/ui_win32.c | 54 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h index a94ff122ce..6d1cb105e0 100644 --- a/gfx/common/win32_common.h +++ b/gfx/common/win32_common.h @@ -43,8 +43,6 @@ extern bool g_restore_desktop; LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); -LRESULT win32_menu_loop(HWND handle, WPARAM wparam); - void win32_monitor_get_info(void); void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id); diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index a5db871b82..84b328d0b7 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -412,6 +412,33 @@ bool win32_shader_dlg_init(void) return true; } +bool win32_browser( + HWND owner, + char *filename, + const char *extensions, + const char *title, + const char *initial_dir) +{ + OPENFILENAME ofn; + + memset((void*)&ofn, 0, sizeof(OPENFILENAME)); + + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = owner; + ofn.lpstrFilter = extensions; + ofn.lpstrFile = filename; + ofn.lpstrTitle = title; + ofn.lpstrInitialDir = TEXT(initial_dir); + ofn.lpstrDefExt = ""; + ofn.nMaxFile = PATH_MAX; + ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + + if (!GetOpenFileName(&ofn)) + return false; + + return true; +} + LRESULT win32_menu_loop(HWND owner, WPARAM wparam) { WPARAM mode = wparam & 0xffff; @@ -533,33 +560,6 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam) return 0L; } -bool win32_browser( - HWND owner, - char *filename, - const char *extensions, - const char *title, - const char *initial_dir) -{ - OPENFILENAME ofn; - - memset((void*)&ofn, 0, sizeof(OPENFILENAME)); - - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = owner; - ofn.lpstrFilter = extensions; - ofn.lpstrFile = filename; - ofn.lpstrTitle = title; - ofn.lpstrInitialDir = TEXT(initial_dir); - ofn.lpstrDefExt = ""; - ofn.nMaxFile = PATH_MAX; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - - if (!GetOpenFileName(&ofn)) - return false; - - return true; -} - static void ui_companion_win32_deinit(void *data) { ui_companion_win32_t *handle = (ui_companion_win32_t*)data;