Skip to content

Support long module path #57335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
15 commits merged into from
Aug 15, 2021
Merged

Support long module path #57335

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
638594b
Support long path
nxtn Feb 8, 2020
ff306e0
while (true)
nxtn Mar 14, 2020
20187cf
Calculate new length based on array length
nxtn Mar 14, 2020
ed89f18
Add a test
nxtn Mar 14, 2020
0b1c57e
Merge branch 'master' into longpath
adamsitnik Feb 23, 2021
969b96b
use a smaller value to ensure that at least for DEBUG builds
adamsitnik Feb 25, 2021
c3db3e6
add few extra asserts to the test to see why it fails in CI
adamsitnik Feb 25, 2021
e26b516
Assembly.LoadFile used the way this test is implemented fails on Mono
adamsitnik Mar 3, 2021
d2469a8
Merge remote-tracking branch 'upstream/main' into modulePathFix
adamsitnik Aug 13, 2021
c2cfde0
don't run the test on Windows 7, for some reason it does not work
adamsitnik Aug 13, 2021
46965ed
Apply suggestions from code review
adamsitnik Aug 13, 2021
b1e9b11
handle truncated module names, simplify the implementation and dispos…
adamsitnik Aug 13, 2021
93414f6
make sure that when the module is not found by the test, the test run…
adamsitnik Aug 13, 2021
e391f71
Apply suggestions from code review
adamsitnik Aug 15, 2021
6b4f2bc
polishing
adamsitnik Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
polishing
  • Loading branch information
@adamsitnik
adamsitnik committed Aug 15, 2021
commit 6b4f2bcd7b09229ca804736b05ad94331923ae5b
15 changes: 8 additions & 7 deletions src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Win32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul

var modules = new ProcessModuleCollection(firstModuleOnly ? 1 : modulesCount);

const int startLength =
const int StartLength =
#if DEBUG
1; // in debug, validate ArrayPool growth
#else
Interop.Kernel32.MAX_PATH;
#endif
char[]? chars = ArrayPool<char>.Shared.Rent(startLength);
char[]? chars = ArrayPool<char>.Shared.Rent(StartLength);
try
{
for (int i = 0; i < modulesCount; i++)
Expand All @@ -157,7 +157,7 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul
Interop.Kernel32.NtModuleInfo ntModuleInfo;
if (!Interop.Kernel32.GetModuleInformation(processHandle, moduleHandle, out ntModuleInfo))
{
HandleLastWin32Error(null);
HandleLastWin32Error();
continue;
}

Expand All @@ -178,7 +178,8 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul

if (length == 0)
{
HandleLastWin32Error(module);
module.Dispose();
HandleLastWin32Error();
continue;
}

Expand All @@ -193,7 +194,8 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul

if (length == 0)
{
HandleLastWin32Error(module);
module.Dispose();
HandleLastWin32Error();
continue;
}

Expand Down Expand Up @@ -246,7 +248,7 @@ private static void EnumProcessModulesUntilSuccess(SafeProcessHandle processHand
}
}

private static void HandleLastWin32Error(ProcessModule? processModule)
private static void HandleLastWin32Error()
{
int lastError = Marshal.GetLastWin32Error();
switch (lastError)
Expand All @@ -258,7 +260,6 @@ private static void HandleLastWin32Error(ProcessModule? processModule)
// move on.
break;
default:
processModule?.Dispose();
throw new Win32Exception(lastError);
}
}
Expand Down