mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

*not part of tbox build* 

fix for 56954
This commit is contained in:
idk%eng.sun.com 2000-10-17 08:28:15 +00:00
Родитель 8685390f44
Коммит 0bd1ad3e11
3 изменённых файлов: 86 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
java/xpcom/java/src/bcJavaGlobal.h
Просмотреть файл

@ -24,6 +24,13 @@
#include "nscore.h" #include "nscore.h"
#include "jni.h" #include "jni.h"
#define EXCEPTION_CHECKING(env) \
do { \
if ((env)->ExceptionOccurred()) { \
(env)->ExceptionDescribe(); \
} \
} while (0);
class bcJavaGlobal { class bcJavaGlobal {
public: public:
static JNIEnv * GetJNIEnv(void); static JNIEnv * GetJNIEnv(void);

64
java/xpcom/java/src/bcJavaMarshalToolkit.cpp
Просмотреть файл

@ -26,6 +26,7 @@
#include "bcIIDJava.h" #include "bcIIDJava.h"
#include "bcJavaStubsAndProxies.h" #include "bcJavaStubsAndProxies.h"
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "bcJavaGlobal.h"
jclass bcJavaMarshalToolkit::objectClass = NULL; jclass bcJavaMarshalToolkit::objectClass = NULL;
jclass bcJavaMarshalToolkit::objectArrayClass = NULL; jclass bcJavaMarshalToolkit::objectArrayClass = NULL;
@ -137,6 +138,7 @@ nsresult bcJavaMarshalToolkit::Marshal(bcIMarshaler *m) {
r = MarshalElement(m, retV, PR_FALSE, &param, XPTType2bcXPType(param.GetType().TagPart()), i); r = MarshalElement(m, retV, PR_FALSE, &param, XPTType2bcXPType(param.GetType().TagPart()), i);
} else { } else {
jobject object = env->GetObjectArrayElement(args,i); jobject object = env->GetObjectArrayElement(args,i);
EXCEPTION_CHECKING(env);
r = MarshalElement(m, object, param.IsOut(), &param, XPTType2bcXPType(param.GetType().TagPart()), i); r = MarshalElement(m, object, param.IsOut(), &param, XPTType2bcXPType(param.GetType().TagPart()), i);
} }
} }
@ -171,6 +173,7 @@ nsresult bcJavaMarshalToolkit::UnMarshal(bcIUnMarshaler *um) {
&& isOut) { //we need to allocate memory for out parametr && isOut) { //we need to allocate memory for out parametr
UnMarshalElement(&value, i, NULL, 1, &param, XPTType2bcXPType(type.TagPart()),allocator); UnMarshalElement(&value, i, NULL, 1, &param, XPTType2bcXPType(type.TagPart()),allocator);
env->SetObjectArrayElement(args,i,value); env->SetObjectArrayElement(args,i,value);
EXCEPTION_CHECKING(env);
} }
continue; continue;
} }
@ -180,9 +183,11 @@ nsresult bcJavaMarshalToolkit::UnMarshal(bcIUnMarshaler *um) {
} else { } else {
if (isOut) { if (isOut) {
value = env->GetObjectArrayElement(args,i); value = env->GetObjectArrayElement(args,i);
EXCEPTION_CHECKING(env);
} }
UnMarshalElement(&value, i, um, isOut, &param, XPTType2bcXPType(type.TagPart()),allocator); UnMarshalElement(&value, i, um, isOut, &param, XPTType2bcXPType(type.TagPart()),allocator);
env->SetObjectArrayElement(args,i,value); env->SetObjectArrayElement(args,i,value);
EXCEPTION_CHECKING(env);
} }
} }
delete allocator; delete allocator;
@ -196,12 +201,14 @@ nsresult bcJavaMarshalToolkit::UnMarshal(bcIUnMarshaler *um) {
if (! isOut \ if (! isOut \
&& (modifier == none)) { \ && (modifier == none)) { \
data = env->Call##_Type_##Method(value,_type_##ValueMID); \ data = env->Call##_Type_##Method(value,_type_##ValueMID); \
EXCEPTION_CHECKING(env); \
} else if (isOut && (modifier == array)) { \ } else if (isOut && (modifier == array)) { \
/* could not happend. We take care about it in T_ARRAY case */ \ /* could not happend. We take care about it in T_ARRAY case */ \
} else if (modifier == arrayElement \ } else if (modifier == arrayElement \
|| (isOut && (modifier == none))) { \ || (isOut && (modifier == none))) { \
indexInArray = (modifier == arrayElement) ? ind : 0; \ indexInArray = (modifier == arrayElement) ? ind : 0; \
env->Get##_Type_##ArrayRegion((j##_type_##Array)value, indexInArray, 1, &data); \ env->Get##_Type_##ArrayRegion((j##_type_##Array)value, indexInArray, 1, &data); \
EXCEPTION_CHECKING(env); \
} \ } \
m->WriteSimple(&data,type); \ m->WriteSimple(&data,type); \
} while (0) } while (0)
@ -270,12 +277,28 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
|| (isOut && (modifier == none))) { || (isOut && (modifier == none))) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
data = (jstring)env->GetObjectArrayElement((jobjectArray)value,indexInArray); data = (jstring)env->GetObjectArrayElement((jobjectArray)value,indexInArray);
EXCEPTION_CHECKING(env);
} }
char * str = NULL; char * str = NULL;
if (data) { if (data) {
str = (char*)env->GetStringUTFChars((jstring)data,NULL); size_t length = 0;
m->WriteString(str,strlen(str)+1); if (type == bc_T_CHAR_STR) {
env->ReleaseStringUTFChars(data,str); str = (char*)env->GetStringUTFChars((jstring)data,NULL);
length = strlen(str)+1;
} else {
str = (char*)env->GetStringChars((jstring)data,NULL);
length = env->GetStringLength((jstring)data);
length *= sizeof(jchar);
length += 2;
}
EXCEPTION_CHECKING(env);
m->WriteString(str,length);
if (type == bc_T_CHAR_STR) {
env->ReleaseStringUTFChars(data,str);
} else {
env->ReleaseStringChars(data,(const jchar*)str);
}
EXCEPTION_CHECKING(env);
} else { } else {
m->WriteString(str,0); m->WriteString(str,0);
} }
@ -292,6 +315,7 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
|| (isOut && (modifier == none))) { || (isOut && (modifier == none))) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
data = (jstring)env->GetObjectArrayElement((jobjectArray)value,indexInArray); data = (jstring)env->GetObjectArrayElement((jobjectArray)value,indexInArray);
EXCEPTION_CHECKING(env);
} }
nsIID iid = bcIIDJava::GetIID(data); nsIID iid = bcIIDJava::GetIID(data);
m->WriteSimple(&iid, type); m->WriteSimple(&iid, type);
@ -312,6 +336,7 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
|| (isOut && (modifier == none))) { || (isOut && (modifier == none))) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
data = env->GetObjectArrayElement((jobjectArray)value,indexInArray); data = env->GetObjectArrayElement((jobjectArray)value,indexInArray);
EXCEPTION_CHECKING(env);
} }
if (data != NULL) { if (data != NULL) {
NS_WITH_SERVICE(bcJavaStubsAndProxies, javaStubsAndProxies, kJavaStubsAndProxies, &r); NS_WITH_SERVICE(bcJavaStubsAndProxies, javaStubsAndProxies, kJavaStubsAndProxies, &r);
@ -337,6 +362,7 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
} }
const nsXPTParamInfo& arg_param = info->GetParam(argnum); const nsXPTParamInfo& arg_param = info->GetParam(argnum);
jobject object = env->GetObjectArrayElement(args,argnum); jobject object = env->GetObjectArrayElement(args,argnum);
EXCEPTION_CHECKING(env);
r = MarshalElement(m, object, arg_param.IsOut(),(nsXPTParamInfo*)&arg_param, r = MarshalElement(m, object, arg_param.IsOut(),(nsXPTParamInfo*)&arg_param,
XPTType2bcXPType(arg_param.GetType().TagPart()), (uint8)0); XPTType2bcXPType(arg_param.GetType().TagPart()), (uint8)0);
} }
@ -352,9 +378,11 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
jobject arrayValue = value; jobject arrayValue = value;
if (isOut) { if (isOut) {
arrayValue = env->GetObjectArrayElement((jobjectArray)value,0); arrayValue = env->GetObjectArrayElement((jobjectArray)value,0);
EXCEPTION_CHECKING(env);
} }
if (m != NULL) { if (m != NULL) {
PRUint32 arraySize = (arrayValue == NULL) ? 0 : env->GetArrayLength((jarray)arrayValue); PRUint32 arraySize = (arrayValue == NULL) ? 0 : env->GetArrayLength((jarray)arrayValue);
EXCEPTION_CHECKING(env);
m->WriteSimple(&arraySize,bc_T_U32); m->WriteSimple(&arraySize,bc_T_U32);
for (PRUint32 i = 0; i < arraySize; i++) { for (PRUint32 i = 0; i < arraySize; i++) {
MarshalElement(m,arrayValue,PR_FALSE,param,type,i,arrayElement); MarshalElement(m,arrayValue,PR_FALSE,param,type,i,arrayElement);
@ -380,19 +408,22 @@ bcJavaMarshalToolkit::MarshalElement(bcIMarshaler *m, jobject value, PRBool isO
if ( ! isOut \ if ( ! isOut \
&& (modifier == none) ) { \ && (modifier == none) ) { \
*value = env->NewObject(_type_##Class,_type_##InitMID,data); \ *value = env->NewObject(_type_##Class,_type_##InitMID,data); \
} else if (isOut && (modifier == array)) { \ EXCEPTION_CHECKING(env); \
*value = env->NewObjectArray(1, _type_##ArrayClass, NULL); \ } else if (isOut && (modifier == array)) { \
} else if ( (isOut && callSide == onServer) \ *value = env->NewObjectArray(1, _type_##ArrayClass, NULL); \
|| (modifier == array)) { \ } else if ( (isOut && callSide == onServer) \
|| (modifier == array)) { \
int arraySize; \ int arraySize; \
arraySize = (modifier == array) ? ind : 1; \ arraySize = (modifier == array) ? ind : 1; \
*value = env->New##_Type_##Array(arraySize); \ *value = env->New##_Type_##Array(arraySize); \
EXCEPTION_CHECKING(env); \
} \ } \
if (modifier == arrayElement \ if (modifier == arrayElement \
|| (isOut && (modifier == none)) \ || (isOut && (modifier == none)) \
) { \ ) { \
indexInArray = (modifier == arrayElement) ? ind : 0; \ indexInArray = (modifier == arrayElement) ? ind : 0; \
env->Set##_Type_##ArrayRegion((j##_type_##Array)*value, indexInArray, 1, &data); \ env->Set##_Type_##ArrayRegion((j##_type_##Array)*value, indexInArray, 1, &data); \
EXCEPTION_CHECKING(env); \
} \ } \
} while(0) } while(0)
@ -454,24 +485,32 @@ bcJavaMarshalToolkit::UnMarshalElement(jobject *value, uint8 ind, bcIUnMarshaler
jstring data = NULL; jstring data = NULL;
if (um) { if (um) {
um->ReadString(&data,&size,allocator); um->ReadString(&data,&size,allocator);
data = env->NewStringUTF((const char*)data); if (type == bc_T_CHAR_STR) {
data = env->NewStringUTF((const char*)data);
} else {
data = env->NewString((const jchar*)data,size);
}
EXCEPTION_CHECKING(env);
} }
if ( ! isOut if ( ! isOut
&& (modifier == none) ) { && (modifier == none) ) {
*value = data; *value = data;
} else if (isOut && (modifier == array)) { } else if (isOut && (modifier == array)) {
*value = env->NewObjectArray(1, stringArrayClass, NULL); *value = env->NewObjectArray(1, stringArrayClass, NULL);
EXCEPTION_CHECKING(env);
} else if ( (isOut && callSide == onServer) } else if ( (isOut && callSide == onServer)
|| (modifier == array)) { || (modifier == array)) {
int arraySize; int arraySize;
arraySize = (modifier == array) ? ind : 1; arraySize = (modifier == array) ? ind : 1;
*value = env->NewObjectArray(arraySize,stringClass,NULL); *value = env->NewObjectArray(arraySize,stringClass,NULL);
EXCEPTION_CHECKING(env);
} }
if (modifier == arrayElement if (modifier == arrayElement
|| (isOut && (modifier == none)) || (isOut && (modifier == none))
) { ) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data); env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data);
EXCEPTION_CHECKING(env);
} }
break; break;
} }
@ -489,17 +528,20 @@ bcJavaMarshalToolkit::UnMarshalElement(jobject *value, uint8 ind, bcIUnMarshaler
*value = data; *value = data;
} else if (isOut && (modifier == array)) { } else if (isOut && (modifier == array)) {
*value = env->NewObjectArray(1, iidArrayClass, NULL); *value = env->NewObjectArray(1, iidArrayClass, NULL);
EXCEPTION_CHECKING(env);
} else if ( (isOut && callSide == onServer) } else if ( (isOut && callSide == onServer)
|| (modifier == array)) { || (modifier == array)) {
int arraySize; int arraySize;
arraySize = (modifier == array) ? ind : 1; arraySize = (modifier == array) ? ind : 1;
*value = env->NewObjectArray(arraySize,iidClass,NULL); *value = env->NewObjectArray(arraySize,iidClass,NULL);
EXCEPTION_CHECKING(env);
} }
if (modifier == arrayElement if (modifier == arrayElement
|| (isOut && (modifier == none)) || (isOut && (modifier == none))
) { ) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data); env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data);
EXCEPTION_CHECKING(env);
} }
break; break;
} }
@ -534,19 +576,24 @@ bcJavaMarshalToolkit::UnMarshalElement(jobject *value, uint8 ind, bcIUnMarshaler
} else if ( isOut && (modifier == array)) { //we are creating type[][] } else if ( isOut && (modifier == array)) { //we are creating type[][]
jobject arrayObject; jobject arrayObject;
arrayObject = env->NewObjectArray(1,clazz,NULL); arrayObject = env->NewObjectArray(1,clazz,NULL);
EXCEPTION_CHECKING(env);
jclass arrayClass = (jclass) env->CallObjectMethod(arrayObject,getClassMID); //nb how to to it better ? jclass arrayClass = (jclass) env->CallObjectMethod(arrayObject,getClassMID); //nb how to to it better ?
EXCEPTION_CHECKING(env);
*value = env->NewObjectArray(1, arrayClass, NULL); *value = env->NewObjectArray(1, arrayClass, NULL);
EXCEPTION_CHECKING(env);
} else if ( (isOut && callSide == onServer) } else if ( (isOut && callSide == onServer)
|| (modifier == array)) { || (modifier == array)) {
int arraySize; int arraySize;
arraySize = (modifier == array) ? ind : 1; arraySize = (modifier == array) ? ind : 1;
*value = env->NewObjectArray(arraySize,clazz,NULL); *value = env->NewObjectArray(arraySize,clazz,NULL);
EXCEPTION_CHECKING(env);
} }
if (modifier == arrayElement if (modifier == arrayElement
|| (isOut && (modifier == none)) || (isOut && (modifier == none))
) { ) {
indexInArray = (modifier == arrayElement) ? ind : 0; indexInArray = (modifier == arrayElement) ? ind : 0;
env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data); env->SetObjectArrayElement((jobjectArray)*value, indexInArray, data);
EXCEPTION_CHECKING(env);
} }
break; break;
@ -568,6 +615,7 @@ bcJavaMarshalToolkit::UnMarshalElement(jobject *value, uint8 ind, bcIUnMarshaler
UnMarshalElement(&arrayValue,arraySize,NULL,0,param,type,allocator,array); UnMarshalElement(&arrayValue,arraySize,NULL,0,param,type,allocator,array);
if (isOut) { if (isOut) {
env->SetObjectArrayElement((jobjectArray)*value,0,arrayValue); env->SetObjectArrayElement((jobjectArray)*value,0,arrayValue);
EXCEPTION_CHECKING(env);
} else { } else {
*value = arrayValue; *value = arrayValue;
} }

28
java/xpcom/xpcom/bcXPCOMMarshalToolkit.cpp
Просмотреть файл

@ -25,6 +25,7 @@
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "bcORB.h" #include "bcORB.h"
#include "bcXPCOMStubsAndProxies.h" #include "bcXPCOMStubsAndProxies.h"
#include "nsCRT.h"
static NS_DEFINE_CID(kORBCIID,BC_ORB_CID); static NS_DEFINE_CID(kORBCIID,BC_ORB_CID);
static NS_DEFINE_CID(kXPCOMStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID); static NS_DEFINE_CID(kXPCOMStubsAndProxies,BC_XPCOMSTUBSANDPROXIES_CID);
@ -246,10 +247,21 @@ nsresult bcXPCOMMarshalToolkit::MarshalElement(bcIMarshaler *m, void *data, nsXP
m->WriteSimple(data, XPTType2bcXPType(type)); m->WriteSimple(data, XPTType2bcXPType(type));
break; break;
case nsXPTType::T_CHAR_STR : case nsXPTType::T_CHAR_STR :
case nsXPTType::T_WCHAR_STR : case nsXPTType::T_WCHAR_STR :
data = *(char **)data; {
m->WriteString(data,strlen((char*)data)+1); data = *(char **)data;
break; size_t length = 0;
if (type == nsXPTType::T_WCHAR_STR) {
length = nsCRT::strlen((const PRUnichar*)data);
length *= sizeof(PRUnichar);
length +=2;
} else {
length = nsCRT::strlen((const char*)data);
length+=1;
}
m->WriteString(data,length);
break;
}
case nsXPTType::T_INTERFACE : case nsXPTType::T_INTERFACE :
case nsXPTType::T_INTERFACE_IS : case nsXPTType::T_INTERFACE_IS :
{ {
@ -320,7 +332,13 @@ nsresult bcXPCOMMarshalToolkit::MarshalElement(bcIMarshaler *m, void *data, nsXP
MarshalElement(m,current,param,datumType.TagPart(),0); MarshalElement(m,current,param,datumType.TagPart(),0);
} }
} else { } else {
m->WriteString(data, arraySize); size_t length = 0;
if (type == nsXPTType::T_PWSTRING_SIZE_IS) {
length = arraySize * sizeof(PRUnichar);
} else {
length = arraySize;
}
m->WriteString(data, length);
} }
break; break;
} }