|
From: Mark H. <mha...@us...> - 2007-06-03 14:53:07
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21318/com/win32comext/shell/src Modified Files: PyIActiveDesktop.cpp PyIContextMenu.cpp PyICopyHook.cpp PyIDropTargetHelper.cpp PyIQueryAssociations.cpp PyIShellBrowser.cpp PyIShellExtInit.cpp PyIShellFolder.cpp PyIShellLink.cpp PyIShellView.cpp shell.cpp Log Message: PyWinObject_AsHANDLE losts its 3rd param - None is always OK (zero always was, so the distinction is futile Index: PyIDropTargetHelper.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIDropTargetHelper.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyIDropTargetHelper.cpp 21 Jan 2007 12:47:50 -0000 1.3 --- PyIDropTargetHelper.cpp 3 Jun 2007 14:53:07 -0000 1.4 *************** *** 55,59 **** &dwEffect)) // @pyparm int|dwEffect||One of shellcon.DROPEFFECT_* values return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, FALSE)) return NULL; BOOL bPythonIsHappy = TRUE; --- 55,59 ---- &dwEffect)) // @pyparm int|dwEffect||One of shellcon.DROPEFFECT_* values return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; BOOL bPythonIsHappy = TRUE; Index: PyIShellExtInit.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellExtInit.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyIShellExtInit.cpp 9 Oct 2003 12:09:17 -0000 1.3 --- PyIShellExtInit.cpp 3 Jun 2007 14:53:07 -0000 1.4 *************** *** 47,51 **** if (!PyCom_InterfaceFromPyInstanceOrObject(obpDataObject, IID_IDataObject, (void **)&pDataObject, TRUE /* bNoneOK */)) bPythonIsHappy = FALSE; ! if (!PyWinObject_AsHANDLE(obhkey, (HANDLE *)&hkey, FALSE)) bPythonIsHappy = FALSE; if (!bPythonIsHappy) return NULL; HRESULT hr; --- 47,51 ---- if (!PyCom_InterfaceFromPyInstanceOrObject(obpDataObject, IID_IDataObject, (void **)&pDataObject, TRUE /* bNoneOK */)) bPythonIsHappy = FALSE; ! if (!PyWinObject_AsHANDLE(obhkey, (HANDLE *)&hkey)) bPythonIsHappy = FALSE; if (!bPythonIsHappy) return NULL; HRESULT hr; Index: shell.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** shell.cpp 3 Jun 2007 01:35:16 -0000 1.56 --- shell.cpp 3 Jun 2007 14:53:07 -0000 1.57 *************** *** 482,488 **** &pci->nShow, &pci->dwHotKey, &obhIcon)) return FALSE; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&pci->hwnd, FALSE)) return NULL; ! if (!PyWinObject_AsHANDLE(obhIcon, (HANDLE *)&pci->hIcon, TRUE)) return NULL; if (PyString_Check(obVerb)) { --- 482,488 ---- &pci->nShow, &pci->dwHotKey, &obhIcon)) return FALSE; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&pci->hwnd)) return NULL; ! if (!PyWinObject_AsHANDLE(obhIcon, (HANDLE *)&pci->hIcon)) return NULL; if (PyString_Check(obVerb)) { *************** *** 589,593 **** PyObject *obhwnd; return PyArg_ParseTuple(obpmsg, "Oiiii(ii)", &obhwnd,&msg->message,&msg->wParam,&msg->lParam,&msg->time,&msg->pt.x,&msg->pt.y) ! && PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&msg->hwnd, FALSE); } --- 589,593 ---- PyObject *obhwnd; return PyArg_ParseTuple(obpmsg, "Oiiii(ii)", &obhwnd,&msg->message,&msg->wParam,&msg->lParam,&msg->time,&msg->pt.x,&msg->pt.y) ! && PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&msg->hwnd); } *************** *** 839,843 **** &obProgressTitle)) // @tupleitem 6|string|ProgressTitle|Title for progress dialog (flags must contain FOF_SIMPLEPROGRESS). Default=None return FALSE; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&p->hwnd, TRUE)) return NULL; if (obNameMappings != Py_None) { --- 839,843 ---- &obProgressTitle)) // @tupleitem 6|string|ProgressTitle|Title for progress dialog (flags must contain FOF_SIMPLEPROGRESS). Default=None return FALSE; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&p->hwnd)) return NULL; if (obNameMappings != Py_None) { *************** *** 934,938 **** &obcbparam)) // @pyparm object|callback_data|None|An object passed to the callback function return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&bi.hwndOwner, TRUE)) return NULL; if (obcb != Py_None) { --- 934,938 ---- &obcbparam)) // @pyparm object|callback_data|None|An object passed to the callback function return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&bi.hwndOwner)) return NULL; if (obcb != Py_None) { *************** *** 1053,1057 **** &bCreate)) // @pyparm int|bCreate|0|Should the path be created. return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; // @comm This method is only available in shell version 4.71. If the --- 1053,1057 ---- &bCreate)) // @pyparm int|bCreate|0|Should the path be created. return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; // @comm This method is only available in shell version 4.71. If the *************** *** 1081,1085 **** &nFolder)) // @pyparm int|nFolder||One of the CSIDL_* constants specifying the path. return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; LPITEMIDLIST pidl; --- 1081,1085 ---- &nFolder)) // @pyparm int|nFolder||One of the CSIDL_* constants specifying the path. return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; LPITEMIDLIST pidl; *************** *** 1157,1164 **** &flags)) // @pyparm int|flags||Controls which path is returned. May be SHGFP_TYPE_CURRENT or SHGFP_TYPE_DEFAULT return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; HANDLE handle; ! if (!PyWinObject_AsHANDLE(obHandle, &handle, TRUE)) return NULL; --- 1157,1164 ---- &flags)) // @pyparm int|flags||Controls which path is returned. May be SHGFP_TYPE_CURRENT or SHGFP_TYPE_DEFAULT return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; HANDLE handle; ! if (!PyWinObject_AsHANDLE(obHandle, &handle)) return NULL; *************** *** 1194,1198 **** &obToken)) // @pyparm <o PyHANDLE>|hToken|None|Handle to an access token, can be None return NULL; ! if (!PyWinObject_AsHANDLE(obToken, &hToken, TRUE)) return NULL; if (!PyWinObject_AsWCHAR(obPath, &Path, FALSE)) --- 1194,1198 ---- &obToken)) // @pyparm <o PyHANDLE>|hToken|None|Handle to an access token, can be None return NULL; ! if (!PyWinObject_AsHANDLE(obToken, &hToken)) return NULL; if (!PyWinObject_AsWCHAR(obPath, &Path, FALSE)) *************** *** 1225,1231 **** &flags)) // @pyparm int|reserved|0|Must be 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; ! if (!PyWinObject_AsHANDLE(obToken, &hToken, TRUE)) return NULL; LPITEMIDLIST pidl; --- 1225,1231 ---- &flags)) // @pyparm int|reserved|0|Must be 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; ! if (!PyWinObject_AsHANDLE(obToken, &hToken)) return NULL; LPITEMIDLIST pidl; *************** *** 1274,1278 **** &flags)) // @pyparm int|flags||One of the SHERB_* values. return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE)) return NULL; // @comm This method is only available in shell version 4.71. If the function is not available, a COM Exception with HRESULT=E_NOTIMPL will be raised. --- 1274,1278 ---- &flags)) // @pyparm int|flags||One of the SHERB_* values. return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; // @comm This method is only available in shell version 4.71. If the function is not available, a COM Exception with HRESULT=E_NOTIMPL will be raised. *************** *** 1518,1522 **** &entry.fRecursive)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, FALSE)) return NULL; if (!PyObject_AsPIDL(obPIDL, (ITEMIDLIST **)&entry.pidl, TRUE)) --- 1518,1522 ---- &entry.fRecursive)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; if (!PyObject_AsPIDL(obPIDL, (ITEMIDLIST **)&entry.pidl, TRUE)) *************** *** 1565,1569 **** &index)) // @pyparm int|index||The index to retrieve. If -1, the result if an integer representing the valid index values. return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal, FALSE)) return NULL; if (index==0xFFFFFFFF) { --- 1565,1569 ---- &index)) // @pyparm int|index||The index to retrieve. If -1, the result if an integer representing the valid index values. return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal)) return NULL; if (index==0xFFFFFFFF) { *************** *** 1591,1595 **** &index)) // @pyparm int|index||The index to retrieve. If -1, the result if an integer representing the valid index values. return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal, FALSE)) return NULL; if (index==0xFFFFFFFF) { --- 1591,1595 ---- &index)) // @pyparm int|index||The index to retrieve. If -1, the result if an integer representing the valid index values. return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal)) return NULL; if (index==0xFFFFFFFF) { *************** *** 1617,1621 **** &obhglobal)) // @pyparm <o PyHANDLE>|hglobal||The HGLOBAL object - generally obtained the 'data_handle' property of a <o PySTGMEDIUM> return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal, FALSE)) return NULL; POINT pt; --- 1617,1621 ---- &obhglobal)) // @pyparm <o PyHANDLE>|hglobal||The HGLOBAL object - generally obtained the 'data_handle' property of a <o PySTGMEDIUM> return NULL; ! if (!PyWinObject_AsHANDLE(obhglobal, (HANDLE *)&hglobal)) return NULL; POINT pt; *************** *** 2107,2111 **** &obhMonitor)) // @pyparm <o PyHANDLE>|hMonitor|| goto done; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&p->hwnd, TRUE)) goto done; if (obVerb && !PyWinObject_AsString(obVerb, (char **)&p->lpVerb)) --- 2107,2111 ---- &obhMonitor)) // @pyparm <o PyHANDLE>|hMonitor|| goto done; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&p->hwnd)) goto done; if (obVerb && !PyWinObject_AsString(obVerb, (char **)&p->lpVerb)) Index: PyIActiveDesktop.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIActiveDesktop.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyIActiveDesktop.cpp 17 Jan 2007 13:55:04 -0000 1.3 --- PyIActiveDesktop.cpp 3 Jun 2007 14:53:07 -0000 1.4 *************** *** 481,485 **** &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)) --- 481,485 ---- &flags)) // @pyparm int|Flags||One of shellcon.DTI_ADDUI_* flags return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; if (!PyWinObject_AsCOMPONENT(obcomp, &comp)) *************** *** 669,673 **** &flags)) // @pyparm int|Flags||ADDURL_SILENT, or 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE)) return NULL; if (!PyWinObject_AsCOMPONENT(obcomp, &comp)) --- 669,673 ---- &flags)) // @pyparm int|Flags||ADDURL_SILENT, or 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; if (!PyWinObject_AsCOMPONENT(obcomp, &comp)) Index: PyIShellFolder.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellFolder.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** PyIShellFolder.cpp 24 May 2007 06:01:05 -0000 1.15 --- PyIShellFolder.cpp 3 Jun 2007 14:53:07 -0000 1.16 *************** *** 55,59 **** &oblpszDisplayName, &pdwAttributes) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; BOOL bPythonIsHappy = TRUE; --- 55,59 ---- &oblpszDisplayName, &pdwAttributes) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; BOOL bPythonIsHappy = TRUE; *************** *** 95,99 **** if ( !PyArg_ParseTuple(args, "|Ol:EnumObjects", &obhwndOwner, &grfFlags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; --- 95,99 ---- if ( !PyArg_ParseTuple(args, "|Ol:EnumObjects", &obhwndOwner, &grfFlags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; *************** *** 247,251 **** if ( !PyArg_ParseTuple(args, "OO:CreateViewObject", &obhwndOwner, &obriid) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; BOOL bPythonIsHappy = TRUE; --- 247,251 ---- if ( !PyArg_ParseTuple(args, "OO:CreateViewObject", &obhwndOwner, &obriid) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; BOOL bPythonIsHappy = TRUE; *************** *** 316,320 **** if ( !PyArg_ParseTuple(args, "OOOl|O:GetUIObjectOf", &obhwndOwner, &obpidl, &obriid, &rgfInOut, &obiidout) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; BOOL bPythonIsHappy = TRUE; --- 316,320 ---- if ( !PyArg_ParseTuple(args, "OOOl|O:GetUIObjectOf", &obhwndOwner, &obpidl, &obriid, &rgfInOut, &obiidout) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; BOOL bPythonIsHappy = TRUE; *************** *** 393,397 **** if ( !PyArg_ParseTuple(args, "OOOl:SetNameOf", &obhwndOwner, &obpidl, &oblpszName, &flags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner, TRUE)) return NULL; --- 393,397 ---- if ( !PyArg_ParseTuple(args, "OOOl:SetNameOf", &obhwndOwner, &obpidl, &oblpszName, &flags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndOwner, (HANDLE *)&hwndOwner)) return NULL; Index: PyIContextMenu.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIContextMenu.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PyIContextMenu.cpp 24 May 2007 06:01:05 -0000 1.5 --- PyIContextMenu.cpp 3 Jun 2007 14:53:07 -0000 1.6 *************** *** 44,48 **** &uFlags)) // @pyparm int|uFlags||Combination of shellcon.CMF_* flags, can be 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhmenu, (HANDLE *)&hmenu, FALSE)) return NULL; HRESULT hr; --- 44,48 ---- &uFlags)) // @pyparm int|uFlags||Combination of shellcon.CMF_* flags, can be 0 return NULL; ! if (!PyWinObject_AsHANDLE(obhmenu, (HANDLE *)&hmenu)) return NULL; HRESULT hr; Index: PyIShellBrowser.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellBrowser.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PyIShellBrowser.cpp 20 Feb 2007 10:10:23 -0000 1.8 --- PyIShellBrowser.cpp 3 Jun 2007 14:53:07 -0000 1.9 *************** *** 45,49 **** &obMenuWidths)) // @pyparm <o PyLPOLEMENUGROUPWIDTHS>|lpMenuWidths||Tuple of 6 ints. Items 0,2,and 4 are updated when the tuple is returned. return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared, FALSE)) return NULL; if (!PyObject_AsOLEMENUGROUPWIDTHS( obMenuWidths, &menuWidths)) --- 45,49 ---- &obMenuWidths)) // @pyparm <o PyLPOLEMENUGROUPWIDTHS>|lpMenuWidths||Tuple of 6 ints. Items 0,2,and 4 are updated when the tuple is returned. return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared)) return NULL; if (!PyObject_AsOLEMENUGROUPWIDTHS( obMenuWidths, &menuWidths)) *************** *** 73,81 **** &obhwndActiveObject)) // @pyparm <o PyHANDLE>|hwndActiveObject||Handle to the shell window return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared, FALSE)) return NULL; ! if (!PyWinObject_AsHANDLE(obholemenuRes, (HANDLE *)&holemenuRes, TRUE)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndActiveObject, (HANDLE *)&hwndActiveObject, FALSE)) return NULL; --- 73,81 ---- &obhwndActiveObject)) // @pyparm <o PyHANDLE>|hwndActiveObject||Handle to the shell window return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared)) return NULL; ! if (!PyWinObject_AsHANDLE(obholemenuRes, (HANDLE *)&holemenuRes)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwndActiveObject, (HANDLE *)&hwndActiveObject)) return NULL; *************** *** 103,107 **** &obhmenuShared)) // @pyparm <o PyHANDLE>|hmenuShared||Handle to the composite menu return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared, FALSE)) return NULL; --- 103,107 ---- &obhmenuShared)) // @pyparm <o PyHANDLE>|hmenuShared||Handle to the composite menu return NULL; ! if (!PyWinObject_AsHANDLE(obhmenuShared, (HANDLE *)&hmenuShared)) return NULL; *************** *** 504,508 **** if (FAILED(hr)) return hr; // Process the Python results, and convert back to the real params ! if (!PyWinObject_AsHANDLE(result, (HANDLE *)phwnd, TRUE)) hr = PyCom_HandlePythonFailureToCOM(); Py_DECREF(result); --- 504,508 ---- if (FAILED(hr)) return hr; // Process the Python results, and convert back to the real params ! if (!PyWinObject_AsHANDLE(result, (HANDLE *)phwnd)) hr = PyCom_HandlePythonFailureToCOM(); Py_DECREF(result); Index: PyIShellView.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PyIShellView.cpp 27 Jan 2007 17:18:28 -0000 1.6 --- PyIShellView.cpp 3 Jun 2007 14:53:07 -0000 1.7 *************** *** 388,392 **** if (FAILED(hr)) return hr; // Process the Python results, and convert back to the real params ! if (!PyWinObject_AsHANDLE(result, (HANDLE *)phWnd, TRUE)) hr=MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateViewWindow"); Py_DECREF(result); --- 388,392 ---- if (FAILED(hr)) return hr; // Process the Python results, and convert back to the real params ! if (!PyWinObject_AsHANDLE(result, (HANDLE *)phWnd)) hr=MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateViewWindow"); Py_DECREF(result); Index: PyIShellLink.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellLink.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PyIShellLink.cpp 21 Jan 2007 02:36:31 -0000 1.8 --- PyIShellLink.cpp 3 Jun 2007 14:53:07 -0000 1.9 *************** *** 479,483 **** if ( !PyArg_ParseTuple(args, "Ol:Resolve", &obhwnd, &fFlags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE)) return NULL; HRESULT hr; --- 479,483 ---- if ( !PyArg_ParseTuple(args, "Ol:Resolve", &obhwnd, &fFlags) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; HRESULT hr; Index: PyICopyHook.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyICopyHook.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyICopyHook.cpp 20 Jan 2007 22:46:30 -0000 1.3 --- PyICopyHook.cpp 3 Jun 2007 14:53:07 -0000 1.4 *************** *** 50,54 **** if ( !PyArg_ParseTuple(args, "OiiOlOl:CopyCallback", &obhwnd, &wFunc, &wFlags, &obsrcFile, &srcAttribs, &obdestFile, &destAttribs) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, FALSE)) return NULL; BOOL bPythonIsHappy = TRUE; --- 50,54 ---- if ( !PyArg_ParseTuple(args, "OiiOlOl:CopyCallback", &obhwnd, &wFunc, &wFlags, &obsrcFile, &srcAttribs, &obdestFile, &destAttribs) ) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; BOOL bPythonIsHappy = TRUE; Index: PyIQueryAssociations.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIQueryAssociations.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PyIQueryAssociations.cpp 21 Jan 2007 13:34:42 -0000 1.5 --- PyIQueryAssociations.cpp 3 Jun 2007 14:53:07 -0000 1.6 *************** *** 44,50 **** if (!PyWinObject_AsWCHAR(obAssoc, &pszAssoc, TRUE)) return NULL; ! if (!PyWinObject_AsHKEY(obhkProgid, &hkProgid, TRUE)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd, TRUE)) return NULL; HRESULT hr; --- 44,50 ---- if (!PyWinObject_AsWCHAR(obAssoc, &pszAssoc, TRUE)) return NULL; ! if (!PyWinObject_AsHKEY(obhkProgid, &hkProgid)) return NULL; ! if (!PyWinObject_AsHANDLE(obhwnd, (HANDLE *)&hwnd)) return NULL; HRESULT hr; |
