Win32: Add menu choice to open from memstick/PSP/GAME

This commit is contained in:
Henrik Rydgard 2013-03-28 20:26:24 +01:00
parent e7027b6c9c
commit 6f7cc57f53
5 changed files with 18 additions and 6 deletions

@ -197,9 +197,9 @@ namespace MainWindow
return TRUE;
}
void BrowseAndBoot(void)
void BrowseAndBoot(std::string defaultPath)
{
std::string fn;
std::string fn = defaultPath;
std::string filter = "";
filter += "PSP";
@ -282,7 +282,16 @@ namespace MainWindow
switch (wmId)
{
case ID_FILE_LOAD:
BrowseAndBoot();
BrowseAndBoot("");
break;
case ID_FILE_LOAD_MEMSTICK:
{
std::string memStickDir, flash0dir;
GetSysDirectories(memStickDir, flash0dir);
memStickDir += "PSP\\GAME";
BrowseAndBoot(memStickDir);
}
break;
case ID_FILE_REFRESHGAMELIST:

@ -1,6 +1,7 @@
#pragma once
#include <windows.h>
#include <string>
#include <Core/Core.h>
namespace MainWindow
@ -15,7 +16,7 @@ namespace MainWindow
HINSTANCE GetHInstance();
HWND GetDisplayHWND();
void SetPlaying(const char*text);
void BrowseAndBoot();
void BrowseAndBoot(std::string defaultPath);
void SetNextState(CoreState state);
void SaveStateActionFinished(bool result, void *userdata);
void _ViewFullScreen(HWND hWnd);

@ -160,7 +160,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
EmuThread_Start(fileToStart);
}
if (g_Config.bBrowse)
MainWindow::BrowseAndBoot();
MainWindow::BrowseAndBoot("");
if (!hideLog)
SetForegroundWindow(hwndMain);

@ -204,6 +204,7 @@ BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Open...", ID_FILE_LOAD
MENUITEM "&Open from MS:/PSP/GAME...", ID_FILE_LOAD_MEMSTICK
MENUITEM "&Close", ID_EMULATION_STOP
MENUITEM SEPARATOR
MENUITEM "Open &Memory Stick", ID_FILE_MEMSTICK

@ -265,6 +265,7 @@
#define IDC_MEMCHECK 40140
#define ID_OPTIONS_USEMEDIAENGINE 40141
#define ID_FILE_MEMSTICK 40142
#define ID_FILE_LOAD_MEMSTICK 40143
#define IDC_STATIC -1
// Next default values for new objects
@ -272,7 +273,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 233
#define _APS_NEXT_COMMAND_VALUE 40143
#define _APS_NEXT_COMMAND_VALUE 40144
#define _APS_NEXT_CONTROL_VALUE 1163
#define _APS_NEXT_SYMED_VALUE 101
#endif