Integrate minidump generate to udmp_parser module + PYI definitions (…

…#15) - Split `udmp_parser.utils` into a separate file, add a `generate_minidump` function. A variant of this function is added to the `pyproject.toml::project.scripts` to generate a `.exe` when `pip install`-ing it - Add type hints (`.pyi` file) for the python bindings (fix #12) - Fix one missing class (`MemoryInfoListStream_t` -> `MemoryInfoListStream`) which wasn't exposed before Co-authored-by: 0vercl0k <[email protected]>
0vercl0k · Aug 27, 2023 · f7bf64a · f7bf64a
1 parent a8d1490
commit f7bf64a
Show file tree

Hide file tree

Showing 10 changed files with 648 additions and 197 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # udmp-parser: A Cross-Platform C++ parser library for Windows user minidumps
 
 ![Build status](https://github.com/0vercl0k/udmp-parser/workflows/Builds/badge.svg)
+[![Downloads](https://static.pepy.tech/badge/udmp-parser/month)](https://pepy.tech/project/udmp-parser)
 
 This is a cross-platform (Windows / Linux / OSX / x86 / x64) C++ library that parses Windows user [minidump](https://docs.microsoft.com/en-us/windows/win32/debug/minidump-files) dumps (`.dump /m` and **not** `.dump /f` in WinDbg usermode).
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ project(
     udmp-parser
     DESCRIPTION "A Cross-Platform C++ parser library for Windows user minidumps."
     HOMEPAGE_URL https://github.com/0vercl0k/udmp-parser
-    VERSION 0.4
+    VERSION 0.5.0
 )
 
 set(PROJECT_AUTHOR 0vercl0k)

diff --git a/src/lib/udmp-parser.h b/src/lib/udmp-parser.h
@@ -75,9 +75,9 @@ namespace fs = std::filesystem;
 namespace udmpparser {
 
 #ifdef NDEBUG
-void DbgPrintf(const char *Format, ...) { (void)Format; }
+static void DbgPrintf(const char *Format, ...) { (void)Format; }
 #else
-void DbgPrintf(const char *Format, ...) {
+static void DbgPrintf(const char *Format, ...) {
   va_list ArgList;
   va_start(ArgList, Format);
   vfprintf(stderr, Format, ArgList);
@@ -226,7 +226,7 @@ struct Context64_t {
   uint128_t Xmm13;
   uint128_t Xmm14;
   uint128_t Xmm15;
-  uint8_t Padding[0x60];
+  std::array<uint8_t, 0x60> Padding;
   std::array<uint128_t, 26> VectorRegister;
   uint64_t VectorControl;
   uint64_t DebugControl;

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -24,14 +24,21 @@ list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}")
 
 find_package(nanobind CONFIG REQUIRED)
 
-nanobind_add_module(udmp_parser NB_STATIC src/udmp_parser.cc)
+set(CMAKE_CXX_STANDARD 20)
+
+nanobind_add_module(udmp_parser NB_STATIC src/udmp_parser_utils.cc src/udmp_parser.cc)
+
+if(MSVC)
+    target_link_libraries(udmp_parser PRIVATE DbgHelp.lib)
+endif(MSVC)
 
 if(BUILD_PYTHON_PACKAGE)
     #
     # Those directives are only used when creating a standalone `udmp_parser` python package
     #
     target_include_directories(udmp_parser PRIVATE ../lib)
     install(TARGETS udmp_parser LIBRARY DESTINATION .)
+    install(DIRECTORY udmp_parser-stubs DESTINATION .)
 else()
     #
     # This is the general case, when built from the root cmakefile

diff --git a/src/python/pyproject.toml b/src/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "udmp-parser"
-version = "0.4.3"
+version = "0.5.0"
 description = "A Cross-Platform C++ parser library for Windows user minidumps."
 readme = "README.md"
 requires-python = ">=3.8"
@@ -21,6 +21,9 @@ dependencies = []
 [project.urls]
 Homepage = "https://github.com/0vercl0k/udmp-parser"
 
+[project.scripts]
+generate_minidump = "udmp_parser.utils:generate_minidump_from_command_line"
+
 [tool.isort]
 profile = "black"
 
@@ -29,9 +32,7 @@ wheel.py-api = "cp312"
 minimum-version = "0.4"
 build-dir = "build/{wheel_tag}"
 cmake.minimum-version = "3.20"
-cmake.args = [
-    "-DBUILD_PYTHON_PACKAGE:BOOL=ON",
-]
+cmake.args = ["-DBUILD_PYTHON_PACKAGE:BOOL=ON"]
 
 [tool.cibuildwheel]
 build-verbosity = 1

diff --git a/src/python/src/udmp_parser.cc b/src/python/src/udmp_parser.cc
@@ -4,7 +4,7 @@
 // Released under MIT License, by 0vercl0k - 2023
 //
 // With contribution from:
-//  * hugsy - (github.com / hugsy)
+//  * hugsy - (github.com/hugsy)
 //
 
 #include "udmp-parser.h"
@@ -23,7 +23,12 @@
 
 namespace nb = nanobind;
 
+void udmp_parser_utils_module(nb::module_ &m);
+
 NB_MODULE(udmp_parser, m) {
+
+  udmp_parser_utils_module(m);
+
   nb::enum_<udmpparser::ProcessorArch_t>(m, "ProcessorArch")
       .value("X86", udmpparser::ProcessorArch_t::X86)
       .value("ARM", udmpparser::ProcessorArch_t::ARM)
@@ -193,6 +198,14 @@ NB_MODULE(udmp_parser, m) {
       .def_ro("StreamType", &udmpparser::dmp::Directory_t::StreamType)
       .def_ro("Location", &udmpparser::dmp::Directory_t::Location);
 
+  nb::class_<udmpparser::dmp::MemoryInfoListStream_t>(m, "MemoryInfoListStream")
+      .def_ro("SizeOfHeader",
+              &udmpparser::dmp::MemoryInfoListStream_t::SizeOfHeader)
+      .def_ro("SizeOfEntry",
+              &udmpparser::dmp::MemoryInfoListStream_t::SizeOfEntry)
+      .def_ro("NumberOfEntries",
+              &udmpparser::dmp::MemoryInfoListStream_t::NumberOfEntries);
+
   nb::class_<udmpparser::dmp::Memory64ListStreamHdr_t>(m,
                                                        "Memory64ListStreamHdr")
       .def_ro("NumberOfMemoryRanges",
@@ -315,7 +328,7 @@ NB_MODULE(udmp_parser, m) {
       .def("__repr__", &udmpparser::MemBlock_t::to_string);
   ;
 
-  nb::class_<udmpparser::Module_t>(m, "Modules")
+  nb::class_<udmpparser::Module_t>(m, "Module")
       .def(nb::init<const udmpparser::dmp::ModuleEntry_t &, const std::string &,
                     const void *, const void *>(),
            nb::rv_policy::take_ownership)
@@ -374,91 +387,4 @@ NB_MODULE(udmp_parser, m) {
       .def_ro_static("major", &udmpparser::Version::Major)
       .def_ro_static("minor", &udmpparser::Version::Minor)
       .def_ro_static("release", &udmpparser::Version::Release);
-
-  auto utils = m.def_submodule("utils", "Helper functions");
-  utils.def(
-      "TypeToString",
-      [](const uint32_t Type) -> std::string {
-        switch (Type) {
-        case 0x2'00'00: {
-          return "MEM_PRIVATE";
-        }
-        case 0x4'00'00: {
-          return "MEM_MAPPED";
-        }
-        case 0x1'00'00'00: {
-          return "MEM_IMAGE";
-        }
-        }
-        return "";
-      },
-      "Get a string representation of the memory type");
-
-  utils.def(
-      "StateToString",
-      [](const uint32_t State) {
-        switch (State) {
-        case 0x10'00: {
-          return "MEM_COMMIT";
-        }
-
-        case 0x20'00: {
-          return "MEM_RESERVE";
-        }
-
-        case 0x1'00'00: {
-          return "MEM_FREE";
-        }
-        }
-        return "";
-      },
-      "Get a string representation of the memory state");
-
-  utils.def(
-      "ProtectionToString",
-      [](const uint32_t Protection) {
-        struct {
-          const char *Name = nullptr;
-          uint32_t Mask = 0;
-        } Flags[] = {
-            {"PAGE_NOACCESS", 0x01},
-            {"PAGE_READONLY", 0x02},
-            {"PAGE_READWRITE", 0x04},
-            {"PAGE_WRITECOPY", 0x08},
-            {"PAGE_EXECUTE", 0x10},
-            {"PAGE_EXECUTE_READ", 0x20},
-            {"PAGE_EXECUTE_READWRITE", 0x40},
-            {"PAGE_EXECUTE_WRITECOPY", 0x80},
-            {"PAGE_GUARD", 0x100},
-            {"PAGE_NOCACHE", 0x200},
-            {"PAGE_WRITECOMBINE", 0x400},
-            {"PAGE_TARGETS_INVALID", 0x4000'0000},
-        };
-        std::stringstream ss;
-        uint32_t KnownFlags = 0;
-
-        for (const auto &Flag : Flags) {
-          if ((Protection & Flag.Mask) == 0) {
-            continue;
-          }
-
-          ss << Flag.Name << ",";
-          KnownFlags |= Flag.Mask;
-        }
-
-        const uint32_t MissingFlags = (~KnownFlags) & Protection;
-        if (MissingFlags) {
-          ss << std::hex << "0x" << MissingFlags;
-        }
-
-        std::string ProtectionString = ss.str();
-        if (ProtectionString.size() > 1 &&
-            ProtectionString[ProtectionString.size() - 1] == ',') {
-          ProtectionString =
-              ProtectionString.substr(0, ProtectionString.size() - 1);
-        }
-
-        return ProtectionString;
-      },
-      "Get a string representation of the memory protection");
 }