[server\__init__.py] Use OleDLL instead of oledll (#769)

enthought · Jan 29, 2025 · b7e5bcc · b7e5bcc
1 parent d305713
commit b7e5bcc
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/comtypes/server/__init__.py b/comtypes/server/__init__.py
@@ -1,12 +1,14 @@
 import ctypes
-from ctypes import HRESULT, POINTER, byref
+from ctypes import HRESULT, POINTER, OleDLL, byref, c_void_p
+from ctypes.wintypes import DWORD, LPVOID
 from typing import TYPE_CHECKING, Any, Optional, Type
 
 import comtypes
 import comtypes.client
 import comtypes.client.dynamic
 from comtypes import GUID, STDMETHOD, IUnknown
 from comtypes.automation import IDispatch
+from comtypes.GUID import REFCLSID
 
 if TYPE_CHECKING:
     from ctypes import _Pointer
@@ -67,7 +69,23 @@ def LockServer(self, fLock: int) -> hints.Hresult: ...
 ACTIVEOBJECT_STRONG = 0x0
 ACTIVEOBJECT_WEAK = 0x1
 
-oleaut32 = ctypes.oledll.oleaut32
+_oleaut32 = OleDLL("oleaut32")
+
+_RegisterActiveObject = _oleaut32.RegisterActiveObject
+_RegisterActiveObject.argtypes = [
+    c_void_p,
+    REFCLSID,
+    DWORD,
+    POINTER(DWORD),
+]
+_RegisterActiveObject.restype = HRESULT
+
+_RevokeActiveObject = _oleaut32.RevokeActiveObject
+_RevokeActiveObject.argtypes = [
+    DWORD,
+    LPVOID,
+]
+_RevokeActiveObject.restype = HRESULT
 
 
 def RegisterActiveObject(comobj: comtypes.COMObject, weak: bool = True) -> int:
@@ -78,9 +96,9 @@ def RegisterActiveObject(comobj: comtypes.COMObject, weak: bool = True) -> int:
     else:
         flags = ACTIVEOBJECT_STRONG
     handle = ctypes.c_ulong()
-    oleaut32.RegisterActiveObject(punk, byref(clsid), flags, byref(handle))
+    _RegisterActiveObject(punk, byref(clsid), flags, byref(handle))
     return handle.value
 
 
 def RevokeActiveObject(handle: int) -> None:
-    oleaut32.RevokeActiveObject(handle, None)
+    _RevokeActiveObject(handle, None)