Fix pdf/ps/svg support and bump cairo to 1.15.12 on Windows.

Author: anntzer

setup.py

@@ -162,7 +162,7 @@ def build_extensions(self):
                 ["/std:c++17", "/EHsc", "/D_USE_MATH_DEFINES",
                  "/wd4244", "/wd4267"])  # cf. gcc -Wconversion.
             ext.libraries += (
-                ["cairo", "freetype"])
+                ["psapi", "cairo", "freetype"])
             ext.library_dirs += (
                 # Windows conda path for FreeType.
                 [str(Path(sys.prefix, "Library/lib"))])

src/_mplcairo.cpp

@@ -1,5 +1,6 @@
 #include "_mplcairo.h"
 
+#include "_os.h"
 #include "_pattern_cache.h"
 #include "_raqm.h"
 #include "_util.h"
@@ -1528,11 +1529,15 @@ PYBIND11_MODULE(_mplcairo, m)
         py::getattr(dll, name, py::int_(0)), ctypes.attr("c_void_p"))
       .attr("value").cast<std::optional<uintptr_t>>().value_or(0);
   };
+#else
+  auto const& load_ptr = [&](char const* name) -> os::symbol_t {
+    return os::dlsym(name);
+  };
+#endif
 #define LOAD_API(name) \
   detail::name = reinterpret_cast<decltype(detail::name)>(load_ptr(#name));
   ITER_CAIRO_OPTIONAL_API(LOAD_API)
-#undef LOAD_PTR
-#endif
+#undef LOAD_API
 
   FT_CHECK(FT_Init_FreeType, &detail::ft_library);
 

src/_os.cpp

@@ -2,7 +2,11 @@
 
 #if defined __linux__ || defined __APPLE__
 #include <dlfcn.h>
-#else
+#elif defined _WIN32
+#include <memory>
+
+#define NOMINMAX
+#include <psapi.h>
 #include <Windows.h>
 #endif
 
@@ -28,7 +32,7 @@ char const* dlerror() {
   return ::dlerror();
 }
 
-#elif _WIN32
+#elif defined _WIN32
 using library_t = HMODULE;
 using symbol_t = FARPROC;
 
@@ -44,6 +48,22 @@ symbol_t dlsym(library_t handle, char const* symbol) {
   return GetProcAddress(handle, symbol);
 }
 
+symbol_t dlsym(char const* symbol) {
+  auto hProcess = GetCurrentProcess();
+  auto cbNeeded = DWORD{};
+  EnumProcessModules(hProcess, nullptr, 0, &cbNeeded);
+  auto n_modules = cbNeeded / sizeof(HMODULE);
+  auto lphModule = std::unique_ptr<HMODULE[]>(new HMODULE[n_modules]);
+  if (EnumProcessModules(hProcess, lphModule.get(), cbNeeded, &cbNeeded)) {
+    for (auto i = 0; i < n_modules; ++i) {
+      if (auto proc = GetProcAddress(lphModule[i], symbol)) {
+        return proc;
+      }
+    }
+  }
+  return nullptr;
+}
+
 char const* dlerror() {
   return "";  // FIXME
 }

src/_os.h

@@ -1,4 +1,7 @@
+#include <iostream>
+
 #ifdef _WIN32
+#define NOMINMAX
 #include <Windows.h>
 #endif
 
@@ -10,6 +13,9 @@ using symbol_t = void*;
 #elif defined _WIN32
 using library_t = HMODULE;
 using symbol_t = FARPROC;
+
+// Like dlsym, but looks through everything listed by EnumProcessModules.
+symbol_t dlsym(char const* symbol);
 #endif
 library_t dlopen(char const* filename);
 bool dlclose(library_t handle);

tools/build-windows-wheel.ps1

@@ -1,20 +1,30 @@
-New-Item -ItemType directory build
+New-Item -ItemType directory -Force build | Out-Null
 Set-Location build
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-Invoke-WebRequest `
-    https://github.com/preshing/cairo-windows/releases/download/1.15.10/cairo-windows-1.15.10.zip `
-    -OutFile cairo-windows-1.15.10.zip
-Expand-Archive cairo-windows-1.15.10.zip -DestinationPath .
-Invoke-WebRequest `
-    https://github.com/ubawurinna/freetype-windows-binaries/releases/download/v2.9.1/freetype-2.9.1.zip `
-    -OutFile freetype-2.9.1.zip
-Expand-Archive freetype-2.9.1.zip -DestinationPath freetype-2.9.1
+
+$cairo_url = `
+    "https://github.com/preshing/cairo-windows/releases/download/1.15.12"
+$cairo_name = "cairo-windows-1.15.12"
+if (!(Test-Path "$cairo_name")) {
+    Invoke-WebRequest "$cairo_url/$cairo_name.zip" -OutFile "$cairo_name.zip"
+    Expand-Archive "$cairo_name.zip" -DestinationPath .
+}
+
+$freetype_url = `
+    "https://github.com/ubawurinna/freetype-windows-binaries/releases/download/v2.9.1"
+$freetype_name = "freetype-2.9.1"
+if (!(Test-Path "$freetype_name")) {
+    Invoke-WebRequest "$freetype_url/$freetype_name.zip" -OutFile "$freetype_name.zip"
+    Expand-Archive "$freetype_name.zip" -DestinationPath "$freetype_name"
+}
+
 Set-Location ..
+
 $Env:CL = `
-    "/I$(Get-Location)\build\cairo-windows-1.15.10\include " `
-  + "/I$(Get-Location)\build\freetype-2.9.1\include"
+    "/I$(Get-Location)\build\$cairo_name\include " `
+  + "/I$(Get-Location)\build\$freetype_name\include"
 $Env:LINK = `
-    "/LIBPATH:$(Get-Location)\build\cairo-windows-1.15.10\lib\x64 " `
-  + "/LIBPATH:$(Get-Location)\build\freetype-2.9.1\win64"
+    "/LIBPATH:$(Get-Location)\build\$cairo_name\lib\x64 " `
+  + "/LIBPATH:$(Get-Location)\build\$freetype_name\win64"
 python -mpip install --upgrade pybind11
 python setup.py bdist_wheel