diff options
author | Thomas Heller <theller@ctypes.org> | 2010-03-30 19:46:23 (GMT) |
---|---|---|
committer | Thomas Heller <theller@ctypes.org> | 2010-03-30 19:46:23 (GMT) |
commit | 5006ba0fef6bda6d4e76a14f02a6dcefc3ba57e2 (patch) | |
tree | 3367e2a69a3e6875340f06924dac7447f01cf0b4 /Lib/ctypes | |
parent | 8f66efe253e1bf179842b79c5c2b8cd35529b98a (diff) | |
download | cpython-5006ba0fef6bda6d4e76a14f02a6dcefc3ba57e2.zip cpython-5006ba0fef6bda6d4e76a14f02a6dcefc3ba57e2.tar.gz cpython-5006ba0fef6bda6d4e76a14f02a6dcefc3ba57e2.tar.bz2 |
Merged revisions 79115,79424,79491 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/branch_libffi-3_0_10-win
........
r79115 | thomas.heller | 2010-03-19 22:14:47 +0100 (Fr, 19 Mrz 2010) | 7 lines
Work in progress. 2 tests fail on x86/win32 because the stack
checking code in ffi_call_win32 is not yet implemented.
Remove most files from _ctypes/libffi_msvc, only two include files
stay (updated from _ctypes/libffi/...). Other files are used in the
cross-platform _ctypes/libffi directory.
........
r79424 | thomas.heller | 2010-03-25 19:28:02 +0100 (Do, 25 Mrz 2010) | 1 line
Build _ctypes on Win64.
........
r79491 | thomas.heller | 2010-03-29 21:30:33 +0200 (Mo, 29 Mrz 2010) | 4 lines
On Windows, ctypes does no longer check the stack before and after
calling a foreign function.
This allows to use the unmodified libffi library.
........
Diffstat (limited to 'Lib/ctypes')
-rw-r--r-- | Lib/ctypes/test/test_win32.py | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py index 5dedd9f..3c0500d 100644 --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -6,32 +6,6 @@ import unittest, sys import _ctypes_test -if sys.platform == "win32" and sizeof(c_void_p) == sizeof(c_int): - # Only windows 32-bit has different calling conventions. - - class WindowsTestCase(unittest.TestCase): - def test_callconv_1(self): - # Testing stdcall function - - IsWindow = windll.user32.IsWindow - # ValueError: Procedure probably called with not enough arguments (4 bytes missing) - self.assertRaises(ValueError, IsWindow) - - # This one should succeeed... - self.assertEqual(0, IsWindow(0)) - - # ValueError: Procedure probably called with too many arguments (8 bytes in excess) - self.assertRaises(ValueError, IsWindow, 0, 0, 0) - - def test_callconv_2(self): - # Calling stdcall function as cdecl - - IsWindow = cdll.user32.IsWindow - - # ValueError: Procedure called with not enough arguments (4 bytes missing) - # or wrong calling convention - self.assertRaises(ValueError, IsWindow, None) - if sys.platform == "win32": class FunctionCallTestCase(unittest.TestCase): |