[Python-3000-checkins] r66613 - in python/branches/py3k: Lib/ctypes/test/test_bitfields.py Misc/NEWS Modules/_ctypes/cfield.c

[thomas.heller]

Author: thomas.heller
Date: Wed Sep 24 21:01:29 2008
New Revision: 66613

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/ctypes/test/test_bitfields.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_ctypes/cfield.c

Modified: python/branches/py3k/Lib/ctypes/test/test_bitfields.py
==============================================================================
--- python/branches/py3k/Lib/ctypes/test/test_bitfields.py	(original)
+++ python/branches/py3k/Lib/ctypes/test/test_bitfields.py	Wed Sep 24 21:01:29 2008
@@ -215,6 +215,21 @@
                         ("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):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Sep 24 21:01:29 2008
@@ -20,6 +20,9 @@
 
 - Bug #3884: Make the turtle module toplevel again.
 
+- Issue #3547: Fixed ctypes structures bitfields of varying integer
+  sizes.
+
 Extension Modules
 -----------------
 

Modified: python/branches/py3k/Modules/_ctypes/cfield.c
==============================================================================
--- python/branches/py3k/Modules/_ctypes/cfield.c	(original)
+++ python/branches/py3k/Modules/_ctypes/cfield.c	Wed Sep 24 21:01:29 2008
@@ -159,7 +159,7 @@
 		break;
 
 	case EXPAND_BITFIELD:
-		/* XXX needs more */
+		*poffset += dict->size - *pfield_size/8;
 		*psize += dict->size - *pfield_size/8;
 
 		*pfield_size = dict->size * 8;