[Windows] Fix x86

moi15moi · Dec 21, 2024 · 0439168 · 0439168
1 parent f212f1d
commit 0439168
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/find_system_fonts_filename/windows/dwrite.py b/find_system_fonts_filename/windows/dwrite.py
@@ -347,4 +347,4 @@ def __init__(self) -> None:
         # https://learn.microsoft.com/en-us/windows/win32/api/dwrite/nf-dwrite-dwritecreatefactory
         self.DWriteCreateFactory = dwrite.DWriteCreateFactory
         self.DWriteCreateFactory.restype = HRESULT
-        self.DWriteCreateFactory.argtypes = [wintypes.UINT, GUID, POINTER(POINTER(IUnknown))]
+        self.DWriteCreateFactory.argtypes = [wintypes.UINT, POINTER(GUID), POINTER(POINTER(IUnknown))]
diff --git a/find_system_fonts_filename/windows/gdi32.py b/find_system_fonts_filename/windows/gdi32.py
@@ -96,8 +96,8 @@ def __init__(self) -> None:
         # https://learn.microsoft.com/en-us/previous-versions/dd162618(v=vs.85)
         self.ENUMFONTFAMEXPROC = WINFUNCTYPE(
             wintypes.INT,
-            ENUMLOGFONTEXW,
-            TEXTMETRICW,
+            POINTER(ENUMLOGFONTEXW),
+            POINTER(TEXTMETRICW),
             wintypes.DWORD,
             wintypes.LPARAM,
         )

diff --git a/find_system_fonts_filename/windows/windows_fonts.py b/find_system_fonts_filename/windows/windows_fonts.py
@@ -72,7 +72,7 @@ def get_filepath_from_IDWriteFontFace(font_face) -> Set[str]:
     return fonts_filename
 
 
-def enum_fonts_2(logfont: ENUMLOGFONTEXW, text_metric: TEXTMETRICW, font_type: wintypes.DWORD, lparam: wintypes.LPARAM):
+def enum_fonts_2(logfont: POINTER(ENUMLOGFONTEXW), text_metric: POINTER(TEXTMETRICW), font_type: wintypes.DWORD, lparam: wintypes.LPARAM):
     enum_data: EnumData = py_object.from_address(lparam).value
 
     # It seems that font_type can be 0. In those case, the font format is .fon
@@ -81,10 +81,10 @@ def enum_fonts_2(logfont: ENUMLOGFONTEXW, text_metric: TEXTMETRICW, font_type: w
         # Replace the lfFaceName with the elfFullName.
         # See why here: https://github.com/libass/libass/issues/744
         lfFaceName = create_unicode_buffer(enum_data.gdi.LF_FACESIZE)
-        enum_data.msvcrt.wcsncpy_s(lfFaceName, enum_data.gdi.LF_FACESIZE, logfont.elfFullName, enum_data.msvcrt.TRUNCATE)
-        logfont.elfLogFont.lfFaceName = lfFaceName.value
+        enum_data.msvcrt.wcsncpy_s(lfFaceName, enum_data.gdi.LF_FACESIZE, logfont.contents.elfFullName, enum_data.msvcrt.TRUNCATE)
+        logfont.contents.elfLogFont.lfFaceName = lfFaceName.value
 
-        hfont = enum_data.gdi.CreateFontIndirectW(byref(logfont.elfLogFont))
+        hfont = enum_data.gdi.CreateFontIndirectW(byref(logfont.contents.elfLogFont))
         enum_data.gdi.SelectObject(enum_data.dc, hfont)
 
         font_face = POINTER(IDWriteFontFace)()
@@ -96,9 +96,9 @@ def enum_fonts_2(logfont: ENUMLOGFONTEXW, text_metric: TEXTMETRICW, font_type: w
     return True
 
 
-def enum_fonts_1(logfont: ENUMLOGFONTEXW, text_metric: TEXTMETRICW, font_type: wintypes.DWORD, lparam: wintypes.LPARAM):
+def enum_fonts_1(logfont: POINTER(ENUMLOGFONTEXW), text_metric: POINTER(TEXTMETRICW), font_type: wintypes.DWORD, lparam: wintypes.LPARAM):
     enum_data: EnumData = py_object.from_address(lparam).value
-    enum_data.gdi.EnumFontFamiliesW(enum_data.dc, logfont.elfLogFont.lfFaceName, enum_data.gdi.ENUMFONTFAMEXPROC(enum_fonts_2), lparam)
+    enum_data.gdi.EnumFontFamiliesW(enum_data.dc, logfont.contents.elfLogFont.lfFaceName, enum_data.gdi.ENUMFONTFAMEXPROC(enum_fonts_2), lparam)
 
     return True
 
@@ -132,7 +132,7 @@ def get_system_fonts_filename() -> Set[str]:
         fonts_filename = set()
 
         dwrite_factory = POINTER(IDWriteFactory)()
-        dwrite.DWriteCreateFactory(DWRITE_FACTORY_TYPE.DWRITE_FACTORY_TYPE_ISOLATED, dwrite_factory._iid_, byref(dwrite_factory))
+        dwrite.DWriteCreateFactory(DWRITE_FACTORY_TYPE.DWRITE_FACTORY_TYPE_ISOLATED, byref(dwrite_factory._iid_), byref(dwrite_factory))
 
         gdi_interop = POINTER(IDWriteGdiInterop)()
         dwrite_factory.GetGdiInterop(byref(gdi_interop))