pywin32-checkins

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21179

Modified Files:
	win32util.cpp win32win.cpp 
Log Message:
fix error in previous 64bit checkin, and another handle I missed completely


Index: win32util.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32util.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32util.cpp	3 Jun 2007 12:35:58 -0000	1.9
--- win32util.cpp	3 Jun 2007 13:23:45 -0000	1.10
***************
*** 205,211 ****
  	if (fnName==NULL) fnName = "CREATESTRUCT value";
  	if (bFromTuple)
! 		sprintf(argBuf, "(iiii(iiii)illi):%s", fnName);
  	else
! 		sprintf(argBuf, "iiii(iiii)illi:%s", fnName);
  	PyObject *obname, *obclassName;
  	BOOL ret =  PyArg_ParseTuple(ob, argBuf,
--- 205,211 ----
  	if (fnName==NULL) fnName = "CREATESTRUCT value";
  	if (bFromTuple)
! 		sprintf(argBuf, "(iiii(iiii)iOOi):%s", fnName);
  	else
! 		sprintf(argBuf, "iiii(iiii)iOOi:%s", fnName);
  	PyObject *obname, *obclassName;
  	BOOL ret =  PyArg_ParseTuple(ob, argBuf,

Index: win32win.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32win.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** win32win.cpp	3 Jun 2007 12:35:58 -0000	1.14
--- win32win.cpp	3 Jun 2007 13:23:45 -0000	1.15
***************
*** 2139,2150 ****
  		return NULL;
  
- 	HWND insertAfter;
  	int x,y,cx,cy;
  	int flags;
!     // @pyparm int|hWndInsertAfter||A hwnd, else one of the win32con.HWND_* constants.
  	// @pyparm (x,y,cx,cy)|position||The new position of the window.
  	// @pyparm int|flags||Window positioning flags.
! 	if (!PyArg_ParseTuple(args,"i(iiii)i:SetWindowPos",
! 		        (int *)(&insertAfter), &x, &y, &cx, &cy, &flags ))
  		return NULL;
  	GUI_BGN_SAVE;
--- 2139,2153 ----
  		return NULL;
  
  	int x,y,cx,cy;
  	int flags;
! 	PyObject *obAfter;
! 	// @pyparm int|hWndInsertAfter||A hwnd, else one of the win32con.HWND_* constants.
  	// @pyparm (x,y,cx,cy)|position||The new position of the window.
  	// @pyparm int|flags||Window positioning flags.
! 	if (!PyArg_ParseTuple(args,"O(iiii)i:SetWindowPos",
! 		        &obAfter, &x, &y, &cx, &cy, &flags ))
! 		return NULL;
! 	HWND insertAfter;
! 	if (!PyWinObject_AsHANDLE(obAfter, (HANDLE *)&insertAfter))
  		return NULL;
  	GUI_BGN_SAVE;