Skip to content

Revive and correct integer handling logic for VARIANTs when setting values. #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junkmd merged 5 commits into from
Jul 17, 2025
Merged

Revive and correct integer handling logic for VARIANTs when setting values. #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f205e3b
Add boundary tests for `VARIANT` integer type selection.
junkmd Jul 17, 2025
e0f2b16
Separate int and `c_int` handling in `VARIANT`.
junkmd Jul 17, 2025
703e7a0
Correctly handle large negative integers in `VARIANT`.
junkmd Jul 17, 2025
fb06dc0
Raise TypeError for out-of-range integers in `VARIANT`.
junkmd Jul 17, 2025
d1cdb75
Simplify test for out-of-range integers.
junkmd Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions comtypes/automation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ def _set_value(self, value):
elif isinstance(value, bool):
self.vt = VT_BOOL
self._.VT_BOOL = value
elif isinstance(value, (int, c_int)):
self.vt = VT_I4
self._.VT_I4 = value
elif isinstance(value, int):
u = self._
# try VT_I4 first.
Expand All @@ -264,22 +261,19 @@ def _set_value(self, value):
self.vt = VT_UI4
return
# try VT_I8 next.
if value >= 0:
u.VT_I8 = value
if u.VT_I8 == value:
# did work.
self.vt = VT_I8
return
u.VT_I8 = value
if u.VT_I8 == value:
# did work.
self.vt = VT_I8
return
# try VT_UI8 next.
if value >= 0:
u.VT_UI8 = value
if u.VT_UI8 == value:
# did work.
self.vt = VT_UI8
return
# VT_R8 is last resort.
self.vt = VT_R8
u.VT_R8 = float(value)
raise TypeError(f"Cannot put {value!r} in VARIANT")
elif isinstance(value, (float, c_double)):
self.vt = VT_R8
self._.VT_R8 = value
Expand Down Expand Up @@ -364,6 +358,9 @@ def _set_value(self, value):
elif isinstance(value, c_uint):
self.vt = VT_UI4
self._.VT_UI4 = value
elif isinstance(value, c_int):
self.vt = VT_I4
self._.VT_I4 = value
elif isinstance(value, c_float):
self.vt = VT_R4
self._.VT_R4 = value
Expand Down
33 changes: 33 additions & 0 deletions comtypes/test/test_variant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,39 @@ def test_integers(self):
self.assertEqual(v.value, 1)
self.assertIsInstance(v.value, int)

def test_vt_uix_range_boundaries(self):
MIN_VT_I4 = -(2**31)
MAX_VT_I4 = 2**31 - 1
MAX_VT_UI4 = 2**32 - 1
MIN_VT_I8 = -(2**63)
MAX_VT_I8 = 2**63 - 1
MAX_VT_UI8 = 2**64 - 1
for val, vt in [
(MIN_VT_I8, VT_I8),
(MIN_VT_I4 - 1, VT_I8),
(MIN_VT_I4, VT_I4),
(0, VT_I4),
(MAX_VT_I4, VT_I4),
(MAX_VT_I4 + 1, VT_UI4),
(MAX_VT_UI4, VT_UI4),
(MAX_VT_UI4 + 1, VT_I8),
(MAX_VT_I8, VT_I8),
(MAX_VT_I8 + 1, VT_UI8),
(MAX_VT_UI8, VT_UI8),
]:
with self.subTest(val=val, vt=vt):
v = VARIANT()
v.value = val
self.assertEqual(v.value, val)
self.assertEqual(v.vt, vt)

def test_out_of_vt_uix_range(self):
MIN_VT_I8 = -(2**63)
MAX_VT_UI8 = 2**64 - 1
for val in [MIN_VT_I8 - 1, MAX_VT_UI8 + 1]:
with self.subTest(val=val), self.assertRaises(TypeError):
VARIANT().value = val

def test_datetime(self):
now = datetime.datetime.now()

Expand Down