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

Bug 320441 - JavaXPCOM is not 64-bit safe. patch by bsmedberg and myself. r=bsmedberg

Browse Source 
Original committer: pedemont%us.ibm.com
Original revision: 1.37
Original date: 2005/12/15 22:50:37


git-svn-id: svn://10.0.0.236/trunk@212609 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com 2006-09-27 15:17:33 +00:00
parent 6204fb11f5
commit b169cf78d5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
View File

@ -480,7 +480,7 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
case nsXPTType::T_I64:
case nsXPTType::T_U32:
retval.i = env->CallLongMethodA(javaObject, mid, java_params);
retval.j = env->CallLongMethodA(javaObject, mid, java_params);
break;
case nsXPTType::T_FLOAT:
@ -514,7 +514,7 @@ nsJavaXPTCStub::CallMethod(PRUint16 aMethodIndex,
break;
case nsXPTType::T_VOID:
retval.i = env->CallIntMethodA(javaObject, mid, java_params);
retval.j = env->CallLongMethodA(javaObject, mid, java_params);
break;
default:
@ -1026,26 +1026,26 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
}
break;
// Pass the 'void*' address as an integer
// Pass the 'void*' address as a long
case nsXPTType::T_VOID:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.i = (jint) aVariant.val.p;
aMethodSig.Append('I');
aJValue.j = (jlong) aVariant.val.p;
aMethodSig.Append('J');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
jintArray array = env->NewIntArray(1);
jlongArray array = env->NewLongArray(1);
if (!array) {
rv = NS_ERROR_OUT_OF_MEMORY;
break;
}
env->SetIntArrayRegion(array, 0, 1, (jint*) aVariant.val.p);
env->SetLongArrayRegion(array, 0, 1, (jlong*) aVariant.val.p);
aJValue.l = array;
} else {
aJValue.l = nsnull;
}
aMethodSig.AppendLiteral("[I");
aMethodSig.AppendLiteral("[J");
}
}
break;
@ -1154,7 +1154,7 @@ nsJavaXPTCStub::GetRetvalSig(const nsXPTParamInfo* aParamInfo,
break;
case nsXPTType::T_VOID:
aRetvalSig.Append('I');
aRetvalSig.Append('J');
break;
case nsXPTType::T_ARRAY:
@ -1659,10 +1659,10 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
case nsXPTType::T_VOID:
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint32 *) aVariant.val.p) = aJValue.i;
aVariant.val.p = NS_REINTERPRET_CAST(void*, aJValue.j);
} else if (aJValue.l) { // 'inout' & 'out'
env->GetIntArrayRegion((jintArray) aJValue.l, 0, 1,
(jint*) aVariant.val.p);
env->GetLongArrayRegion((jlongArray) aJValue.l, 0, 1,
(jlong*) aVariant.val.p);
}
}
break;