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

[Debugger] Fix script directory bugs (fix #2094) (#2095)

This commit is contained in:
shyguyhex 2021-08-08 05:58:54 -05:00 committed by zilmar
parent e0673ea4e1
commit bd15ecbb0b
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Project64/UserInterface/Debugger/Debugger-Scripts.cpp
View File

@ -49,11 +49,20 @@ LRESULT CDebugScripts::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*l
RefreshList(); RefreshList();
LoadWindowPos(); m_InstallDir = (std::string)CPath(CPath::MODULE_DIRECTORY);
WindowCreated(); m_ScriptsDir = m_InstallDir + "Scripts\\";
if (!PathFileExistsA(m_ScriptsDir.c_str()))
{
CreateDirectoryA(m_ScriptsDir.c_str(), nullptr);
}
m_hQuitScriptDirWatchEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr); m_hQuitScriptDirWatchEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
m_hScriptDirWatchThread = CreateThread(nullptr, 0, ScriptDirWatchProc, (void*)this, 0, nullptr); m_hScriptDirWatchThread = CreateThread(nullptr, 0, ScriptDirWatchProc, (void*)this, 0, nullptr);
LoadWindowPos();
WindowCreated();
return 0; return 0;
} }
@ -88,7 +97,7 @@ DWORD WINAPI CDebugScripts::ScriptDirWatchProc(void* ctx)
HANDLE hEvents[2]; HANDLE hEvents[2];
hEvents[0] = FindFirstChangeNotification(L"Scripts", FALSE, FILE_NOTIFY_CHANGE_FILE_NAME); hEvents[0] = FindFirstChangeNotification(_this->m_ScriptsDir.ToUTF16().c_str(), FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
if (hEvents[0] == INVALID_HANDLE_VALUE) if (hEvents[0] == INVALID_HANDLE_VALUE)
{ {
@ -195,7 +204,7 @@ LRESULT CDebugScripts::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*
ConsoleCopy(); ConsoleCopy();
break; break;
case IDC_SCRIPTDIR_BTN: case IDC_SCRIPTDIR_BTN:
ShellExecute(nullptr, L"open", L"Scripts", nullptr, nullptr, SW_SHOW); ShellExecuteA(nullptr, "open", m_ScriptsDir.c_str(), nullptr, m_InstallDir.c_str(), SW_SHOW);
break; break;
} }
return FALSE; return FALSE;
@ -221,9 +230,8 @@ void CDebugScripts::RefreshStatus()
{ {
INSTANCE_STATE state = m_Debugger->ScriptSystem()->GetInstanceState(m_SelectedScriptName.c_str()); INSTANCE_STATE state = m_Debugger->ScriptSystem()->GetInstanceState(m_SelectedScriptName.c_str());
stdstr statusText; stdstr statusText = m_ScriptsDir + m_SelectedScriptName;
CPath(stdstr_f("Scripts\\%s", m_SelectedScriptName.c_str())).GetFullyQualified(statusText);
if (state == STATE_RUNNING) if (state == STATE_RUNNING)
{ {
statusText += " (Running)"; statusText += " (Running)";
@ -366,7 +374,7 @@ LRESULT CDebugScripts::OnRefreshList(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
{ {
int nIndex = m_ScriptList.GetSelectedIndex(); int nIndex = m_ScriptList.GetSelectedIndex();
CPath SearchPath("Scripts", "*"); CPath SearchPath(m_ScriptsDir, "*");
if (!SearchPath.FindFirst(CPath::FIND_ATTRIBUTE_ALLFILES)) if (!SearchPath.FindFirst(CPath::FIND_ATTRIBUTE_ALLFILES))
{ {
@ -464,7 +472,7 @@ void CDebugScripts::ToggleSelected()
void CDebugScripts::EditSelected() void CDebugScripts::EditSelected()
{ {
ShellExecute(nullptr, L"edit", stdstr(m_SelectedScriptName).ToUTF16().c_str(), nullptr, L"Scripts", SW_SHOWNORMAL); ShellExecuteA(nullptr, "edit", m_SelectedScriptName.c_str(), nullptr, m_ScriptsDir.c_str(), SW_SHOWNORMAL);
} }
// Console input // Console input

4
Source/Project64/UserInterface/Debugger/Debugger-Scripts.h
View File

@ -84,7 +84,9 @@ private:
CEditConsole m_ConsoleEdit; CEditConsole m_ConsoleEdit;
CScriptList m_ScriptList; CScriptList m_ScriptList;
CStatusBarCtrl m_StatusBar; CStatusBarCtrl m_StatusBar;
std::string m_SelectedScriptName; stdstr m_SelectedScriptName;
stdstr m_InstallDir;
stdstr m_ScriptsDir;
HANDLE m_hQuitScriptDirWatchEvent; HANDLE m_hQuitScriptDirWatchEvent;
HANDLE m_hScriptDirWatchThread; HANDLE m_hScriptDirWatchThread;

3
Source/Project64/UserInterface/Debugger/ScriptInstance.cpp
View File

@ -142,7 +142,8 @@ void CScriptInstance::StartScriptProc()
if (m_TempPath) if (m_TempPath)
{ {
stdstr fullPath = stdstr_f("Scripts/%s", m_TempPath); stdstr scriptsDir = (std::string)CPath(CPath::MODULE_DIRECTORY) + "Scripts\\";
stdstr fullPath = scriptsDir + m_TempPath;
duk_int_t scriptresult = duk_peval_file(ctx, fullPath.c_str()); duk_int_t scriptresult = duk_peval_file(ctx, fullPath.c_str());
m_TempPath = nullptr; m_TempPath = nullptr;