piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped fopen/close/read/write functions inside a simple "IOFile" class. Reading, writing, and error checking became simpler in most cases. It should be near impossible to forget to close a file now that the destructor takes care of it. (I hope this fixes Issue 3635) I have tested the functionality of most things, but it is possible I broke something. :p

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2011-03-11 10:21:46 +00:00
parent 4f69672b2b
commit 59fd1008ca
68 changed files with 1112 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -67,21 +67,20 @@ CFrame* main_frame = NULL;
LONG WINAPI MyUnhandledExceptionFilter(LPEXCEPTION_POINTERS e) {
//EnterCriticalSection(&g_uefcs);
FILE* file = NULL;
fopen_s(&file, "exceptioninfo.txt", "a");
fseeko(file, 0, SEEK_END);
etfprint(file, "\n");
File::IOFile file("exceptioninfo.txt", "a");
file.Seek(0, SEEK_END);
etfprint(file.GetHandle(), "\n");
//etfprint(file, g_buildtime);
//etfprint(file, "\n");
//dumpCurrentDate(file);
etfprintf(file, "Unhandled Exception\n Code: 0x%08X\n",
etfprintf(file.GetHandle(), "Unhandled Exception\n Code: 0x%08X\n",
e->ExceptionRecord->ExceptionCode);
#ifndef _M_X64
STACKTRACE2(file, e->ContextRecord->Eip, e->ContextRecord->Esp, e->ContextRecord->Ebp);
STACKTRACE2(file.GetHandle(), e->ContextRecord->Eip, e->ContextRecord->Esp, e->ContextRecord->Ebp);
#else
STACKTRACE2(file, e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp);
STACKTRACE2(file.GetHandle(), e->ContextRecord->Rip, e->ContextRecord->Rsp, e->ContextRecord->Rbp);
#endif
fclose(file);
file.Close();
_flushall();
//LeaveCriticalSection(&g_uefcs);
@ -211,20 +210,16 @@ bool DolphinApp::OnInit()
#else
"x64");
#endif
FILE* workingDir = fopen(tmp, "r");
std::ifstream workingDir(tmp);
if (!workingDir)
{
if (PanicYesNoT("Dolphin has not been configured with an install location,\nKeep Dolphin portable?"))
{
FILE* portable = fopen((File::GetUserPath(D_CONFIG_IDX) + "portable").c_str(), "w");
std::ofstream portable((File::GetUserPath(D_CONFIG_IDX) + "portable").c_str());
if (!portable)
{
PanicAlertT("Portable Setting could not be saved\n Are you running Dolphin from read only media or from a directory that dolphin is not located in?");
}
else
{
fclose(portable);
}
}
else
{
@ -232,14 +227,12 @@ bool DolphinApp::OnInit()
sprintf(CWD, "%s", (const char*)wxGetCwd().mb_str());
if (PanicYesNoT("Set install location to:\n %s ?", CWD))
{
FILE* workingDirF = fopen(tmp, "w");
std::ofstream workingDirF(tmp);
if (!workingDirF)
PanicAlertT("Install directory could not be saved");
else
{
fwrite(CWD, ((std::string)CWD).size()+1, 1, workingDirF);
fwrite("", 1, 1, workingDirF); //seems to be needed on linux
fclose(workingDirF);
workingDirF << CWD << '\n';
}
}
else
@ -248,16 +241,12 @@ bool DolphinApp::OnInit()
}
else
{
char *tmpChar;
size_t len = (size_t)File::GetSize(workingDir);
tmpChar = new char[len];
fread(tmpChar, len, 1, workingDir);
fclose(workingDir);
if (!wxSetWorkingDirectory(wxString::From8BitData(tmpChar)))
std::string tmpChar;
std::getline(workingDir, tmpChar);
if (!wxSetWorkingDirectory(wxString::From8BitData(tmpChar.c_str())))
{
INFO_LOG(CONSOLE, "set working directory failed");
}
delete [] tmpChar;
}
}
#else