Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 11:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOT YET PART OF SEAMONKEY:

Browse Source 
* added looping to read/write InterfaceDirectoryEntrys
* InterfaceDescriptors are no longer DECODEd as part of the IDE DECODEing process
* added skeleton for XPT_GetDescriptorByOffset
This commit is contained in:
coop%netscape.com 1999-01-20 17:58:14 +00:00
parent 562c3ea105
commit 4fe4d500ab
2 changed files with 92 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
xpcom/libxpt/src/xpt_struct.c
View File

@ -41,11 +41,29 @@ XPT_DoHeader(XPTCursor *cursor, XPTHeader **headerp)
if(!XPT_Do8(&my_cursor, &header->major_version) || if(!XPT_Do8(&my_cursor, &header->major_version) ||
!XPT_Do8(&my_cursor, &header->minor_version) || !XPT_Do8(&my_cursor, &header->minor_version) ||
!XPT_Do16(&my_cursor, &header->num_interfaces) || !XPT_Do16(&my_cursor, &header->num_interfaces) ||
!XPT_Do32(&my_cursor, &header->file_length) || !XPT_Do32(&my_cursor, &header->file_length)) {
!XPT_DoInterfaceDirectoryEntry(&my_cursor,
&header->interface_directory) || goto error;
!XPT_Do8(&my_cursor, header->data_pool) || }
!XPT_DoAnnotation(&my_cursor, &header->annotations)) {
if (mode == XPT_DECODE)
header->interface_directory =
PR_CALLOC(header->num_interfaces *
sizeof(XPTInterfaceDirectoryEntry));
for (i = 0; i < header->num_interfaces; i++) {
if (!XPT_DoInterfaceDirectoryEntry(&my_cursor,
&header->interface_directory[i]))
goto error;
}
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; goto error;
} }
@ -64,8 +82,8 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
XPTCursor my_cursor; XPTCursor my_cursor;
XPTInterfaceDirectoryEntry *ide; XPTInterfaceDirectoryEntry *ide;
PRBool already; PRBool already;
XPT_PREAMBLE(cursor, idep, XPT_HEADER, XPT_IDE_SIZE, XPT_PREAMBLE(cursor, idep, XPT_HEADER, sizeof(XPTInterfaceDirectoryEntry),
my_cursor, already, XPTInterfaceDirectoryEntry, my_cursor, already, XPTInterfaceDirectoryEntry,
ide); ide);
@ -78,15 +96,20 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
/* write the namespace string in the data pool, and the offset in our /* write the namespace string in the data pool, and the offset in our
cursor space */ cursor space */
!XPT_DoCString(&my_cursor, &ide->namespace) || !XPT_DoCString(&my_cursor, &ide->namespace)) {
/* write the InterfaceDescriptor in the data pool, and the offset
in our cursor space */
!XPT_DoInterfaceDescriptor(&my_cursor, &ide->interface_descriptor)) {
goto error; goto error;
} }
/* 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,
&ide->interface_descriptor)) {
goto error;
}
}
return PR_TRUE; return PR_TRUE;
XPT_ERROR_HANDLE(ide); XPT_ERROR_HANDLE(ide);
@ -394,6 +417,11 @@ XPT_DoAnnotation(XPTCursor *cursor, XPTAnnotation **ap)
XPT_ERROR_HANDLE(a); XPT_ERROR_HANDLE(a);
} }
PRBool
XPT_DoAnnotations(XPTCursor *cursor, XPTAnnotation **ap) {
return PR_FALSE;
}
int int
XPT_SizeOfHeader(XPTHeader *headerp) XPT_SizeOfHeader(XPTHeader *headerp)
{ {
@ -405,3 +433,9 @@ XPT_SizeOfInterfaceDescriptor(XPTInterfaceDescriptor *idp)
{ {
return 0; return 0;
} }
XPTInterfaceDescriptor
XPT_GetDescriptorByOffset(XPTState *state, XPTHeader *header, uint32
descriptor_num) {
}

58
xpcom/typelib/xpt/src/xpt_struct.c
View File

@ -41,11 +41,29 @@ XPT_DoHeader(XPTCursor *cursor, XPTHeader **headerp)
if(!XPT_Do8(&my_cursor, &header->major_version) || if(!XPT_Do8(&my_cursor, &header->major_version) ||
!XPT_Do8(&my_cursor, &header->minor_version) || !XPT_Do8(&my_cursor, &header->minor_version) ||
!XPT_Do16(&my_cursor, &header->num_interfaces) || !XPT_Do16(&my_cursor, &header->num_interfaces) ||
!XPT_Do32(&my_cursor, &header->file_length) || !XPT_Do32(&my_cursor, &header->file_length)) {
!XPT_DoInterfaceDirectoryEntry(&my_cursor,
&header->interface_directory) || goto error;
!XPT_Do8(&my_cursor, header->data_pool) || }
!XPT_DoAnnotation(&my_cursor, &header->annotations)) {
if (mode == XPT_DECODE)
header->interface_directory =
PR_CALLOC(header->num_interfaces *
sizeof(XPTInterfaceDirectoryEntry));
for (i = 0; i < header->num_interfaces; i++) {
if (!XPT_DoInterfaceDirectoryEntry(&my_cursor,
&header->interface_directory[i]))
goto error;
}
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; goto error;
} }
@ -64,8 +82,8 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
XPTCursor my_cursor; XPTCursor my_cursor;
XPTInterfaceDirectoryEntry *ide; XPTInterfaceDirectoryEntry *ide;
PRBool already; PRBool already;
XPT_PREAMBLE(cursor, idep, XPT_HEADER, XPT_IDE_SIZE, XPT_PREAMBLE(cursor, idep, XPT_HEADER, sizeof(XPTInterfaceDirectoryEntry),
my_cursor, already, XPTInterfaceDirectoryEntry, my_cursor, already, XPTInterfaceDirectoryEntry,
ide); ide);
@ -78,15 +96,20 @@ XPT_DoInterfaceDirectoryEntry(XPTCursor *cursor,
/* write the namespace string in the data pool, and the offset in our /* write the namespace string in the data pool, and the offset in our
cursor space */ cursor space */
!XPT_DoCString(&my_cursor, &ide->namespace) || !XPT_DoCString(&my_cursor, &ide->namespace)) {
/* write the InterfaceDescriptor in the data pool, and the offset
in our cursor space */
!XPT_DoInterfaceDescriptor(&my_cursor, &ide->interface_descriptor)) {
goto error; goto error;
} }
/* 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,
&ide->interface_descriptor)) {
goto error;
}
}
return PR_TRUE; return PR_TRUE;
XPT_ERROR_HANDLE(ide); XPT_ERROR_HANDLE(ide);
@ -394,6 +417,11 @@ XPT_DoAnnotation(XPTCursor *cursor, XPTAnnotation **ap)
XPT_ERROR_HANDLE(a); XPT_ERROR_HANDLE(a);
} }
PRBool
XPT_DoAnnotations(XPTCursor *cursor, XPTAnnotation **ap) {
return PR_FALSE;
}
int int
XPT_SizeOfHeader(XPTHeader *headerp) XPT_SizeOfHeader(XPTHeader *headerp)
{ {
@ -405,3 +433,9 @@ XPT_SizeOfInterfaceDescriptor(XPTInterfaceDescriptor *idp)
{ {
return 0; return 0;
} }
XPTInterfaceDescriptor
XPT_GetDescriptorByOffset(XPTState *state, XPTHeader *header, uint32
descriptor_num) {
}