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

DBG: option to not call SetForegroundWindow

This commit is contained in:
mrexodia 2016-09-10 12:39:19 +02:00
parent 53abfc51fa
commit ddd229302f
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
5 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dbg/_exports.cpp
View File

@ -854,6 +854,7 @@ extern "C" DLL_EXPORT duint _dbg_sendmessage(DBGMSG type, void* param1, void* pa
bTraceRecordEnabledDuringTrace = settingboolget("Engine", "TraceRecordEnabledDuringTrace");
bSkipInt3Stepping = settingboolget("Engine", "SkipInt3Stepping");
bIgnoreInconsistentBreakpoints = settingboolget("Engine", "IgnoreInconsistentBreakpoints");
bNoForegroundWindow = settingboolget("Gui", "NoForegroundWindow");
duint setting;
if(BridgeSettingGetUint("Engine", "BreakpointType", &setting))

2
src/dbg/_plugins.cpp
View File

@ -49,7 +49,7 @@ PLUG_IMPEXP void _plugin_debugpause()
{
DebugUpdateGuiSetStateAsync(GetContextDataEx(hActiveThread, UE_CIP), true);
lock(WAITID_RUN);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
dbgsetskipexceptions(false);
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };

35
src/dbg/debugger.cpp
View File

@ -89,6 +89,7 @@ bool bEnableSourceDebugging = true;
bool bTraceRecordEnabledDuringTrace = true;
bool bSkipInt3Stepping = false;
bool bIgnoreInconsistentBreakpoints = false;
bool bNoForegroundWindow = false;
duint DbgEvents = 0;
static duint dbgcleartracecondition()
@ -640,7 +641,7 @@ void cbPauseBreakpoint()
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
@ -718,7 +719,7 @@ static void cbGenericBreakpoint(BP_TYPE bptype, void* ExceptionAddress = nullptr
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
wait(WAITID_RUN);
return;
@ -797,7 +798,7 @@ static void cbGenericBreakpoint(BP_TYPE bptype, void* ExceptionAddress = nullptr
}
if(breakCondition) //break the debugger
{
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
}
else //resume immediately
@ -837,7 +838,7 @@ void cbRunToUserCodeBreakpoint(void* ExceptionAddress)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
wait(WAITID_RUN);
}
@ -1034,7 +1035,7 @@ void cbStep()
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
plugincbcall(CB_STEPPED, &stepInfo);
wait(WAITID_RUN);
@ -1053,7 +1054,7 @@ static void cbRtrFinalStep()
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
wait(WAITID_RUN);
}
@ -1345,7 +1346,7 @@ static void cbCreateThread(CREATE_THREAD_DEBUG_INFO* CreateThread)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
}
@ -1382,7 +1383,7 @@ static void cbExitThread(EXIT_THREAD_DEBUG_INFO* ExitThread)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
}
@ -1436,7 +1437,7 @@ static void cbSystemBreakpoint(void* ExceptionData) // TODO: System breakpoint e
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
CloseHandle(CreateThread(NULL, 0, cbInitializationScriptThread, NULL, 0, NULL));
}
else
@ -1579,7 +1580,7 @@ static void cbLoadDll(LOAD_DLL_DEBUG_INFO* LoadDll)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
}
@ -1613,7 +1614,7 @@ static void cbUnloadDll(UNLOAD_DLL_DEBUG_INFO* UnloadDll)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
@ -1657,7 +1658,7 @@ static void cbOutputDebugString(OUTPUT_DEBUG_STRING_INFO* DebugString)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
wait(WAITID_RUN);
}
}
@ -1712,7 +1713,7 @@ static void cbException(EXCEPTION_DEBUG_INFO* ExceptionData)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
plugincbcall(CB_EXCEPTION, &callbackInfo);
wait(WAITID_RUN);
@ -1765,7 +1766,7 @@ static void cbException(EXCEPTION_DEBUG_INFO* ExceptionData)
// Plugin callback
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
bSkipExceptions = false;
plugincbcall(CB_EXCEPTION, &callbackInfo);
wait(WAITID_RUN);
@ -2456,6 +2457,12 @@ const char* dbggetdebuggeeinitscript()
return szDebuggeeInitializationScript;
}
void dbgsetforeground()
{
if(!bNoForegroundWindow)
SetForegroundWindow(GuiGetWindowHandle());
}
DWORD WINAPI threadDebugLoop(void* lpParameter)
{
debugLoopFunction(lpParameter, false);

2
src/dbg/debugger.h
View File

@ -110,6 +110,7 @@ bool dbgsettracecondition(String expression, duint maxCount);
bool dbgtraceactive();
void dbgsetdebuggeeinitscript(const char* fileName);
const char* dbggetdebuggeeinitscript();
void dbgsetforeground();
void cbStep();
void cbRtrStep();
@ -144,5 +145,6 @@ extern bool bEnableSourceDebugging;
extern bool bTraceRecordEnabledDuringTrace;
extern bool bSkipInt3Stepping;
extern bool bIgnoreInconsistentBreakpoints;
extern bool bNoForegroundWindow;
#endif // _DEBUGGER_H

2
src/dbg/debugger_commands.cpp
View File

@ -1510,7 +1510,7 @@ void cbDebugLoadLibBPX()
DebugUpdateGuiSetStateAsync(GetContextDataEx(hActiveThread, UE_CIP), true);
//lock
lock(WAITID_RUN);
SetForegroundWindow(GuiGetWindowHandle());
dbgsetforeground();
PLUG_CB_PAUSEDEBUG pauseInfo = { nullptr };
plugincbcall(CB_PAUSEDEBUG, &pauseInfo);
wait(WAITID_RUN);