Merged revisions 66611 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66611 | thomas.heller | 2008-09-24 20:26:05 +0200 (Mi, 24 Sep 2008) | 3 lines

  Fix issue #3547: ctypes is confused by bitfields of varying integer types

  Reviewed by Fredrik Lundh and Skip Montanaro.
........

diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py
index c17ba3ca33121a229ef515748cd2c55691128c4a..06c4023fa2d18f2e6226e52b1dc3cdc5165c862e 100644 (file)
--- a/Lib/ctypes/test/test_bitfields.py
+++ b/Lib/ctypes/test/test_bitfields.py
@@ -215,6 +215,21 @@ class BitFieldTest(unittest.TestCase):
                         ("b", c_ubyte, 4)]
         self.failUnlessEqual(sizeof(X), sizeof(c_byte))
 
+    def test_mixed_4(self):
+        class X(Structure):
+            _fields_ = [("a", c_short, 4),
+                        ("b", c_short, 4),
+                        ("c", c_int, 24),
+                        ("d", c_short, 4),
+                        ("e", c_short, 4),
+                        ("f", c_int, 24)]
+        # MS compilers do NOT combine c_short and c_int into
+        # one field, gcc does.
+        if os.name in ("nt", "ce"):
+            self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4)
+        else:
+            self.failUnlessEqual(sizeof(X), sizeof(c_int) * 2)
+
     def test_anon_bitfields(self):
         # anonymous bit-fields gave a strange error message
         class X(Structure):

diff --git a/Misc/NEWS b/Misc/NEWS
index ac2dda80c5956a1e76930e5f28b060708157c7d6..10799600368555f508e6318cd29df608711d5a97 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -20,6 +20,9 @@ Library
 
 - Bug #3884: Make the turtle module toplevel again.
 
+- Issue #3547: Fixed ctypes structures bitfields of varying integer
+  sizes.
+
 Extension Modules
 -----------------
 

diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index beca0186d2f5751286c699ade757ff37a4a93ca9..9040dbb13500d22f36220220a792885f5f11a492 100644 (file)
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -159,7 +159,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
                break;
 
        case EXPAND_BITFIELD:
-               /* XXX needs more */
+               *poffset += dict->size - *pfield_size/8;
                *psize += dict->size - *pfield_size/8;
 
                *pfield_size = dict->size * 8;