Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24246/com/win32comext/shell/src
Modified Files:
PyIDropTargetHelper.cpp
Log Message:
Fix places where HWNDs treated as longs
Index: PyIDropTargetHelper.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIDropTargetHelper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIDropTargetHelper.cpp 26 Jan 2005 22:31:09 -0000 1.2
--- PyIDropTargetHelper.cpp 21 Jan 2007 12:47:50 -0000 1.3
***************
*** 41,55 ****
if ( pIDT == NULL )
return NULL;
- // @pyparm int|hwnd||
- // @pyparm <o PyIDataObject *>|pDataObj||Description for pDataObj
POINT pt;
PyObject *obpt;
- // @pyparm (int, int)|pt||Description for pt
PyObject *obpDataObj;
IDataObject *pDataObj;
HWND hwnd;
DWORD dwEffect;
! // @pyparm int|pdwEffect||Description for pdwEffect
! if ( !PyArg_ParseTuple(args, "lOOl:DragEnter", &hwnd, &obpDataObj, &obpt, &dwEffect) )
return NULL;
BOOL bPythonIsHappy = TRUE;
--- 41,59 ----
if ( pIDT == NULL )
return NULL;
POINT pt;
PyObject *obpt;
PyObject *obpDataObj;
IDataObject *pDataObj;
HWND hwnd;
+ PyObject *obhwnd;
DWORD dwEffect;
!
! if (!PyArg_ParseTuple(args, "OOOl:DragEnter",
! &obhwnd, // @pyparm <o PyHANDLE>|hwnd||Handle to target window
! &obpDataObj, // @pyparm <o PyIDataObject>|pDataObj||Object that is dragged onto the window
! &obpt, // @pyparm (int, int)|pt||Coordinates where drag operation entered the window
! &dwEffect)) // @pyparm int|dwEffect||One of shellcon.DROPEFFECT_* values
! return NULL;
! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, FALSE))
return NULL;
BOOL bPythonIsHappy = TRUE;
***************
*** 181,185 ****
obpDataObj = PyCom_PyObjectFromIUnknown(pDataObj, IID_IDataObject, TRUE);
PyObject *result;
! HRESULT hr=InvokeViaPolicy("DragEnter", &result, "OOl", obpDataObj, obpt, dwEffect);
Py_XDECREF(obpDataObj);
Py_DECREF(obpt);
--- 185,189 ----
obpDataObj = PyCom_PyObjectFromIUnknown(pDataObj, IID_IDataObject, TRUE);
PyObject *result;
! HRESULT hr=InvokeViaPolicy("DragEnter", &result, "NOOl", PyWinLong_FromHANDLE(hwnd), obpDataObj, obpt, dwEffect);
Py_XDECREF(obpDataObj);
Py_DECREF(obpt);
|