Update of /cvsroot/ctypes/ctypes/ctypes
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18422
Modified Files:
wintypes.py
Log Message:
Merge in changes from Python SVN.
Index: wintypes.py
===================================================================
RCS file: /cvsroot/ctypes/ctypes/ctypes/wintypes.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wintypes.py 8 Mar 2006 19:02:47 -0000 1.3
--- wintypes.py 14 Jun 2006 09:13:52 -0000 1.4
***************
*** 1,42 ****
! # XXX This module needs cleanup.
!
from ctypes import *
- DWORD = c_ulong
- WORD = c_ushort
BYTE = c_byte
ULONG = c_ulong
LONG = c_long
LARGE_INTEGER = c_longlong
ULARGE_INTEGER = c_ulonglong
HANDLE = c_ulong # in the header files: void *
! HWND = HANDLE
HDC = HANDLE
! HMODULE = HANDLE
HINSTANCE = HANDLE
- HRGN = HANDLE
- HTASK = HANDLE
HKEY = HANDLE
! HPEN = HANDLE
! HGDIOBJ = HANDLE
HMENU = HANDLE
! LCID = DWORD
!
! WPARAM = c_uint
! LPARAM = c_long
!
! BOOL = c_long
! VARIANT_BOOL = c_short
!
! LPCOLESTR = LPOLESTR = OLESTR = c_wchar_p
! LPCWSTR = LPWSTR = c_wchar_p
!
! LPCSTR = LPSTR = c_char_p
class RECT(Structure):
--- 1,74 ----
! # This file contains the most useful windows datatypes.
from ctypes import *
BYTE = c_byte
+ WORD = c_ushort
+ DWORD = c_ulong
+
+ BOOLEAN = BYTE
+ BOOL = c_long
+ VARIANT_BOOL = c_short
ULONG = c_ulong
LONG = c_long
+ # in the windows header files, these are structures.
LARGE_INTEGER = c_longlong
ULARGE_INTEGER = c_ulonglong
+ LPCOLESTR = LPOLESTR = OLESTR = c_wchar_p
+ LPCWSTR = LPWSTR = c_wchar_p
+ LPCSTR = LPSTR = c_char_p
+
+ WPARAM = c_uint
+ LPARAM = c_long
+
+ ATOM = WORD
+ LANGID = WORD
+
+ COLORREF = DWORD
+ LGRPID = DWORD
+ LCTYPE = DWORD
+
+ LCID = DWORD
+ ################################################################
+ # HANDLE types
HANDLE = c_ulong # in the header files: void *
! HACCEL = HANDLE
! HBITMAP = HANDLE
! HBRUSH = HANDLE
! HCOLORSPACE = HANDLE
HDC = HANDLE
! HDESK = HANDLE
! HDWP = HANDLE
! HENHMETAFILE = HANDLE
! HFONT = HANDLE
! HGDIOBJ = HANDLE
! HGLOBAL = HANDLE
! HHOOK = HANDLE
! HICON = HANDLE
HINSTANCE = HANDLE
HKEY = HANDLE
! HKL = HANDLE
! HLOCAL = HANDLE
HMENU = HANDLE
+ HMETAFILE = HANDLE
+ HMODULE = HANDLE
+ HMONITOR = HANDLE
+ HPALETTE = HANDLE
+ HPEN = HANDLE
+ HRGN = HANDLE
+ HRSRC = HANDLE
+ HSTR = HANDLE
+ HTASK = HANDLE
+ HWINSTA = HANDLE
+ HWND = HANDLE
+ SC_HANDLE = HANDLE
+ SERVICE_STATUS_HANDLE = HANDLE
! ################################################################
! # Some important structure definitions
class RECT(Structure):
***************
*** 45,59 ****
("right", c_long),
("bottom", c_long)]
! RECTL = RECT
class POINT(Structure):
_fields_ = [("x", c_long),
("y", c_long)]
! POINTL = POINT
class SIZE(Structure):
_fields_ = [("cx", c_long),
("cy", c_long)]
! SIZEL = SIZE
def RGB(red, green, blue):
--- 77,102 ----
("right", c_long),
("bottom", c_long)]
! tagRECT = _RECTL = RECTL = RECT
!
! class _SMALL_RECT(Structure):
! _fields_ = [('Left', c_short),
! ('Top', c_short),
! ('Right', c_short),
! ('Bottom', c_short)]
! SMALL_RECT = _SMALL_RECT
!
! class _COORD(Structure):
! _fields_ = [('X', c_short),
! ('Y', c_short)]
class POINT(Structure):
_fields_ = [("x", c_long),
("y", c_long)]
! tagPOINT = _POINTL = POINTL = POINT
class SIZE(Structure):
_fields_ = [("cx", c_long),
("cy", c_long)]
! tagSIZE = SIZEL = SIZE
def RGB(red, green, blue):
***************
*** 63,66 ****
--- 106,110 ----
_fields_ = [("dwLowDateTime", DWORD),
("dwHighDateTime", DWORD)]
+ _FILETIME = FILETIME
class MSG(Structure):
***************
*** 71,74 ****
--- 115,119 ----
("time", DWORD),
("pt", POINT)]
+ tagMSG = MSG
MAX_PATH = 260
|
