Skip to content
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

Jump to bottom

Fix 32-bit process module enumeration on 64-bit Windows (#70370) #71218

Merged
merged 4 commits into from
Jun 24, 2022
Merged

Fix 32-bit process module enumeration on 64-bit Windows (#70370) #71218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49f8dcc
Fix not all modules being listed for x86 target processes under Windo…
just-ero Jun 23, 2022
98b5a21
Addendum.
just-ero Jun 23, 2022
70590a0
Move `LIST_MODULES_ALL`.
just-ero Jun 23, 2022
683a4e8
Update src/libraries/Common/src/Interop/Windows/Kernel32/Interop.Enum…
jkotas Jun 23, 2022
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
6 changes: 4 additions & 2 deletions ...ws/Kernel32/Interop.EnumProcessModules.cs → .../Kernel32/Interop.EnumProcessModulesEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ internal static partial class Interop
{
internal static partial class Kernel32
{
[LibraryImport(Libraries.Kernel32, EntryPoint = "K32EnumProcessModules", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
internal const int LIST_MODULES_ALL = 0x00000003;

[LibraryImport(Libraries.Kernel32, EntryPoint = "K32EnumProcessModulesEx", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
internal static partial bool EnumProcessModules(SafeProcessHandle handle, IntPtr[]? modules, int size, out int needed);
internal static partial bool EnumProcessModulesEx(SafeProcessHandle handle, IntPtr[]? modules, int size, out int needed, int filterFlag);
}
}
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
Link="Common\System\Collections\Generic\ArrayBuilder.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
<Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EnumProcessModules.cs"
Link="Common\Interop\Windows\Kernel32\Interop.EnumProcessModules.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.EnumProcessModulesEx.cs"
Link="Common\Interop\Windows\Kernel32\Interop.EnumProcessModulesEx.cs" />
<Compile Include="$(CommonPath)Interop\Windows\Kernel32\Interop.FormatMessage.cs"
Link="Common\Interop\Windows\Kernel32\Interop.FormatMessage.cs" />
<Compile Include="$(CommonPath)Interop\Windows\NtDll\Interop.NtQueryInformationProcess.cs"
Expand Down
10 changes: 5 additions & 5 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 @@ -78,7 +78,7 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul
{
processHandle = ProcessManager.OpenProcess(processId, Interop.Advapi32.ProcessOptions.PROCESS_QUERY_INFORMATION | Interop.Advapi32.ProcessOptions.PROCESS_VM_READ, true);

bool succeeded = Interop.Kernel32.EnumProcessModules(processHandle, null, 0, out int needed);
bool succeeded = Interop.Kernel32.EnumProcessModulesEx(processHandle, null, 0, out int needed, Interop.Kernel32.LIST_MODULES_ALL);

// The API we need to use to enumerate process modules differs on two factors:
// 1) If our process is running in WOW64.
Expand Down Expand Up @@ -108,15 +108,15 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul
throw new Win32Exception(Interop.Errors.ERROR_PARTIAL_COPY, SR.EnumProcessModuleFailedDueToWow);
}

EnumProcessModulesUntilSuccess(processHandle, null, 0, out needed);
EnumProcessModulesUntilSuccess(processHandle, null, 0, out needed, Interop.Kernel32.LIST_MODULES_ALL);
}

int modulesCount = needed / IntPtr.Size;
IntPtr[] moduleHandles = new IntPtr[modulesCount];
while (true)
{
int size = needed;
EnumProcessModulesUntilSuccess(processHandle, moduleHandles, size, out needed);
EnumProcessModulesUntilSuccess(processHandle, moduleHandles, size, out needed, Interop.Kernel32.LIST_MODULES_ALL);
if (size == needed)
{
break;
Expand Down Expand Up @@ -221,15 +221,15 @@ private static ProcessModuleCollection GetModules(int processId, bool firstModul
}
}

private static void EnumProcessModulesUntilSuccess(SafeProcessHandle processHandle, IntPtr[]? modules, int size, out int needed)
private static void EnumProcessModulesUntilSuccess(SafeProcessHandle processHandle, IntPtr[]? modules, int size, out int needed, int filterFlag)
Copy link
Member

Choose a reason for hiding this comment

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

nit: if Interop.Kernel32.LIST_MODULES_ALL is the only value we use, you could avoid adding the new parameter to EnumProcessModulesUntilSuccess and just always pass Interop.Kernel32.LIST_MODULES_ALL to EnumProcessModulesEx

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, didn't wanna break any of the existing patterns.

{
// When called on a running process, EnumProcessModules may fail with ERROR_PARTIAL_COPY
// if the target process is not yet initialized or if the module list changes during the function call.
// We just try to avoid the race by retring 50 (an arbitrary number) times.
int i = 0;
while (true)
{
if (Interop.Kernel32.EnumProcessModules(processHandle, modules, size, out needed))
if (Interop.Kernel32.EnumProcessModulesEx(processHandle, modules, size, out needed, filterFlag))
{
return;
}
Expand Down