pyglet 2.1.13__py3-none-any.whl → 3.0.dev1__py3-none-any.whl

pyglet/libs/win32/__init__.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
 import atexit
 import struct
 import warnings
 from ctypes import HRESULT
-from ctypes.wintypes import ATOM, HFONT, HGDIOBJ, HGLOBAL, HMENU, HMODULE, INT, LPVOID, PUINT
+from ctypes.wintypes import ATOM, HFONT, HGDIOBJ, HGLOBAL, HMENU, HMODULE, INT, LPVOID, PUINT, HKEY, LPBYTE, LPCVOID
 
 import pyglet
 
@@ -11,7 +12,7 @@ from .types import *
 
 IS64 = struct.calcsize("P") == 8
 
-_debug_win32 = pyglet.options['debug_win32']
+_debug_win32 = pyglet.options.debug_win32
 
 DebugLibrary = lambda lib: ctypes.WinDLL(lib, use_last_error=True if _debug_win32 else False)
 
@@ -22,9 +23,9 @@ _dwmapi = DebugLibrary('dwmapi')
 _shell32 = DebugLibrary('shell32')
 _ole32 = DebugLibrary('ole32')
 _oleaut32 = DebugLibrary('oleaut32')
-
-if constants.WINDOWS_8_1_OR_GREATER:
-    _shcore = DebugLibrary('shcore')
+_shcore = DebugLibrary('shcore')
+_advapi32 = DebugLibrary("advapi32")
+_comdlg32 = DebugLibrary("comdlg32")
 
 # _gdi32
 _gdi32.AddFontMemResourceEx.restype = HANDLE
@@ -261,8 +262,13 @@ _dwmapi.DwmFlush.restype = c_int
 _dwmapi.DwmFlush.argtypes = []
 _dwmapi.DwmGetColorizationColor.restype = HRESULT
 _dwmapi.DwmGetColorizationColor.argtypes = [POINTER(DWORD), POINTER(BOOL)]
+_dwmapi.DwmGetWindowAttribute.restype = HRESULT
+_dwmapi.DwmGetWindowAttribute.argtypes = [HWND, DWORD, PVOID, DWORD]
 _dwmapi.DwmEnableBlurBehindWindow.restype = HRESULT
 _dwmapi.DwmEnableBlurBehindWindow.argtypes = [HWND, POINTER(DWM_BLURBEHIND)]
+_dwmapi.DwmSetWindowAttribute.restype = HRESULT
+_dwmapi.DwmSetWindowAttribute.argtypes = [HWND, DWORD, LPCVOID, DWORD]
+
 
 # _shell32
 _shell32.DragAcceptFiles.restype = c_void
@@ -302,6 +308,21 @@ if constants.WINDOWS_8_1_OR_GREATER:
     _shcore.GetDpiForMonitor.argtypes = [HMONITOR, MONITOR_DPI_TYPE, POINTER(UINT), POINTER(UINT)]
     _shcore.GetDpiForMonitor.restype = HRESULT
 
+# _advapi32
+_advapi32.RegCloseKey.argtypes = [HKEY]
+_advapi32.RegCloseKey.restype = LONG
+_advapi32.RegOpenKeyExW.argtypes = [HKEY, LPCWSTR, DWORD, REGSAM, POINTER(HKEY)]
+_advapi32.RegOpenKeyExW.restype = LONG
+_advapi32.RegQueryValueExW.argtypes = [HKEY,LPCWSTR,LPVOID, POINTER(DWORD), LPBYTE, POINTER(DWORD)]
+_advapi32.RegQueryValueExW.restype = LONG
+
+# _comdlg32
+_comdlg32.GetOpenFileNameW.argtypes = [POINTER(OPENFILENAMEW)]
+_comdlg32.GetOpenFileNameW.restype = BOOL
+_comdlg32.GetSaveFileNameW.argtypes = [POINTER(OPENFILENAMEW)]
+_comdlg32.GetSaveFileNameW.restype = BOOL
+
+
 if _debug_win32:
     import traceback
 
@@ -311,8 +332,7 @@ if _debug_win32:
     def win32_errcheck(result, func, args):
         last_err = ctypes.get_last_error()
         if last_err != 0:  # If the result is not success and last error is invalid.
-            for entry in traceback.format_list(traceback.extract_stack()[:-1]):
-                _log_win32.write(entry)
+            _log_win32.writelines(traceback.format_list(traceback.extract_stack()[:-1]))
             print(f"[Result {result}] Error #{last_err} - {ctypes.FormatError(last_err)}", file=_log_win32)
         return args
 
@@ -335,7 +355,7 @@ if _debug_win32:
 
 # Initialize COM. Required for: WIC (DirectWrite), WMF, and XInput
 try:
-    if pyglet.options["com_mta"] is True:
+    if pyglet.options.com_mta is True:
         _ole32.CoInitializeEx(None, constants.COINIT_MULTITHREADED)
     else:
         _ole32.CoInitializeEx(None, constants.COINIT_APARTMENTTHREADED)

pyglet/libs/win32/constants.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import sys
 
 # Most of this file is win32con.py from Python for Windows Extensions:
@@ -19,24 +20,24 @@ VK_OEM_7 = 0xde
 VK_OEM_8 = 0xdf
 VK_OEM_102 = 0xe2
 
-# Copyright (c) 1994-2001, Mark Hammond 
+# Copyright (c) 1994-2001, Mark Hammond
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
 # are met:
-# 
-# Redistributions of source code must retain the above copyright notice, 
+#
+# Redistributions of source code must retain the above copyright notice,
 # this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright 
-# notice, this list of conditions and the following disclaimer in 
+#
+# Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
 # the documentation and/or other materials provided with the distribution.
-# 
-# Neither name of Mark Hammond nor the name of contributors may be used 
-# to endorse or promote products derived from this software without 
-# specific prior written permission. 
-# 
+#
+# Neither name of Mark Hammond nor the name of contributors may be used
+# to endorse or promote products derived from this software without
+# specific prior written permission.
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
 # IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -3509,7 +3510,7 @@ ELF_CULTURE_LATIN = 0
 RASTER_FONTTYPE = 1
 DEVICE_FONTTYPE = 2
 TRUETYPE_FONTTYPE = 4
-def PALETTEINDEX(i): return ((16777216 | (i)))
+def PALETTEINDEX(i): return (16777216 | (i))
 
 PC_RESERVED = 1
 PC_EXPLICIT = 2
@@ -3564,42 +3565,42 @@ STOCK_LAST = 16
 CLR_INVALID = -1
 
 # Exception/Status codes from winuser.h and winnt.h
-STATUS_WAIT_0                    = 0    
-STATUS_ABANDONED_WAIT_0          = 128    
-STATUS_USER_APC                  = 192    
-STATUS_TIMEOUT                   = 258    
-STATUS_PENDING                   = 259    
-STATUS_SEGMENT_NOTIFICATION      = 1073741829    
-STATUS_GUARD_PAGE_VIOLATION      = -2147483647    
-STATUS_DATATYPE_MISALIGNMENT     = -2147483646    
-STATUS_BREAKPOINT                = -2147483645    
-STATUS_SINGLE_STEP               = -2147483644    
-STATUS_ACCESS_VIOLATION          = -1073741819    
-STATUS_IN_PAGE_ERROR             = -1073741818    
-STATUS_INVALID_HANDLE            = -1073741816    
-STATUS_NO_MEMORY                 = -1073741801    
-STATUS_ILLEGAL_INSTRUCTION       = -1073741795    
-STATUS_NONCONTINUABLE_EXCEPTION  = -1073741787    
-STATUS_INVALID_DISPOSITION       = -1073741786    
-STATUS_ARRAY_BOUNDS_EXCEEDED     = -1073741684    
-STATUS_FLOAT_DENORMAL_OPERAND    = -1073741683    
-STATUS_FLOAT_DIVIDE_BY_ZERO      = -1073741682    
-STATUS_FLOAT_INEXACT_RESULT      = -1073741681    
-STATUS_FLOAT_INVALID_OPERATION   = -1073741680    
-STATUS_FLOAT_OVERFLOW            = -1073741679    
-STATUS_FLOAT_STACK_CHECK         = -1073741678    
-STATUS_FLOAT_UNDERFLOW           = -1073741677    
-STATUS_INTEGER_DIVIDE_BY_ZERO    = -1073741676    
-STATUS_INTEGER_OVERFLOW          = -1073741675    
-STATUS_PRIVILEGED_INSTRUCTION    = -1073741674    
-STATUS_STACK_OVERFLOW            = -1073741571    
-STATUS_CONTROL_C_EXIT            = -1073741510    
+STATUS_WAIT_0                    = 0
+STATUS_ABANDONED_WAIT_0          = 128
+STATUS_USER_APC                  = 192
+STATUS_TIMEOUT                   = 258
+STATUS_PENDING                   = 259
+STATUS_SEGMENT_NOTIFICATION      = 1073741829
+STATUS_GUARD_PAGE_VIOLATION      = -2147483647
+STATUS_DATATYPE_MISALIGNMENT     = -2147483646
+STATUS_BREAKPOINT                = -2147483645
+STATUS_SINGLE_STEP               = -2147483644
+STATUS_ACCESS_VIOLATION          = -1073741819
+STATUS_IN_PAGE_ERROR             = -1073741818
+STATUS_INVALID_HANDLE            = -1073741816
+STATUS_NO_MEMORY                 = -1073741801
+STATUS_ILLEGAL_INSTRUCTION       = -1073741795
+STATUS_NONCONTINUABLE_EXCEPTION  = -1073741787
+STATUS_INVALID_DISPOSITION       = -1073741786
+STATUS_ARRAY_BOUNDS_EXCEEDED     = -1073741684
+STATUS_FLOAT_DENORMAL_OPERAND    = -1073741683
+STATUS_FLOAT_DIVIDE_BY_ZERO      = -1073741682
+STATUS_FLOAT_INEXACT_RESULT      = -1073741681
+STATUS_FLOAT_INVALID_OPERATION   = -1073741680
+STATUS_FLOAT_OVERFLOW            = -1073741679
+STATUS_FLOAT_STACK_CHECK         = -1073741678
+STATUS_FLOAT_UNDERFLOW           = -1073741677
+STATUS_INTEGER_DIVIDE_BY_ZERO    = -1073741676
+STATUS_INTEGER_OVERFLOW          = -1073741675
+STATUS_PRIVILEGED_INSTRUCTION    = -1073741674
+STATUS_STACK_OVERFLOW            = -1073741571
+STATUS_CONTROL_C_EXIT            = -1073741510
 
 
 WAIT_FAILED                      = -1
 WAIT_OBJECT_0                    = STATUS_WAIT_0 + 0
 
-WAIT_ABANDONED                      = STATUS_ABANDONED_WAIT_0 + 0 
+WAIT_ABANDONED                      = STATUS_ABANDONED_WAIT_0 + 0
 WAIT_ABANDONED_0                    = STATUS_ABANDONED_WAIT_0 + 0
 
 WAIT_TIMEOUT                        = STATUS_TIMEOUT
@@ -4186,7 +4187,7 @@ PM_NOREMOVE = 0
 PM_REMOVE = 1
 PM_NOYIELD = 2
 # Name clashes with key.MOD_ALT, key.MOD_CONTROL and key.MOD_SHIFT
-WIN32_MOD_ALT = 1 
+WIN32_MOD_ALT = 1
 WIN32_MOD_CONTROL = 2
 WIN32_MOD_SHIFT = 4
 WIN32_MOD_WIN = 8
@@ -5037,6 +5038,7 @@ WINDOWS_8_1_OR_GREATER = sys.getwindowsversion() >= (6, 3)
 WINDOWS_10_ANNIVERSARY_UPDATE_OR_GREATER = sys.getwindowsversion() >= (10, 0, 14393)  # 1607
 WINDOWS_10_CREATORS_UPDATE_OR_GREATER = sys.getwindowsversion() >= (10, 0, 15063)  # 1703
 WINDOWS_10_1809_OR_GREATER = sys.getwindowsversion() >= (10, 0, 17763)  # 1809
+WINDOWS_11_21H2_OR_GREATER = sys.getwindowsversion() >= (10, 0, 22000)
 
 MSGFLT_ALLOW = 1
 MSGFLT_DISALLOW = 2
@@ -5086,4 +5088,13 @@ USER_DEFAULT_SCREEN_DPI = 96
 
 QDC_ONLY_ACTIVE_PATHS = 0x00000002
 DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME = 0x00000001
-DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 0x00000002
+DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME = 0x00000002
+
+# Since Windows 11 21H2
+DWMWA_USE_IMMERSIVE_DARK_MODE = 20
+DWMWA_WINDOW_CORNER_PREFERENCE = 33
+DWMWA_BORDER_COLOR = 34
+DWMWA_CAPTION_COLOR = 35
+DWMWA_TEXT_COLOR = 36
+DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37
+DWMWA_SYSTEMBACKDROP_TYPE = 38

pyglet/libs/win32/context_managers.py

@@ -27,15 +27,20 @@ After::
         return result
 
 """
+from __future__ import annotations
+
 from contextlib import contextmanager
-from typing import Optional, Generator
-from ctypes.wintypes import HANDLE
+from typing import Generator, TYPE_CHECKING
 from ctypes import WinError
 from pyglet.libs.win32 import _user32 as user32
 
+if TYPE_CHECKING:
+    from pyglet.libs.win32.com import COMObject
+    from ctypes.wintypes import HANDLE
+
 
 @contextmanager
-def device_context(window_handle: Optional[int] = None) -> Generator[HANDLE, None, None]:
+def device_context(window_handle: int | None = None) -> Generator[HANDLE, None, None]:
     """
     A Windows device context wrapped as a context manager.
 
@@ -55,3 +60,15 @@ def device_context(window_handle: Optional[int] = None) -> Generator[HANDLE, Non
     finally:
         if not user32.ReleaseDC(None, _dc):
             raise WinError()
+
+
+@contextmanager
+def com_context(com_object: COMObject) -> Generator[COMObject, None, None]:
+    """A simple context manager for a COM object.
+
+    This can help reduce missed release calls leading to leaks.
+    """
+    try:
+        yield com_object
+    finally:
+        com_object.Release()

pyglet/libs/win32/dinput.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import ctypes
-from ctypes.wintypes import BOOL, DWORD, HANDLE, HWND, LPDWORD, LPVOID, UINT, WCHAR, WORD
+from ctypes.wintypes import BOOL, DWORD, HANDLE, HWND, LONG, LPDWORD, LPVOID, UINT, WCHAR, WORD
 
 from pyglet.libs.win32 import com
 
@@ -122,8 +122,10 @@ DIDC_ALIAS = 0x00010000
 DIDC_PHANTOM = 0x00020000
 DIDC_HIDDEN = 0x00040000
 
+
 def DIDFT_GETINSTANCE(n):
-    return (n >> 8) & 0xffff
+    return (n >> 8) & 0xFFFF
+
 
 DIDFT_ALL = 0x00000000
 
@@ -204,8 +206,7 @@ DISCL_NOWINKEY = 0x00000010
 DIPROP_BUFFERSIZE = 1
 DIPROP_GUIDANDPATH = 12
 
-GUID_XAxis = \
-    com.GUID(0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00)
+GUID_XAxis = com.GUID(0xA36D02E0, 0xC9F3, 0x11CF, 0xBF, 0xC7, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00)
 
 
 class DIDEVICEINSTANCE(ctypes.Structure):
@@ -220,9 +221,12 @@ class DIDEVICEINSTANCE(ctypes.Structure):
         ('wUsagePage', WORD),
         ('wUsage', WORD),
     )
+
+
 LPDIDEVICEINSTANCE = ctypes.POINTER(DIDEVICEINSTANCE)
 LPDIENUMDEVICESCALLBACK = ctypes.WINFUNCTYPE(BOOL, LPDIDEVICEINSTANCE, LPVOID)
 
+
 class DIDEVICEOBJECTINSTANCE(ctypes.Structure):
     _fields_ = (
         ('dwSize', DWORD),
@@ -241,9 +245,11 @@ class DIDEVICEOBJECTINSTANCE(ctypes.Structure):
         ('wExponent', WORD),
         ('wReportId', WORD),
     )
+
+
 LPDIDEVICEOBJECTINSTANCE = ctypes.POINTER(DIDEVICEOBJECTINSTANCE)
-LPDIENUMDEVICEOBJECTSCALLBACK = \
-    ctypes.WINFUNCTYPE( BOOL, LPDIDEVICEOBJECTINSTANCE, LPVOID)
+LPDIENUMDEVICEOBJECTSCALLBACK = ctypes.WINFUNCTYPE(BOOL, LPDIDEVICEOBJECTINSTANCE, LPVOID)
+
 
 class DIOBJECTDATAFORMAT(ctypes.Structure):
     _fields_ = (
@@ -253,8 +259,11 @@ class DIOBJECTDATAFORMAT(ctypes.Structure):
         ('dwFlags', DWORD),
     )
     __slots__ = [n for n, t in _fields_]
+
+
 LPDIOBJECTDATAFORMAT = ctypes.POINTER(DIOBJECTDATAFORMAT)
 
+
 class DIDATAFORMAT(ctypes.Structure):
     _fields_ = (
         ('dwSize', DWORD),
@@ -265,8 +274,11 @@ class DIDATAFORMAT(ctypes.Structure):
         ('rgodf', LPDIOBJECTDATAFORMAT),
     )
     __slots__ = [n for n, t in _fields_]
+
+
 LPDIDATAFORMAT = ctypes.POINTER(DIDATAFORMAT)
 
+
 class DIDEVICEOBJECTDATA(ctypes.Structure):
     _fields_ = (
         ('dwOfs', DWORD),
@@ -275,8 +287,11 @@ class DIDEVICEOBJECTDATA(ctypes.Structure):
         ('dwSequence', DWORD),
         ('uAppData', ctypes.POINTER(UINT)),
     )
+
+
 LPDIDEVICEOBJECTDATA = ctypes.POINTER(DIDEVICEOBJECTDATA)
 
+
 class DIPROPHEADER(ctypes.Structure):
     _fields_ = (
         ('dwSize', DWORD),
@@ -284,109 +299,111 @@ class DIPROPHEADER(ctypes.Structure):
         ('dwObj', DWORD),
         ('dwHow', DWORD),
     )
+
+
 LPDIPROPHEADER = ctypes.POINTER(DIPROPHEADER)
 
+
 class DIPROPDWORD(ctypes.Structure):
     _fields_ = (
         ('diph', DIPROPHEADER),
         ('dwData', DWORD),
     )
 
+
 # All method names in the interfaces are filled in, but unused (so far)
 # methods have no parameters.. they'll crash when we try and use them, at
 # which point we can go in and fill them in.
 
+
+# Define DIJOYSTATE2 based on the C++ struct
+class DIJOYSTATE2(ctypes.Structure):
+    _fields_ = [
+        ("lX", LONG),  # X-axis
+        ("lY", LONG),  # Y-axis
+        ("lZ", LONG),  # Z-axis
+        ("lRx", LONG),  # X-axis rotation
+        ("lRy", LONG),  # Y-axis rotation
+        ("lRz", LONG),  # Z-axis rotation
+        ("rglSlider", LONG * 2),  # Two slider axes
+        ("rgdwPOV", DWORD * 4),  # Four POVs (D-pad directions)
+        ("rgbButtons", ctypes.c_ubyte * 128),  # 128 buttons
+        ("lVX", LONG),  # X-axis velocity
+        ("lVY", LONG),  # Y-axis velocity
+        ("lVZ", LONG),  # Z-axis velocity
+        ("lVRx", LONG),  # Angular velocity X
+        ("lVRy", LONG),  # Angular velocity Y
+        ("lVRz", LONG),  # Angular velocity Z
+        ("rglVSlider", LONG * 2),
+        ("lAX", LONG),  # Acceleration X
+        ("lAY", LONG),  # Acceleration Y
+        ("lAZ", LONG),  # Acceleration Z
+        ("lARx", LONG),  # Angular acceleration X
+        ("lARy", LONG),  # Angular acceleration Y
+        ("lARz", LONG),  # Angular acceleration Z
+        ("rglASlider", LONG * 2),
+        ("lFX", LONG),  # Force X
+        ("lFY", LONG),  # Force Y
+        ("lFZ", LONG),  # Force Z
+        ("lFRx", LONG),  # Force angular X
+        ("lFRy", LONG),  # Force angular Y
+        ("lFRz", LONG),  # Force angular Z
+        ("rglFSlider", LONG * 2),
+    ]
+
+
 # IDirect* interfaces are all Unicode (e.g. IDirectInputDevice8W).
 
+
 class IDirectInputDevice8(com.pIUnknown):
     _methods_ = [
-        ('GetCapabilities',
-         com.STDMETHOD()),
-        ('EnumObjects',
-         com.STDMETHOD(LPDIENUMDEVICEOBJECTSCALLBACK, LPVOID, DWORD)),
-        ('GetProperty',
-         com.STDMETHOD(LPVOID, LPDIPROPHEADER)),
-        ('SetProperty',
-         com.STDMETHOD(LPVOID, LPDIPROPHEADER)),
-        ('Acquire',
-         com.STDMETHOD()),
-        ('Unacquire',
-         com.STDMETHOD()),
-        ('GetDeviceState',
-         com.STDMETHOD()),
-        ('GetDeviceData',
-         com.STDMETHOD(DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD)),
-        ('SetDataFormat',
-         com.STDMETHOD(LPDIDATAFORMAT)),
-        ('SetEventNotification',
-         com.STDMETHOD(HANDLE)),
-        ('SetCooperativeLevel',
-         com.STDMETHOD(HWND, DWORD)),
-        ('GetObjectInfo',
-         com.STDMETHOD()),
-        ('GetDeviceInfo',
-         com.STDMETHOD()),
-        ('RunControlPanel',
-         com.STDMETHOD()),
-        ('Initialize',
-         com.STDMETHOD()),
-        ('CreateEffect',
-         com.STDMETHOD()),
-        ('EnumEffects',
-         com.STDMETHOD()),
-        ('GetEffectInfo',
-         com.STDMETHOD()),
-        ('GetForceFeedbackState',
-         com.STDMETHOD()),
-        ('SendForceFeedbackCommand',
-         com.STDMETHOD()),
-        ('EnumCreatedEffectObjects',
-         com.STDMETHOD()),
-        ('Escape',
-         com.STDMETHOD()),
-        ('Poll',
-         com.STDMETHOD()),
-        ('SendDeviceData',
-         com.STDMETHOD()),
-        ('EnumEffectsInFile',
-         com.STDMETHOD()),
-        ('WriteEffectToFile',
-         com.STDMETHOD()),
-        ('BuildActionMap',
-         com.STDMETHOD()),
-        ('SetActionMap',
-         com.STDMETHOD()),
-        ('GetImageInfo',
-         com.STDMETHOD()),
-     ]
+        ('GetCapabilities', com.STDMETHOD()),
+        ('EnumObjects', com.STDMETHOD(LPDIENUMDEVICEOBJECTSCALLBACK, LPVOID, DWORD)),
+        ('GetProperty', com.STDMETHOD(LPVOID, LPDIPROPHEADER)),
+        ('SetProperty', com.STDMETHOD(LPVOID, LPDIPROPHEADER)),
+        ('Acquire', com.STDMETHOD()),
+        ('Unacquire', com.STDMETHOD()),
+        ('GetDeviceState', com.STDMETHOD(DWORD, LPVOID)),
+        ('GetDeviceData', com.STDMETHOD(DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD)),
+        ('SetDataFormat', com.STDMETHOD(LPDIDATAFORMAT)),
+        ('SetEventNotification', com.STDMETHOD(HANDLE)),
+        ('SetCooperativeLevel', com.STDMETHOD(HWND, DWORD)),
+        ('GetObjectInfo', com.STDMETHOD()),
+        ('GetDeviceInfo', com.STDMETHOD()),
+        ('RunControlPanel', com.STDMETHOD()),
+        ('Initialize', com.STDMETHOD()),
+        ('CreateEffect', com.STDMETHOD()),
+        ('EnumEffects', com.STDMETHOD()),
+        ('GetEffectInfo', com.STDMETHOD()),
+        ('GetForceFeedbackState', com.STDMETHOD()),
+        ('SendForceFeedbackCommand', com.STDMETHOD()),
+        ('EnumCreatedEffectObjects', com.STDMETHOD()),
+        ('Escape', com.STDMETHOD()),
+        ('Poll', com.STDMETHOD()),
+        ('SendDeviceData', com.STDMETHOD()),
+        ('EnumEffectsInFile', com.STDMETHOD()),
+        ('WriteEffectToFile', com.STDMETHOD()),
+        ('BuildActionMap', com.STDMETHOD()),
+        ('SetActionMap', com.STDMETHOD()),
+        ('GetImageInfo', com.STDMETHOD()),
+    ]
+
 
 class IDirectInput8(com.pIUnknown):
     _methods_ = [
-        ('CreateDevice',
-         com.STDMETHOD(ctypes.POINTER(com.GUID),
-                       ctypes.POINTER(IDirectInputDevice8),
-                       ctypes.c_void_p)),
-        ('EnumDevices',
-         com.STDMETHOD(DWORD, LPDIENUMDEVICESCALLBACK, LPVOID, DWORD)),
-        ('GetDeviceStatus',
-         com.STDMETHOD()),
-        ('RunControlPanel',
-         com.STDMETHOD()),
-        ('Initialize',
-         com.STDMETHOD()),
-        ('FindDevice',
-         com.STDMETHOD()),
-        ('EnumDevicesBySemantics',
-         com.STDMETHOD()),
-        ('ConfigureDevices',
-         com.STDMETHOD()),
+        ('CreateDevice', com.STDMETHOD(ctypes.POINTER(com.GUID), ctypes.POINTER(IDirectInputDevice8), ctypes.c_void_p)),
+        ('EnumDevices', com.STDMETHOD(DWORD, LPDIENUMDEVICESCALLBACK, LPVOID, DWORD)),
+        ('GetDeviceStatus', com.STDMETHOD()),
+        ('RunControlPanel', com.STDMETHOD()),
+        ('Initialize', com.STDMETHOD()),
+        ('FindDevice', com.STDMETHOD()),
+        ('EnumDevicesBySemantics', com.STDMETHOD()),
+        ('ConfigureDevices', com.STDMETHOD()),
     ]
 
-IID_IDirectInput8W = \
-    com.GUID(0xBF798031,0x483A,0x4DA2,0xAA,0x99,0x5D,0x64,0xED,0x36,0x97,0x00)
+
+IID_IDirectInput8W = com.GUID(0xBF798031, 0x483A, 0x4DA2, 0xAA, 0x99, 0x5D, 0x64, 0xED, 0x36, 0x97, 0x00)
 
 DIRECTINPUT_VERSION = 0x0800
 DirectInput8Create = lib.DirectInput8Create
-DirectInput8Create.argtypes = \
-    (ctypes.c_void_p, DWORD, com.LPGUID, ctypes.c_void_p, ctypes.c_void_p)
-
+DirectInput8Create.argtypes = (ctypes.c_void_p, DWORD, com.LPGUID, ctypes.c_void_p, ctypes.c_void_p)