x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG+LAUNCHER: fixed launcher with a working directory set

This commit is contained in:
mrexodia 2016-12-13 16:27:23 +01:00
parent 3545cbcb60
commit d37e75d126
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dbg/commandline.cpp
View File

@ -4,7 +4,7 @@
#include "debugger.h"
#include "console.h"
char commandLine[MAX_COMMAND_LINE_SIZE];
char commandLine[MAX_SETTING_SIZE];
void showcommandlineerror(cmdline_error_t* cmdline_error)
{

7
src/dbg/commandparser.cpp
View File

@ -107,9 +107,6 @@ void Command::dataAppend(const char ch)
void Command::dataFinish()
{
if(_data.length())
{
_tokens.push_back(_data);
_data.clear();
}
_tokens.push_back(_data);
_data.clear();
}

12
src/launcher/x64dbg_launcher.cpp
View File

@ -13,7 +13,6 @@ typedef BOOL(WINAPI* LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
typedef BOOL(WINAPI* LPFN_Wow64DisableWow64FsRedirection)(PVOID);
typedef BOOL(WINAPI* LPFN_Wow64RevertWow64FsRedirection)(PVOID);
LPFN_Wow64DisableWow64FsRedirection _Wow64DisableRedirection = NULL;
LPFN_Wow64RevertWow64FsRedirection _Wow64RevertRedirection = NULL;
@ -479,6 +478,17 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
}
cmdLine += L"\"";
}
else //empty command line
{
cmdLine += L" \"\"";
}
//append current working directory
TCHAR szCurDir[MAX_PATH] = TEXT("");
GetCurrentDirectory(_countof(szCurDir), szCurDir);
cmdLine += L" \"";
cmdLine += szCurDir;
cmdLine += L"\"";
if(canDisableRedirect)
rWow.DisableRedirect();