mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 10:00:54 +00:00
NOT YET PART OF SEAMONKEY:
* removed struct size #defines -> they were just silly anyway. * replaced references to IDE file offsetsi with uint32 indices. * first attempt at sorting out order of storage for XPTHeader and XPTInterfaceDirectoryEntry
This commit is contained in:
coop%netscape.com
parent
45c2ae4f23
commit
cebd0d5f18
@ -75,11 +75,9 @@ struct XPTHeader {
|
||||
uint16 num_interfaces;
|
||||
uint32 file_length;
|
||||
XPTInterfaceDirectoryEntry *interface_directory;
|
||||
uint8 *data_pool;
|
||||
uint32 data_pool;
|
||||
XPTAnnotation *annotations;
|
||||
};
|
||||
#define XPT_HEADER_BASE_SIZE (16 + 1 + 1 + 2 + 4 + 4 + 4)
|
||||
|
||||
|
||||
/*
|
||||
* A contiguous array of fixed-size InterfaceDirectoryEntry records begins at
|
||||
@ -93,20 +91,18 @@ struct XPTInterfaceDirectoryEntry {
|
||||
char *namespace;
|
||||
XPTInterfaceDescriptor *interface_descriptor;
|
||||
};
|
||||
#define XPT_IDE_SIZE (16 + 4 + 4 + 4)
|
||||
|
||||
/*
|
||||
* An InterfaceDescriptor is a variable-size record used to describe a
|
||||
* single XPCOM interface, including all of its methods.
|
||||
*/
|
||||
struct XPTInterfaceDescriptor {
|
||||
XPTInterfaceDirectoryEntry *parent_interface;
|
||||
uint16 num_methods;
|
||||
XPTMethodDescriptor *method_descriptors;
|
||||
uint16 num_constants;
|
||||
XPTConstDescriptor *const_descriptors;
|
||||
uint32 parent_interface;
|
||||
uint16 num_methods;
|
||||
XPTMethodDescriptor *method_descriptors;
|
||||
uint16 num_constants;
|
||||
XPTConstDescriptor *const_descriptors;
|
||||
};
|
||||
#define XPT_ID_BASE_SIZE (4 + 2 + 2)
|
||||
|
||||
/*
|
||||
* This is our special string struct with a length value associated with it,
|
||||
@ -138,7 +134,6 @@ struct XPTTypeDescriptorPrefix {
|
||||
uint8 is_pointer:1, is_unique_pointer:1, is_reference:1,
|
||||
tag:5;
|
||||
};
|
||||
#define XPT_TDP_SIZE 1
|
||||
|
||||
/*
|
||||
* The following defines map mnemonic names to the different numeric values
|
||||
@ -201,11 +196,10 @@ struct XPTTypeDescriptorPrefix {
|
||||
struct XPTTypeDescriptor {
|
||||
XPTTypeDescriptorPrefix *prefix;
|
||||
union {
|
||||
XPTInterfaceDirectoryEntry *interface;
|
||||
uint8 argnum;
|
||||
uint32 interface;
|
||||
uint8 argnum;
|
||||
} type;
|
||||
};
|
||||
#define XPT_TD_SIZE (XPT_TDP_SIZE + 4)
|
||||
|
||||
/*
|
||||
* A ConstDescriptor is a variable-size record that records the name and
|
||||
@ -241,7 +235,6 @@ struct XPTConstDescriptor {
|
||||
XPTString *string;
|
||||
} value; /* varies according to type */
|
||||
};
|
||||
#define XPT_CD_SIZE (4 + XPT_TD_SIZE + 8)
|
||||
|
||||
/*
|
||||
* A ParamDescriptor is a variable-size record used to describe either a
|
||||
@ -251,7 +244,6 @@ struct XPTParamDescriptor {
|
||||
uint8 in:1, out:1, retval:1, reserved:5;
|
||||
XPTTypeDescriptor type;
|
||||
};
|
||||
#define XPT_PD_SIZE (1 + XPT_TD_SIZE)
|
||||
|
||||
/*
|
||||
* A MethodDescriptor is a variable-size record used to describe a single
|
||||
@ -265,7 +257,6 @@ struct XPTMethodDescriptor {
|
||||
XPTParamDescriptor *params;
|
||||
XPTParamDescriptor result;
|
||||
};
|
||||
#define XPT_MD_BASE_SIZE (1 + 4 + 1 + XPT_PD_SIZE)
|
||||
|
||||
/*
|
||||
* Annotation records are variable-size records used to store secondary
|
||||
@ -291,7 +282,6 @@ struct XPTMethodDescriptor {
|
||||
struct XPTAnnotationPrefix {
|
||||
uint8 is_last:1, tag:7;
|
||||
};
|
||||
#define XPT_AP_SIZE 1
|
||||
|
||||
struct XPTPrivateAnnotation {
|
||||
XPTString *creator;
|
||||
|
||||
@ -25,47 +25,69 @@ PRBool
|
||||
XPT_DoHeader(XPTCursor *cursor, XPTHeader **headerp)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTCursor my_cursor;
|
||||
XPTHeader *header;
|
||||
PRBool already;
|
||||
uint32 ide_offset;
|
||||
int i;
|
||||
|
||||
XPT_PREAMBLE(cursor, headerp, XPT_HEADER, XPT_SizeOfHeader(*headerp),
|
||||
my_cursor, already, XPTHeader, header);
|
||||
if (mode == XPT_DECODE)
|
||||
header = PR_NEWZAP(XPTHeader);
|
||||
else
|
||||
header = *headerp;
|
||||
|
||||
if (mode == XPT_ENCODE) {
|
||||
ide_offset = XPT_SizeOfHeader(); /* IDEs appear after annotations */
|
||||
}
|
||||
|
||||
for (i = 0; i < 16; i++) {
|
||||
if (!XPT_Do8(&my_cursor, &header->magic[i]))
|
||||
if (!XPT_Do8(cursor, &header->magic[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
if(!XPT_Do8(&my_cursor, &header->major_version) ||
|
||||
!XPT_Do8(&my_cursor, &header->minor_version) ||
|
||||
!XPT_Do16(&my_cursor, &header->num_interfaces) ||
|
||||
!XPT_Do32(&my_cursor, &header->file_length)) {
|
||||
|
||||
if(!XPT_Do8(cursor, &header->major_version) ||
|
||||
!XPT_Do8(cursor, &header->minor_version) ||
|
||||
!XPT_Do16(cursor, &header->num_interfaces) ||
|
||||
!XPT_Do32(cursor, &header->file_length) ||
|
||||
!XPT_Do32(cursor, &ide_offset)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (mode == XPT_DECODE)
|
||||
/*
|
||||
* This sections a little hairy right now. We need to do
|
||||
* XPT_DataOffset before writing but after reading.
|
||||
*
|
||||
* if (mode == XPT_DECODE ||
|
||||
* XPT_DataOffset(cursor->state, &header->data_pool)) {
|
||||
* if(!XPT_Do32(cursor, &header->data_pool)) {
|
||||
* goto error;
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* if (mode == XPT_ENCODE ||
|
||||
* XPT_DataOffset(cursor->state, &header->data_pool)) {
|
||||
* XPT_DoAnnotations(annotations);
|
||||
* }
|
||||
*/
|
||||
|
||||
if (mode == XPT_DECODE) {
|
||||
header->interface_directory =
|
||||
PR_CALLOC(header->num_interfaces *
|
||||
sizeof(XPTInterfaceDirectoryEntry));
|
||||
|
||||
/* shouldn't be necessary now, but maybe later */
|
||||
XPT_SeekTo(cursor, ide_offset);
|
||||
}
|
||||
|
||||
for (i = 0; i < header->num_interfaces; i++) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(&my_cursor,
|
||||
&header->interface_directory[i]))
|
||||
goto error;
|
||||
XPT_DoInterfaceDirectoryEntry(cursor,
|
||||
&header->interface_directory[i]);
|
||||
}
|
||||
|
||||
if(!XPT_Do8(&my_cursor, header->data_pool)
|
||||
|
||||
/* This is where we'll do something with Annotations eventually.
|
||||
* || !XPT_DoAnnotations(&my_cursor, &header->annotations)
|
||||
*/
|
||||
|
||||
) {
|
||||
|
||||
goto error;
|
||||
if (mode == XPT_DECODE)
|
||||
|
||||
for (i = 0; i < header->num_interfaces; i++) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(&cursor,
|
||||
&header->interface_directory[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
@ -79,24 +101,23 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
|
||||
XPTInterfaceDirectoryEntry **idep)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTCursor my_cursor;
|
||||
XPTInterfaceDirectoryEntry *ide;
|
||||
PRBool already;
|
||||
|
||||
XPT_PREAMBLE(cursor, idep, XPT_HEADER, sizeof(XPTInterfaceDirectoryEntry),
|
||||
my_cursor, already, XPTInterfaceDirectoryEntry,
|
||||
ide);
|
||||
|
||||
if (mode == XPT_DECODE)
|
||||
ide = PR_NEWZAP(XPTInterfaceDirectoryEntry);
|
||||
else
|
||||
ide = *idep;
|
||||
|
||||
/* write the IID in our cursor space */
|
||||
if (!XPT_DoIID(&my_cursor, &ide->iid) ||
|
||||
if (!XPT_DoIID(cursor, &ide->iid) ||
|
||||
|
||||
/* write the name string in the data pool, and the offset in our
|
||||
cursor space */
|
||||
!XPT_DoCString(&my_cursor, &ide->name) ||
|
||||
!XPT_DoCString(&cursor, &ide->name) ||
|
||||
|
||||
/* write the namespace string in the data pool, and the offset in our
|
||||
cursor space */
|
||||
!XPT_DoCString(&my_cursor, &ide->namespace)) {
|
||||
!XPT_DoCString(&cursor, &ide->namespace)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
@ -104,7 +125,7 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
|
||||
/* write the InterfaceDescriptor in the data pool, and the offset
|
||||
in our cursor space, but only if we're encoding. */
|
||||
if (mode == XPT_ENCODE) {
|
||||
if (!XPT_DoInterfaceDescriptor(&my_cursor,
|
||||
if (!XPT_DoInterfaceDescriptor(&cursor,
|
||||
&ide->interface_descriptor)) {
|
||||
goto error;
|
||||
}
|
||||
@ -120,15 +141,15 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTInterfaceDescriptor *id;
|
||||
XPTCursor my_cursor;
|
||||
PRBool already;
|
||||
int i, len;
|
||||
int i;
|
||||
|
||||
XPT_PREAMBLE(cursor, idp, XPT_DATA, XPT_SizeOfInterfaceDescriptor(*idp),
|
||||
my_cursor, already, XPTInterfaceDescriptor, id);
|
||||
if (mode == XPT_DECODE)
|
||||
id = PR_NEWZAP(XPTInterfaceDescriptor);
|
||||
else
|
||||
id = *idp;
|
||||
|
||||
if(!XPT_DoInterfaceDirectoryEntry(&my_cursor, &id->parent_interface) ||
|
||||
!XPT_Do16(&my_cursor, &id->num_methods)) {
|
||||
if(!XPT_Do32(cursor, &id->parent_interface) ||
|
||||
!XPT_Do16(cursor, &id->num_methods)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
@ -138,11 +159,11 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
sizeof(XPTMethodDescriptor));
|
||||
|
||||
for (i = 0; i < id->num_methods; i++) {
|
||||
if (!XPT_DoMethodDescriptor(&my_cursor, &id->method_descriptors[i]))
|
||||
if (!XPT_DoMethodDescriptor(&cursor, &id->method_descriptors[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!XPT_Do16(&my_cursor, &id->num_constants)) {
|
||||
if (!XPT_Do16(cursor, &id->num_constants)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@ -151,7 +172,7 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
sizeof(XPTConstDescriptor));
|
||||
|
||||
for (i = 0; i < id->num_constants; i++) {
|
||||
if (!XPT_DoConstDescriptor(&my_cursor, &id->const_descriptors[i])) {
|
||||
if (!XPT_DoConstDescriptor(&cursor, &id->const_descriptors[i])) {
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
@ -332,7 +353,7 @@ XPT_DoTypeDescriptor(XPTCursor *cursor, XPTTypeDescriptor **tdp)
|
||||
}
|
||||
|
||||
if (td->prefix->tag == TD_INTERFACE_TYPE) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(cursor, &td->type.interface))
|
||||
if (!XPT_Do32(cursor, &td->type.interface))
|
||||
goto error;
|
||||
} else {
|
||||
if (td->prefix->tag == TD_INTERFACE_IS_TYPE) {
|
||||
|
||||
@ -75,11 +75,9 @@ struct XPTHeader {
|
||||
uint16 num_interfaces;
|
||||
uint32 file_length;
|
||||
XPTInterfaceDirectoryEntry *interface_directory;
|
||||
uint8 *data_pool;
|
||||
uint32 data_pool;
|
||||
XPTAnnotation *annotations;
|
||||
};
|
||||
#define XPT_HEADER_BASE_SIZE (16 + 1 + 1 + 2 + 4 + 4 + 4)
|
||||
|
||||
|
||||
/*
|
||||
* A contiguous array of fixed-size InterfaceDirectoryEntry records begins at
|
||||
@ -93,20 +91,18 @@ struct XPTInterfaceDirectoryEntry {
|
||||
char *namespace;
|
||||
XPTInterfaceDescriptor *interface_descriptor;
|
||||
};
|
||||
#define XPT_IDE_SIZE (16 + 4 + 4 + 4)
|
||||
|
||||
/*
|
||||
* An InterfaceDescriptor is a variable-size record used to describe a
|
||||
* single XPCOM interface, including all of its methods.
|
||||
*/
|
||||
struct XPTInterfaceDescriptor {
|
||||
XPTInterfaceDirectoryEntry *parent_interface;
|
||||
uint16 num_methods;
|
||||
XPTMethodDescriptor *method_descriptors;
|
||||
uint16 num_constants;
|
||||
XPTConstDescriptor *const_descriptors;
|
||||
uint32 parent_interface;
|
||||
uint16 num_methods;
|
||||
XPTMethodDescriptor *method_descriptors;
|
||||
uint16 num_constants;
|
||||
XPTConstDescriptor *const_descriptors;
|
||||
};
|
||||
#define XPT_ID_BASE_SIZE (4 + 2 + 2)
|
||||
|
||||
/*
|
||||
* This is our special string struct with a length value associated with it,
|
||||
@ -138,7 +134,6 @@ struct XPTTypeDescriptorPrefix {
|
||||
uint8 is_pointer:1, is_unique_pointer:1, is_reference:1,
|
||||
tag:5;
|
||||
};
|
||||
#define XPT_TDP_SIZE 1
|
||||
|
||||
/*
|
||||
* The following defines map mnemonic names to the different numeric values
|
||||
@ -201,11 +196,10 @@ struct XPTTypeDescriptorPrefix {
|
||||
struct XPTTypeDescriptor {
|
||||
XPTTypeDescriptorPrefix *prefix;
|
||||
union {
|
||||
XPTInterfaceDirectoryEntry *interface;
|
||||
uint8 argnum;
|
||||
uint32 interface;
|
||||
uint8 argnum;
|
||||
} type;
|
||||
};
|
||||
#define XPT_TD_SIZE (XPT_TDP_SIZE + 4)
|
||||
|
||||
/*
|
||||
* A ConstDescriptor is a variable-size record that records the name and
|
||||
@ -241,7 +235,6 @@ struct XPTConstDescriptor {
|
||||
XPTString *string;
|
||||
} value; /* varies according to type */
|
||||
};
|
||||
#define XPT_CD_SIZE (4 + XPT_TD_SIZE + 8)
|
||||
|
||||
/*
|
||||
* A ParamDescriptor is a variable-size record used to describe either a
|
||||
@ -251,7 +244,6 @@ struct XPTParamDescriptor {
|
||||
uint8 in:1, out:1, retval:1, reserved:5;
|
||||
XPTTypeDescriptor type;
|
||||
};
|
||||
#define XPT_PD_SIZE (1 + XPT_TD_SIZE)
|
||||
|
||||
/*
|
||||
* A MethodDescriptor is a variable-size record used to describe a single
|
||||
@ -265,7 +257,6 @@ struct XPTMethodDescriptor {
|
||||
XPTParamDescriptor *params;
|
||||
XPTParamDescriptor result;
|
||||
};
|
||||
#define XPT_MD_BASE_SIZE (1 + 4 + 1 + XPT_PD_SIZE)
|
||||
|
||||
/*
|
||||
* Annotation records are variable-size records used to store secondary
|
||||
@ -291,7 +282,6 @@ struct XPTMethodDescriptor {
|
||||
struct XPTAnnotationPrefix {
|
||||
uint8 is_last:1, tag:7;
|
||||
};
|
||||
#define XPT_AP_SIZE 1
|
||||
|
||||
struct XPTPrivateAnnotation {
|
||||
XPTString *creator;
|
||||
|
||||
@ -25,47 +25,69 @@ PRBool
|
||||
XPT_DoHeader(XPTCursor *cursor, XPTHeader **headerp)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTCursor my_cursor;
|
||||
XPTHeader *header;
|
||||
PRBool already;
|
||||
uint32 ide_offset;
|
||||
int i;
|
||||
|
||||
XPT_PREAMBLE(cursor, headerp, XPT_HEADER, XPT_SizeOfHeader(*headerp),
|
||||
my_cursor, already, XPTHeader, header);
|
||||
if (mode == XPT_DECODE)
|
||||
header = PR_NEWZAP(XPTHeader);
|
||||
else
|
||||
header = *headerp;
|
||||
|
||||
if (mode == XPT_ENCODE) {
|
||||
ide_offset = XPT_SizeOfHeader(); /* IDEs appear after annotations */
|
||||
}
|
||||
|
||||
for (i = 0; i < 16; i++) {
|
||||
if (!XPT_Do8(&my_cursor, &header->magic[i]))
|
||||
if (!XPT_Do8(cursor, &header->magic[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
if(!XPT_Do8(&my_cursor, &header->major_version) ||
|
||||
!XPT_Do8(&my_cursor, &header->minor_version) ||
|
||||
!XPT_Do16(&my_cursor, &header->num_interfaces) ||
|
||||
!XPT_Do32(&my_cursor, &header->file_length)) {
|
||||
|
||||
if(!XPT_Do8(cursor, &header->major_version) ||
|
||||
!XPT_Do8(cursor, &header->minor_version) ||
|
||||
!XPT_Do16(cursor, &header->num_interfaces) ||
|
||||
!XPT_Do32(cursor, &header->file_length) ||
|
||||
!XPT_Do32(cursor, &ide_offset)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (mode == XPT_DECODE)
|
||||
/*
|
||||
* This sections a little hairy right now. We need to do
|
||||
* XPT_DataOffset before writing but after reading.
|
||||
*
|
||||
* if (mode == XPT_DECODE ||
|
||||
* XPT_DataOffset(cursor->state, &header->data_pool)) {
|
||||
* if(!XPT_Do32(cursor, &header->data_pool)) {
|
||||
* goto error;
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* if (mode == XPT_ENCODE ||
|
||||
* XPT_DataOffset(cursor->state, &header->data_pool)) {
|
||||
* XPT_DoAnnotations(annotations);
|
||||
* }
|
||||
*/
|
||||
|
||||
if (mode == XPT_DECODE) {
|
||||
header->interface_directory =
|
||||
PR_CALLOC(header->num_interfaces *
|
||||
sizeof(XPTInterfaceDirectoryEntry));
|
||||
|
||||
/* shouldn't be necessary now, but maybe later */
|
||||
XPT_SeekTo(cursor, ide_offset);
|
||||
}
|
||||
|
||||
for (i = 0; i < header->num_interfaces; i++) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(&my_cursor,
|
||||
&header->interface_directory[i]))
|
||||
goto error;
|
||||
XPT_DoInterfaceDirectoryEntry(cursor,
|
||||
&header->interface_directory[i]);
|
||||
}
|
||||
|
||||
if(!XPT_Do8(&my_cursor, header->data_pool)
|
||||
|
||||
/* This is where we'll do something with Annotations eventually.
|
||||
* || !XPT_DoAnnotations(&my_cursor, &header->annotations)
|
||||
*/
|
||||
|
||||
) {
|
||||
|
||||
goto error;
|
||||
if (mode == XPT_DECODE)
|
||||
|
||||
for (i = 0; i < header->num_interfaces; i++) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(&cursor,
|
||||
&header->interface_directory[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
return PR_TRUE;
|
||||
@ -79,24 +101,23 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
|
||||
XPTInterfaceDirectoryEntry **idep)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTCursor my_cursor;
|
||||
XPTInterfaceDirectoryEntry *ide;
|
||||
PRBool already;
|
||||
|
||||
XPT_PREAMBLE(cursor, idep, XPT_HEADER, sizeof(XPTInterfaceDirectoryEntry),
|
||||
my_cursor, already, XPTInterfaceDirectoryEntry,
|
||||
ide);
|
||||
|
||||
if (mode == XPT_DECODE)
|
||||
ide = PR_NEWZAP(XPTInterfaceDirectoryEntry);
|
||||
else
|
||||
ide = *idep;
|
||||
|
||||
/* write the IID in our cursor space */
|
||||
if (!XPT_DoIID(&my_cursor, &ide->iid) ||
|
||||
if (!XPT_DoIID(cursor, &ide->iid) ||
|
||||
|
||||
/* write the name string in the data pool, and the offset in our
|
||||
cursor space */
|
||||
!XPT_DoCString(&my_cursor, &ide->name) ||
|
||||
!XPT_DoCString(&cursor, &ide->name) ||
|
||||
|
||||
/* write the namespace string in the data pool, and the offset in our
|
||||
cursor space */
|
||||
!XPT_DoCString(&my_cursor, &ide->namespace)) {
|
||||
!XPT_DoCString(&cursor, &ide->namespace)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
@ -104,7 +125,7 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
|
||||
/* write the InterfaceDescriptor in the data pool, and the offset
|
||||
in our cursor space, but only if we're encoding. */
|
||||
if (mode == XPT_ENCODE) {
|
||||
if (!XPT_DoInterfaceDescriptor(&my_cursor,
|
||||
if (!XPT_DoInterfaceDescriptor(&cursor,
|
||||
&ide->interface_descriptor)) {
|
||||
goto error;
|
||||
}
|
||||
@ -120,15 +141,15 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
{
|
||||
XPTMode mode = cursor->state->mode;
|
||||
XPTInterfaceDescriptor *id;
|
||||
XPTCursor my_cursor;
|
||||
PRBool already;
|
||||
int i, len;
|
||||
int i;
|
||||
|
||||
XPT_PREAMBLE(cursor, idp, XPT_DATA, XPT_SizeOfInterfaceDescriptor(*idp),
|
||||
my_cursor, already, XPTInterfaceDescriptor, id);
|
||||
if (mode == XPT_DECODE)
|
||||
id = PR_NEWZAP(XPTInterfaceDescriptor);
|
||||
else
|
||||
id = *idp;
|
||||
|
||||
if(!XPT_DoInterfaceDirectoryEntry(&my_cursor, &id->parent_interface) ||
|
||||
!XPT_Do16(&my_cursor, &id->num_methods)) {
|
||||
if(!XPT_Do32(cursor, &id->parent_interface) ||
|
||||
!XPT_Do16(cursor, &id->num_methods)) {
|
||||
|
||||
goto error;
|
||||
}
|
||||
@ -138,11 +159,11 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
sizeof(XPTMethodDescriptor));
|
||||
|
||||
for (i = 0; i < id->num_methods; i++) {
|
||||
if (!XPT_DoMethodDescriptor(&my_cursor, &id->method_descriptors[i]))
|
||||
if (!XPT_DoMethodDescriptor(&cursor, &id->method_descriptors[i]))
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!XPT_Do16(&my_cursor, &id->num_constants)) {
|
||||
if (!XPT_Do16(cursor, &id->num_constants)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@ -151,7 +172,7 @@ XPT_DoInterfaceDescriptor(XPTCursor *cursor, XPTInterfaceDescriptor **idp)
|
||||
sizeof(XPTConstDescriptor));
|
||||
|
||||
for (i = 0; i < id->num_constants; i++) {
|
||||
if (!XPT_DoConstDescriptor(&my_cursor, &id->const_descriptors[i])) {
|
||||
if (!XPT_DoConstDescriptor(&cursor, &id->const_descriptors[i])) {
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
@ -332,7 +353,7 @@ XPT_DoTypeDescriptor(XPTCursor *cursor, XPTTypeDescriptor **tdp)
|
||||
}
|
||||
|
||||
if (td->prefix->tag == TD_INTERFACE_TYPE) {
|
||||
if (!XPT_DoInterfaceDirectoryEntry(cursor, &td->type.interface))
|
||||
if (!XPT_Do32(cursor, &td->type.interface))
|
||||
goto error;
|
||||
} else {
|
||||
if (td->prefix->tag == TD_INTERFACE_IS_TYPE) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user