preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-11 05:26:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4168 from thedax/win32Portability

Browse Source 
Win32: Fix critical bug with GetSysDirectories.
This commit is contained in:
Unknown W. Brackets committed 2013-10-13 16:44:14 -07:00
2 parents 06b0ac9ccc 54de8739f1
commit 4b2dccd367
4 files changed
+9 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/FileUtil.cpp
+4 -4
View File
@@ -652,13 +652,13 @@ std::string GetBundleDirectory()
#endif
#ifdef _WIN32
std::string &GetExeDirectory()
std::wstring &GetExeDirectory()
{
static std::string DolphinPath;
static std::wstring DolphinPath;
if (DolphinPath.empty())
{
char Dolphin_exe_Path[2048];
GetModuleFileNameA(NULL, Dolphin_exe_Path, 2048);
wchar_t Dolphin_exe_Path[2048];
GetModuleFileName(NULL, Dolphin_exe_Path, 2048);
DolphinPath = Dolphin_exe_Path;
DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
}
Common/FileUtil.h
+1 -1
View File
@@ -125,7 +125,7 @@ std::string GetBundleDirectory();
#endif
#ifdef _WIN32
std::string &GetExeDirectory();
std::wstring &GetExeDirectory();
#endif
// simple wrapper for cstdlib file functions to
Core/System.cpp
+2 -2
View File
@@ -363,7 +363,7 @@ CoreParameter &PSP_CoreParameter() {
void GetSysDirectories(std::string &memstickpath, std::string &flash0path) {
#ifdef _WIN32
std::string path = File::GetExeDirectory();
std::string path = ConvertWStringToUTF8(File::GetExeDirectory());
// Mount a filesystem
flash0path = path + "/flash0/";
@@ -402,7 +402,7 @@ void GetSysDirectories(std::string &memstickpath, std::string &flash0path) {
// We're screwed anyway if we can't write to Documents, or can't detect it.
std::string testFile = "/_writable_test.$$$";
if (!File::CreateEmptyFile(path + testFile))
if (!File::CreateEmptyFile(memstickpath + testFile))
memstickpath = ConvertWStringToUTF8(myDocumentsPath) + "/PPSSPP/";
// Clean up our mess.
UI/NativeApp.cpp
+2 -1
View File
@@ -36,6 +36,7 @@
#include "file/zip_read.h"
#include "native/ext/stb_image_write/stb_image_writer.h"
#include "native/ext/jpge/jpge.h"
#include "native/util/text/utf8.h"
#include "gfx_es2/gl_state.h"
#include "gfx_es2/draw_text.h"
#include "gfx/gl_lost_manager.h"
@@ -368,7 +369,7 @@ void NativeInit(int argc, const char *argv[],
INFO_LOG(BOOT, "Logger inited.");
#else
if (g_Config.currentDirectory.empty()) {
g_Config.currentDirectory = File::GetExeDirectory();
g_Config.currentDirectory = ConvertWStringToUTF8(File::GetExeDirectory());
}
g_Config.memCardDirectory = "MemStick/";
#endif