From 8127e078131594d8b97889fe0fc9aa916790701a Mon Sep 17 00:00:00 2001 From: markm Date: Tue, 18 Apr 2006 23:24:16 +0000 Subject: [PATCH] Added information for GetWindowState --- pywinauto/win32defines.py | 1 + pywinauto/win32functions.py | 1 + pywinauto/win32structures.py | 71 ++++++++---------------------------- 3 files changed, 17 insertions(+), 56 deletions(-) diff --git a/pywinauto/win32defines.py b/pywinauto/win32defines.py index 8f1b3fd..b9bd96d 100644 --- a/pywinauto/win32defines.py +++ b/pywinauto/win32defines.py @@ -11066,6 +11066,7 @@ ERROR_SEVERITY_ERROR = 3221225472L # Variable c_uint SE_BACKUP_NAME = u'SeBackupPrivilege' # Variable POINTER(c_wchar) SWP_SHOWWINDOW = 64 # Variable c_int SMTO_ABORTIFHUNG = 2 # Variable c_int +SMTO_NOTIMEOUTIFNOTHUNG = 0x0008 POLYGONALCAPS = 32 # Variable c_int TCN_LAST = 4294966716L # Variable c_uint MCI_SYSINFO = 2064 # Variable c_int diff --git a/pywinauto/win32functions.py b/pywinauto/win32functions.py index decd95c..faf7ddd 100644 --- a/pywinauto/win32functions.py +++ b/pywinauto/win32functions.py @@ -81,6 +81,7 @@ GetWindow = ctypes.windll.user32.GetWindow ShowWindow = ctypes.windll.user32.ShowWindow GetWindowContextHelpId = ctypes.windll.user32.GetWindowContextHelpId GetWindowLong = ctypes.windll.user32.GetWindowLongW +GetWindowPlacement = ctypes.windll.user32.GetWindowPlacement GetWindowRect = ctypes.windll.user32.GetWindowRect GetWindowText = ctypes.windll.user32.GetWindowTextW GetWindowTextLength = ctypes.windll.user32.GetWindowTextLengthW diff --git a/pywinauto/win32structures.py b/pywinauto/win32structures.py index 668604e..72520e1 100644 --- a/pywinauto/win32structures.py +++ b/pywinauto/win32structures.py @@ -108,10 +108,6 @@ def _reduce(self): return (_construct, (self.__class__, str(buffer(self)))) - - - - #LPTTTOOLINFOW = POINTER(tagTOOLINFOW) #PTOOLINFOW = POINTER(tagTOOLINFOW) BOOL = c_int @@ -143,8 +139,6 @@ LPWSTR = c_long# POINTER(WCHAR) - - class POINT(Structure): _fields_ = [ # C:/PROGRA~1/MIAF9D~1/VC98/Include/windef.h 307 @@ -155,7 +149,6 @@ assert sizeof(POINT) == 8, sizeof(POINT) assert alignment(POINT) == 4, alignment(POINT) - #==================================================================== class RECT(Structure): "Wrap the RECT structure and add extra functionality" @@ -296,7 +289,6 @@ assert sizeof(LVITEMW) == 40, sizeof(LVITEMW) assert alignment(LVITEMW) == 1, alignment(LVITEMW) - class TVITEMW(Structure): _pack_ = 1 _fields_ = [ @@ -328,8 +320,6 @@ assert sizeof(NMHDR) == 12, sizeof(NMHDR) assert alignment(NMHDR) == 4, alignment(NMHDR) - - # C:/PROGRA~1/MICROS~4/VC98/Include/commctrl.h 4275 class NMTVDISPINFOW(Structure): _pack_ = 1 @@ -342,8 +332,6 @@ assert sizeof(NMTVDISPINFOW) == 52, sizeof(NMTVDISPINFOW) assert alignment(NMTVDISPINFOW) == 1, alignment(NMTVDISPINFOW) - - class LOGFONTW(Structure): _fields_ = [ # C:/PROGRA~1/MIAF9D~1/VC98/Include/wingdi.h 1090 @@ -377,8 +365,6 @@ assert sizeof(LOGFONTW) == 92, sizeof(LOGFONTW) assert alignment(LOGFONTW) == 4, alignment(LOGFONTW) - - class TEXTMETRICW(Structure): _pack_ = 2 _fields_ = [ @@ -433,8 +419,6 @@ assert sizeof(NONCLIENTMETRICSW) == 500, sizeof(NONCLIENTMETRICSW) assert alignment(NONCLIENTMETRICSW) == 2, alignment(NONCLIENTMETRICSW) - - # C:/PROGRA~1/MIAF9D~1/VC98/Include/wingdi.h 1025 class LOGBRUSH(Structure): _fields_ = [ @@ -446,8 +430,6 @@ class LOGBRUSH(Structure): assert sizeof(LOGBRUSH) == 12, sizeof(LOGBRUSH) assert alignment(LOGBRUSH) == 4, alignment(LOGBRUSH) - - # C:/PROGRA~1/MIAF9D~1/VC98/Include/winuser.h 5147 class MENUITEMINFOW(Structure): _pack_ = 2 @@ -468,8 +450,6 @@ class MENUITEMINFOW(Structure): assert sizeof(MENUITEMINFOW) == 44, sizeof(MENUITEMINFOW) assert alignment(MENUITEMINFOW) == 2, alignment(MENUITEMINFOW) - - class MENUBARINFO(Structure): _fields_ = [ ('cbSize', DWORD), @@ -496,13 +476,6 @@ assert sizeof(MSG) == 28, sizeof(MSG) assert alignment(MSG) == 4, alignment(MSG) - - - - - - - # C:/_tools/Python24/Lib/site-packages/ctypes/wrap/test/commctrl.h 1865 class TOOLINFOW(Structure): _pack_ = 1 @@ -521,10 +494,6 @@ assert sizeof(TOOLINFOW) == 44, sizeof(TOOLINFOW) assert alignment(TOOLINFOW) == 1, alignment(TOOLINFOW) - - - - # C:/_tools/Python24/Lib/site-packages/ctypes/wrap/test/commctrl.h 2068 class NMTTDISPINFOW(Structure): _pack_ = 1 @@ -542,7 +511,6 @@ assert sizeof(NMTTDISPINFOW) == 188, sizeof(NMTTDISPINFOW) assert alignment(NMTTDISPINFOW) == 1, alignment(NMTTDISPINFOW) - class HDITEMW(Structure): _pack_ = 1 _fields_ = [ @@ -561,10 +529,6 @@ assert sizeof(HDITEMW) == 36, sizeof(HDITEMW) assert alignment(HDITEMW) == 1, alignment(HDITEMW) - - - - # C:/_tools/Python24/Lib/site-packages/ctypes/wrap/test/commctrl.h 4456 class COMBOBOXEXITEMW(Structure): _pack_ = 1 @@ -584,8 +548,6 @@ assert sizeof(COMBOBOXEXITEMW) == 36, sizeof(COMBOBOXEXITEMW) assert alignment(COMBOBOXEXITEMW) == 1, alignment(COMBOBOXEXITEMW) - - # C:/PROGRA~1/MICROS~4/VC98/Include/commctrl.h 4757 class TCITEMHEADERW(Structure): _pack_ = 1 @@ -686,11 +648,6 @@ assert sizeof(REBARBANDINFOW) == 80, sizeof(REBARBANDINFOW) assert alignment(REBARBANDINFOW) == 1, alignment(REBARBANDINFOW) - - - - - # C:/PROGRA~1/MICROS~4/VC98/Include/winbase.h 223 class SECURITY_ATTRIBUTES(Structure): _fields_ = [ @@ -741,7 +698,6 @@ assert sizeof(PROCESS_INFORMATION) == 16, sizeof(PROCESS_INFORMATION) assert alignment(PROCESS_INFORMATION) == 4, alignment(PROCESS_INFORMATION) - # C:/PROGRA~1/MICROS~4/VC98/Include/commctrl.h 3417 class NMLISTVIEW(Structure): _pack_ = 1 @@ -760,9 +716,6 @@ assert sizeof(NMLISTVIEW) == 44, sizeof(NMLISTVIEW) assert alignment(NMLISTVIEW) == 1, alignment(NMLISTVIEW) - - - # C:/PROGRA~1/MICROS~4/VC98/Include/commctrl.h 235 class NMMOUSE(Structure): _pack_ = 1 @@ -778,8 +731,6 @@ assert sizeof(NMMOUSE) == 32, sizeof(NMMOUSE) assert alignment(NMMOUSE) == 1, alignment(NMMOUSE) - - # C:/PROGRA~1/MICROS~4/VC98/Include/winuser.h 4283 class MOUSEINPUT(Structure): _pack_ = 2 @@ -822,8 +773,6 @@ assert sizeof(HARDWAREINPUT) == 8, sizeof(HARDWAREINPUT) assert alignment(HARDWAREINPUT) == 2, alignment(HARDWAREINPUT) - - # C:/PROGRA~1/MICROS~4/VC98/Include/winuser.h 4314 class UNION_INPUT_STRUCTS(Union): _fields_ = [ @@ -901,11 +850,6 @@ assert alignment(MENUINFO) == 2, alignment(MENUINFO) - - - - - NMTTDISPINFOW_V1_SIZE = 184 # Variable c_uint # C:/PROGRA~1/MICROS~4/VC98/Include/commctrl.h 2066 @@ -922,3 +866,18 @@ class NMTTDISPINFOW(Structure): ] assert sizeof(NMTTDISPINFOW) == 188, sizeof(NMTTDISPINFOW) assert alignment(NMTTDISPINFOW) == 1, alignment(NMTTDISPINFOW) + + +# C:/PROGRA~1/MICROS~4/VC98/Include/winuser.h 2208 +class WINDOWPLACEMENT(Structure): + _fields_ = [ + # C:/PROGRA~1/MICROS~4/VC98/Include/winuser.h 2208 + ('length', UINT), + ('flags', UINT), + ('showCmd', UINT), + ('ptMinPosition', POINT), + ('ptMaxPosition', POINT), + ('rcNormalPosition', RECT), + ] +assert sizeof(WINDOWPLACEMENT) == 44, sizeof(WINDOWPLACEMENT) +assert alignment(WINDOWPLACEMENT) == 4, alignment(WINDOWPLACEMENT)