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

Properly handle unsigned values. Not part of default build. a=mkaply.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@172759 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com 2005-04-26 23:00:18 +00:00
parent adb5c60b03
commit e0276f5926
2 changed files with 171 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
View File

@ -58,23 +58,21 @@ CreateJavaArray(JNIEnv* env, PRUint8 aType, PRUint32 aSize, const nsID& aIID,
switch (aType)
{
case nsXPTType::T_I8:
case nsXPTType::T_U8:
array = env->NewByteArray(aSize);
break;
case nsXPTType::T_I16:
case nsXPTType::T_U16:
case nsXPTType::T_U8:
array = env->NewShortArray(aSize);
break;
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_VOID:
case nsXPTType::T_U16:
array = env->NewIntArray(aSize);
break;
case nsXPTType::T_I64:
case nsXPTType::T_U64:
case nsXPTType::T_U32:
array = env->NewLongArray(aSize);
break;
@ -82,6 +80,8 @@ CreateJavaArray(JNIEnv* env, PRUint8 aType, PRUint32 aSize, const nsID& aIID,
array = env->NewFloatArray(aSize);
break;
// XXX how do we handle unsigned 64-bit values?
case nsXPTType::T_U64:
case nsXPTType::T_DOUBLE:
array = env->NewDoubleArray(aSize);
break;
@ -136,6 +136,10 @@ CreateJavaArray(JNIEnv* env, PRUint8 aType, PRUint32 aSize, const nsID& aIID,
break;
}
case nsXPTType::T_VOID:
array = env->NewIntArray(aSize);
break;
default:
NS_WARNING("unknown type");
return NS_ERROR_FAILURE;
@ -251,7 +255,6 @@ CreateNativeArray(PRUint8 aType, PRUint32 aSize, void** aResult)
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_VOID:
array = PR_Malloc(aSize * sizeof(PRUint32));
break;
@ -292,6 +295,10 @@ CreateNativeArray(PRUint8 aType, PRUint32 aSize, void** aResult)
array = PR_Malloc(aSize * sizeof(void*));
break;
case nsXPTType::T_VOID:
array = PR_Malloc(aSize * sizeof(PRUint32));
break;
default:
NS_WARNING("unknown type");
return NS_ERROR_FAILURE;
@ -317,11 +324,10 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
switch (aType)
{
case nsXPTType::T_I8:
case nsXPTType::T_U8:
{
LOG(("byte\n"));
if (!aIsOut && !aIsArrayElement) { // 'in'
aVariant.val.u8 = env->CallByteMethod(aParam, byteValueMID);
aVariant.val.i8 = env->CallByteMethod(aParam, byteValueMID);
} else { // 'inout' & 'array'
jbyte value;
if (aParam) {
@ -330,25 +336,25 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
if (aIsOut) { // 'inout'
if (aParam) {
aVariant.val.u8 = value;
aVariant.val.i8 = value;
aVariant.ptr = &aVariant.val;
} else {
aVariant.ptr = nsnull;
}
aVariant.SetPtrIsData();
} else { // 'array'
NS_STATIC_CAST(PRUint8*, aVariant.val.p)[aIndex] = value;
NS_STATIC_CAST(PRInt8*, aVariant.val.p)[aIndex] = value;
}
}
break;
}
case nsXPTType::T_I16:
case nsXPTType::T_U16:
case nsXPTType::T_U8: // C++ unsigned octet <=> Java short
{
LOG(("short\n"));
if (!aIsOut && !aIsArrayElement) { // 'in'
aVariant.val.u16 = env->CallShortMethod(aParam, shortValueMID);
aVariant.val.i16 = env->CallShortMethod(aParam, shortValueMID);
} else { // 'inout' & 'array'
jshort value;
if (aParam) {
@ -357,25 +363,28 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
if (aIsOut) { // 'inout'
if (aParam) {
aVariant.val.u16 = value;
aVariant.val.i16 = value;
aVariant.ptr = &aVariant.val;
} else {
aVariant.ptr = nsnull;
}
aVariant.SetPtrIsData();
} else { // 'array'
NS_STATIC_CAST(PRUint16*, aVariant.val.p)[aIndex] = value;
if (aType == nsXPTType::T_I16)
NS_STATIC_CAST(PRInt16*, aVariant.val.p)[aIndex] = value;
else
NS_STATIC_CAST(PRUint8*, aVariant.val.p)[aIndex] = value;
}
}
break;
}
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_U16: // C++ unsigned short <=> Java int
{
LOG(("int\n"));
if (!aIsOut && !aIsArrayElement) { // 'in'
aVariant.val.u32 = env->CallIntMethod(aParam, intValueMID);
aVariant.val.i32 = env->CallIntMethod(aParam, intValueMID);
} else { // 'inout' & 'array'
jint value;
if (aParam) {
@ -384,25 +393,28 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
if (aIsOut) { // 'inout'
if (aParam) {
aVariant.val.u32 = value;
aVariant.val.i32 = value;
aVariant.ptr = &aVariant.val;
} else {
aVariant.ptr = nsnull;
}
aVariant.SetPtrIsData();
} else { // 'array'
NS_STATIC_CAST(PRUint32*, aVariant.val.p)[aIndex] = value;
if (aType == nsXPTType::T_I32)
NS_STATIC_CAST(PRInt32*, aVariant.val.p)[aIndex] = value;
else
NS_STATIC_CAST(PRUint16*, aVariant.val.p)[aIndex] = value;
}
}
break;
}
case nsXPTType::T_I64:
case nsXPTType::T_U64:
case nsXPTType::T_U32: // C++ unsigned int <=> Java long
{
LOG(("long\n"));
if (!aIsOut && !aIsArrayElement) { // 'in'
aVariant.val.u64 = env->CallLongMethod(aParam, longValueMID);
aVariant.val.i64 = env->CallLongMethod(aParam, longValueMID);
} else { // 'inout' & 'array'
jlong value;
if (aParam) {
@ -411,14 +423,17 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
if (aIsOut) { // 'inout'
if (aParam) {
aVariant.val.u64 = value;
aVariant.val.i64 = value;
aVariant.ptr = &aVariant.val;
} else {
aVariant.ptr = nsnull;
}
aVariant.SetPtrIsData();
} else { // 'array'
NS_STATIC_CAST(PRUint64*, aVariant.val.p)[aIndex] = value;
if (aType == nsXPTType::T_I64)
NS_STATIC_CAST(PRInt64*, aVariant.val.p)[aIndex] = value;
else
NS_STATIC_CAST(PRUint32*, aVariant.val.p)[aIndex] = value;
}
}
break;
@ -450,11 +465,17 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
break;
}
// XXX how do we handle unsigned 64-bit value?
case nsXPTType::T_U64: // C++ unsigned long <=> Java double
case nsXPTType::T_DOUBLE:
{
LOG(("double\n"));
if (!aIsOut && !aIsArrayElement) { // 'in'
aVariant.val.d = env->CallDoubleMethod(aParam, doubleValueMID);
jdouble value = env->CallDoubleMethod(aParam, doubleValueMID);
if (aType == nsXPTType::T_DOUBLE)
aVariant.val.d = value;
else
aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value);
} else { // 'inout' & 'array'
jdouble value;
if (aParam) {
@ -463,14 +484,21 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
if (aIsOut) { // 'inout'
if (aParam) {
aVariant.val.d = value;
if (aType == nsXPTType::T_DOUBLE)
aVariant.val.d = value;
else
aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value);
aVariant.ptr = &aVariant.val;
} else {
aVariant.ptr = nsnull;
}
aVariant.SetPtrIsData();
} else { // 'array'
NS_STATIC_CAST(double*, aVariant.val.p)[aIndex] = value;
if (aType == nsXPTType::T_DOUBLE)
NS_STATIC_CAST(double*, aVariant.val.p)[aIndex] = value;
else
NS_STATIC_CAST(PRUint64*, aVariant.val.p)[aIndex] =
NS_STATIC_CAST(PRUint64, value);
}
}
break;
@ -900,10 +928,9 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
switch (aType)
{
case nsXPTType::T_I8:
case nsXPTType::T_U8:
{
if (NS_SUCCEEDED(aInvokeResult)) {
jbyte value = aVariant.val.u8;
jbyte value = aVariant.val.i8;
if (aParamInfo.IsRetval() && !aIsArrayElement) {
*aParam = env->NewObject(byteClass, byteInitMID, value);
} else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {
@ -914,10 +941,11 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
}
case nsXPTType::T_I16:
case nsXPTType::T_U16:
case nsXPTType::T_U8:
{
if (NS_SUCCEEDED(aInvokeResult)) {
jshort value = aVariant.val.u16;
jshort value = (aType == nsXPTType::T_I16) ? aVariant.val.i16 :
aVariant.val.u8;
if (aParamInfo.IsRetval() && !aIsArrayElement) {
*aParam = env->NewObject(shortClass, shortInitMID, value);
} else if ((aParamInfo.IsOut() || aIsArrayElement) && aParam) {
@ -928,10 +956,11 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
}
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_U16:
{
if (NS_SUCCEEDED(aInvokeResult)) {
jint value = aVariant.val.u32;
jint value = (aType == nsXPTType::T_I32) ? aVariant.val.i32 :
aVariant.val.u16;
if (aParamInfo.IsRetval() && !aIsArrayElement) {
*aParam = env->NewObject(intClass, intInitMID, value);
} else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {
@ -942,10 +971,11 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
}
case nsXPTType::T_I64:
case nsXPTType::T_U64:
case nsXPTType::T_U32:
{
if (NS_SUCCEEDED(aInvokeResult)) {
jlong value = aVariant.val.u64;
jlong value = (aType == nsXPTType::T_I64) ? aVariant.val.i64 :
aVariant.val.u32;
if (aParamInfo.IsRetval() && !aIsArrayElement) {
*aParam = env->NewObject(longClass, longInitMID, value);
} else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {
@ -968,10 +998,13 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
break;
}
// XXX how do we handle unsigned 64-bit values?
case nsXPTType::T_U64:
case nsXPTType::T_DOUBLE:
{
if (NS_SUCCEEDED(aInvokeResult)) {
jdouble value = aVariant.val.d;
jdouble value = (aType == nsXPTType::T_DOUBLE) ? aVariant.val.d :
aVariant.val.u64;
if (aParamInfo.IsRetval() && !aIsArrayElement) {
*aParam = env->NewObject(doubleClass, doubleInitMID, value);
} else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {

192
mozilla/extensions/java/xpcom/nsJavaXPTCStub.cpp
View File

@ -588,10 +588,9 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
switch (tag)
{
case nsXPTType::T_I8:
case nsXPTType::T_U8:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.b = aVariant.val.u8;
aJValue.b = aVariant.val.i8;
aMethodSig.Append('B');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
@ -612,10 +611,11 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
break;
case nsXPTType::T_I16:
case nsXPTType::T_U16:
case nsXPTType::T_U8:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.s = aVariant.val.u16;
aJValue.s = (tag == nsXPTType::T_I16) ? aVariant.val.i16 :
aVariant.val.u8;
aMethodSig.Append('S');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
@ -636,10 +636,11 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
break;
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_U16:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.i = aVariant.val.u32;
aJValue.i = (tag == nsXPTType::T_I32) ? aVariant.val.i32 :
aVariant.val.u16;
aMethodSig.Append('I');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
@ -660,10 +661,11 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
break;
case nsXPTType::T_I64:
case nsXPTType::T_U64:
case nsXPTType::T_U32:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.j = aVariant.val.u64;
aJValue.j = (tag == nsXPTType::T_I64) ? aVariant.val.i64 :
aVariant.val.u32;
aMethodSig.Append('J');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
@ -706,10 +708,13 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
}
break;
// XXX how do we handle unsigned 64-bit values?
case nsXPTType::T_U64:
case nsXPTType::T_DOUBLE:
{
if (!aParamInfo.IsOut()) { // 'in'
aJValue.d = aVariant.val.d;
aJValue.d = (tag == nsXPTType::T_DOUBLE) ? aVariant.val.d :
aVariant.val.u64;
aMethodSig.Append('D');
} else { // 'inout' & 'out'
if (aVariant.val.p) {
@ -1041,22 +1046,21 @@ nsJavaXPTCStub::GetRetvalSig(const nsXPTParamInfo* aParamInfo,
switch (tag)
{
case nsXPTType::T_I8:
case nsXPTType::T_U8:
aRetvalSig.Append('B');
break;
case nsXPTType::T_I16:
case nsXPTType::T_U16:
case nsXPTType::T_U8:
aRetvalSig.Append('S');
break;
case nsXPTType::T_I32:
case nsXPTType::T_U32:
case nsXPTType::T_U16:
aRetvalSig.Append('I');
break;
case nsXPTType::T_I64:
case nsXPTType::T_U64:
case nsXPTType::T_U32:
aRetvalSig.Append('J');
break;
@ -1064,6 +1068,7 @@ nsJavaXPTCStub::GetRetvalSig(const nsXPTParamInfo* aParamInfo,
aRetvalSig.Append('F');
break;
case nsXPTType::T_U64:
case nsXPTType::T_DOUBLE:
aRetvalSig.Append('D');
break;
@ -1128,57 +1133,69 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
switch (tag)
{
case nsXPTType::T_I8:
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRInt8 *) aVariant.val.p) = aJValue.b;
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetByteArrayRegion((jbyteArray) aJValue.l, 0, 1,
(PRInt8 *) aVariant.val.p);
}
}
break;
case nsXPTType::T_U8:
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint8 *) aVariant.val.p) = aJValue.b;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetByteArrayRegion((jbyteArray) aJValue.l, 0, 1,
(jbyte*) aVariant.val.p);
}
}
}
break;
case nsXPTType::T_I16:
{
jshort value = 0;
if (aParamInfo.IsRetval()) { // 'retval'
value = aJValue.s;
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetShortArrayRegion((jshortArray) aJValue.l, 0, 1, &value);
}
if (aVariant.val.p) {
if (tag == nsXPTType::T_U8)
*((PRUint8 *) aVariant.val.p) = value;
else
*((PRInt16 *) aVariant.val.p) = value;
}
}
break;
case nsXPTType::T_U16:
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint16 *) aVariant.val.p) = aJValue.s;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetShortArrayRegion((jshortArray) aJValue.l, 0, 1,
(jshort*) aVariant.val.p);
}
}
}
break;
case nsXPTType::T_I32:
case nsXPTType::T_U32:
{
jint value = 0;
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint32 *) aVariant.val.p) = aJValue.i;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetIntArrayRegion((jintArray) aJValue.l, 0, 1,
(jint*) aVariant.val.p);
}
value = aJValue.i;
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetIntArrayRegion((jintArray) aJValue.l, 0, 1, &value);
}
if (aVariant.val.p) {
if (tag == nsXPTType::T_U16)
*((PRUint16 *) aVariant.val.p) = value;
else
*((PRInt32 *) aVariant.val.p) = value;
}
}
break;
case nsXPTType::T_U32:
case nsXPTType::T_I64:
case nsXPTType::T_U64:
{
jlong value = 0;
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint64 *) aVariant.val.p) = aJValue.j;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetLongArrayRegion((jlongArray) aJValue.l, 0, 1,
(jlong*) aVariant.val.p);
}
value = aJValue.j;
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetLongArrayRegion((jlongArray) aJValue.l, 0, 1, &value);
}
if (aVariant.val.p) {
if (tag == nsXPTType::T_U32)
*((PRUint32 *) aVariant.val.p) = value;
else
*((PRInt64 *) aVariant.val.p) = value;
}
}
break;
@ -1187,24 +1204,29 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
{
if (aParamInfo.IsRetval()) { // 'retval'
*((float *) aVariant.val.p) = aJValue.f;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetFloatArrayRegion((jfloatArray) aJValue.l, 0, 1,
(jfloat*) aVariant.val.p);
}
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetFloatArrayRegion((jfloatArray) aJValue.l, 0, 1,
(jfloat*) aVariant.val.p);
}
}
break;
// XXX how do we handle 64-bit values?
case nsXPTType::T_U64:
case nsXPTType::T_DOUBLE:
{
jdouble value = 0;
if (aParamInfo.IsRetval()) { // 'retval'
*((double *) aVariant.val.p) = aJValue.d;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetDoubleArrayRegion((jdoubleArray) aJValue.l, 0, 1,
(jdouble*) aVariant.val.p);
}
value = aJValue.d;
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetDoubleArrayRegion((jdoubleArray) aJValue.l, 0, 1, &value);
}
if (aVariant.val.p) {
if (tag == nsXPTType::T_DOUBLE)
*((double *) aVariant.val.p) = value;
else
*((PRUint64 *) aVariant.val.p) = NS_STATIC_CAST(PRUint64, value);
}
}
break;
@ -1213,11 +1235,9 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRBool *) aVariant.val.p) = aJValue.z;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetBooleanArrayRegion((jbooleanArray) aJValue.l, 0, 1,
(jboolean*) aVariant.val.p);
}
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetBooleanArrayRegion((jbooleanArray) aJValue.l, 0, 1,
(jboolean*) aVariant.val.p);
}
}
break;
@ -1230,23 +1250,21 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
*((char *) aVariant.val.p) = aJValue.c;
else
*((PRUnichar *) aVariant.val.p) = aJValue.c;
} else { // 'inout' & 'out'
if (aJValue.l) {
jchar* array = mJavaEnv->GetCharArrayElements((jcharArray) aJValue.l,
nsnull);
if (!array) {
rv = NS_ERROR_OUT_OF_MEMORY;
break;
}
if (type.TagPart() == nsXPTType::T_CHAR)
*((char *) aVariant.val.p) = array[0];
else
*((PRUnichar *) aVariant.val.p) = array[0];
mJavaEnv->ReleaseCharArrayElements((jcharArray) aJValue.l, array,
JNI_ABORT);
} else if (aJValue.l) { // 'inout' & 'out'
jchar* array = mJavaEnv->GetCharArrayElements((jcharArray) aJValue.l,
nsnull);
if (!array) {
rv = NS_ERROR_OUT_OF_MEMORY;
break;
}
if (type.TagPart() == nsXPTType::T_CHAR)
*((char *) aVariant.val.p) = array[0];
else
*((PRUnichar *) aVariant.val.p) = array[0];
mJavaEnv->ReleaseCharArrayElements((jcharArray) aJValue.l, array,
JNI_ABORT);
}
}
break;
@ -1589,11 +1607,9 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
{
if (aParamInfo.IsRetval()) { // 'retval'
*((PRUint32 *) aVariant.val.p) = aJValue.i;
} else { // 'inout' & 'out'
if (aJValue.l) {
mJavaEnv->GetIntArrayRegion((jintArray) aJValue.l, 0, 1,
(jint*) aVariant.val.p);
}
} else if (aJValue.l) { // 'inout' & 'out'
mJavaEnv->GetIntArrayRegion((jintArray) aJValue.l, 0, 1,
(jint*) aVariant.val.p);
}
}
break;