Un-hardcode python module name.

Author: SeanCline

src/dbg/DbgEngContext.cpp

@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <DbgEng.h>
 
+#include <cctype>
 #include <string>
 
 namespace PyExt::Dbg {
@@ -100,10 +101,14 @@ namespace PyExt::Dbg {
 					name, sizeof(name), &nameSize)))
 				continue;
 
-			// Match "python" prefix but not unrelated modules. python3.dll is a thin
-			// forwarder with no useful symbols, so skip the bare "python3".
+			// Match the versioned "pythonNNN" dll that actually carries the symbols
+			// (python311, python314, python313t, python27, ...). Skip the bare
+			// "python" launcher exe (no PyType_Type etc.) and the "python3.dll"
+			// forwarder. This mirrors engextcpp's FindFirstModule("python???"),
+			// which required digits after the prefix.
 			std::string mod(name);
-			if (mod.rfind("python", 0) == 0 && mod != "python3") {
+			if (mod.rfind("python", 0) == 0 && mod != "python3"
+				&& mod.size() > 6 && std::isdigit(static_cast<unsigned char>(mod[6]))) {
 				std::string result = mod;
 				result += '!';
 				result += symbol;

test/PyExtTest/RemoteValueTest.cpp

@@ -29,11 +29,16 @@ TEST_CASE("RemoteValue matches the ExtRemoteTyped object model.", "[integration]
 
 	DbgEngContext ctx(dump.pClient.Get());
 
+	// The dump's Python version varies across the CI matrix (2.7, 3.11, 3.14, ...),
+	// so the module name is resolved dynamically rather than hardcoded.
+	auto pyTypeTypeSym = ctx.qualifyPythonSymbol("PyType_Type");
+	REQUIRE(pyTypeTypeSym.has_value());
+
 	SECTION("pointerSize / evaluate / qualify")
 	{
 		REQUIRE(ctx.pointerSize() == 8);
 
-		auto addr = ctx.evaluateU64("python314!PyType_Type");
+		auto addr = ctx.evaluateU64(*pyTypeTypeSym);
 		REQUIRE(addr.has_value());
 		REQUIRE(*addr != 0);
 
@@ -44,7 +49,7 @@ TEST_CASE("RemoteValue matches the ExtRemoteTyped object model.", "[integration]
 
 	SECTION("scalar + field parity against the object model")
 	{
-		auto addrOpt = ctx.evaluateU64("python314!PyType_Type");
+		auto addrOpt = ctx.evaluateU64(*pyTypeTypeSym);
 		REQUIRE(addrOpt.has_value());
 		const std::uint64_t addr = *addrOpt;
 
@@ -67,7 +72,7 @@ TEST_CASE("RemoteValue matches the ExtRemoteTyped object model.", "[integration]
 
 	SECTION("typeSize via GetTypeSize (the cast-expression-site primitive)")
 	{
-		auto addr = ctx.evaluateU64("python314!PyType_Type");
+		auto addr = ctx.evaluateU64(*pyTypeTypeSym);
 		REQUIRE(addr.has_value());
 		// PyObject header is 2 pointers on a GIL build (proven 0x10 in Phase 0).
 		REQUIRE(RemoteValue(ctx, "PyObject", *addr).typeSize()
@@ -76,7 +81,7 @@ TEST_CASE("RemoteValue matches the ExtRemoteTyped object model.", "[integration]
 
 	SECTION("expected-absent field returns nullopt, does not throw")
 	{
-		auto addr = ctx.evaluateU64("python314!PyType_Type");
+		auto addr = ctx.evaluateU64(*pyTypeTypeSym);
 		REQUIRE(addr.has_value());
 		RemoteValue rv(ctx, "_object", *addr);
 		REQUIRE_FALSE(rv.field("field_that_does_not_exist").has_value());