ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: copy selected file path from browser into core/content buffer

This commit is contained in:
Brad Parker 2017-02-21 15:29:06 -05:00
parent 238e234106
commit 4e1b4d051d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/drivers/ui_win32.c
View File

@ -533,6 +533,7 @@ bool win32_shader_dlg_init(void)
static bool win32_browser( static bool win32_browser(
HWND owner, HWND owner,
char *filename, char *filename,
size_t filename_size,
const char *extensions, const char *extensions,
const char *title, const char *title,
const char *initial_dir) const char *initial_dir)
@ -544,8 +545,6 @@ static bool win32_browser(
if (browser) if (browser)
{ {
ui_browser_window_state_t browser_state; ui_browser_window_state_t browser_state;
/* OPENFILENAME.lpstrFilter requires a null separated list of name/ext pairs terminated by a second null at the end. */
char *all_files[] = {"All Files (*.*)", "*.*", ""};
/* These need to be big enough to hold the path/name of any file the user may select. /* These need to be big enough to hold the path/name of any file the user may select.
* FIXME: We should really handle the error case when this isn't big enough. */ * FIXME: We should really handle the error case when this isn't big enough. */
@ -561,7 +560,8 @@ static bool win32_browser(
if (filename && *filename) if (filename && *filename)
strlcpy(new_file, filename, sizeof(new_file)); strlcpy(new_file, filename, sizeof(new_file));
browser_state.filters = all_files[0]; /* OPENFILENAME.lpstrFilters is actually const, so this cast should be safe */
browser_state.filters = (char*)extensions;
browser_state.title = new_title; browser_state.title = new_title;
browser_state.startdir = strdup(""); browser_state.startdir = strdup("");
browser_state.path = new_file; browser_state.path = new_file;
@ -569,6 +569,9 @@ static bool win32_browser(
result = browser->open(&browser_state); result = browser->open(&browser_state);
if (filename && browser_state.path)
strlcpy(filename, browser_state.path, filename_size);
free(browser_state.startdir); free(browser_state.startdir);
} }
@ -597,13 +600,14 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
switch (mode) switch (mode)
{ {
/* OPENFILENAME.lpstrFilter requires a null separated list of name/ext pairs terminated by a second null at the end. */
case ID_M_LOAD_CORE: case ID_M_LOAD_CORE:
extensions = "Libretro core (.dll)\0*.dll\0All Files\0*.*\0"; extensions = "Libretro core (.dll)\0*.dll\0All Files\0*.*\0\0";
title = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_LIST); title = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_LIST);
initial_dir = settings->directory.libretro; initial_dir = settings->directory.libretro;
break; break;
case ID_M_LOAD_CONTENT: case ID_M_LOAD_CONTENT:
extensions = "All Files (*.*)\0*.*\0"; extensions = "All Files (*.*)\0*.*\0\0";
title = msg_hash_to_str( title = msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST); MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST);
initial_dir = settings->directory.menu_content; initial_dir = settings->directory.menu_content;
@ -616,7 +620,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
MultiByteToWideChar(CP_UTF8, 0, title, -1, title_wide, sizeof(title_wide) / sizeof(title_wide[0])); MultiByteToWideChar(CP_UTF8, 0, title, -1, title_wide, sizeof(title_wide) / sizeof(title_wide[0]));
wcstombs(title_cp, title_wide, sizeof(title_cp) - 1); wcstombs(title_cp, title_wide, sizeof(title_cp) - 1);
if (!win32_browser(owner, win32_file, if (!win32_browser(owner, win32_file, sizeof(win32_file),
extensions, title_cp, initial_dir)) extensions, title_cp, initial_dir))
break; break;

2
ui/drivers/win32/ui_win32_browser_window.c
View File

@ -29,7 +29,7 @@ static bool ui_browser_window_win32_core(ui_browser_window_state_t *state, bool
ofn.lStructSize = sizeof(OPENFILENAME); ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = (HWND)state->window; ofn.hwndOwner = (HWND)state->window;
ofn.lpstrFilter = state->filters; ofn.lpstrFilter = state->filters; /* actually const */
ofn.lpstrFile = state->path; ofn.lpstrFile = state->path;
ofn.lpstrTitle = state->title; ofn.lpstrTitle = state->title;
ofn.lpstrInitialDir = state->startdir; ofn.lpstrInitialDir = state->startdir;