Fixed IDL files to not use mozilla-specific types where possible.

Also identified and entered a placeholder solution for variants not being
able to represent an empty array.  also made primenumber test use
verifyheader.

SOAP is not part of default build.
This commit is contained in:
rayw%netscape.com 2002-02-14 13:08:25 +00:00
Родитель e2c9876847
Коммит 38932fd4cf
8 изменённых файлов: 18 добавлений и 12 удалений

Просмотреть файл

@ -158,10 +158,10 @@ interface nsISOAPMessage:nsISupports {
*/ */
void encode(in unsigned short aVersion, void encode(in unsigned short aVersion,
in AString aMethodName, in AString aTargetObjectURI, in AString aMethodName, in AString aTargetObjectURI,
in PRUint32 aHeaderBlockCount, in unsigned long aHeaderBlockCount,
[array, [array,
size_is(aHeaderBlockCount)] in nsISOAPHeaderBlock size_is(aHeaderBlockCount)] in nsISOAPHeaderBlock
aHeaderBlocks, in PRUint32 aParameterCount,[array, aHeaderBlocks, in unsigned long aParameterCount,[array,
size_is size_is
(aParameterCount)] (aParameterCount)]
in nsISOAPParameter aParameters); in nsISOAPParameter aParameters);
@ -175,7 +175,7 @@ interface nsISOAPMessage:nsISupports {
* *
* @return Array of header blocks found in the message. * @return Array of header blocks found in the message.
*/ */
void getHeaderBlocks(out PRUint32 aCount, void getHeaderBlocks(out unsigned long aCount,
[array, size_is(aCount), [array, size_is(aCount),
retval] out nsISOAPHeaderBlock aHeaderBlocks); retval] out nsISOAPHeaderBlock aHeaderBlocks);
@ -194,7 +194,7 @@ interface nsISOAPMessage:nsISupports {
* @return Array of parameters found in the message. * @return Array of parameters found in the message.
*/ */
void getParameters(in boolean aDocumentStyle, void getParameters(in boolean aDocumentStyle,
out PRUint32 aCount, out unsigned long aCount,
[array, size_is(aCount), [array, size_is(aCount),
retval] out nsISOAPParameter aParameters); retval] out nsISOAPParameter aParameters);

Просмотреть файл

@ -58,6 +58,6 @@ interface nsISOAPResponseListener:nsISupports {
* indicating that the last response was already sent. * indicating that the last response was already sent.
*/ */
boolean handleResponse(in nsISOAPResponse aResponse, boolean handleResponse(in nsISOAPResponse aResponse,
in nsISOAPCall aCall, in nsresult status, in nsISOAPCall aCall, in unsigned long status,
in boolean aLast); in boolean aLast);
}; };

Просмотреть файл

@ -2166,6 +2166,9 @@ static PRInt32 DecodeArrayPosition(const nsAString& src, PRUint32 aDimensionCoun
static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const nsIID* aIID, static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const nsIID* aIID,
PRUint32 aDimensionCount, PRInt32* aDimensionSizes, PRUint32 aSizeof, PRUint8* aArray) PRUint32 aDimensionCount, PRInt32* aDimensionSizes, PRUint32 aSizeof, PRUint8* aArray)
{ {
if (aSizeof == 0) { // Variants do not support construction of null-sized arrays
return aResult->SetAsEmpty();
}
if (aDimensionCount > 1) { // We cannot reuse variants because they are kept by resulting array if (aDimensionCount > 1) { // We cannot reuse variants because they are kept by resulting array
PRInt32 count = aDimensionSizes[0]; PRInt32 count = aDimensionSizes[0];
PRUint32 size = aSizeof / count; PRUint32 size = aSizeof / count;

Просмотреть файл

@ -65,7 +65,7 @@ function makeCall(value) {
// verifySource headers. If the server does not permit them, then // verifySource headers. If the server does not permit them, then
// this setting will cause the service request to fail: // this setting will cause the service request to fail:
//s.verifySourceHeader = true; s.verifySourceHeader = true;
// If no verification of source headers is occurring, then it is necessary // If no verification of source headers is occurring, then it is necessary
// to request privileges. // to request privileges.

Просмотреть файл

@ -158,10 +158,10 @@ interface nsISOAPMessage:nsISupports {
*/ */
void encode(in unsigned short aVersion, void encode(in unsigned short aVersion,
in AString aMethodName, in AString aTargetObjectURI, in AString aMethodName, in AString aTargetObjectURI,
in PRUint32 aHeaderBlockCount, in unsigned long aHeaderBlockCount,
[array, [array,
size_is(aHeaderBlockCount)] in nsISOAPHeaderBlock size_is(aHeaderBlockCount)] in nsISOAPHeaderBlock
aHeaderBlocks, in PRUint32 aParameterCount,[array, aHeaderBlocks, in unsigned long aParameterCount,[array,
size_is size_is
(aParameterCount)] (aParameterCount)]
in nsISOAPParameter aParameters); in nsISOAPParameter aParameters);
@ -175,7 +175,7 @@ interface nsISOAPMessage:nsISupports {
* *
* @return Array of header blocks found in the message. * @return Array of header blocks found in the message.
*/ */
void getHeaderBlocks(out PRUint32 aCount, void getHeaderBlocks(out unsigned long aCount,
[array, size_is(aCount), [array, size_is(aCount),
retval] out nsISOAPHeaderBlock aHeaderBlocks); retval] out nsISOAPHeaderBlock aHeaderBlocks);
@ -194,7 +194,7 @@ interface nsISOAPMessage:nsISupports {
* @return Array of parameters found in the message. * @return Array of parameters found in the message.
*/ */
void getParameters(in boolean aDocumentStyle, void getParameters(in boolean aDocumentStyle,
out PRUint32 aCount, out unsigned long aCount,
[array, size_is(aCount), [array, size_is(aCount),
retval] out nsISOAPParameter aParameters); retval] out nsISOAPParameter aParameters);

Просмотреть файл

@ -58,6 +58,6 @@ interface nsISOAPResponseListener:nsISupports {
* indicating that the last response was already sent. * indicating that the last response was already sent.
*/ */
boolean handleResponse(in nsISOAPResponse aResponse, boolean handleResponse(in nsISOAPResponse aResponse,
in nsISOAPCall aCall, in nsresult status, in nsISOAPCall aCall, in unsigned long status,
in boolean aLast); in boolean aLast);
}; };

Просмотреть файл

@ -2166,6 +2166,9 @@ static PRInt32 DecodeArrayPosition(const nsAString& src, PRUint32 aDimensionCoun
static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const nsIID* aIID, static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const nsIID* aIID,
PRUint32 aDimensionCount, PRInt32* aDimensionSizes, PRUint32 aSizeof, PRUint8* aArray) PRUint32 aDimensionCount, PRInt32* aDimensionSizes, PRUint32 aSizeof, PRUint8* aArray)
{ {
if (aSizeof == 0) { // Variants do not support construction of null-sized arrays
return aResult->SetAsEmpty();
}
if (aDimensionCount > 1) { // We cannot reuse variants because they are kept by resulting array if (aDimensionCount > 1) { // We cannot reuse variants because they are kept by resulting array
PRInt32 count = aDimensionSizes[0]; PRInt32 count = aDimensionSizes[0];
PRUint32 size = aSizeof / count; PRUint32 size = aSizeof / count;

Просмотреть файл

@ -65,7 +65,7 @@ function makeCall(value) {
// verifySource headers. If the server does not permit them, then // verifySource headers. If the server does not permit them, then
// this setting will cause the service request to fail: // this setting will cause the service request to fail:
//s.verifySourceHeader = true; s.verifySourceHeader = true;
// If no verification of source headers is occurring, then it is necessary // If no verification of source headers is occurring, then it is necessary
// to request privileges. // to request privileges.