cpython-lru_cache-weakref: Modules/_ctypes/cfield.c annotate

annotate Modules/_ctypes/cfield.c @ 79675:c0a2294de787 2.7

Issue #16199: Backport 2to3 typo fix from 3.2.

author	Chris Jerdonek <chris.jerdonek@gmail.com>
date	Thu, 11 Oct 2012 16:15:46 -0700
parents	77401bd4f567
children

rev	line source
38780 381a72ab5fb8 Add pep-291 compatibility markers. Thomas Heller <theller@ctypes.org> parents: 38626 diff changeset	1 /*****************************************************************
381a72ab5fb8 Add pep-291 compatibility markers. Thomas Heller <theller@ctypes.org> parents: 38626 diff changeset	2 This file should be kept compatible with Python 2.3, see PEP 291.
381a72ab5fb8 Add pep-291 compatibility markers. Thomas Heller <theller@ctypes.org> parents: 38626 diff changeset	3 *****************************************************************/
381a72ab5fb8 Add pep-291 compatibility markers. Thomas Heller <theller@ctypes.org> parents: 38626 diff changeset	4
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	5 #include "Python.h"
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	6
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	7 #include <ffi.h>
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	8 #ifdef MS_WIN32
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	9 #include <windows.h>
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	10 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	11 #include "ctypes.h"
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	12
59998 d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55387 diff changeset	13
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55387 diff changeset	14 #define CTYPES_CAPSULE_WCHAR_T "_ctypes/cfield.c wchar_t buffer from unicode"
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55387 diff changeset	15 CTYPES_CAPSULE_INSTANTIATE_DESTRUCTOR(CTYPES_CAPSULE_WCHAR_T)
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55387 diff changeset	16
d11fbc796499 Backported PyCapsule from 3.1, and converted most uses of Larry Hastings <larry@hastings.org> parents: 55387 diff changeset	17
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	18 /******************************************************************/
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	19 /*
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	20 PyCField_Type
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	21 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	22 static PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	23 PyCField_new(PyTypeObject type, PyObject args, PyObject *kwds)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	24 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	25 CFieldObject *obj;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	26 obj = (CFieldObject *)type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	27 return (PyObject *)obj;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	28 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	29
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	30 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	31 * Expects the size, index and offset for the current field in *psize and
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	32 * poffset, stores the total size so far in psize, the offset for the next
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	33 * field in *poffset, the alignment requirements for the current field in
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	34 * *palign, and returns a field desriptor for this field.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	35 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	36 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	37 * bitfields extension:
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	38 * bitsize != 0: this is a bit field.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	39 * pbitofs points to the current bit offset, this will be updated.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	40 * prev_desc points to the type of the previous bitfield, if any.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	41 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	42 PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	43 PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	44 Py_ssize_t pfield_size, int bitsize, int pbitofs,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	45 Py_ssize_t psize, Py_ssize_t poffset, Py_ssize_t *palign,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	46 int pack, int big_endian)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	47 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	48 CFieldObject *self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	49 PyObject *proto;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	50 Py_ssize_t size, align, length;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	51 SETFUNC setfunc = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	52 GETFUNC getfunc = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	53 StgDictObject *dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	54 int fieldtype;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	55 #define NO_BITFIELD 0
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	56 #define NEW_BITFIELD 1
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	57 #define CONT_BITFIELD 2
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	58 #define EXPAND_BITFIELD 3
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	59
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	60 self = (CFieldObject )PyObject_CallObject((PyObject )&PyCField_Type,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	61 NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	62 if (self == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	63 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	64 dict = PyType_stgdict(desc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	65 if (!dict) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	66 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	67 "has no _stginfo_");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	68 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	69 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	70 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	71 if (bitsize /* this is a bitfield request */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	72 && pfield_size / we have a bitfield open */
49343 edb5eecf3bb8 Fix issue #3547 for MingW, update comments (backport from trunk). Thomas Heller <theller@ctypes.org> parents: 49289 diff changeset	73 #ifdef MS_WIN32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	74 /* MSVC, GCC with -mms-bitfields */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	75 && dict->size * 8 == *pfield_size
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	76 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	77 /* GCC */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	78 && dict->size * 8 <= *pfield_size
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	79 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	80 && (pbitofs + bitsize) <= pfield_size) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	81 /* continue bit field */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	82 fieldtype = CONT_BITFIELD;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	83 #ifndef MS_WIN32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	84 } else if (bitsize /* this is a bitfield request */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	85 && pfield_size / we have a bitfield open */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	86 && dict->size * 8 >= *pfield_size
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	87 && (pbitofs + bitsize) <= dict->size 8) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	88 /* expand bit field */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	89 fieldtype = EXPAND_BITFIELD;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	90 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	91 } else if (bitsize) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	92 /* start new bitfield */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	93 fieldtype = NEW_BITFIELD;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	94 *pbitofs = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	95 pfield_size = dict->size 8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	96 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	97 /* not a bit field */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	98 fieldtype = NO_BITFIELD;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	99 *pbitofs = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	100 *pfield_size = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	101 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	102
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	103 size = dict->size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	104 length = dict->length;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	105 proto = desc;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	106
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	107 /* Field descriptors for 'c_char * n' are be scpecial cased to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	108 return a Python string instead of an Array object instance...
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	109 */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	110 if (PyCArrayTypeObject_Check(proto)) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	111 StgDictObject *adict = PyType_stgdict(proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	112 StgDictObject *idict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	113 if (adict && adict->proto) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	114 idict = PyType_stgdict(adict->proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	115 if (!idict) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	116 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	117 "has no _stginfo_");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	118 Py_DECREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	119 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	120 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	121 if (idict->getfunc == _ctypes_get_fielddesc("c")->getfunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	122 struct fielddesc *fd = _ctypes_get_fielddesc("s");
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	123 getfunc = fd->getfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	124 setfunc = fd->setfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	125 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	126 #ifdef CTYPES_UNICODE
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	127 if (idict->getfunc == _ctypes_get_fielddesc("u")->getfunc) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	128 struct fielddesc *fd = _ctypes_get_fielddesc("U");
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	129 getfunc = fd->getfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	130 setfunc = fd->setfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	131 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	132 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	133 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	134 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	135
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	136 self->setfunc = setfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	137 self->getfunc = getfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	138 self->index = index;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	139
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	140 Py_INCREF(proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	141 self->proto = proto;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	142
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	143 switch (fieldtype) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	144 case NEW_BITFIELD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	145 if (big_endian)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	146 self->size = (bitsize << 16) + pfield_size - pbitofs - bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	147 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	148 self->size = (bitsize << 16) + *pbitofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	149 *pbitofs = bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	150 /* fall through */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	151 case NO_BITFIELD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	152 if (pack)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	153 align = min(pack, dict->align);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	154 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	155 align = dict->align;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	156 if (align && *poffset % align) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	157 Py_ssize_t delta = align - (*poffset % align);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	158 *psize += delta;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	159 *poffset += delta;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	160 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	161
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	162 if (bitsize == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	163 self->size = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	164 *psize += size;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	165
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	166 self->offset = *poffset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	167 *poffset += size;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	168
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	169 *palign = align;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	170 break;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	171
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	172 case EXPAND_BITFIELD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	173 poffset += dict->size - pfield_size/8;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	174 psize += dict->size - pfield_size/8;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	175
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	176 pfield_size = dict->size 8;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	177
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	178 if (big_endian)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	179 self->size = (bitsize << 16) + pfield_size - pbitofs - bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	180 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	181 self->size = (bitsize << 16) + *pbitofs;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	182
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	183 self->offset = poffset - size; / poffset is already updated for the NEXT field */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	184 *pbitofs += bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	185 break;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	186
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	187 case CONT_BITFIELD:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	188 if (big_endian)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	189 self->size = (bitsize << 16) + pfield_size - pbitofs - bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	190 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	191 self->size = (bitsize << 16) + *pbitofs;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	192
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	193 self->offset = poffset - size; / poffset is already updated for the NEXT field */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	194 *pbitofs += bitsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	195 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	196 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	197
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	198 return (PyObject *)self;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	199 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	200
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	201 static int
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	202 PyCField_set(CFieldObject self, PyObject inst, PyObject *value)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	203 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	204 CDataObject *dst;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	205 char *ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	206 assert(CDataObject_Check(inst));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	207 dst = (CDataObject *)inst;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	208 ptr = dst->b_ptr + self->offset;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	209 if (value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	210 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	211 "can't delete attribute");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	212 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	213 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	214 return PyCData_set(inst, self->proto, self->setfunc, value,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	215 self->index, self->size, ptr);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	216 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	217
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	218 static PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	219 PyCField_get(CFieldObject self, PyObject inst, PyTypeObject *type)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	220 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	221 CDataObject *src;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	222 if (inst == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	223 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	224 return (PyObject *)self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	225 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	226 assert(CDataObject_Check(inst));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	227 src = (CDataObject *)inst;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	228 return PyCData_get(self->proto, self->getfunc, inst,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	229 self->index, self->size, src->b_ptr + self->offset);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	230 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	231
38625 5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	232 static PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	233 PyCField_get_offset(PyObject self, void data)
38625 5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	234 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	235 return PyInt_FromSsize_t(((CFieldObject *)self)->offset);
38625 5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	236 }
5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	237
5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	238 static PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	239 PyCField_get_size(PyObject self, void data)
38625 5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	240 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	241 return PyInt_FromSsize_t(((CFieldObject *)self)->size);
38625 5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	242 }
5fbefb5c8a23 Convert CFieldObject tp_members to tp_getset, since there is no Thomas Heller <theller@ctypes.org> parents: 37498 diff changeset	243
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	244 static PyGetSetDef PyCField_getset[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	245 { "offset", PyCField_get_offset, NULL, "offset in bytes of this field" },
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	246 { "size", PyCField_get_size, NULL, "size in bytes of this field" },
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	247 { NULL, NULL, NULL, NULL },
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	248 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	249
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	250 static int
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	251 PyCField_traverse(CFieldObject self, visitproc visit, void arg)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	252 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	253 Py_VISIT(self->proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	254 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	255 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	256
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	257 static int
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	258 PyCField_clear(CFieldObject *self)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	259 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	260 Py_CLEAR(self->proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	261 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	262 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	263
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	264 static void
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	265 PyCField_dealloc(PyObject *self)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	266 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	267 PyCField_clear((CFieldObject *)self);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	268 self->ob_type->tp_free((PyObject *)self);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	269 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	270
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	271 static PyObject *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	272 PyCField_repr(CFieldObject *self)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	273 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	274 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	275 Py_ssize_t bits = self->size >> 16;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	276 Py_ssize_t size = self->size & 0xFFFF;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	277 const char *name;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	278
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	279 name = ((PyTypeObject *)self->proto)->tp_name;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	280
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	281 if (bits)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	282 result = PyString_FromFormat(
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	283 #if (PY_VERSION_HEX < 0x02050000)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	284 "<Field type=%s, ofs=%d:%d, bits=%d>",
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	285 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	286 "<Field type=%s, ofs=%zd:%zd, bits=%zd>",
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	287 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	288 name, self->offset, size, bits);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	289 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	290 result = PyString_FromFormat(
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	291 #if (PY_VERSION_HEX < 0x02050000)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	292 "<Field type=%s, ofs=%d, size=%d>",
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	293 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	294 "<Field type=%s, ofs=%zd, size=%zd>",
37004 3bf23061d86c Backport from upstream version: compatibility with older Python Thomas Heller <theller@ctypes.org> parents: 36994 diff changeset	295 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	296 name, self->offset, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	297 return result;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	298 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	299
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	300 PyTypeObject PyCField_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	301 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	302 "_ctypes.CField", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	303 sizeof(CFieldObject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	304 0, /* tp_itemsize */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	305 PyCField_dealloc, /* tp_dealloc */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	306 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	307 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	308 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	309 0, /* tp_compare */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	310 (reprfunc)PyCField_repr, /* tp_repr */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	311 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	312 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	313 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	314 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	315 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	316 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	317 0, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	318 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	319 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	320 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	321 "Structure/Union member", /* tp_doc */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	322 (traverseproc)PyCField_traverse, /* tp_traverse */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	323 (inquiry)PyCField_clear, /* tp_clear */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	324 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	325 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	326 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	327 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	328 0, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	329 0, /* tp_members */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	330 PyCField_getset, /* tp_getset */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	331 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	332 0, /* tp_dict */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	333 (descrgetfunc)PyCField_get, /* tp_descr_get */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	334 (descrsetfunc)PyCField_set, /* tp_descr_set */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	335 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	336 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	337 0, /* tp_alloc */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	338 PyCField_new, /* tp_new */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	339 0, /* tp_free */
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	340 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	341
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	342
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	343 /******************************************************************/
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	344 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	345 Accessor functions
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	346 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	347
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	348 /* Derived from Modules/structmodule.c:
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	349 Helper routine to get a Python integer and raise the appropriate error
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	350 if it isn't one */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	351
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	352 static int
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	353 get_long(PyObject v, long p)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	354 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	355 long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	356 if (PyFloat_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	357 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	358 "int expected instead of float");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	359 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	360 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	361 x = PyInt_AsUnsignedLongMask(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	362 if (x == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	363 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	364 *p = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	365 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	366 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	367
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	368 /* Same, but handling unsigned long */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	369
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	370 static int
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	371 get_ulong(PyObject v, unsigned long p)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	372 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	373 unsigned long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	374 if (PyFloat_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	375 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	376 "int expected instead of float");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	377 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	378 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	379 x = PyInt_AsUnsignedLongMask(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	380 if (x == (unsigned long)-1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	381 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	382 *p = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	383 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	384 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	385
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	386 #ifdef HAVE_LONG_LONG
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	387
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	388 /* Same, but handling native long long. */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	389
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	390 static int
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	391 get_longlong(PyObject v, PY_LONG_LONG p)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	392 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	393 PY_LONG_LONG x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	394 if (PyFloat_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	395 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	396 "int expected instead of float");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	397 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	398 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	399 x = PyInt_AsUnsignedLongLongMask(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	400 if (x == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	401 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	402 *p = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	403 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	404 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	405
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	406 /* Same, but handling native unsigned long long. */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	407
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	408 static int
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	409 get_ulonglong(PyObject v, unsigned PY_LONG_LONG p)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	410 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	411 unsigned PY_LONG_LONG x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	412 if (PyFloat_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	413 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	414 "int expected instead of float");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	415 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	416 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	417 x = PyInt_AsUnsignedLongLongMask(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	418 if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	419 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	420 *p = x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	421 return 0;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	422 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	423
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	424 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	425
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	426 /*****************************************************************
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	427 * Integer fields, with bitfield support
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	428 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	429
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	430 /* how to decode the size field, for integer get/set functions */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	431 #define LOW_BIT(x) ((x) & 0xFFFF)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	432 #define NUM_BITS(x) ((x) >> 16)
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	433
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	434 /* Doesn't work if NUM_BITS(size) == 0, but it never happens in SET() call. */
77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	435 #define BIT_MASK(type, size) (((((type)1 << (NUM_BITS(size) - 1)) - 1) << 1) + 1)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	436
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	437 /* This macro CHANGES the first parameter IN PLACE. For proper sign handling,
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	438 we must first shift left, then right.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	439 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	440 #define GET_BITFIELD(v, size) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	441 if (NUM_BITS(size)) { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	442 v <<= (sizeof(v)*8 - LOW_BIT(size) - NUM_BITS(size)); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	443 v >>= (sizeof(v)*8 - NUM_BITS(size)); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	444 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	445
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	446 /* This macro RETURNS the first parameter with the bit field CHANGED. */
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	447 #define SET(type, x, v, size) \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	448 (NUM_BITS(size) ? \
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	449 ( ( (type)x & ~(BIT_MASK(type, size) << LOW_BIT(size)) ) \| ( ((type)v & BIT_MASK(type, size)) << LOW_BIT(size) ) ) \
77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	450 : (type)v)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	451
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	452 /* byte swapping macros */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	453 #define SWAP_2(v) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	454 ( ( (v >> 8) & 0x00FF) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	455 ( (v << 8) & 0xFF00) )
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	456
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	457 #define SWAP_4(v) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	458 ( ( (v & 0x000000FF) << 24 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	459 ( (v & 0x0000FF00) << 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	460 ( (v & 0x00FF0000) >> 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	461 ( ((v >> 24) & 0xFF)) )
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	462
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	463 #ifdef _MSC_VER
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	464 #define SWAP_8(v) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	465 ( ( (v & 0x00000000000000FFL) << 56 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	466 ( (v & 0x000000000000FF00L) << 40 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	467 ( (v & 0x0000000000FF0000L) << 24 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	468 ( (v & 0x00000000FF000000L) << 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	469 ( (v & 0x000000FF00000000L) >> 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	470 ( (v & 0x0000FF0000000000L) >> 24 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	471 ( (v & 0x00FF000000000000L) >> 40 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	472 ( ((v >> 56) & 0xFF)) )
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	473 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	474 #define SWAP_8(v) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	475 ( ( (v & 0x00000000000000FFLL) << 56 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	476 ( (v & 0x000000000000FF00LL) << 40 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	477 ( (v & 0x0000000000FF0000LL) << 24 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	478 ( (v & 0x00000000FF000000LL) << 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	479 ( (v & 0x000000FF00000000LL) >> 8 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	480 ( (v & 0x0000FF0000000000LL) >> 24 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	481 ( (v & 0x00FF000000000000LL) >> 40 ) \| \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	482 ( ((v >> 56) & 0xFF)) )
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	483 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	484
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	485 #define SWAP_INT SWAP_4
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	486
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	487 #if SIZEOF_LONG == 4
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	488 # define SWAP_LONG SWAP_4
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	489 #elif SIZEOF_LONG == 8
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	490 # define SWAP_LONG SWAP_8
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	491 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	492 /*****************************************************************
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	493 * The setter methods return an object which must be kept alive, to keep the
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	494 * data valid which has been stored in the memory block. The ctypes object
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	495 * instance inserts this object into its 'b_objects' list.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	496 *
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	497 * For simple Python types like integers or characters, there is nothing that
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	498 * has to been kept alive, so Py_None is returned in these cases. But this
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	499 * makes inspecting the 'b_objects' list, which is accessible from Python for
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	500 * debugging, less useful.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	501 *
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	502 * So, defining the _CTYPES_DEBUG_KEEP symbol returns the original value
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	503 * instead of Py_None.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	504 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	505
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	506 #ifdef _CTYPES_DEBUG_KEEP
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	507 #define _RET(x) Py_INCREF(x); return x
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	508 #else
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	509 #define _RET(X) Py_INCREF(Py_None); return Py_None
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	510 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	511
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	512 /*****************************************************************
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	513 * integer accessor methods, supporting bit fields
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	514 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	515
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	516 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	517 b_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	518 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	519 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	520 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	521 return NULL;
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	522 (signed char )ptr = SET(signed char, (signed char )ptr, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	523 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	524 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	525
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	526
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	527 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	528 b_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	529 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	530 signed char val = (signed char )ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	531 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	532 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	533 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	534
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	535 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	536 B_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	537 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	538 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	539 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	540 return NULL;
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	541 (unsigned char )ptr = SET(unsigned char, (unsigned char)ptr, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	542 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	543 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	544
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	545
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	546 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	547 B_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	548 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	549 unsigned char val = (unsigned char )ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	550 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	551 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	552 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	553
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	554 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	555 h_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	556 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	557 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	558 short x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	559 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	560 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	561 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	562 x = SET(short, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	563 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	564 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	565 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	566
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	567
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	568 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	569 h_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	570 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	571 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	572 short field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	573 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	574 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	575 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	576 field = SWAP_2(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	577 field = SET(short, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	578 field = SWAP_2(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	579 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	580 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	581 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	582
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	583 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	584 h_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	585 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	586 short val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	587 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	588 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	589 return PyInt_FromLong((long)val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	590 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	591
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	592 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	593 h_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	594 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	595 short val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	596 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	597 val = SWAP_2(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	598 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	599 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	600 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	601
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	602 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	603 H_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	604 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	605 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	606 unsigned short x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	607 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	608 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	609 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	610 x = SET(unsigned short, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	611 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	612 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	613 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	614
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	615 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	616 H_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	617 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	618 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	619 unsigned short field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	620 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	621 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	622 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	623 field = SWAP_2(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	624 field = SET(unsigned short, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	625 field = SWAP_2(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	626 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	627 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	628 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	629
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	630
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	631 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	632 H_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	633 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	634 unsigned short val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	635 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	636 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	637 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	638 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	639
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	640 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	641 H_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	642 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	643 unsigned short val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	644 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	645 val = SWAP_2(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	646 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	647 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	648 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	649
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	650 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	651 i_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	652 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	653 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	654 int x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	655 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	656 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	657 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	658 x = SET(int, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	659 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	660 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	661 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	662
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	663 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	664 i_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	665 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	666 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	667 int field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	668 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	669 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	670 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	671 field = SWAP_INT(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	672 field = SET(int, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	673 field = SWAP_INT(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	674 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	675 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	676 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	677
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	678
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	679 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	680 i_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	681 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	682 int val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	683 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	684 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	685 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	686 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	687
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	688 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	689 i_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	690 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	691 int val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	692 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	693 val = SWAP_INT(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	694 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	695 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	696 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	697
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	698 #ifdef MS_WIN32
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	699 /* short BOOL - VARIANT_BOOL */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	700 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	701 vBOOL_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	702 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	703 switch (PyObject_IsTrue(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	704 case -1:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	705 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	706 case 0:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	707 (short int )ptr = VARIANT_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	708 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	709 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	710 (short int )ptr = VARIANT_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	711 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	712 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	713 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	714
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	715 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	716 vBOOL_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	717 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	718 return PyBool_FromLong((long)(short int )ptr);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	719 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	720 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	721
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	722 #ifdef HAVE_C99_BOOL
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	723 #define BOOL_TYPE _Bool
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	724 #else
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	725 #define BOOL_TYPE char
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	726 #undef SIZEOF__BOOL
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	727 #define SIZEOF__BOOL 1
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	728 #endif
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	729
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	730 static PyObject *
45672 d41a4206405c Issue 1872: Changed the struct module typecode from 't' to '?', for Thomas Heller <theller@ctypes.org> parents: 44924 diff changeset	731 bool_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	732 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	733 switch (PyObject_IsTrue(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	734 case -1:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	735 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	736 case 0:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	737 (BOOL_TYPE )ptr = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	738 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	739 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	740 (BOOL_TYPE )ptr = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	741 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	742 }
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	743 }
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	744
493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	745 static PyObject *
45672 d41a4206405c Issue 1872: Changed the struct module typecode from 't' to '?', for Thomas Heller <theller@ctypes.org> parents: 44924 diff changeset	746 bool_get(void *ptr, Py_ssize_t size)
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	747 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	748 return PyBool_FromLong((long)(BOOL_TYPE )ptr);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	749 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	750
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	751 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	752 I_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	753 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	754 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	755 unsigned int x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	756 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	757 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	758 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	759 x = SET(unsigned int, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	760 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	761 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	762 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	763
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	764 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	765 I_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	766 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	767 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	768 unsigned int field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	769 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	770 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	771 memcpy(&field, ptr, sizeof(field));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	772 field = SET(unsigned int, field, (unsigned int)val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	773 field = SWAP_INT(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	774 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	775 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	776 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	777
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	778
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	779 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	780 I_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	781 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	782 unsigned int val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	783 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	784 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	785 return PyLong_FromUnsignedLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	786 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	787
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	788 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	789 I_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	790 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	791 unsigned int val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	792 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	793 val = SWAP_INT(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	794 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	795 return PyLong_FromUnsignedLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	796 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	797
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	798 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	799 l_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	800 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	801 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	802 long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	803 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	804 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	805 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	806 x = SET(long, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	807 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	808 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	809 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	810
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	811 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	812 l_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	813 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	814 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	815 long field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	816 if (get_long(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	817 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	818 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	819 field = SWAP_LONG(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	820 field = SET(long, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	821 field = SWAP_LONG(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	822 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	823 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	824 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	825
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	826
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	827 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	828 l_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	829 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	830 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	831 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	832 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	833 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	834 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	835
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	836 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	837 l_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	838 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	839 long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	840 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	841 val = SWAP_LONG(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	842 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	843 return PyInt_FromLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	844 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	845
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	846 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	847 L_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	848 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	849 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	850 unsigned long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	851 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	852 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	853 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	854 x = SET(unsigned long, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	855 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	856 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	857 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	858
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	859 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	860 L_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	861 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	862 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	863 unsigned long field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	864 if (get_ulong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	865 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	866 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	867 field = SWAP_LONG(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	868 field = SET(unsigned long, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	869 field = SWAP_LONG(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	870 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	871 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	872 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	873
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	874
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	875 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	876 L_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	877 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	878 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	879 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	880 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	881 return PyLong_FromUnsignedLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	882 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	883
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	884 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	885 L_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	886 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	887 unsigned long val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	888 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	889 val = SWAP_LONG(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	890 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	891 return PyLong_FromUnsignedLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	892 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	893
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	894 #ifdef HAVE_LONG_LONG
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	895 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	896 q_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	897 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	898 PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	899 PY_LONG_LONG x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	900 if (get_longlong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	901 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	902 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	903 x = SET(PY_LONG_LONG, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	904 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	905 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	906 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	907
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	908 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	909 q_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	910 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	911 PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	912 PY_LONG_LONG field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	913 if (get_longlong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	914 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	915 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	916 field = SWAP_8(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	917 field = SET(PY_LONG_LONG, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	918 field = SWAP_8(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	919 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	920 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	921 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	922
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	923 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	924 q_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	925 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	926 PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	927 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	928 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	929 return PyLong_FromLongLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	930 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	931
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	932 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	933 q_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	934 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	935 PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	936 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	937 val = SWAP_8(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	938 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	939 return PyLong_FromLongLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	940 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	941
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	942 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	943 Q_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	944 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	945 unsigned PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	946 unsigned PY_LONG_LONG x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	947 if (get_ulonglong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	948 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	949 memcpy(&x, ptr, sizeof(x));
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	950 x = SET(PY_LONG_LONG, x, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	951 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	952 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	953 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	954
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	955 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	956 Q_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	957 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	958 unsigned PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	959 unsigned PY_LONG_LONG field;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	960 if (get_ulonglong(value, &val) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	961 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	962 memcpy(&field, ptr, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	963 field = SWAP_8(field);
78174 77401bd4f567 Issue #6493: Fix handling of c_uint32 bitfields with width of 32 on Windows. Meador Inge <meadori@gmail.com> parents: 77207 diff changeset	964 field = SET(unsigned PY_LONG_LONG, field, val, size);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	965 field = SWAP_8(field);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	966 memcpy(ptr, &field, sizeof(field));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	967 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	968 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	969
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	970 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	971 Q_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	972 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	973 unsigned PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	974 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	975 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	976 return PyLong_FromUnsignedLongLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	977 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	978
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	979 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	980 Q_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	981 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	982 unsigned PY_LONG_LONG val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	983 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	984 val = SWAP_8(val);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	985 GET_BITFIELD(val, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	986 return PyLong_FromUnsignedLongLong(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	987 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	988 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	989
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	990 /*****************************************************************
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	991 * non-integer accessor methods, not supporting bit fields
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	992 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	993
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	994
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	995 static PyObject *
44712 2c9bc61d4f73 Use 'g' instead of 'D' as the ctypes typecode for c_longdouble, for Thomas Heller <theller@ctypes.org> parents: 44335 diff changeset	996 g_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	997 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	998 long double x;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	999
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1000 x = PyFloat_AsDouble(value);
77207 8a65eceea56c Issue #9041: raised exception is misleading Meador Inge <meadori@gmail.com> parents: 68256 diff changeset	1001 if (x == -1 && PyErr_Occurred())
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1002 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1003 memcpy(ptr, &x, sizeof(long double));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1004 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1005 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1006
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1007 static PyObject *
44712 2c9bc61d4f73 Use 'g' instead of 'D' as the ctypes typecode for c_longdouble, for Thomas Heller <theller@ctypes.org> parents: 44335 diff changeset	1008 g_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1009 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1010 long double val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1011 memcpy(&val, ptr, sizeof(long double));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1012 return PyFloat_FromDouble(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1013 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1014
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1015 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1016 d_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1017 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1018 double x;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1019
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1020 x = PyFloat_AsDouble(value);
77207 8a65eceea56c Issue #9041: raised exception is misleading Meador Inge <meadori@gmail.com> parents: 68256 diff changeset	1021 if (x == -1 && PyErr_Occurred())
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1022 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1023 memcpy(ptr, &x, sizeof(double));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1024 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1025 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1026
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1027 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1028 d_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1029 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1030 double val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1031 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1032 return PyFloat_FromDouble(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1033 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1034
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1035 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1036 d_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1037 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1038 double x;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1039
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1040 x = PyFloat_AsDouble(value);
77207 8a65eceea56c Issue #9041: raised exception is misleading Meador Inge <meadori@gmail.com> parents: 68256 diff changeset	1041 if (x == -1 && PyErr_Occurred())
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1042 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1043 #ifdef WORDS_BIGENDIAN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1044 if (_PyFloat_Pack8(x, (unsigned char *)ptr, 1))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1045 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1046 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1047 if (_PyFloat_Pack8(x, (unsigned char *)ptr, 0))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1048 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1049 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1050 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1051 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1052
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1053 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1054 d_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1055 {
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1056 #ifdef WORDS_BIGENDIAN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1057 return PyFloat_FromDouble(_PyFloat_Unpack8(ptr, 1));
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1058 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1059 return PyFloat_FromDouble(_PyFloat_Unpack8(ptr, 0));
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1060 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1061 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1062
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1063 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1064 f_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1065 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1066 float x;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1067
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1068 x = (float)PyFloat_AsDouble(value);
77207 8a65eceea56c Issue #9041: raised exception is misleading Meador Inge <meadori@gmail.com> parents: 68256 diff changeset	1069 if (x == -1 && PyErr_Occurred())
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1070 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1071 memcpy(ptr, &x, sizeof(x));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1072 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1073 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1074
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1075 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1076 f_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1077 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1078 float val;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1079 memcpy(&val, ptr, sizeof(val));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1080 return PyFloat_FromDouble(val);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1081 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1082
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1083 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1084 f_set_sw(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1085 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1086 float x;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1087
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1088 x = (float)PyFloat_AsDouble(value);
77207 8a65eceea56c Issue #9041: raised exception is misleading Meador Inge <meadori@gmail.com> parents: 68256 diff changeset	1089 if (x == -1 && PyErr_Occurred())
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1090 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1091 #ifdef WORDS_BIGENDIAN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1092 if (_PyFloat_Pack4(x, (unsigned char *)ptr, 1))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1093 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1094 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1095 if (_PyFloat_Pack4(x, (unsigned char *)ptr, 0))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1096 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1097 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1098 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1099 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1100
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1101 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1102 f_get_sw(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1103 {
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1104 #ifdef WORDS_BIGENDIAN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1105 return PyFloat_FromDouble(_PyFloat_Unpack4(ptr, 1));
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1106 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1107 return PyFloat_FromDouble(_PyFloat_Unpack4(ptr, 0));
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1108 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1109 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1110
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1111 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1112 py_object refcounts:
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1113
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1114 1. If we have a py_object instance, O_get must Py_INCREF the returned
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1115 object, of course. If O_get is called from a function result, no py_object
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1116 instance is created - so callproc.c::GetResult has to call Py_DECREF.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1117
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1118 2. The memory block in py_object owns a refcount. So, py_object must call
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1119 Py_DECREF on destruction. Maybe only when b_needsfree is non-zero.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1120 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1121 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1122 O_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1123 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1124 PyObject ob = (PyObject **)ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1125 if (ob == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1126 if (!PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1127 /* Set an error if not yet set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1128 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1129 "PyObject is NULL");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1130 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1131 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1132 Py_INCREF(ob);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1133 return ob;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1134 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1135
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1136 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1137 O_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1138 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1139 /* Hm, does the memory block need it's own refcount or not? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1140 (PyObject *)ptr = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1141 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1142 return value;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1143 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1144
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1145
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1146 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1147 c_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1148 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1149 if (!PyString_Check(value) \|\| (1 != PyString_Size(value))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1150 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1151 "one character string expected");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1152 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1153 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1154 (char )ptr = PyString_AS_STRING(value)[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1155 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1156 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1157
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1158
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1159 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1160 c_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1161 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1162 return PyString_FromStringAndSize((char *)ptr, 1);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1163 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1164
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1165 #ifdef CTYPES_UNICODE
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1166 /* u - a single wchar_t character */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1167 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1168 u_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1169 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1170 Py_ssize_t len;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1171
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1172 if (PyString_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1173 value = PyUnicode_FromEncodedObject(value,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1174 _ctypes_conversion_encoding,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1175 _ctypes_conversion_errors);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1176 if (!value)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1177 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1178 } else if (!PyUnicode_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1179 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1180 "unicode string expected instead of %s instance",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1181 value->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1182 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1183 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1184 Py_INCREF(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1185
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1186 len = PyUnicode_GET_SIZE(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1187 if (len != 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1188 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1189 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1190 "one character unicode string expected");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1191 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1192 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1193
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1194 (wchar_t )ptr = PyUnicode_AS_UNICODE(value)[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1195 Py_DECREF(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1196
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1197 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1198 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1199
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1200
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1201 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1202 u_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1203 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1204 return PyUnicode_FromWideChar((wchar_t *)ptr, 1);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1205 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1206
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1207 /* U - a unicode string */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1208 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1209 U_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1210 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1211 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1212 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1213 Py_UNICODE *p;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1214
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1215 size /= sizeof(wchar_t); /* we count character units here, not bytes */
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1216
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1217 result = PyUnicode_FromWideChar((wchar_t *)ptr, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1218 if (!result)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1219 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1220 /* We need 'result' to be able to count the characters with wcslen,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1221 since ptr may not be NUL terminated. If the length is smaller (if
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1222 it was actually NUL terminated, we construct a new one and throw
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1223 away the result.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1224 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1225 /* chop off at the first NUL character, if any. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1226 p = PyUnicode_AS_UNICODE(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1227 for (len = 0; len < size; ++len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1228 if (!p[len])
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1229 break;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1230
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1231 if (len < size) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1232 PyObject ob = PyUnicode_FromWideChar((wchar_t )ptr, len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1233 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1234 return ob;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1235 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1236 return result;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1237 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1238
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1239 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1240 U_set(void ptr, PyObject value, Py_ssize_t length)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1241 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1242 Py_ssize_t size;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1243
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1244 /* It's easier to calculate in characters than in bytes */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1245 length /= sizeof(wchar_t);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1246
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1247 if (PyString_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1248 value = PyUnicode_FromEncodedObject(value,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1249 _ctypes_conversion_encoding,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1250 _ctypes_conversion_errors);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1251 if (!value)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1252 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1253 } else if (!PyUnicode_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1254 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1255 "unicode string expected instead of %s instance",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1256 value->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1257 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1258 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1259 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1260 size = PyUnicode_GET_SIZE(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1261 if (size > length) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1262 PyErr_Format(PyExc_ValueError,
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1263 #if (PY_VERSION_HEX < 0x02050000)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1264 "string too long (%d, maximum length %d)",
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1265 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1266 "string too long (%zd, maximum length %zd)",
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1267 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1268 size, length);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1269 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1270 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1271 } else if (size < length-1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1272 /* copy terminating NUL character if there is space */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1273 size += 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1274 PyUnicode_AsWideChar((PyUnicodeObject )value, (wchar_t )ptr, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1275 return value;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1276 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1277
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1278 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1279
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1280 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1281 s_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1282 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1283 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1284 size_t slen;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1285
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1286 result = PyString_FromString((char *)ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1287 if (!result)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1288 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1289 /* chop off at the first NUL character, if any.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1290 * On error, result will be deallocated and set to NULL.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1291 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1292 slen = strlen(PyString_AS_STRING(result));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1293 size = min(size, (Py_ssize_t)slen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1294 if (result->ob_refcnt == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1295 /* shorten the result */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1296 _PyString_Resize(&result, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1297 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1298 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1299 /* cannot shorten the result */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1300 return PyString_FromStringAndSize(ptr, size);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1301 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1302
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1303 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1304 s_set(void ptr, PyObject value, Py_ssize_t length)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1305 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1306 char *data;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1307 Py_ssize_t size;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1308
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1309 data = PyString_AsString(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1310 if (!data)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1311 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1312 size = strlen(data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1313 if (size < length) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1314 /* This will copy the leading NUL character
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1315 * if there is space for it.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1316 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1317 ++size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1318 } else if (size > length) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1319 PyErr_Format(PyExc_ValueError,
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1320 #if (PY_VERSION_HEX < 0x02050000)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1321 "string too long (%d, maximum length %d)",
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1322 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1323 "string too long (%zd, maximum length %zd)",
41999 b4f4ee84c30d Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. Thomas Heller <theller@ctypes.org> parents: 41998 diff changeset	1324 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1325 size, length);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1326 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1327 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1328 /* Also copy the terminating NUL character if there is space */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1329 memcpy((char *)ptr, data, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1330 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1331 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1332
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1333 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1334 z_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1335 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1336 if (value == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1337 (char *)ptr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1338 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1339 return value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1340 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1341 if (PyString_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1342 (char *)ptr = PyString_AS_STRING(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1343 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1344 return value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1345 } else if (PyUnicode_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1346 PyObject *str = PyUnicode_AsEncodedString(value,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1347 _ctypes_conversion_encoding,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1348 _ctypes_conversion_errors);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1349 if (str == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1350 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1351 (char *)ptr = PyString_AS_STRING(str);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1352 return str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1353 } else if (PyInt_Check(value) \|\| PyLong_Check(value)) {
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1354 #if SIZEOF_VOID_P == SIZEOF_LONG_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1355 (char )ptr = (char )PyInt_AsUnsignedLongLongMask(value);
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1356 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1357 (char )ptr = (char )PyInt_AsUnsignedLongMask(value);
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1358 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1359 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1360 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1361 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1362 "string or integer address expected instead of %s instance",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1363 value->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1364 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1365 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1366
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1367 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1368 z_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1369 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1370 /* XXX What about invalid pointers ??? */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1371 if ((void *)ptr) {
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1372 #if defined(MS_WIN32) && !defined(_WIN32_WCE)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1373 if (IsBadStringPtrA((char *)ptr, -1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1374 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1375 "invalid string pointer %p",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1376 (char *)ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1377 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1378 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1379 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1380 return PyString_FromString((char *)ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1381 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1382 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1383 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1384 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1385 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1386
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1387 #ifdef CTYPES_UNICODE
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1388 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1389 Z_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1390 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1391 if (value == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1392 (wchar_t *)ptr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1393 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1394 return value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1395 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1396 if (PyString_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1397 value = PyUnicode_FromEncodedObject(value,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1398 _ctypes_conversion_encoding,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1399 _ctypes_conversion_errors);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1400 if (!value)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1401 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1402 } else if (PyInt_Check(value) \|\| PyLong_Check(value)) {
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1403 #if SIZEOF_VOID_P == SIZEOF_LONG_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1404 (wchar_t )ptr = (wchar_t )PyInt_AsUnsignedLongLongMask(value);
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1405 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1406 (wchar_t )ptr = (wchar_t )PyInt_AsUnsignedLongMask(value);
39679 3bfc8bb4e726 Port _ctypes.pyd to win64 on AMD64. Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1407 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1408 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1409 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1410 } else if (!PyUnicode_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1411 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1412 "unicode string or integer address expected instead of %s instance",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1413 value->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1414 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1415 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1416 Py_INCREF(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1417 #ifdef HAVE_USABLE_WCHAR_T
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1418 /* HAVE_USABLE_WCHAR_T means that Py_UNICODE and wchar_t is the same
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1419 type. So we can copy directly. Hm, are unicode objects always NUL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1420 terminated in Python, internally?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1421 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1422 (wchar_t *)ptr = PyUnicode_AS_UNICODE(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1423 return value;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1424 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1425 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1426 /* We must create a wchar_t* buffer from the unicode object,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1427 and keep it alive */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1428 PyObject *keep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1429 wchar_t *buffer;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1430
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1431 int size = PyUnicode_GET_SIZE(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1432 size += 1; /* terminating NUL */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1433 size *= sizeof(wchar_t);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1434 buffer = (wchar_t *)PyMem_Malloc(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1435 if (!buffer) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1436 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1437 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1438 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1439 memset(buffer, 0, size);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1440 keep = CAPSULE_NEW(buffer, CTYPES_CAPSULE_WCHAR_T);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1441 if (!keep) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1442 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1443 PyMem_Free(buffer);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1444 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1445 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1446 (wchar_t )ptr = (wchar_t )buffer;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1447 if (-1 == PyUnicode_AsWideChar((PyUnicodeObject *)value,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1448 buffer, PyUnicode_GET_SIZE(value))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1449 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1450 Py_DECREF(keep);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1451 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1452 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1453 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1454 return keep;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1455 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1456 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1457 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1458
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1459 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1460 Z_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1461 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1462 wchar_t *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1463 p = (wchar_t *)ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1464 if (p) {
41577 3d72c1091e5a Merged revisions 55027 via svnmerge from Thomas Heller <theller@ctypes.org> parents: 41563 diff changeset	1465 #if defined(MS_WIN32) && !defined(_WIN32_WCE)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1466 if (IsBadStringPtrW((wchar_t *)ptr, -1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1467 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1468 "invalid string pointer %p",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1469 (wchar_t *)ptr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1470 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1471 }
41577 3d72c1091e5a Merged revisions 55027 via svnmerge from Thomas Heller <theller@ctypes.org> parents: 41563 diff changeset	1472 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1473 return PyUnicode_FromWideChar(p, wcslen(p));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1474 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1475 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1476 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1477 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1478 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1479 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1480
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1481 #ifdef MS_WIN32
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1482 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1483 BSTR_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1484 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1485 BSTR bstr;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1486
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1487 /* convert value into a PyUnicodeObject or NULL */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1488 if (Py_None == value) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1489 value = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1490 } else if (PyString_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1491 value = PyUnicode_FromEncodedObject(value,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1492 _ctypes_conversion_encoding,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1493 _ctypes_conversion_errors);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1494 if (!value)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1495 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1496 } else if (PyUnicode_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1497 Py_INCREF(value); /* for the descref below */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1498 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1499 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1500 "unicode string expected instead of %s instance",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1501 value->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1502 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1503 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1504
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1505 /* create a BSTR from value */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1506 if (value) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1507 Py_ssize_t size = PyUnicode_GET_SIZE(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1508 if ((unsigned) size != size) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1509 PyErr_SetString(PyExc_ValueError, "String too long for BSTR");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1510 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1511 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1512 bstr = SysAllocStringLen(PyUnicode_AS_UNICODE(value),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1513 (unsigned)size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1514 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1515 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1516 bstr = NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1517
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1518 /* free the previous contents, if any */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1519 if ((BSTR )ptr)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1520 SysFreeString((BSTR )ptr);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1521
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1522 /* and store it */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1523 (BSTR )ptr = bstr;
40712 656dd0095f52 Merged revisions 53556 via svnmerge from Thomas Heller <theller@ctypes.org> parents: 39523 diff changeset	1524
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1525 /* We don't need to keep any other object */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1526 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1527 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1528
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1529
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1530 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1531 BSTR_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1532 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1533 BSTR p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1534 p = (BSTR )ptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1535 if (p)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1536 return PyUnicode_FromWideChar(p, SysStringLen(p));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1537 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1538 /* Hm, it seems NULL pointer and zero length string are the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1539 same in BSTR, see Don Box, p 81
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1540 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1541 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1542 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1543 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1544 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1545 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1546
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1547 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1548 P_set(void ptr, PyObject value, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1549 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1550 void *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1551 if (value == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1552 (void *)ptr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1553 _RET(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1554 }
39049 35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1555
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1556 if (!PyInt_Check(value) && !PyLong_Check(value)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1557 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1558 "cannot be converted to pointer");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1559 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1560 }
39049 35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1561
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1562 #if SIZEOF_VOID_P <= SIZEOF_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1563 v = (void *)PyInt_AsUnsignedLongMask(value);
39049 35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1564 #else
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1565 #ifndef HAVE_LONG_LONG
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1566 # error "PyLong_AsVoidPtr: sizeof(void*) > sizeof(long), but no long long"
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1567 #elif SIZEOF_LONG_LONG < SIZEOF_VOID_P
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1568 # error "PyLong_AsVoidPtr: sizeof(PY_LONG_LONG) < sizeof(void*)"
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1569 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1570 v = (void *)PyInt_AsUnsignedLongLongMask(value);
39049 35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1571 #endif
35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1572
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1573 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1574 return NULL;
39049 35c4fda47dfb Fix bug #1518190: accept any integer or long value in the Thomas Heller <theller@ctypes.org> parents: 39002 diff changeset	1575
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1576 (void *)ptr = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1577 _RET(value);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1578 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1579
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1580 static PyObject *
41998 7b84e8919b00 [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur Thomas Heller <theller@ctypes.org> parents: 41564 diff changeset	1581 P_get(void *ptr, Py_ssize_t size)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1582 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1583 if ((void *)ptr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1584 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1585 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1586 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1587 return PyLong_FromVoidPtr((void *)ptr);
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1588 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1589
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1590 static struct fielddesc formattable[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1591 { 's', s_set, s_get, &ffi_type_pointer},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1592 { 'b', b_set, b_get, &ffi_type_schar},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1593 { 'B', B_set, B_get, &ffi_type_uchar},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1594 { 'c', c_set, c_get, &ffi_type_schar},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1595 { 'd', d_set, d_get, &ffi_type_double, d_set_sw, d_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1596 { 'g', g_set, g_get, &ffi_type_longdouble},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1597 { 'f', f_set, f_get, &ffi_type_float, f_set_sw, f_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1598 { 'h', h_set, h_get, &ffi_type_sshort, h_set_sw, h_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1599 { 'H', H_set, H_get, &ffi_type_ushort, H_set_sw, H_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1600 { 'i', i_set, i_get, &ffi_type_sint, i_set_sw, i_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1601 { 'I', I_set, I_get, &ffi_type_uint, I_set_sw, I_get_sw},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1602 /* XXX Hm, sizeof(int) == sizeof(long) doesn't hold on every platform */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1603 /* As soon as we can get rid of the type codes, this is no longer a problem */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1604 #if SIZEOF_LONG == 4
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1605 { 'l', l_set, l_get, &ffi_type_sint32, l_set_sw, l_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1606 { 'L', L_set, L_get, &ffi_type_uint32, L_set_sw, L_get_sw},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1607 #elif SIZEOF_LONG == 8
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1608 { 'l', l_set, l_get, &ffi_type_sint64, l_set_sw, l_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1609 { 'L', L_set, L_get, &ffi_type_uint64, L_set_sw, L_get_sw},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1610 #else
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1611 # error
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1612 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1613 #ifdef HAVE_LONG_LONG
43539 a262178c1c0a Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. Thomas Heller <theller@ctypes.org> parents: 41577 diff changeset	1614 #if SIZEOF_LONG_LONG == 8
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1615 { 'q', q_set, q_get, &ffi_type_sint64, q_set_sw, q_get_sw},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1616 { 'Q', Q_set, Q_get, &ffi_type_uint64, Q_set_sw, Q_get_sw},
43539 a262178c1c0a Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. Thomas Heller <theller@ctypes.org> parents: 41577 diff changeset	1617 #else
a262178c1c0a Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. Thomas Heller <theller@ctypes.org> parents: 41577 diff changeset	1618 # error
a262178c1c0a Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. Thomas Heller <theller@ctypes.org> parents: 41577 diff changeset	1619 #endif
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1620 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1621 { 'P', P_set, P_get, &ffi_type_pointer},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1622 { 'z', z_set, z_get, &ffi_type_pointer},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1623 #ifdef CTYPES_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1624 { 'u', u_set, u_get, NULL}, /* ffi_type set later */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1625 { 'U', U_set, U_get, &ffi_type_pointer},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1626 { 'Z', Z_set, Z_get, &ffi_type_pointer},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1627 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1628 #ifdef MS_WIN32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1629 { 'X', BSTR_set, BSTR_get, &ffi_type_pointer},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1630 { 'v', vBOOL_set, vBOOL_get, &ffi_type_sshort},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1631 #endif
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1632 #if SIZEOF__BOOL == 1
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1633 { '?', bool_set, bool_get, &ffi_type_uchar}, /* Also fallback for no native _Bool support */
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1634 #elif SIZEOF__BOOL == SIZEOF_SHORT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1635 { '?', bool_set, bool_get, &ffi_type_ushort},
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1636 #elif SIZEOF__BOOL == SIZEOF_INT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1637 { '?', bool_set, bool_get, &ffi_type_uint, I_set_sw, I_get_sw},
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1638 #elif SIZEOF__BOOL == SIZEOF_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1639 { '?', bool_set, bool_get, &ffi_type_ulong, L_set_sw, L_get_sw},
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1640 #elif SIZEOF__BOOL == SIZEOF_LONG_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1641 { '?', bool_set, bool_get, &ffi_type_ulong, Q_set_sw, Q_get_sw},
41167 493cae705f91 Patch #1649190: Adding support for _Bool to ctypes as c_bool, by David Remahl. Thomas Heller <theller@ctypes.org> parents: 40711 diff changeset	1642 #endif /* SIZEOF__BOOL */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1643 { 'O', O_set, O_get, &ffi_type_pointer},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1644 { 0, NULL, NULL, NULL},
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1645 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1646
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1647 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1648 Ideas: Implement VARIANT in this table, using 'V' code.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1649 Use '?' as code for BOOL.
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1650 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1651
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1652 struct fielddesc *
53365 d51e4f62bc8c Issue #3102: All global symbols that the _ctypes extension defines are Thomas Heller <theller@ctypes.org> parents: 50788 diff changeset	1653 _ctypes_get_fielddesc(char *fmt)
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1654 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1655 static int initialized = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1656 struct fielddesc *table = formattable;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1657
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1658 if (!initialized) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1659 initialized = 1;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1660 #ifdef CTYPES_UNICODE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1661 if (sizeof(wchar_t) == sizeof(short))
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1662 _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sshort;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1663 else if (sizeof(wchar_t) == sizeof(int))
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1664 _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sint;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1665 else if (sizeof(wchar_t) == sizeof(long))
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59998 diff changeset	1666 _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_slong;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1667 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1668 }
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1669
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1670 for (; table->code; ++table) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1671 if (table->code == fmt[0])
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1672 return table;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1673 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1674 return NULL;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1675 }
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1676
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1677 typedef struct { char c; char x; } s_char;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1678 typedef struct { char c; short x; } s_short;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1679 typedef struct { char c; int x; } s_int;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1680 typedef struct { char c; long x; } s_long;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1681 typedef struct { char c; float x; } s_float;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1682 typedef struct { char c; double x; } s_double;
43278 28716dd14bc5 Add a 'c_longdouble' type to the ctypes module. Thomas Heller <theller@ctypes.org> parents: 42333 diff changeset	1683 typedef struct { char c; long double x; } s_long_double;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1684 typedef struct { char c; char *x; } s_char_p;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1685 typedef struct { char c; void *x; } s_void_p;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1686
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1687 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1688 #define CHAR_ALIGN (sizeof(s_char) - sizeof(char))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1689 #define SHORT_ALIGN (sizeof(s_short) - sizeof(short))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1690 #define INT_ALIGN (sizeof(s_int) - sizeof(int))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1691 #define LONG_ALIGN (sizeof(s_long) - sizeof(long))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1692 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1693 #define FLOAT_ALIGN (sizeof(s_float) - sizeof(float))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1694 #define DOUBLE_ALIGN (sizeof(s_double) - sizeof(double))
43278 28716dd14bc5 Add a 'c_longdouble' type to the ctypes module. Thomas Heller <theller@ctypes.org> parents: 42333 diff changeset	1695 #define LONGDOUBLE_ALIGN (sizeof(s_long_double) - sizeof(long double))
28716dd14bc5 Add a 'c_longdouble' type to the ctypes module. Thomas Heller <theller@ctypes.org> parents: 42333 diff changeset	1696
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1697 /* #define CHAR_P_ALIGN (sizeof(s_char_p) - sizeof(char)) /
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1698 #define VOID_P_ALIGN (sizeof(s_void_p) - sizeof(void*))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1699
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1700 /*
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1701 #ifdef HAVE_USABLE_WCHAR_T
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1702 typedef struct { char c; wchar_t x; } s_wchar;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1703 typedef struct { char c; wchar_t *x; } s_wchar_p;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1704
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1705 #define WCHAR_ALIGN (sizeof(s_wchar) - sizeof(wchar_t))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1706 #define WCHAR_P_ALIGN (sizeof(s_wchar_p) - sizeof(wchar_t*))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1707 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1708 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1709
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1710 #ifdef HAVE_LONG_LONG
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1711 typedef struct { char c; PY_LONG_LONG x; } s_long_long;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1712 #define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(PY_LONG_LONG))
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1713 #endif
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1714
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1715 /* from ffi.h:
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1716 typedef struct _ffi_type
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1717 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1718 size_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1719 unsigned short alignment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1720 unsigned short type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1721 struct _ffi_type **elements;
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1722 } ffi_type;
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1723 */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1724
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1725 /* align and size are bogus for void, but they must not be zero */
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1726 ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1727
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1728 ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1729 ffi_type ffi_type_sint8 = { 1, 1, FFI_TYPE_SINT8 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1730
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1731 ffi_type ffi_type_uint16 = { 2, 2, FFI_TYPE_UINT16 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1732 ffi_type ffi_type_sint16 = { 2, 2, FFI_TYPE_SINT16 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1733
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1734 ffi_type ffi_type_uint32 = { 4, 4, FFI_TYPE_UINT32 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1735 ffi_type ffi_type_sint32 = { 4, 4, FFI_TYPE_SINT32 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1736
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1737 ffi_type ffi_type_uint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_UINT64 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1738 ffi_type ffi_type_sint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_SINT64 };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1739
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1740 ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1741 ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1742
43678 530573cd4f7a ffi_type_longdouble may be already #defined. Thomas Heller <theller@ctypes.org> parents: 43601 diff changeset	1743 #ifdef ffi_type_longdouble
530573cd4f7a ffi_type_longdouble may be already #defined. Thomas Heller <theller@ctypes.org> parents: 43601 diff changeset	1744 #undef ffi_type_longdouble
530573cd4f7a ffi_type_longdouble may be already #defined. Thomas Heller <theller@ctypes.org> parents: 43601 diff changeset	1745 #endif
47473 c34e34057714 MacOS X: Enable 4-way universal builds Ronald Oussoren <ronaldoussoren@mac.com> parents: 47294 diff changeset	1746 /* This is already defined on OSX */
43278 28716dd14bc5 Add a 'c_longdouble' type to the ctypes module. Thomas Heller <theller@ctypes.org> parents: 42333 diff changeset	1747 ffi_type ffi_type_longdouble = { sizeof(long double), LONGDOUBLE_ALIGN,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 53799 diff changeset	1748 FFI_TYPE_LONGDOUBLE };
36897 6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1749
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1750 ffi_type ffi_type_pointer = { sizeof(void *), VOID_P_ALIGN, FFI_TYPE_POINTER };
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1751
6f2eda495d9d Copy ctypes-0.9.9.4 sources from external into the trunk. Thomas Heller <theller@ctypes.org> parents: diff changeset	1752 /---------------- EOF ----------------/

Mercurial > cpython-lru_cache-weakref

annotate Modules/_ctypes/cfield.c @ 79675:c0a2294de787 2.7