|
From: Mark H. <mha...@us...> - 2008-02-07 08:01:39
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/bits/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31073 Modified Files: Tag: sidnei-bits PyIBackgroundCopyFile.cpp PyIBackgroundCopyJob.cpp PyIBackgroundCopyJob.h PyIBackgroundCopyJob2.cpp PyIBackgroundCopyJob3.cpp bits.cpp bits_pch.h Log Message: Fix params for many methods. Index: PyIBackgroundCopyJob.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyJob.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** PyIBackgroundCopyJob.h 7 Feb 2008 06:07:33 -0000 1.1.2.2 --- PyIBackgroundCopyJob.h 7 Feb 2008 08:01:42 -0000 1.1.2.3 *************** *** 5,8 **** --- 5,10 ---- // Interface Declaration + #pragma once + #include "Bits.h" #include "PythonCOM.h" Index: PyIBackgroundCopyJob3.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyJob3.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** PyIBackgroundCopyJob3.cpp 7 Feb 2008 06:07:33 -0000 1.1.2.2 --- PyIBackgroundCopyJob3.cpp 7 Feb 2008 08:01:42 -0000 1.1.2.3 *************** *** 49,60 **** SysFreeString(OldPrefix); SysFreeString(NewPrefix); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! Py_INCREF(Py_None); ! return Py_None; ! } --- 49,56 ---- SysFreeString(OldPrefix); SysFreeString(NewPrefix); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! return PyInt_FromLong(hr); } *************** *** 67,73 **** // @pyparm <o unicode>|RemoteUrl||Description for RemoteUrl // @pyparm <o unicode>|LocalName||Description for LocalName - // @pyparm int|RangeCount||Description for RangeCount - // *** The input argument Ranges of type "BG_FILE_RANGE" was not processed *** - // Please check the conversion function is appropriate and exists! BG_FILE_RANGE *Ranges; PyObject *obRanges; --- 63,66 ---- *************** *** 77,87 **** LPWSTR RemoteUrl; LPWSTR LocalName; ! DWORD RangeCount; ! if ( !PyArg_ParseTuple(args, "OOlO:AddFileWithRanges", &obRemoteUrl, &obLocalName, &RangeCount, &obRanges) ) return NULL; BOOL bPythonIsHappy = TRUE; if (bPythonIsHappy && !PyWinObject_AsBstr(obRemoteUrl, &RemoteUrl)) bPythonIsHappy = FALSE; if (bPythonIsHappy && !PyWinObject_AsBstr(obLocalName, &LocalName)) bPythonIsHappy = FALSE; ! if (bPythonIsHappy && !PyObject_AsBG_FILE_RANGE_LIST( obRanges, &Ranges )) bPythonIsHappy = FALSE; if (!bPythonIsHappy) return NULL; HRESULT hr; --- 70,80 ---- LPWSTR RemoteUrl; LPWSTR LocalName; ! if ( !PyArg_ParseTuple(args, "OOO:AddFileWithRanges", &obRemoteUrl, &obLocalName, &obRanges) ) return NULL; + DWORD RangeCount; BOOL bPythonIsHappy = TRUE; if (bPythonIsHappy && !PyWinObject_AsBstr(obRemoteUrl, &RemoteUrl)) bPythonIsHappy = FALSE; if (bPythonIsHappy && !PyWinObject_AsBstr(obLocalName, &LocalName)) bPythonIsHappy = FALSE; ! if (bPythonIsHappy && !PyObject_AsBG_FILE_RANGE_LIST( obRanges, &RangeCount, &Ranges )) bPythonIsHappy = FALSE; if (!bPythonIsHappy) return NULL; HRESULT hr; *************** *** 90,102 **** SysFreeString(RemoteUrl); SysFreeString(LocalName); ! PyObject_FreeBG_FILE_RANGE_LIST(Ranges); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! Py_INCREF(Py_None); ! return Py_None; ! } --- 83,91 ---- SysFreeString(RemoteUrl); SysFreeString(LocalName); ! PyObject_FreeBG_FILE_RANGE_LIST(RangeCount, Ranges); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! return PyInt_FromLong(hr); } *************** *** 114,125 **** PY_INTERFACE_PRECALL; hr = pIBCJ3->SetFileACLFlags( Flags ); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! Py_INCREF(Py_None); ! return Py_None; ! } --- 103,110 ---- PY_INTERFACE_PRECALL; hr = pIBCJ3->SetFileACLFlags( Flags ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! return PyInt_FromLong(hr); } *************** *** 130,151 **** if ( pIBCJ3 == NULL ) return NULL; - DWORD * Flags; - PyObject *obFlags; if ( !PyArg_ParseTuple(args, ":GetFileACLFlags") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ3->GetFileACLFlags( Flags ); ! PyObject_FreeDWORD(Flags); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! // *** The output argument Flags of type "DWORD *" was not processed *** ! // The type 'DWORD *' (Flags) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 115,128 ---- if ( pIBCJ3 == NULL ) return NULL; if ( !PyArg_ParseTuple(args, ":GetFileACLFlags") ) return NULL; HRESULT hr; + DWORD Flags; PY_INTERFACE_PRECALL; ! hr = pIBCJ3->GetFileACLFlags( &Flags ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ3, IID_IBackgroundCopyJob3 ); ! return PyLong_FromUnsignedLongLong(Flags); } Index: bits_pch.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/bits_pch.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** bits_pch.h 7 Feb 2008 06:07:33 -0000 1.1.2.3 --- bits_pch.h 7 Feb 2008 08:01:42 -0000 1.1.2.4 *************** *** 5,80 **** #include <PythonCOM.h> ! BOOL PyObject_AsDWORD(PyObject *ob, DWORD *dw); ! void PyObject_FreeDWORD(DWORD *dw); ! ! BOOL PyObject_AsULONG(PyObject *ob, ULONG *ul); ! void PyObject_FreeULONG(ULONG *ul); ! ! BOOL PyObject_AsULONG_LIST(PyObject *ob, ULONG **ul); ! void PyObject_FreeULONG_LIST(ULONG *ul); ! ! BOOL PyObject_AsWCHAR_LIST(PyObject *ob, WCHAR **wch); ! void PyObject_FreeWCHAR_LIST(WCHAR *wch); ! ! BOOL PyObject_AsconstWCHAR_LIST(PyObject *ob, const WCHAR **wch); ! void PyObject_FreeconstWCHAR_LIST(const WCHAR *wch); ! ! BOOL PyObject_AsGUID(PyObject *ob, GUID *guid); ! void PyObject_FreeGUID(GUID *guid); ! ! BOOL PyObject_AsLPWSTR(PyObject *ob, LPWSTR *lpw); ! void PyObject_FreeLPWSTR(LPWSTR *lpw); ! ! BOOL PyObject_AsLPWSTR_LIST(PyObject *ob, LPWSTR **lpw); ! void PyObject_FreeLPWSTR_LIST(LPWSTR *lpw); ! ! BOOL PyObject_AsBG_FILE_INFO(PyObject *ob, BG_FILE_INFO *fi); ! void PyObject_FreeBG_FILE_INFO(BG_FILE_INFO *fi); ! ! BOOL PyObject_AsBG_FILE_INFO_LIST(PyObject *ob, BG_FILE_INFO **fi); ! void PyObject_FreeBG_FILE_INFO_LIST(BG_FILE_INFO *fi); ! ! BOOL PyObject_AsBG_FILE_PROGRESS(PyObject *ob, BG_FILE_PROGRESS *fi); ! void PyObject_FreeBG_FILE_PROGRESS(BG_FILE_PROGRESS *fi); ! ! BOOL PyObject_AsBG_FILE_PROGRESS_LIST(PyObject *ob, BG_FILE_PROGRESS **fi); ! void PyObject_FreeBG_FILE_PROGRESS_LIST(BG_FILE_PROGRESS *fi); ! ! BOOL PyObject_AsBG_FILE_RANGE_LIST(PyObject *ob, BG_FILE_RANGE **fr); ! void PyObject_FreeBG_FILE_RANGE_LIST(BG_FILE_RANGE *fr); ! ! BOOL PyObject_AsBG_JOB_STATE(PyObject *ob, BG_JOB_STATE *js); ! void PyObject_FreeBG_JOB_STATE(BG_JOB_STATE *js); ! BOOL PyObject_AsBG_JOB_STATE_LIST(PyObject *ob, BG_JOB_STATE **js); ! void PyObject_FreeBG_JOB_STATE_LIST(BG_JOB_STATE *js); ! BOOL PyObject_AsBG_JOB_PROGRESS(PyObject *ob, BG_JOB_PROGRESS *jp); ! void PyObject_FreeBG_JOB_PROGRESS(BG_JOB_PROGRESS *jp); ! BOOL PyObject_AsBG_JOB_PROGRESS_LIST(PyObject *ob, BG_JOB_PROGRESS **jp); ! void PyObject_FreeBG_JOB_PROGRESS_LIST(BG_JOB_PROGRESS *jp); BOOL PyObject_AsBG_JOB_TYPE(PyObject *ob, BG_JOB_TYPE *jt); void PyObject_FreeBG_JOB_TYPE(BG_JOB_TYPE *jt); - - BOOL PyObject_AsBG_JOB_TYPE_LIST(PyObject *ob, BG_JOB_TYPE **jt); - void PyObject_FreeBG_JOB_TYPE_LIST(BG_JOB_TYPE *jt); - - BOOL PyObject_AsBG_JOB_TIMES(PyObject *ob, BG_JOB_TIMES *jt); - void PyObject_FreeBG_JOB_TIMES(BG_JOB_TIMES *jt); - - BOOL PyObject_AsBG_JOB_TIMES_LIST(PyObject *ob, BG_JOB_TIMES **jt); - void PyObject_FreeBG_JOB_TIMES_LIST(BG_JOB_TIMES *jt); - - BOOL PyObject_AsBG_JOB_PRIORITY(PyObject *ob, BG_JOB_PRIORITY *jp); - void PyObject_FreeBG_JOB_PRIORITY(BG_JOB_PRIORITY jp); - - BOOL PyObject_AsBG_JOB_PRIORITY_LIST(PyObject *ob, BG_JOB_PRIORITY **jp); - void PyObject_FreeBG_JOB_PRIORITY_LIST(BG_JOB_PRIORITY *jp); - - BOOL PyObject_AsBG_JOB_PROXY_USAGE(PyObject *ob, BG_JOB_PROXY_USAGE *jp); - void PyObject_FreeBG_JOB_PROXY_USAGE(BG_JOB_PROXY_USAGE jp); - - BOOL PyObject_AsBG_JOB_PROXY_USAGE_LIST(PyObject *ob, BG_JOB_PROXY_USAGE **jp); - void PyObject_FreeBG_JOB_PROXY_USAGE_LIST(BG_JOB_PROXY_USAGE *jp); --- 5,21 ---- #include <PythonCOM.h> ! BOOL PyObject_AsBG_FILE_INFO_LIST(PyObject *ob, ULONG *pnum, BG_FILE_INFO **fi); ! void PyObject_FreeBG_FILE_INFO_LIST(ULONG pnum, BG_FILE_INFO *fi); ! BOOL PyObject_AsBG_FILE_RANGE_LIST(PyObject *ob, DWORD *pnum, BG_FILE_RANGE **fr); ! void PyObject_FreeBG_FILE_RANGE_LIST(DWORD num, BG_FILE_RANGE *fr); ! PyObject *PyObject_FromBG_FILE_PROGRESS(BG_FILE_PROGRESS *fp); ! PyObject *PyObject_FromBG_JOB_PROGRESS(BG_JOB_PROGRESS *jp); ! PyObject *PyObject_FromBG_JOB_REPLY_PROGRESS(BG_JOB_REPLY_PROGRESS *jrs); ! PyObject *PyObject_FromBG_JOB_TIMES(BG_JOB_TIMES *jt); ! BOOL PyObject_AsBG_AUTH_CREDENTIALS(PyObject *ob, BG_AUTH_CREDENTIALS *pRet); BOOL PyObject_AsBG_JOB_TYPE(PyObject *ob, BG_JOB_TYPE *jt); void PyObject_FreeBG_JOB_TYPE(BG_JOB_TYPE *jt); Index: PyIBackgroundCopyJob.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyJob.cpp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** PyIBackgroundCopyJob.cpp 7 Feb 2008 06:07:33 -0000 1.1.2.3 --- PyIBackgroundCopyJob.cpp 7 Feb 2008 08:01:42 -0000 1.1.2.4 *************** *** 31,53 **** if ( pIBCJ == NULL ) return NULL; ! // @pyparm int|cFileCount||Description for cFileCount ! // *** The input argument pFileSet of type "BG_FILE_INFO *" was not processed *** ! // Please check the conversion function is appropriate and exists! ! BG_FILE_INFO *pFileSet; ! PyObject *obpFileSet; ! // @pyparm <o PyBG_FILE_INFO *>|pFileSet||Description for pFileSet ULONG cFileCount; ! if ( !PyArg_ParseTuple(args, "lO:AddFileSet", &cFileCount, &obpFileSet) ) [...1020 lines suppressed...] PY_INTERFACE_PRECALL; hr = pIBCJ->TakeOwnership( ); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob ); ! Py_INCREF(Py_None); ! return Py_None; } --- 674,681 ---- PY_INTERFACE_PRECALL; hr = pIBCJ->TakeOwnership( ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ, IID_IBackgroundCopyJob ); ! return PyInt_FromLong(hr); } Index: PyIBackgroundCopyJob2.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyJob2.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** PyIBackgroundCopyJob2.cpp 7 Feb 2008 06:07:33 -0000 1.1.2.2 --- PyIBackgroundCopyJob2.cpp 7 Feb 2008 08:01:42 -0000 1.1.2.3 *************** *** 49,60 **** SysFreeString(Program); SysFreeString(Parameters); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); Py_INCREF(Py_None); return Py_None; - } --- 49,57 ---- *************** *** 65,91 **** if ( pIBCJ2 == NULL ) return NULL; - LPWSTR * pProgram; - PyObject *obpProgram; - LPWSTR * pParameters; - PyObject *obpParameters; if ( !PyArg_ParseTuple(args, ":GetNotifyCmdLine") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetNotifyCmdLine( pProgram, pParameters ); ! PyObject_FreeLPWSTR(pProgram); ! PyObject_FreeLPWSTR(pParameters); ! PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! // *** The output argument pProgram of type "LPWSTR *" was not processed *** ! // The type 'LPWSTR *' (pProgram) is unknown. ! // *** The output argument pParameters of type "LPWSTR *" was not processed *** ! // The type 'LPWSTR *' (pParameters) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 62,80 ---- if ( pIBCJ2 == NULL ) return NULL; if ( !PyArg_ParseTuple(args, ":GetNotifyCmdLine") ) return NULL; + LPWSTR pProgram; + LPWSTR pParameters; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetNotifyCmdLine( &pProgram, &pParameters ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! PyObject *ret = Py_BuildValue("NN", PyWinObject_FromWCHAR(pProgram), PyWinObject_FromWCHAR(pParameters)); ! CoTaskMemFree(pProgram); ! CoTaskMemFree(pParameters); ! return ret; } *************** *** 96,118 **** if ( pIBCJ2 == NULL ) return NULL; - BG_JOB_REPLY_PROGRESS * pProgress; - PyObject *obpProgress; - // @pyparm <o PyBG_JOB_REPLY_PROGRESS *>|pProgress||Description for pProgress if ( !PyArg_ParseTuple(args, ":GetReplyProgress") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyProgress( pProgress ); ! // PyObject_FreeBG_JOB_REPLY_PROGRESS(pProgress); ! PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! // *** The output argument pProgress of type "BG_JOB_REPLY_PROGRESS *" was not processed *** ! // The type 'BG_JOB_REPLY_PROGRESS *' (pProgress) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 85,99 ---- if ( pIBCJ2 == NULL ) return NULL; if ( !PyArg_ParseTuple(args, ":GetReplyProgress") ) return NULL; HRESULT hr; + BG_JOB_REPLY_PROGRESS progress; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyProgress( &progress ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! return PyObject_FromBG_JOB_REPLY_PROGRESS(&progress); } *************** *** 123,149 **** if ( pIBCJ2 == NULL ) return NULL; ! byte ** ppBuffer; ! PyObject *obppBuffer; ! UINT64 * pLength; ! PyObject *obpLength; if ( !PyArg_ParseTuple(args, ":GetReplyData") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyData( ppBuffer, pLength ); ! // PyObject_Freebyte(ppBuffer); ! // PyObject_FreeUINT64(pLength); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! // *** The output argument ppBuffer of type "byte **" was not processed *** ! // The type 'byte **' (ppBuffer) is unknown. ! // *** The output argument pLength of type "UINT64 *" was not processed *** ! // The type 'UINT64 *' (pLength) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 104,127 ---- if ( pIBCJ2 == NULL ) return NULL; ! byte *pBuffer; ! UINT64 length; if ( !PyArg_ParseTuple(args, ":GetReplyData") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyData( &pBuffer, &length ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! PyObject *ret; ! if (pBuffer == NULL) { ! ret = Py_None; ! Py_INCREF(ret); ! } else { ! // MS docs the max size is 1MB - so why use an int64? ! ret = PyString_FromStringAndSize((char *)pBuffer, (Py_ssize_t)length); ! CoTaskMemFree(pBuffer); ! } ! return ret; } *************** *** 159,172 **** if ( !PyArg_ParseTuple(args, "O:SetReplyFileName", &obReplyFileName) ) return NULL; ! BOOL bPythonIsHappy = TRUE; ! if (bPythonIsHappy && !PyWinObject_AsBstr(obReplyFileName, &ReplyFileName)) bPythonIsHappy = FALSE; ! if (!bPythonIsHappy) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pIBCJ2->SetReplyFileName( ReplyFileName ); SysFreeString(ReplyFileName); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); --- 137,147 ---- if ( !PyArg_ParseTuple(args, "O:SetReplyFileName", &obReplyFileName) ) return NULL; ! if (!PyWinObject_AsBstr(obReplyFileName, &ReplyFileName)) ! return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pIBCJ2->SetReplyFileName( ReplyFileName ); SysFreeString(ReplyFileName); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); *************** *** 182,203 **** if ( pIBCJ2 == NULL ) return NULL; - LPWSTR * pReplyFileName; - PyObject *obpReplyFileName; if ( !PyArg_ParseTuple(args, ":GetReplyFileName") ) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyFileName( pReplyFileName ); ! PyObject_FreeLPWSTR(pReplyFileName); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! // *** The output argument pReplyFileName of type "LPWSTR *" was not processed *** ! // The type 'LPWSTR *' (pReplyFileName) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 157,172 ---- if ( pIBCJ2 == NULL ) return NULL; if ( !PyArg_ParseTuple(args, ":GetReplyFileName") ) return NULL; HRESULT hr; + WCHAR *rfn; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->GetReplyFileName(&rfn); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); ! PyObject *ret = PyWinObject_FromWCHAR(rfn); ! CoTaskMemFree(rfn); ! return ret; } *************** *** 208,225 **** if ( pIBCJ2 == NULL ) return NULL; ! if ( !PyArg_ParseTuple(args, ":SetCredentials") ) ! return NULL; ! BG_AUTH_CREDENTIALS *ac; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->SetCredentials(ac); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); Py_INCREF(Py_None); return Py_None; - } --- 177,195 ---- if ( pIBCJ2 == NULL ) return NULL; ! // @pyparm <o BG_AUTH_CREDENTIALS>|creds||Description for creds ! PyObject *obCreds; ! if ( !PyArg_ParseTuple(args, "O:SetCredentials", &obCreds) ) ! return NULL; ! BG_AUTH_CREDENTIALS creds; ! if (!PyObject_AsBG_AUTH_CREDENTIALS(obCreds, &creds)) ! return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCJ2->SetCredentials(&creds); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCJ2, IID_IBackgroundCopyJob2 ); Py_INCREF(Py_None); return Py_None; } Index: bits.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/bits.cpp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** bits.cpp 6 Feb 2008 09:10:25 -0000 1.1.2.3 --- bits.cpp 7 Feb 2008 08:01:42 -0000 1.1.2.4 *************** *** 13,245 **** # include "PythonCOMRegister.h" ! BOOL PyObject_AsDWORD(PyObject *ob, DWORD *dw) ! { ! return FALSE; ! } ! ! void PyObject_FreeDWORD(DWORD *dw) ! { ! } ! ! BOOL PyObject_AsULONG(PyObject *ob, ULONG *ul) ! { ! return FALSE; ! } ! ! void PyObject_FreeULONG(ULONG *ul) ! { ! } ! ! BOOL PyObject_AsULONG_LIST(PyObject *ob, ULONG **ul) ! { ! return FALSE; ! } ! ! void PyObject_FreeULONG_LIST(ULONG *ul) ! { ! } ! ! BOOL PyObject_AsWCHAR_LIST(PyObject *ob, WCHAR **wch) ! { ! return FALSE; ! } ! ! void PyObject_FreeWCHAR_LIST(WCHAR *wch) ! { ! } ! ! BOOL PyObject_AsconstWCHAR_LIST(PyObject *ob, const WCHAR **wch) ! { ! return FALSE; ! } ! ! void PyObject_FreeconstWCHAR_LIST(const WCHAR *wch) ! { ! } ! ! BOOL PyObject_AsGUID(PyObject *ob, GUID *guid) ! { ! return FALSE; ! } ! ! void PyObject_FreeGUID(GUID *guid) ! { ! } ! ! BOOL PyObject_AsLPWSTR(PyObject *ob, LPWSTR *lpw) ! { ! return FALSE; ! } ! ! void PyObject_FreeLPWSTR(LPWSTR *lpw) ! { ! } ! ! BOOL PyObject_AsLPWSTR_LIST(PyObject *ob, LPWSTR **lpw) ! { ! return FALSE; ! } ! ! void PyObject_FreeLPWSTR_LIST(LPWSTR *lpw) ! { ! } ! ! BOOL PyObject_AsBG_FILE_INFO(PyObject *ob, BG_FILE_INFO *fi) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_FILE_INFO(BG_FILE_INFO *fi) ! { ! } ! ! BOOL PyObject_AsBG_FILE_INFO_LIST(PyObject *ob, BG_FILE_INFO **fi) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_FILE_INFO_LIST(BG_FILE_INFO *fi) ! { ! } ! ! BOOL PyObject_AsBG_FILE_PROGRESS(PyObject *ob, BG_FILE_PROGRESS *fp) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_FILE_PROGRESS(BG_FILE_PROGRESS *fp) ! { ! } ! ! BOOL PyObject_AsBG_FILE_PROGRESS_LIST(PyObject *ob, BG_FILE_PROGRESS **fp) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_FILE_PROGRESS_LIST(BG_FILE_PROGRESS *fp) ! { ! } ! ! BOOL PyObject_AsBG_FILE_RANGE_LIST(PyObject *ob, BG_FILE_RANGE **fr) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_FILE_RANGE_LIST(BG_FILE_RANGE *fr) ! { ! } ! ! BOOL PyObject_AsBG_JOB_STATE(PyObject *ob, BG_JOB_STATE *js) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_JOB_STATE(BG_JOB_STATE *js) ! { ! } ! ! BOOL PyObject_AsBG_JOB_STATE_LIST(PyObject *ob, BG_JOB_STATE **js) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_JOB_STATE_LIST(BG_JOB_STATE *js) ! { ! } ! ! BOOL PyObject_AsBG_JOB_PROGRESS(PyObject *ob, BG_JOB_PROGRESS *jp) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_JOB_PROGRESS(BG_JOB_PROGRESS *jp) ! { ! } ! ! BOOL PyObject_AsBG_JOB_PROGRESS_LIST(PyObject *ob, BG_JOB_PROGRESS **jp) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_JOB_PROGRESS_LIST(BG_JOB_PROGRESS *jp) ! { ! } ! ! ! BOOL PyObject_AsBG_JOB_TYPE(PyObject *ob, BG_JOB_TYPE *jt) { ! if (ob && !PyInt_Check(ob)){ return FALSE; - } - *jt = (BG_JOB_TYPE)PyInt_AsLong(ob); - return TRUE; - } - - void PyObject_FreeBG_JOB_TYPE(BG_JOB_TYPE *jt) - { } ! BOOL PyObject_AsBG_JOB_TYPE_LIST(PyObject *ob, BG_JOB_TYPE **jt) ! { ! return FALSE; ! } ! ! void PyObject_FreeBG_JOB_TYPE_LIST(BG_JOB_TYPE *jt) { } - BOOL PyObject_AsBG_JOB_TIMES(PyObject *ob, BG_JOB_TIMES *jt) - { - return FALSE; - } ! void PyObject_FreeBG_JOB_TIMES(BG_JOB_TIMES *jt) ! { ! } ! ! BOOL PyObject_AsBG_JOB_TIMES_LIST(PyObject *ob, BG_JOB_TIMES **jt) { ! return FALSE; } ! ! void PyObject_FreeBG_JOB_TIMES_LIST(BG_JOB_TIMES *jt) { } ! BOOL PyObject_AsBG_JOB_PRIORITY(PyObject *ob, BG_JOB_PRIORITY *jp) { ! return FALSE; } ! void PyObject_FreeBG_JOB_PRIORITY(BG_JOB_PRIORITY jp) { ! } - BOOL PyObject_AsBG_JOB_PRIORITY_LIST(PyObject *ob, BG_JOB_PRIORITY **jp) - { - return FALSE; } ! ! void PyObject_FreeBG_JOB_PRIORITY_LIST(BG_JOB_PRIORITY *jp) { } ! BOOL PyObject_AsBG_JOB_PROXY_USAGE(PyObject *ob, BG_JOB_PROXY_USAGE *jp) { ! return FALSE; } ! void PyObject_FreeBG_JOB_PROXY_USAGE(BG_JOB_PROXY_USAGE jp) { } - BOOL PyObject_AsBG_JOB_PROXY_USAGE_LIST(PyObject *ob, BG_JOB_PROXY_USAGE **jp) - { - return FALSE; - } - void PyObject_FreeBG_JOB_PROXY_USAGE_LIST(BG_JOB_PROXY_USAGE *jp) - { - } static struct PyMethodDef bits_methods[]= --- 13,64 ---- # include "PythonCOMRegister.h" ! BOOL PyObject_AsBG_FILE_INFO_LIST(PyObject *ob, ULONG *pnum, BG_FILE_INFO **fi) { ! PyErr_SetString(PyExc_NotImplementedError, "fix me"); return FALSE; } ! void PyObject_FreeBG_FILE_INFO_LIST(ULONG pnum, BG_FILE_INFO *fi) { } ! BOOL PyObject_AsBG_FILE_RANGE_LIST(PyObject *ob, DWORD *pnum, BG_FILE_RANGE **fr) { ! PyErr_SetString(PyExc_NotImplementedError, "fix me"); ! return FALSE; } ! void PyObject_FreeBG_FILE_RANGE_LIST(DWORD num, BG_FILE_RANGE *fr) { + } ! PyObject *PyObject_FromBG_FILE_PROGRESS(BG_FILE_PROGRESS *fp) { ! return Py_BuildValue("NNi", PyLong_FromLongLong(fp->BytesTotal), PyLong_FromLongLong(fp->BytesTransferred), fp->Completed); } ! PyObject *PyObject_FromBG_JOB_PROGRESS(BG_JOB_PROGRESS *jp) { ! return Py_BuildValue("NNkk", PyLong_FromLongLong(jp->BytesTotal), PyLong_FromLongLong(jp->BytesTransferred), jp->FilesTotal, jp->FilesTransferred); } ! PyObject *PyObject_FromBG_JOB_REPLY_PROGRESS(BG_JOB_REPLY_PROGRESS *jrs) { + return Py_BuildValue("NN", PyLong_FromLongLong(jrs->BytesTotal), PyLong_FromLongLong(jrs->BytesTransferred)); } ! PyObject *PyObject_FromBG_JOB_TIMES(BG_JOB_TIMES *jt) { ! return Py_BuildValue("NNN", PyWinObject_FromFILETIME(jt->CreationTime), PyWinObject_FromFILETIME(jt->ModificationTime), PyWinObject_FromFILETIME(jt->TransferCompletionTime)); } ! BOOL PyObject_AsBG_AUTH_CREDENTIALS(PyObject *ob, BG_AUTH_CREDENTIALS *pRet) { + PyErr_SetString(PyExc_NotImplementedError, "fix me"); + return FALSE; } static struct PyMethodDef bits_methods[]= Index: PyIBackgroundCopyFile.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/bits/src/Attic/PyIBackgroundCopyFile.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** PyIBackgroundCopyFile.cpp 7 Feb 2008 06:07:33 -0000 1.1.2.2 --- PyIBackgroundCopyFile.cpp 7 Feb 2008 08:01:42 -0000 1.1.2.3 *************** *** 37,48 **** PY_INTERFACE_PRECALL; hr = pIBCF->GetRemoteName( &pVal ); - // PyObject_FreeLPWSTR_LIST(pVal); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! ! return PyWinObject_FromWCHAR(pVal); } --- 37,46 ---- PY_INTERFACE_PRECALL; hr = pIBCF->GetRemoteName( &pVal ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! PyObject *ret = PyWinObject_FromWCHAR(pVal); ! CoTaskMemFree(pVal); ! return ret; } *************** *** 59,69 **** PY_INTERFACE_PRECALL; hr = pIBCF->GetLocalName( &pVal ); - PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! ! return PyWinObject_FromWCHAR(pVal); } --- 57,66 ---- PY_INTERFACE_PRECALL; hr = pIBCF->GetLocalName( &pVal ); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! PyObject *ret = PyWinObject_FromWCHAR(pVal); ! CoTaskMemFree(pVal); ! return ret; } *************** *** 74,101 **** if ( pIBCF == NULL ) return NULL; ! // *** The input argument pVal of type "BG_FILE_PROGRESS *" was not processed *** ! // Please check the conversion function is appropriate and exists! ! BG_FILE_PROGRESS * pVal; ! PyObject *obpVal; ! // @pyparm <o PyBG_FILE_PROGRESS *>|pVal||Description for pVal ! if ( !PyArg_ParseTuple(args, "O:GetProgress", &obpVal) ) return NULL; - BOOL bPythonIsHappy = TRUE; - if (bPythonIsHappy && !PyObject_AsBG_FILE_PROGRESS_LIST( obpVal, &pVal )) bPythonIsHappy = FALSE; - if (!bPythonIsHappy) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; ! hr = pIBCF->GetProgress( pVal ); ! PyObject_FreeBG_FILE_PROGRESS_LIST(pVal); ! PY_INTERFACE_POSTCALL; - if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! // *** The output argument pVal of type "BG_FILE_PROGRESS *" was not processed *** ! // The type 'BG_FILE_PROGRESS *' (pVal) is unknown. ! Py_INCREF(Py_None); ! return Py_None; ! } --- 71,84 ---- if ( pIBCF == NULL ) return NULL; ! if ( !PyArg_ParseTuple(args, ":GetProgress") ) return NULL; HRESULT hr; + BG_FILE_PROGRESS val; PY_INTERFACE_PRECALL; ! hr = pIBCF->GetProgress(&val); PY_INTERFACE_POSTCALL; if ( FAILED(hr) ) return PyCom_BuildPyException(hr, pIBCF, IID_IBackgroundCopyFile ); ! return PyObject_FromBG_FILE_PROGRESS(&val); } |
