[Python-checkins] r53388 - in python/trunk: Lib/ctypes/test/test_win32.py Lib/ctypes/wintypes.py Misc/NEWS Modules/_ctypes/libffi_msvc/ffi.c
thomas.heller
python-checkins at python.org
Thu Jan 11 22:18:57 CET 2007
Author: thomas.heller
Date: Thu Jan 11 22:18:56 2007
New Revision: 53388
Modified:
python/trunk/Lib/ctypes/test/test_win32.py
python/trunk/Lib/ctypes/wintypes.py
python/trunk/Misc/NEWS
python/trunk/Modules/_ctypes/libffi_msvc/ffi.c
Log:
Fixes for 64-bit Windows: In ctypes.wintypes, correct the definitions
of HANDLE, WPARAM, LPARAM data types. Make parameterless foreign
function calls work.
Modified: python/trunk/Lib/ctypes/test/test_win32.py
==============================================================================
--- python/trunk/Lib/ctypes/test/test_win32.py (original)
+++ python/trunk/Lib/ctypes/test/test_win32.py Thu Jan 11 22:18:56 2007
@@ -3,6 +3,7 @@
from ctypes import *
from ctypes.test import is_resource_enabled
import unittest, sys
+from ctypes import wintypes
import _ctypes_test
@@ -32,12 +33,30 @@
# or wrong calling convention
self.assertRaises(ValueError, IsWindow, None)
+if sys.platform == "win32":
+ class FunctionCallTestCase(unittest.TestCase):
+
if is_resource_enabled("SEH"):
def test_SEH(self):
- # Call functions with invalid arguments, and make sure that access violations
- # are trapped and raise an exception.
+ # Call functions with invalid arguments, and make sure
+ # that access violations are trapped and raise an
+ # exception.
self.assertRaises(WindowsError, windll.kernel32.GetModuleHandleA, 32)
+ def test_noargs(self):
+ # This is a special case on win32 x64
+ windll.user32.GetDesktopWindow()
+
+ class TestWintypes(unittest.TestCase):
+ def test_HWND(self):
+ self.failUnlessEqual(sizeof(wintypes.HWND), sizeof(c_void_p))
+
+ def test_PARAM(self):
+ self.failUnlessEqual(sizeof(wintypes.WPARAM),
+ sizeof(c_void_p))
+ self.failUnlessEqual(sizeof(wintypes.LPARAM),
+ sizeof(c_void_p))
+
class Structures(unittest.TestCase):
def test_struct_by_value(self):
Modified: python/trunk/Lib/ctypes/wintypes.py
==============================================================================
--- python/trunk/Lib/ctypes/wintypes.py (original)
+++ python/trunk/Lib/ctypes/wintypes.py Thu Jan 11 22:18:56 2007
@@ -34,8 +34,14 @@
LPCWSTR = LPWSTR = c_wchar_p
LPCSTR = LPSTR = c_char_p
-WPARAM = c_uint
-LPARAM = c_long
+# WPARAM is defined as UINT_PTR (which is signed)
+# LPARAM is defined as LONG_PTR (which is unsigned)
+if sizeof(c_long) == sizeof(c_void_p):
+ WPARAM = c_ulong
+ LPARAM = c_long
+elif sizeof(c_longlong) == sizeof(c_void_p):
+ WPARAM = c_ulonglong
+ LPARAM = c_longlong
ATOM = WORD
LANGID = WORD
@@ -48,7 +54,7 @@
################################################################
# HANDLE types
-HANDLE = c_ulong # in the header files: void *
+HANDLE = c_void_p # in the header files: void *
HACCEL = HANDLE
HBITMAP = HANDLE
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Thu Jan 11 22:18:56 2007
@@ -109,6 +109,10 @@
Library
-------
+- Fixes for 64-bit Windows: In ctypes.wintypes, correct the
+ definitions of HANDLE, WPARAM, LPARAM data types. Make
+ parameterless foreign function calls work.
+
- The version number of the ctypes package changed to "1.1.0".
- Bug #1627575: logging: Added _open() method to FileHandler which can
Modified: python/trunk/Modules/_ctypes/libffi_msvc/ffi.c
==============================================================================
--- python/trunk/Modules/_ctypes/libffi_msvc/ffi.c (original)
+++ python/trunk/Modules/_ctypes/libffi_msvc/ffi.c Thu Jan 11 22:18:56 2007
@@ -224,7 +224,8 @@
#else
case FFI_SYSV:
/*@-usedef@*/
- return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes,
+ /* Function call needs at least 40 bytes stack size, on win64 AMD64 */
+ return ffi_call_AMD64(ffi_prep_args, &ecif, cif->bytes ? cif->bytes : 40,
cif->flags, ecif.rvalue, fn);
/*@=usedef@*/
break;
More information about the Python-checkins
mailing list