]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-60580: Fix a wrong type of `ctypes.wintypes.BYTE` (#97579)
authorOleg Iarygin <oleg@arhadthedev.net>
Thu, 26 Jan 2023 14:16:27 +0000 (18:16 +0400)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2023 14:16:27 +0000 (18:16 +0400)
Created from a patch file attached to an issue, by Anatoly Techtonik.

Lib/ctypes/wintypes.py
Lib/test/test_ctypes/test_wintypes.py
Misc/NEWS.d/next/Library/2022-09-26-21-18-47.gh-issue-60580.0hBgde.rst [new file with mode: 0644]

index c619d27596d40b6c396fe23bea33d7187d1d6568..9c4e721438aad5d2b0455ab70db908926bebc861 100644 (file)
@@ -1,7 +1,7 @@
 # The most useful windows datatypes
 import ctypes
 
-BYTE = ctypes.c_byte
+BYTE = ctypes.c_ubyte
 WORD = ctypes.c_ushort
 DWORD = ctypes.c_ulong
 
index 243d5962ffa7f1c6b7e0971d42a7b0ec98de99a0..a01b9b1d0f3109b641de36bb9b3d140f63818668 100644 (file)
@@ -1,3 +1,6 @@
+# See <https://learn.microsoft.com/en-us/windows/win32/winprog/windows-data-types>
+# for reference.
+
 import unittest
 
 # also work on POSIX
@@ -38,6 +41,22 @@ class WinTypesTest(unittest.TestCase):
         vb.value = []
         self.assertIs(vb.value, False)
 
+    def assertIsSigned(self, ctype):
+        self.assertLess(ctype(-1).value, 0)
+
+    def assertIsUnsigned(self, ctype):
+        self.assertGreater(ctype(-1).value, 0)
+
+    def test_signedness(self):
+        for ctype in (wintypes.BYTE, wintypes.WORD, wintypes.DWORD,
+                     wintypes.BOOLEAN, wintypes.UINT, wintypes.ULONG):
+            with self.subTest(ctype=ctype):
+                self.assertIsUnsigned(ctype)
+
+        for ctype in (wintypes.BOOL, wintypes.INT, wintypes.LONG):
+            with self.subTest(ctype=ctype):
+                self.assertIsSigned(ctype)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-09-26-21-18-47.gh-issue-60580.0hBgde.rst b/Misc/NEWS.d/next/Library/2022-09-26-21-18-47.gh-issue-60580.0hBgde.rst
new file mode 100644 (file)
index 0000000..630e56c
--- /dev/null
@@ -0,0 +1,3 @@
+:data:`ctypes.wintypes.BYTE` definition changed from
+:data:`~ctypes.c_byte` to :data:`~ctypes.c_ubyte` to match Windows
+SDK. Patch by Anatoly Techtonik and Oleg Iarygin.