Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get pyxpcom working with the recent nsXPTCStubBase changes.

Browse Source 
Not part of the default build.


git-svn-id: svn://10.0.0.236/trunk@218425 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2007-01-16 06:44:38 +00:00
parent 36c361bd03
commit 943fd850bc
5 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/extensions/python/xpcom/src/VariantUtils.cpp
View File

@@ -1865,7 +1865,7 @@ PyObject *PyXPCOM_InterfaceVariantHelper::MakePythonResult()
**************************************************************************
*************************************************************************/
PyXPCOM_GatewayVariantHelper::PyXPCOM_GatewayVariantHelper( PyG_Base *gw, int method_index, const nsXPTMethodInfo *info, nsXPTCMiniVariant* params )
PyXPCOM_GatewayVariantHelper::PyXPCOM_GatewayVariantHelper( PyG_Base *gw, int method_index, const XPTMethodDescriptor *info, nsXPTCMiniVariant* params )
{
m_params = params;
m_info = info;
@@ -1896,7 +1896,7 @@ PyObject *PyXPCOM_GatewayVariantHelper::MakePyArgs()
// we pass to Python
int i;
for (i=0;i<m_info->num_args;i++) {
nsXPTParamInfo *pi = (nsXPTParamInfo *)m_info->params+i;
XPTParamDescriptor *pi = m_info->params+i;
PythonTypeDescriptor &td = m_python_type_desc_array[i];
td.param_flags = pi->flags;
td.type_flags = pi->type.prefix.flags;
@@ -2166,7 +2166,7 @@ nsresult PyXPCOM_GatewayVariantHelper::GetArrayType(PRUint8 index, PRUint8 *ret,
if (NS_FAILED(rc))
return rc;
nsXPTType datumType;
const nsXPTParamInfo& param_info = m_info->GetParam((PRUint8)index);
const nsXPTParamInfo& param_info = m_info->params[index];
rc = ii->GetTypeForParam(m_method_index, &param_info, 1, &datumType);
if (NS_FAILED(rc))
return rc;
@@ -2716,7 +2716,7 @@ nsresult PyXPCOM_GatewayVariantHelper::ProcessPythonResult(PyObject *ret_ob)
// If they havent given enough, we don't really care.
// although a warning is probably appropriate.
if (num_user_results != num_results) {
const char *method_name = m_info->GetName();
const char *method_name = m_info->name;
PyXPCOM_LogWarning("The method '%s' has %d out params, but %d were supplied by the Python code\n",
method_name,
num_results,
@@ -2732,12 +2732,12 @@ nsresult PyXPCOM_GatewayVariantHelper::ProcessPythonResult(PyObject *ret_ob)
Py_DECREF(sub);
this_py_index = 1;
}
for (i=0;NS_SUCCEEDED(rc) && i<m_info->GetParamCount();i++) {
for (i=0;NS_SUCCEEDED(rc) && i<m_info->num_args;i++) {
// If we've already done it, or don't need to do it!
if (i==index_retval || m_python_type_desc_array[i].is_auto_out)
continue;
nsXPTParamInfo *pi = (nsXPTParamInfo *)m_info->params+i;
if (pi->IsOut()) {
XPTParamDescriptor *pi = m_info->params+i;
if (XPT_PD_IS_OUT(pi->flags)) {
PyObject *sub = PySequence_GetItem(user_result, this_py_index);
if (sub==NULL)
return NS_ERROR_FAILURE;