Skip to content

Support long module path #33505

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

Closed
nxtn wants to merge 8 commits into from
Closed

Support long module path #33505

Changes from 1 commit
Commits
Show all changes
8 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
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
Next Next commit
Support long path
  • Loading branch information
@nxtn
nxtn committed Dec 7, 2020
commit 638594bf7d12f5fc6bcf832bc442107d366c3448
28 changes: 24 additions & 4 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,7 +131,9 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul

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

char[] chars = ArrayPool<char>.Shared.Rent(1024);
const int MaxShortPath = 260;
int minimumLength = MaxShortPath;
char[]? chars = ArrayPool<char>.Shared.Rent(minimumLength);
try
{
for (int i = 0; i < modulesCount; i++)
Expand Down Expand Up @@ -171,14 +173,29 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul

module.ModuleName = new string(chars, 0, length);

length = Interop.Kernel32.GetModuleFileNameEx(processHandle, moduleHandle, chars, chars.Length);
for (; ; )
{
length = Interop.Kernel32.GetModuleFileNameEx(processHandle, moduleHandle, chars, chars.Length);
if (length == chars.Length)
{
char[] toReturn = chars;
chars = null;
ArrayPool<char>.Shared.Return(toReturn);
Comment on lines +187 to +189
Copy link
Member

@danmoseley danmoseley Mar 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the purpose of toReturn - can't you do:

                               ArrayPool<char>.Shared.Return(chars);
                                minimumLength = Math.Min(minimumLength * 2, short.MaxValue);
                                chars = ArrayPool<char>.Shared.Rent(minimumLength);

Copy link
Member

@jkotas jkotas Mar 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danmosemsft This would call Return multiple timeswhenRent` throws an exception.

It would be fine to write it this way if the Return is not inside finally block (ie we let GC take care of collecting the buffer when exception is thrown).

Copy link
Member

@danmoseley danmoseley Mar 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes - tricky. might be worth a comment.

minimumLength = Math.Min(minimumLength * 2, short.MaxValue);
chars = ArrayPool<char>.Shared.Rent(minimumLength);
continue;
}

break;
}

if (length == 0)
{
HandleLastWin32Error();
continue;
}

module.FileName = (length >= 4 && chars[0] == '\\' && chars[1] == '\\' && chars[2] == '?' && chars[3] == '\\') ?
module.FileName = chars.AsSpan().StartsWith(@"\\?\") ?
new string(chars, 4, length - 4) :
new string(chars, 0, length);

Expand All @@ -187,7 +204,10 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul
}
finally
{
ArrayPool<char>.Shared.Return(chars);
if (chars != null)
{
ArrayPool<char>.Shared.Return(chars);
}
}

return modules;
Expand Down