diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-08-20 13:42:16 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2008-08-20 13:42:16 (GMT) |
| commit | c4523628a7dc603c6ab52a3dd54d7e3784885408 (patch) | |
| tree | 250a3814ac053f2d0419954456ea130e8d1a0a73 | |
| parent | b71caf186a7a3ccc5e3c6d5e23779ef6246ca1d2 (diff) | |
| download | cpython-c4523628a7dc603c6ab52a3dd54d7e3784885408.zip cpython-c4523628a7dc603c6ab52a3dd54d7e3784885408.tar.gz cpython-c4523628a7dc603c6ab52a3dd54d7e3784885408.tar.bz2 | |
Merged revisions 65908 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65908 | hirokazu.yamamoto | 2008-08-20 22:14:07 +0900 | 1 line
Issue #3612: Added some missing basic types in ctypes.wintypes.
........
| -rw-r--r-- | Lib/ctypes/wintypes.py | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Lib/ctypes/wintypes.py b/Lib/ctypes/wintypes.py index fdd08a0..e7f569c 100644 --- a/Lib/ctypes/wintypes.py +++ b/Lib/ctypes/wintypes.py @@ -7,8 +7,10 @@ DWORD = c_ulong WCHAR = c_wchar UINT = c_uint +INT = c_int DOUBLE = c_double +FLOAT = c_float BOOLEAN = BYTE BOOL = c_long @@ -22,6 +24,9 @@ class VARIANT_BOOL(_SimpleCData): ULONG = c_ulong LONG = c_long +USHORT = c_ushort +SHORT = c_short + # in the windows header files, these are structures. _LARGE_INTEGER = LARGE_INTEGER = c_longlong _ULARGE_INTEGER = ULARGE_INTEGER = c_ulonglong @@ -29,6 +34,7 @@ _ULARGE_INTEGER = ULARGE_INTEGER = c_ulonglong LPCOLESTR = LPOLESTR = OLESTR = c_wchar_p LPCWSTR = LPWSTR = c_wchar_p LPCSTR = LPSTR = c_char_p +LPCVOID = LPVOID = c_void_p # WPARAM is defined as UINT_PTR (unsigned type) # LPARAM is defined as LONG_PTR (signed type) @@ -157,18 +163,19 @@ class WIN32_FIND_DATAW(Structure): ("cFileName", c_wchar * MAX_PATH), ("cAlternateFileName", c_wchar * 14)] -__all__ = ['ATOM', 'BOOL', 'BOOLEAN', 'BYTE', 'COLORREF', 'DOUBLE', - 'DWORD', 'FILETIME', 'HACCEL', 'HANDLE', 'HBITMAP', 'HBRUSH', +__all__ = ['ATOM', 'BOOL', 'BOOLEAN', 'BYTE', 'COLORREF', 'DOUBLE', 'DWORD', + 'FILETIME', 'FLOAT', 'HACCEL', 'HANDLE', 'HBITMAP', 'HBRUSH', 'HCOLORSPACE', 'HDC', 'HDESK', 'HDWP', 'HENHMETAFILE', 'HFONT', 'HGDIOBJ', 'HGLOBAL', 'HHOOK', 'HICON', 'HINSTANCE', 'HKEY', 'HKL', 'HLOCAL', 'HMENU', 'HMETAFILE', 'HMODULE', 'HMONITOR', 'HPALETTE', 'HPEN', 'HRGN', 'HRSRC', 'HSTR', 'HTASK', 'HWINSTA', - 'HWND', 'LANGID', 'LARGE_INTEGER', 'LCID', 'LCTYPE', 'LGRPID', - 'LONG', 'LPARAM', 'LPCOLESTR', 'LPCSTR', 'LPCWSTR', 'LPOLESTR', - 'LPSTR', 'LPWSTR', 'MAX_PATH', 'MSG', 'OLESTR', 'POINT', - 'POINTL', 'RECT', 'RECTL', 'RGB', 'SC_HANDLE', - 'SERVICE_STATUS_HANDLE', 'SIZE', 'SIZEL', 'SMALL_RECT', 'UINT', - 'ULARGE_INTEGER', 'ULONG', 'VARIANT_BOOL', 'WCHAR', - 'WIN32_FIND_DATAA', 'WIN32_FIND_DATAW', 'WORD', 'WPARAM', '_COORD', - '_FILETIME', '_LARGE_INTEGER', '_POINTL', '_RECTL', '_SMALL_RECT', - '_ULARGE_INTEGER', 'tagMSG', 'tagPOINT', 'tagRECT', 'tagSIZE'] + 'HWND', 'INT', 'LANGID', 'LARGE_INTEGER', 'LCID', 'LCTYPE', + 'LGRPID', 'LONG', 'LPARAM', 'LPCOLESTR', 'LPCSTR', 'LPCVOID', + 'LPCWSTR', 'LPOLESTR', 'LPSTR', 'LPVOID', 'LPWSTR', 'MAX_PATH', + 'MSG', 'OLESTR', 'POINT', 'POINTL', 'RECT', 'RECTL', 'RGB', + 'SC_HANDLE', 'SERVICE_STATUS_HANDLE', 'SHORT', 'SIZE', 'SIZEL', + 'SMALL_RECT', 'UINT', 'ULARGE_INTEGER', 'ULONG', 'USHORT', + 'VARIANT_BOOL', 'WCHAR', 'WIN32_FIND_DATAA', 'WIN32_FIND_DATAW', + 'WORD', 'WPARAM', '_COORD', '_FILETIME', '_LARGE_INTEGER', + '_POINTL', '_RECTL', '_SMALL_RECT', '_ULARGE_INTEGER', 'tagMSG', + 'tagPOINT', 'tagRECT', 'tagSIZE'] |