Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix small issue with open dialog path, remove dupe hle func, add and reorder some

Browse Source
This commit is contained in:
Henrik Rydgard 2013-03-28 22:31:51 +01:00
parent 46bfbbe1fb
commit 23ad4c554a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Core/HLE/sceHttp.cpp
View File

@ -26,13 +26,15 @@
0x71eef62d sceSircsSend
*/
const HLEFunction sceHttp[] = {
{0xab1abe07,0,"sceHttpInit"},
{0xd1c8945e,0,"sceHttpEnd"},
{0xa6800c34,0,"sceHttpInitCache"},
{0x78b54c09,0,"sceHttpEndCache"},
{0x59e6d16f,0,"sceHttpEnableCache"},
{0xccbd167a,0,"sceHttpDisableCache"},
{0xd70d4847,0,"sceHttpGetProxy"},
{0x4cc7d78f,0,"sceHttpGetStatusCode"},
{0xedeeb999,0,"sceHttpReadData"},
{0xa6800c34,0,"sceHttpInitCache"},
{0xab1abe07,0,"sceHttpInit"},
{0xd1c8945e,0,"sceHttpEnd"},
{0x78b54c09,0,"sceHttpEndCache"},
{0xbb70706f,0,"sceHttpSendRequest"},
{0xa5512e01,0,"sceHttpDeleteRequest"},
{0x15540184,0,"sceHttpDeleteHeader"},
@ -42,10 +44,8 @@ const HLEFunction sceHttp[] = {
{0xf0f46c62,0,"sceHttpSetProxy"},
{0x0dafa58f,0,"sceHttpEnableCookie"},
{0x78a0d3ec,0,"sceHttpEnableKeepAlive"},
{0x59e6d16f,0,"sceHttpEnableCache"},
{0x0b12abfb,0,"sceHttpDisableCookie"},
{0xc7ef2559,0,"sceHttpDisableKeepAlive"},
{0xccbd167a,0,"sceHttpDisableCache"},
{0xe4d21302,0,"sceHttpsInit"},
{0xf9d8eb63,0,"sceHttpsEnd"},
{0x47347b50,0,"sceHttpCreateRequest"},
@ -72,6 +72,7 @@ const HLEFunction sceHttp[] = {
{0xCDF8ECB9,0,"sceHttpCreateConnectionWithURL"},
{0x1F0FC3E3,0,"sceHttpSetRecvTimeOut"},
{0xDB266CCF,0,"sceHttpGetAllHeader"},
{0x0282A3BD,0,"sceHttpGetContentLength"},
{0x68AB0F86,0,"sceHttpsInitWithPath"},
{0xB3FAF831,0,"sceHttpsDisableOption"},
{0x2255551E,0,"sceHttpGetNetworkPspError"},

1
Core/HLE/sceUmd.cpp
View File

@ -390,7 +390,6 @@ const HLEFunction sceUmdUser[] =
{0xBD2BDE07,&WrapI_I<sceUmdUnRegisterUMDCallBack>,"sceUmdUnRegisterUMDCallBack"},
{0x87533940,WrapU_V<sceUmdReplaceProhibit>,"sceUmdReplaceProhibit"},
{0xCBE9F02A,WrapU_V<sceUmdReplacePermit>,"sceUmdReplacePermit"},
{0x20628E6F, 0, "sceUmdGetErrorStatFunction"},
};
void Register_sceUmdUser()

6
Windows/WndMainWindow.cpp
View File

@ -199,7 +199,7 @@ namespace MainWindow
void BrowseAndBoot(std::string defaultPath)
{
std::string fn = defaultPath;
std::string fn;
std::string filter = "";
filter += "PSP";
@ -213,7 +213,7 @@ namespace MainWindow
filter[i] = '\0';
}
if (W32Util::BrowseForFileName(true, GetHWND(), "Load File",0,filter.c_str(),"*.pbp;*.elf;*.iso;*.cso;",fn))
if (W32Util::BrowseForFileName(true, GetHWND(), "Load File",defaultPath.size() ? defaultPath.c_str() : 0, filter.c_str(),"*.pbp;*.elf;*.iso;*.cso;",fn))
{
// decode the filename with fullpath
std::string fullpath = fn;
@ -289,7 +289,7 @@ namespace MainWindow
{
std::string memStickDir, flash0dir;
GetSysDirectories(memStickDir, flash0dir);
memStickDir += "PSP\\GAME";
memStickDir += "PSP\\GAME\\";
BrowseAndBoot(memStickDir);
}
break;