fixup! gh-138709: Implement CPU time profiling in profiling.sample

Author: pablogsal

Lib/test/test_profiling/test_sampling_profiler.py

@@ -2531,12 +2531,7 @@ def main():
                         all_threads=True,
                     )
                 except (PermissionError, RuntimeError) as e:
-                    if "Failed to find the PyRuntime section" in str(e):
-                        self.skipTest("Failed to find PyRuntime section in subprocess")
-                    elif "Insufficient permissions" in str(e):
-                        self.skipTest("Insufficient permissions for remote profiling")
-                    else:
-                        raise
+                    self.skipTest("Insufficient permissions for remote profiling")
 
                 cpu_mode_output = captured_output.getvalue()
 
@@ -2555,12 +2550,7 @@ def main():
                         all_threads=True,
                     )
                 except (PermissionError, RuntimeError) as e:
-                    if "Failed to find the PyRuntime section" in str(e):
-                        self.skipTest("Failed to find PyRuntime section in subprocess")
-                    elif "Insufficient permissions" in str(e):
-                        self.skipTest("Insufficient permissions for remote profiling")
-                    else:
-                        raise
+                    self.skipTest("Insufficient permissions for remote profiling")
 
                 wall_mode_output = captured_output.getvalue()
 

Modules/_remote_debugging_module.c

@@ -44,7 +44,8 @@
 #ifdef MS_WINDOWS
 #include <windows.h>
 #include <winternl.h>
-// Define the NTSTATUS values we need
+#include <ntifs.h>
+// ntstatus.h conflicts with windows.h so we have to define the NTSTATUS values we need
 #define STATUS_SUCCESS                   ((NTSTATUS)0x00000000L)
 #define STATUS_INFO_LENGTH_MISMATCH      ((NTSTATUS)0xC0000004L)
 typedef enum _WIN32_THREADSTATE {