summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2010-05-04 19:17:41 (GMT)
committerThomas Heller <theller@ctypes.org>2010-05-04 19:17:41 (GMT)
commit667ce06de4e91d6e9b78d622303809b9f72c4012 (patch)
tree4240dfae9da13123a74b7f24c31e0a3786a09980 /Lib
parenta9eb87a144988731b25923da1d531a572037f160 (diff)
downloadcpython-667ce06de4e91d6e9b78d622303809b9f72c4012.zip
cpython-667ce06de4e91d6e9b78d622303809b9f72c4012.tar.gz
cpython-667ce06de4e91d6e9b78d622303809b9f72c4012.tar.bz2
Merged revisions 80761,80766 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80761 | thomas.heller | 2010-05-04 20:44:42 +0200 (Di, 04 Mai 2010) | 8 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. 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. ........ r80766 | thomas.heller | 2010-05-04 21:08:18 +0200 (Di, 04 Mai 2010) | 2 lines Remove reference to unused source file. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/ctypes/test/test_win32.py26
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):