yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_d-millar_PR-5569_ajmurphy520_fix_for_dbgeng_dialog_entries'

Browse source
This commit is contained in:
Ryan Kurtz 2023-07-21 10:49:30 -04:00
commit bece81176e
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/client/DebugClientImpl1.java
View file

@ -199,11 +199,11 @@ public class DebugClientImpl1 implements DebugClientInternal {
BitmaskSet<DebugVerifierFlags> unusedVerifierFlags) { BitmaskSet<DebugVerifierFlags> unusedVerifierFlags) {
ULONGLONG ullServer = new ULONGLONG(si.id); ULONGLONG ullServer = new ULONGLONG(si.id);
ULONG ulFlags = new ULONG(createFlags.getBitmask()); ULONG ulFlags = new ULONG(createFlags.getBitmask());
if (unusedInitialDirectory != null) { if (unusedInitialDirectory != null && unusedInitialDirectory.length() > 0) {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"IDebugClient1 does not support 'initial directory'"); "IDebugClient1 does not support 'initial directory'");
} }
if (unusedEnvironment != null) { if (unusedEnvironment != null && unusedEnvironment.length() > 0) {
throw new UnsupportedOperationException("IDebugClient1 does not support 'environment'"); throw new UnsupportedOperationException("IDebugClient1 does not support 'environment'");
} }
COMUtils.checkRC(jnaClient.CreateProcess(ullServer, commandLine, ulFlags)); COMUtils.checkRC(jnaClient.CreateProcess(ullServer, commandLine, ulFlags));

4
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/impl/dbgeng/client/DebugClientImpl3.java
View file

@ -42,11 +42,11 @@ public class DebugClientImpl3 extends DebugClientImpl2 {
BitmaskSet<DebugVerifierFlags> unusedVerifierFlags) { BitmaskSet<DebugVerifierFlags> unusedVerifierFlags) {
ULONGLONG ullServer = new ULONGLONG(si.id); ULONGLONG ullServer = new ULONGLONG(si.id);
ULONG ulFlags = new ULONG(createFlags.getBitmask()); ULONG ulFlags = new ULONG(createFlags.getBitmask());
if (unusedInitialDirectory != null) { if (unusedInitialDirectory != null && unusedInitialDirectory.length() > 0) {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"IDebugClient3 does not support 'initial directory'"); "IDebugClient3 does not support 'initial directory'");
} }
if (unusedEnvironment != null) { if (unusedEnvironment != null && unusedEnvironment.length() > 0) {
throw new UnsupportedOperationException("IDebugClient3 does not support 'environment'"); throw new UnsupportedOperationException("IDebugClient3 does not support 'environment'");
} }
COMUtils.checkRC(jnaClient.CreateProcessWide(ullServer, new WString(commandLine), ulFlags)); COMUtils.checkRC(jnaClient.CreateProcessWide(ullServer, new WString(commandLine), ulFlags));

6
Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetProcessLaunchConnectorImpl.java
View file

@ -60,12 +60,12 @@ public class DbgModelTargetProcessLaunchConnectorImpl extends DbgModelTargetObje
HashMap<String, ParameterDescription<?>> map = HashMap<String, ParameterDescription<?>> map =
new HashMap<String, ParameterDescription<?>>(); new HashMap<String, ParameterDescription<?>>();
ParameterDescription<String> param = ParameterDescription.create(String.class, "args", true, ParameterDescription<String> param = ParameterDescription.create(String.class, "args", true,
null, "Cmd", "executable to be launched"); "", "Cmd", "executable to be launched");
ParameterDescription<String> initDir = ParameterDescription<String> initDir =
ParameterDescription.create(String.class, "dir", false, ParameterDescription.create(String.class, "dir", false,
null, "Dir", "initial directory"); "", "Dir", "initial directory");
ParameterDescription<String> env = ParameterDescription.create(String.class, "env", false, ParameterDescription<String> env = ParameterDescription.create(String.class, "env", false,
null, "Env (sep=/0)", "environment block"); "", "Env (sep=/0)", "environment block");
ParameterDescription<Integer> cf = ParameterDescription.create(Integer.class, "cf", true, ParameterDescription<Integer> cf = ParameterDescription.create(Integer.class, "cf", true,
1, "Create Flags", "creation flags"); 1, "Create Flags", "creation flags");
ParameterDescription<Integer> ef = ParameterDescription.create(Integer.class, "ef", false, ParameterDescription<Integer> ef = ParameterDescription.create(Integer.class, "ef", false,