pywin32-checkins

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12402/com/win32comext/shell/src

Modified Files:
	PyIActiveDesktop.cpp 
Log Message:
Fix places where HWNDs treated as longs

Index: PyIActiveDesktop.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIActiveDesktop.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIActiveDesktop.cpp	7 Apr 2006 06:04:41 -0000	1.2
--- PyIActiveDesktop.cpp	17 Jan 2007 13:55:04 -0000	1.3
***************
*** 472,484 ****
  	if ( pIAD == NULL )
  		return NULL;
! 	PyObject *obcomp;
  	COMPONENT comp;
  	DWORD flags;
  	HWND hwnd;
! 	if (!PyArg_ParseTuple(args, "lOk:AddDesktopItemWithUI",
! 		&hwnd,	// @pyparm <o PyHANDLE>|hwnd||Handle to parent window
  		&obcomp,	// @pyparm dict|comp||<o COMPONENT> dictionary
  		&flags))	// @pyparm int|Flags||One of shellcon.DTI_ADDUI_* flags
  		return NULL;
  	if (!PyWinObject_AsCOMPONENT(obcomp, &comp))
  		return NULL;
--- 472,486 ----
  	if ( pIAD == NULL )
  		return NULL;
! 	PyObject *obcomp, *obhwnd;
  	COMPONENT comp;
  	DWORD flags;
  	HWND hwnd;
! 	if (!PyArg_ParseTuple(args, "OOk:AddDesktopItemWithUI",
! 		&obhwnd,	// @pyparm <o PyHANDLE>|hwnd||Handle to parent window
  		&obcomp,	// @pyparm dict|comp||<o COMPONENT> dictionary
  		&flags))	// @pyparm int|Flags||One of shellcon.DTI_ADDUI_* flags
  		return NULL;
+ 	if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE))
+ 		return NULL;
  	if (!PyWinObject_AsCOMPONENT(obcomp, &comp))
  		return NULL;
***************
*** 657,670 ****
  		return NULL;
  	HWND hwnd;
! 	PyObject *obcomp, *obSource;
  	WCHAR *Source=NULL;
  	COMPONENT comp;
  	DWORD flags;
! 	if ( !PyArg_ParseTuple(args, "lOOk:AddUrl",
! 		&hwnd,		// @pyparm <o PyHANDLE>|hwnd||Parent windows for any user interactive
  		&obSource,	// @pyparm <o PyUNICODE>|Source||Source URL
  		&obcomp,	// @pyparm dict|comp||<o COMPONENT> dictionary
  		&flags))	// @pyparm int|Flags||ADDURL_SILENT, or 0
  		return NULL;
  	if (!PyWinObject_AsCOMPONENT(obcomp, &comp))
  		return NULL;
--- 659,674 ----
  		return NULL;
  	HWND hwnd;
! 	PyObject *obcomp, *obSource, *obhwnd;
  	WCHAR *Source=NULL;
  	COMPONENT comp;
  	DWORD flags;
! 	if ( !PyArg_ParseTuple(args, "OOOk:AddUrl",
! 		&obhwnd,		// @pyparm <o PyHANDLE>|hwnd||Parent windows for any user interactive
  		&obSource,	// @pyparm <o PyUNICODE>|Source||Source URL
  		&obcomp,	// @pyparm dict|comp||<o COMPONENT> dictionary
  		&flags))	// @pyparm int|Flags||ADDURL_SILENT, or 0
  		return NULL;
+ 	if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE))
+ 		return NULL;
  	if (!PyWinObject_AsCOMPONENT(obcomp, &comp))
  		return NULL;