From b4ba4665410c70ad8976b092ee9b1ad89625c0ed Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 27 Oct 2024 07:03:35 +1100
Subject: [PATCH] Do not skip failing records on 32-bit

---
 Tests/test_file_wmf.py |  2 ++
 src/display.c          | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
index 2adf38d48c3..e60a5b64e55 100644
--- a/Tests/test_file_wmf.py
+++ b/Tests/test_file_wmf.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 from io import BytesIO
 from pathlib import Path
 from typing import IO
@@ -35,6 +36,7 @@ def test_load() -> None:
             assert im.load()[0, 0] == (255, 255, 255)
 
 
+@pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system")
 def test_render() -> None:
     with open("Tests/images/drawing.emf", "rb") as fp:
         data = fp.read()
diff --git a/src/display.c b/src/display.c
index 03b9316c36a..fe5801fc0e6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -716,12 +716,12 @@ PyImaging_EventLoopWin32(PyObject *self, PyObject *args) {
 
 #define GET32(p, o) ((DWORD *)(p + o))[0]
 
-BOOL
+int
 enhMetaFileProc(
-    HDC hdc, HANDLETABLE FAR *lpht, CONST ENHMETARECORD *lpmr, int nHandles, LPARAM data
+    HDC hdc, HANDLETABLE *lpht, const ENHMETARECORD *lpmr, int nHandles, LPARAM data
 ) {
     PlayEnhMetaFileRecord(hdc, lpht, lpmr, nHandles);
-    return TRUE;
+    return 1;
 }
 
 PyObject *
@@ -804,7 +804,14 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) {
     /* FIXME: make background transparent? configurable? */
     FillRect(dc, &rect, GetStockObject(WHITE_BRUSH));
 
+#ifdef _WIN64
     EnumEnhMetaFile(dc, meta, enhMetaFileProc, NULL, &rect);
+#else
+    if (!PlayEnhMetaFile(dc, meta, &rect)) {
+        PyErr_SetString(PyExc_OSError, "cannot render metafile");
+        goto error;
+    }
+#endif
 
     /* step 4: extract bits from bitmap */