ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged revisions 88284 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88284 | antoine.pitrou | 2011-01-31 22:08:57 +0100 (lun., 31 janv. 2011) | 4 lines

  Issue #8275: Fix passing of callback arguments with ctypes under Win64.
  Patch by Stan Mihai. Ok'ed by Georg.
........
This commit is contained in:
Antoine Pitrou 2011-01-31 21:36:33 +00:00
parent 070f050c3a
commit 2e811c92c7
5 changed files with 55 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_ctypes/_ctypes_test.c
View file

@ -12,6 +12,20 @@
/* some functions handy for testing */
EXPORT(int)
_testfunc_cbk_reg_int(int a, int b, int c, int d, int e,
int (*func)(int, int, int, int, int))
{
return func(a*a, b*b, c*c, d*d, e*e);
}
EXPORT(double)
_testfunc_cbk_reg_double(double a, double b, double c, double d, double e,
double (*func)(double, double, double, double, double))
{
return func(a*a, b*b, c*c, d*d, e*e);
}
EXPORT(void)testfunc_array(int values[4])
{
printf("testfunc_array %d %d %d %d\n",

2
Modules/_ctypes/libffi_msvc/ffi.c
View file

@ -379,7 +379,7 @@ ffi_prep_closure (ffi_closure* closure,
short bytes;
char *tramp;
#ifdef _WIN64
int mask;
int mask = 0;
#endif
FFI_ASSERT (cif->abi == FFI_SYSV);