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

Whitespace fixes. 

SOAP is not part of default build.
This commit is contained in:
rayw%netscape.com 2002-02-15 11:02:43 +00:00
Родитель e3f8c4ff5c
Коммит 676939544c
25 изменённых файлов: 409 добавлений и 409 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

48
extensions/webservices/soap/src/Makefile.in
Просмотреть файл

@ -35,32 +35,32 @@
# #
# ***** END LICENSE BLOCK ***** * # ***** END LICENSE BLOCK ***** *
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = xmlextras MODULE = xmlextras
LIBRARY_NAME = xmlextrassoap_s LIBRARY_NAME = xmlextrassoap_s
REQUIRES = xpcom string caps dom js widget xpconnect necko schema REQUIRES = xpcom string caps dom js widget xpconnect necko schema
CPPSRCS = \ CPPSRCS = \
nsDefaultSOAPEncoder.cpp\ nsDefaultSOAPEncoder.cpp\
nsHTTPSOAPTransport.cpp \ nsHTTPSOAPTransport.cpp \
nsSOAPBlock.cpp \ nsSOAPBlock.cpp \
nsSOAPCall.cpp \ nsSOAPCall.cpp \
nsSOAPEncoding.cpp \ nsSOAPEncoding.cpp \
nsSOAPException.cpp \ nsSOAPException.cpp \
nsSOAPFault.cpp \ nsSOAPFault.cpp \
nsSOAPHeaderBlock.cpp \ nsSOAPHeaderBlock.cpp \
nsSOAPMessage.cpp \ nsSOAPMessage.cpp \
nsSOAPParameter.cpp \ nsSOAPParameter.cpp \
nsSOAPPropertyBag.cpp \ nsSOAPPropertyBag.cpp \
nsSOAPResponse.cpp \ nsSOAPResponse.cpp \
nsSOAPUtils.cpp \ nsSOAPUtils.cpp \
$(NULL) $(NULL)
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.
@ -68,8 +68,8 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_HTML DEFINES += -D_IMPL_NS_HTML
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
DEFINES += -DWIN32_LEAN_AND_MEAN DEFINES += -DWIN32_LEAN_AND_MEAN
endif endif

64
extensions/webservices/soap/src/nsHTTPSOAPTransport.cpp
Просмотреть файл

@ -69,14 +69,14 @@ NS_IMPL_ISUPPORTS1_CI(nsHTTPSOAPTransport, nsISOAPTransport)
#ifdef DEBUG #ifdef DEBUG
#define DEBUG_DUMP_DOCUMENT(message,doc) \ #define DEBUG_DUMP_DOCUMENT(message,doc) \
{ \ { \
nsresult rcc;\ nsresult rcc;\
nsXPIDLString serial;\ nsXPIDLString serial;\
nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rcc));\ nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rcc));\
if (NS_FAILED(rcc)) return rcc; \ if (NS_FAILED(rcc)) return rcc; \
rcc = serializer->SerializeToString(doc, getter_Copies(serial));\ rcc = serializer->SerializeToString(doc, getter_Copies(serial));\
if (NS_FAILED(rcc)) return rcc;\ if (NS_FAILED(rcc)) return rcc;\
nsAutoString result(serial);\ nsAutoString result(serial);\
printf(message ":\n%s\n", NS_ConvertUCS2toUTF8(result).get());\ printf(message ":\n%s\n", NS_ConvertUCS2toUTF8(result).get());\
} }
// Availble from the debugger... // Availble from the debugger...
nsresult DebugPrintDOM(nsIDOMNode * node) nsresult DebugPrintDOM(nsIDOMNode * node)
@ -281,7 +281,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(), rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(),
PR_FALSE, nsnull, nsnull); PR_FALSE, nsnull, nsnull);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -291,7 +291,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
if (!AStringIsNull(action)) { if (!AStringIsNull(action)) {
rv = request->SetRequestHeader("SOAPAction", rv = request->SetRequestHeader("SOAPAction",
NS_ConvertUCS2toUTF8(action).get()); NS_ConvertUCS2toUTF8(action).get());
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -302,7 +302,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument), rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument),
messageDocument); messageDocument);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -336,7 +336,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
} }
NS_IMPL_ISUPPORTS2_CI(nsHTTPSOAPTransportCompletion, nsIDOMEventListener, NS_IMPL_ISUPPORTS2_CI(nsHTTPSOAPTransportCompletion, nsIDOMEventListener,
nsISOAPCallCompletion) nsISOAPCallCompletion)
nsHTTPSOAPTransportCompletion::nsHTTPSOAPTransportCompletion() nsHTTPSOAPTransportCompletion::nsHTTPSOAPTransportCompletion()
{ {
NS_INIT_ISUPPORTS(); NS_INIT_ISUPPORTS();
@ -363,7 +363,7 @@ NS_IMETHODIMP nsHTTPSOAPTransportCompletion::GetCall(nsISOAPCall * *aCall)
/* readonly attribute nsISOAPResponse response; */ /* readonly attribute nsISOAPResponse response; */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransportCompletion::GetResponse(nsISOAPResponse * nsHTTPSOAPTransportCompletion::GetResponse(nsISOAPResponse *
*aResponse) *aResponse)
{ {
*aResponse = *aResponse =
mRequest ? (nsCOMPtr < nsISOAPResponse >) nsnull : mResponse; mRequest ? (nsCOMPtr < nsISOAPResponse >) nsnull : mResponse;
@ -374,7 +374,7 @@ NS_IMETHODIMP
/* readonly attribute nsISOAPResponseListener listener; */ /* readonly attribute nsISOAPResponseListener listener; */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransportCompletion::GetListener(nsISOAPResponseListener * nsHTTPSOAPTransportCompletion::GetListener(nsISOAPResponseListener *
*aListener) *aListener)
{ {
*aListener = mListener; *aListener = mListener;
NS_IF_ADDREF(*aListener); NS_IF_ADDREF(*aListener);
@ -408,7 +408,7 @@ NS_IMETHODIMP
{ {
// PRUint32 status; // PRUint32 status;
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (mRequest) { // Avoid if it has been aborted. if (mRequest) { // Avoid if it has been aborted.
#if 0 #if 0
rv = mRequest->GetStatus(&status); rv = mRequest->GetStatus(&status);
if (NS_SUCCEEDED(rv) && (status < 200 || status >= 300)) if (NS_SUCCEEDED(rv) && (status < 200 || status >= 300))
@ -418,16 +418,16 @@ NS_IMETHODIMP
nsCOMPtr < nsIDOMDocument > document; nsCOMPtr < nsIDOMDocument > document;
rv = mRequest->GetResponseXML(getter_AddRefs(document)); rv = mRequest->GetResponseXML(getter_AddRefs(document));
if (NS_SUCCEEDED(rv) && document) { if (NS_SUCCEEDED(rv) && document) {
rv = mResponse->SetMessage(document); rv = mResponse->SetMessage(document);
DEBUG_DUMP_DOCUMENT("Asynchronous Response", document)} else { DEBUG_DUMP_DOCUMENT("Asynchronous Response", document)} else {
mResponse = nsnull; mResponse = nsnull;
} }
} else { } else {
mResponse = nsnull; mResponse = nsnull;
} }
nsCOMPtr < nsISOAPCallCompletion > kungFuDeathGrip = this; nsCOMPtr < nsISOAPCallCompletion > kungFuDeathGrip = this;
mRequest = nsnull; // Break cycle of references by releas. mRequest = nsnull; // Break cycle of references by releas.
PRBool c; // In other transports, this may signal to stop returning if multiple returns PRBool c; // In other transports, this may signal to stop returning if multiple returns
mListener->HandleResponse(mResponse, mCall, rv, PR_TRUE, &c); mListener->HandleResponse(mResponse, mCall, rv, PR_TRUE, &c);
} }
return NS_OK; return NS_OK;
@ -436,9 +436,9 @@ NS_IMETHODIMP
/* void asyncCall (in nsISOAPCall aCall, in nsISOAPResponseListener aListener, in nsISOAPResponse aResponse); */ /* void asyncCall (in nsISOAPCall aCall, in nsISOAPResponseListener aListener, in nsISOAPResponse aResponse); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::AsyncCall(nsISOAPCall * aCall, nsHTTPSOAPTransport::AsyncCall(nsISOAPCall * aCall,
nsISOAPResponseListener * aListener, nsISOAPResponseListener * aListener,
nsISOAPResponse * aResponse, nsISOAPResponse * aResponse,
nsISOAPCallCompletion ** aCompletion) nsISOAPCallCompletion ** aCompletion)
{ {
NS_ENSURE_ARG(aCall); NS_ENSURE_ARG(aCall);
@ -470,7 +470,7 @@ NS_IMETHODIMP
DEBUG_DUMP_DOCUMENT("Asynchronous Request", messageDocument) DEBUG_DUMP_DOCUMENT("Asynchronous Request", messageDocument)
rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(), rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(),
PR_TRUE, nsnull, nsnull); PR_TRUE, nsnull, nsnull);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -480,7 +480,7 @@ NS_IMETHODIMP
return rv; return rv;
if (!AStringIsNull(action)) { if (!AStringIsNull(action)) {
rv = request->SetRequestHeader("SOAPAction", rv = request->SetRequestHeader("SOAPAction",
NS_ConvertUCS2toUTF8(action).get()); NS_ConvertUCS2toUTF8(action).get());
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -491,7 +491,7 @@ NS_IMETHODIMP
return rv; return rv;
rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument), rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument),
messageDocument); messageDocument);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -499,19 +499,19 @@ NS_IMETHODIMP
if (aListener) { if (aListener) {
completion = completion =
new nsHTTPSOAPTransportCompletion(aCall, aResponse, request, new nsHTTPSOAPTransportCompletion(aCall, aResponse, request,
aListener); aListener);
if (!completion) if (!completion)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr < nsIDOMEventListener > listener = nsCOMPtr < nsIDOMEventListener > listener =
do_QueryInterface(completion); do_QueryInterface(completion);
rv = eventTarget->AddEventListener(NS_LITERAL_STRING("load"), listener, rv = eventTarget->AddEventListener(NS_LITERAL_STRING("load"), listener,
PR_FALSE); PR_FALSE);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
rv = eventTarget->AddEventListener(NS_LITERAL_STRING("error"), rv = eventTarget->AddEventListener(NS_LITERAL_STRING("error"),
listener, PR_FALSE); listener, PR_FALSE);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -528,7 +528,7 @@ NS_IMETHODIMP
/* void addListener (in nsISOAPTransportListener aListener, in boolean aCapture); */ /* void addListener (in nsISOAPTransportListener aListener, in boolean aCapture); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::AddListener(nsISOAPTransportListener * aListener, nsHTTPSOAPTransport::AddListener(nsISOAPTransportListener * aListener,
PRBool aCapture) PRBool aCapture)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -536,7 +536,7 @@ NS_IMETHODIMP
/* void removeListener (in nsISOAPTransportListener aListener, in boolean aCapture); */ /* void removeListener (in nsISOAPTransportListener aListener, in boolean aCapture); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::RemoveListener(nsISOAPTransportListener * nsHTTPSOAPTransport::RemoveListener(nsISOAPTransportListener *
aListener, PRBool aCapture) aListener, PRBool aCapture)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }

24
extensions/webservices/soap/src/nsSOAPBlock.cpp
Просмотреть файл

@ -55,7 +55,7 @@ nsSOAPBlock::~nsSOAPBlock()
NS_IMPL_ISUPPORTS2(nsSOAPBlock, nsISOAPBlock, nsIJSNativeInitializer) NS_IMPL_ISUPPORTS2(nsSOAPBlock, nsISOAPBlock, nsIJSNativeInitializer)
NS_IMETHODIMP nsSOAPBlock::Init(nsISOAPAttachments * aAttachments, NS_IMETHODIMP nsSOAPBlock::Init(nsISOAPAttachments * aAttachments,
PRUint16 aVersion) PRUint16 aVersion)
{ {
if (aVersion == nsISOAPMessage::VERSION_1_1 if (aVersion == nsISOAPMessage::VERSION_1_1
|| aVersion == nsISOAPMessage::VERSION_1_2) { || aVersion == nsISOAPMessage::VERSION_1_2) {
@ -167,15 +167,15 @@ NS_IMETHODIMP nsSOAPBlock::SetElement(nsIDOMElement * aElement)
NS_IMETHODIMP nsSOAPBlock::GetValue(nsIVariant * *aValue) NS_IMETHODIMP nsSOAPBlock::GetValue(nsIVariant * *aValue)
{ {
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);
if (mElement) { // Check for auto-computation if (mElement) { // Check for auto-computation
if (mComputeValue) { if (mComputeValue) {
mComputeValue = PR_FALSE; mComputeValue = PR_FALSE;
if (mEncoding) { if (mEncoding) {
mStatus = mStatus =
mEncoding->Decode(mElement, mSchemaType, mAttachments, mEncoding->Decode(mElement, mSchemaType, mAttachments,
getter_AddRefs(mValue)); getter_AddRefs(mValue));
} else { } else {
mStatus = NS_ERROR_NOT_INITIALIZED; mStatus = NS_ERROR_NOT_INITIALIZED;
} }
} }
} }
@ -195,7 +195,7 @@ NS_IMETHODIMP nsSOAPBlock::SetValue(nsIVariant * aValue)
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPBlock::Initialize(JSContext * cx, JSObject * obj, nsSOAPBlock::Initialize(JSContext * cx, JSObject * obj,
PRUint32 argc, jsval * argv) PRUint32 argc, jsval * argv)
{ {
// Get the arguments. // Get the arguments.
@ -207,11 +207,11 @@ NS_IMETHODIMP
nsCOMPtr < nsISupports > encoding; nsCOMPtr < nsISupports > encoding;
if (!JS_ConvertArguments(cx, argc, argv, "/%iv %is %is %ip %ip", if (!JS_ConvertArguments(cx, argc, argv, "/%iv %is %is %ip %ip",
getter_AddRefs(value), getter_AddRefs(value),
NS_STATIC_CAST(nsAString *, &name), NS_STATIC_CAST(nsAString *, &name),
NS_STATIC_CAST(nsAString *, &namespaceURI), NS_STATIC_CAST(nsAString *, &namespaceURI),
getter_AddRefs(schemaType), getter_AddRefs(schemaType),
getter_AddRefs(encoding))) getter_AddRefs(encoding)))
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
nsresult rc = SetValue(value); nsresult rc = SetValue(value);

6
extensions/webservices/soap/src/nsSOAPCall.cpp
Просмотреть файл

@ -150,7 +150,7 @@ NS_IMETHODIMP nsSOAPCall::Invoke(nsISOAPResponse ** _retval)
return rv; return rv;
nsCOMPtr < nsIDOMDocument > document; nsCOMPtr < nsIDOMDocument > document;
rv = response->GetMessage(getter_AddRefs(document)); // No XML response. rv = response->GetMessage(getter_AddRefs(document)); // No XML response.
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
if (!document) { if (!document) {
@ -159,13 +159,13 @@ NS_IMETHODIMP nsSOAPCall::Invoke(nsISOAPResponse ** _retval)
} }
return response->QueryInterface(NS_GET_IID(nsISOAPResponse), return response->QueryInterface(NS_GET_IID(nsISOAPResponse),
(void **) _retval); (void **) _retval);
} }
/* void asyncInvoke (in nsISOAPResponseListener listener); */ /* void asyncInvoke (in nsISOAPResponseListener listener); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPCall::AsyncInvoke(nsISOAPResponseListener * listener, nsSOAPCall::AsyncInvoke(nsISOAPResponseListener * listener,
nsISOAPCallCompletion ** aCompletion) nsISOAPCallCompletion ** aCompletion)
{ {
nsresult rv; nsresult rv;
nsCOMPtr < nsISOAPTransport > transport; nsCOMPtr < nsISOAPTransport > transport;

84
extensions/webservices/soap/src/nsSOAPEncoding.cpp
Просмотреть файл

@ -53,7 +53,7 @@
// First comes the registry which shares between associated encodings but is never seen by xpconnect. // First comes the registry which shares between associated encodings but is never seen by xpconnect.
NS_IMPL_ISUPPORTS1(nsSOAPEncodingRegistry, nsISOAPEncoding) nsSOAPEncodingRegistry::nsSOAPEncodingRegistry(nsISOAPEncoding * aEncoding):mEncodings(new NS_IMPL_ISUPPORTS1(nsSOAPEncodingRegistry, nsISOAPEncoding) nsSOAPEncodingRegistry::nsSOAPEncodingRegistry(nsISOAPEncoding * aEncoding):mEncodings(new
nsSupportsHashtable) nsSupportsHashtable)
{ {
NS_INIT_ISUPPORTS(); NS_INIT_ISUPPORTS();
@ -73,7 +73,7 @@ nsSOAPEncodingRegistry::~nsSOAPEncodingRegistry()
nsresult nsresult
nsSOAPEncodingRegistry:: nsSOAPEncodingRegistry::
GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf, GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf,
nsISOAPEncoding * *aEncoding) nsISOAPEncoding * *aEncoding)
{ {
NS_SOAP_ENSURE_ARG_STRING(aStyleURI); NS_SOAP_ENSURE_ARG_STRING(aStyleURI);
NS_ENSURE_ARG_POINTER(aEncoding); NS_ENSURE_ARG_POINTER(aEncoding);
@ -97,7 +97,7 @@ GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf,
nsresult nsresult
nsSOAPEncodingRegistry::SetSchemaCollection(nsISchemaCollection * nsSOAPEncodingRegistry::SetSchemaCollection(nsISchemaCollection *
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG(aSchemaCollection); NS_ENSURE_ARG(aSchemaCollection);
mSchemaCollection = aSchemaCollection; mSchemaCollection = aSchemaCollection;
@ -106,13 +106,13 @@ nsresult
nsresult nsresult
nsSOAPEncodingRegistry::GetSchemaCollection(nsISchemaCollection ** nsSOAPEncodingRegistry::GetSchemaCollection(nsISchemaCollection **
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG_POINTER(aSchemaCollection); NS_ENSURE_ARG_POINTER(aSchemaCollection);
if (!mSchemaCollection) { if (!mSchemaCollection) {
nsresult rv; nsresult rv;
nsCOMPtr < nsISchemaLoader > loader = nsCOMPtr < nsISchemaLoader > loader =
do_CreateInstance(NS_SCHEMALOADER_CONTRACTID, &rv); do_CreateInstance(NS_SCHEMALOADER_CONTRACTID, &rv);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
mSchemaCollection = do_QueryInterface(loader); mSchemaCollection = do_QueryInterface(loader);
@ -133,7 +133,7 @@ NS_IMETHODIMP nsSOAPEncodingRegistry::GetStyleURI(nsAString & aStyleURI)
/* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */ /* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetEncoder(const nsAString & aKey, nsSOAPEncodingRegistry::SetEncoder(const nsAString & aKey,
nsISOAPEncoder * aEncoder) nsISOAPEncoder * aEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -141,7 +141,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder getEncoder (in AString aKey); */ /* nsISOAPEncoder getEncoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetEncoder(const nsAString & aKey, nsSOAPEncodingRegistry::GetEncoder(const nsAString & aKey,
nsISOAPEncoder ** _retval) nsISOAPEncoder ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -149,7 +149,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */ /* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDecoder(const nsAString & aKey, nsSOAPEncodingRegistry::SetDecoder(const nsAString & aKey,
nsISOAPDecoder * aDecoder) nsISOAPDecoder * aDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -157,7 +157,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder getDecoder (in AString aKey); */ /* nsISOAPDecoder getDecoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDecoder(const nsAString & aKey, nsSOAPEncodingRegistry::GetDecoder(const nsAString & aKey,
nsISOAPDecoder ** _retval) nsISOAPDecoder ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -165,14 +165,14 @@ NS_IMETHODIMP
/* attribute nsISOAPEncoder defaultEncoder; */ /* attribute nsISOAPEncoder defaultEncoder; */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDefaultEncoder(nsISOAPEncoder * nsSOAPEncodingRegistry::GetDefaultEncoder(nsISOAPEncoder *
*aDefaultEncoder) *aDefaultEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDefaultEncoder(nsISOAPEncoder * nsSOAPEncodingRegistry::SetDefaultEncoder(nsISOAPEncoder *
aDefaultEncoder) aDefaultEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -180,14 +180,14 @@ NS_IMETHODIMP
/* attribute nsISOAPDecoder defaultDecoder; */ /* attribute nsISOAPDecoder defaultDecoder; */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDefaultDecoder(nsISOAPDecoder * nsSOAPEncodingRegistry::GetDefaultDecoder(nsISOAPDecoder *
*aDefaultDecoder) *aDefaultDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDefaultDecoder(nsISOAPDecoder * nsSOAPEncodingRegistry::SetDefaultDecoder(nsISOAPDecoder *
aDefaultDecoder) aDefaultDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -195,12 +195,12 @@ NS_IMETHODIMP
/* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */ /* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::Encode(nsIVariant * aSource, nsSOAPEncodingRegistry::Encode(nsIVariant * aSource,
const nsAString & aNamespaceURI, const nsAString & aNamespaceURI,
const nsAString & aName, const nsAString & aName,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIDOMElement * aDestination, nsIDOMElement * aDestination,
nsIDOMElement ** _retval) nsIDOMElement ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -208,9 +208,9 @@ NS_IMETHODIMP
/* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */ /* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::Decode(nsIDOMElement * aSource, nsSOAPEncodingRegistry::Decode(nsIDOMElement * aSource,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -277,7 +277,7 @@ nsSOAPEncoding::~nsSOAPEncoding()
nsresult nsresult
nsSOAPEncoding::SetSchemaCollection(nsISchemaCollection * nsSOAPEncoding::SetSchemaCollection(nsISchemaCollection *
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG(aSchemaCollection); NS_ENSURE_ARG(aSchemaCollection);
return mRegistry->SetSchemaCollection(aSchemaCollection); return mRegistry->SetSchemaCollection(aSchemaCollection);
@ -285,7 +285,7 @@ nsresult
nsresult nsresult
nsSOAPEncoding::GetSchemaCollection(nsISchemaCollection ** nsSOAPEncoding::GetSchemaCollection(nsISchemaCollection **
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG_POINTER(aSchemaCollection); NS_ENSURE_ARG_POINTER(aSchemaCollection);
return mRegistry->GetSchemaCollection(aSchemaCollection); return mRegistry->GetSchemaCollection(aSchemaCollection);
@ -302,8 +302,8 @@ NS_IMETHODIMP nsSOAPEncoding::GetStyleURI(nsAString & aStyleURI)
/* nsISOAPEncoding getAssociatedEncoding (in AString aStyleURI, in boolean aCreateIf); */ /* nsISOAPEncoding getAssociatedEncoding (in AString aStyleURI, in boolean aCreateIf); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetAssociatedEncoding(const nsAString & aStyleURI, nsSOAPEncoding::GetAssociatedEncoding(const nsAString & aStyleURI,
PRBool aCreateIf, PRBool aCreateIf,
nsISOAPEncoding ** _retval) nsISOAPEncoding ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aStyleURI); NS_SOAP_ENSURE_ARG_STRING(aStyleURI);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -313,7 +313,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */ /* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::SetEncoder(const nsAString & aKey, nsSOAPEncoding::SetEncoder(const nsAString & aKey,
nsISOAPEncoder * aEncoder) nsISOAPEncoder * aEncoder)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG(aEncoder); NS_ENSURE_ARG(aEncoder);
@ -329,7 +329,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder getEncoder (in AString aKey); */ /* nsISOAPEncoder getEncoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetEncoder(const nsAString & aKey, nsSOAPEncoding::GetEncoder(const nsAString & aKey,
nsISOAPEncoder ** _retval) nsISOAPEncoder ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -344,7 +344,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */ /* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::SetDecoder(const nsAString & aKey, nsSOAPEncoding::SetDecoder(const nsAString & aKey,
nsISOAPDecoder * aDecoder) nsISOAPDecoder * aDecoder)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG(aDecoder); NS_ENSURE_ARG(aDecoder);
@ -360,7 +360,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder getDecoder (in AString aKey); */ /* nsISOAPDecoder getDecoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetDecoder(const nsAString & aKey, nsSOAPEncoding::GetDecoder(const nsAString & aKey,
nsISOAPDecoder ** _retval) nsISOAPDecoder ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -375,12 +375,12 @@ NS_IMETHODIMP
/* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */ /* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::Encode(nsIVariant * aSource, nsSOAPEncoding::Encode(nsIVariant * aSource,
const nsAString & aNamespaceURI, const nsAString & aNamespaceURI,
const nsAString & aName, const nsAString & aName,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIDOMElement * aDestination, nsIDOMElement * aDestination,
nsIDOMElement ** _retval) nsIDOMElement ** _retval)
{ {
NS_ENSURE_ARG(aSource); NS_ENSURE_ARG(aSource);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -391,8 +391,8 @@ NS_IMETHODIMP
return rv; return rv;
if (encoder) { if (encoder) {
return encoder->Encode(this, aSource, aNamespaceURI, aName, return encoder->Encode(this, aSource, aNamespaceURI, aName,
aSchemaType, aAttachments, aDestination, aSchemaType, aAttachments, aDestination,
_retval); _retval);
} }
*_retval = nsnull; *_retval = nsnull;
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
@ -401,9 +401,9 @@ NS_IMETHODIMP
/* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */ /* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::Decode(nsIDOMElement * aSource, nsSOAPEncoding::Decode(nsIDOMElement * aSource,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
NS_ENSURE_ARG(aSource); NS_ENSURE_ARG(aSource);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -413,7 +413,7 @@ NS_IMETHODIMP
return rv; return rv;
if (decoder) { if (decoder) {
return decoder->Decode(this, aSource, aSchemaType, aAttachments, return decoder->Decode(this, aSource, aSchemaType, aAttachments,
_retval); _retval);
} }
*_retval = nsnull; *_retval = nsnull;
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;

2
extensions/webservices/soap/src/nsSOAPException.cpp
Просмотреть файл

@ -215,7 +215,7 @@ nsresult nsSOAPException::AddException(nsresult aStatus, const nsAString & aName
xs->GetCurrentException(getter_AddRefs(old)); xs->GetCurrentException(getter_AddRefs(old));
nsCOMPtr<nsIException> exception = new nsSOAPException(aStatus, nsCOMPtr<nsIException> exception = new nsSOAPException(aStatus,
aName.IsEmpty() ? NS_LITERAL_STRING("SOAP_FAILURE") : aName, aName.IsEmpty() ? NS_LITERAL_STRING("SOAP_FAILURE") : aName,
aMessage.IsEmpty() ? NS_LITERAL_STRING("No description") : aMessage, old); aMessage.IsEmpty() ? NS_LITERAL_STRING("No description") : aMessage, old);
if (exception) { if (exception) {
xm->SetCurrentException(exception); xm->SetCurrentException(exception);
} }

42
extensions/webservices/soap/src/nsSOAPFault.cpp
Просмотреть файл

@ -67,14 +67,14 @@ NS_IMETHODIMP nsSOAPFault::SetElement(nsIDOMElement * aElement)
return rc; return rc;
if (name.Equals(nsSOAPUtils::kFaultTagName)) { if (name.Equals(nsSOAPUtils::kFaultTagName)) {
if (namespaceURI. if (namespaceURI.
Equals(*nsSOAPUtils::kSOAPEnvURI[nsISOAPMessage::VERSION_1_2])) { Equals(*nsSOAPUtils::kSOAPEnvURI[nsISOAPMessage::VERSION_1_2])) {
mVersion = nsISOAPMessage::VERSION_1_2; mVersion = nsISOAPMessage::VERSION_1_2;
} else if (namespaceURI. } else if (namespaceURI.
Equals(*nsSOAPUtils:: Equals(*nsSOAPUtils::
kSOAPEnvURI[nsISOAPMessage::VERSION_1_1])) { kSOAPEnvURI[nsISOAPMessage::VERSION_1_1])) {
mVersion = nsISOAPMessage::VERSION_1_1; mVersion = nsISOAPMessage::VERSION_1_1;
} else { } else {
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
} }
} else { } else {
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
@ -101,9 +101,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultCode(nsAString & aFaultCode)
aFaultCode.Truncate(); aFaultCode.Truncate();
nsCOMPtr < nsIDOMElement > faultcode; nsCOMPtr < nsIDOMElement > faultcode;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultCodeTagName, nsSOAPUtils::kFaultCodeTagName,
getter_AddRefs(faultcode)); getter_AddRefs(faultcode));
if (faultcode) { if (faultcode) {
nsAutoString combined; nsAutoString combined;
nsSOAPUtils::GetElementTextContent(faultcode, combined); nsSOAPUtils::GetElementTextContent(faultcode, combined);
@ -121,9 +121,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultNamespaceURI(nsAString & aNamespaceURI)
aNamespaceURI.Truncate(); aNamespaceURI.Truncate();
nsCOMPtr < nsIDOMElement > faultcode; nsCOMPtr < nsIDOMElement > faultcode;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultCodeTagName, nsSOAPUtils::kFaultCodeTagName,
getter_AddRefs(faultcode)); getter_AddRefs(faultcode));
if (faultcode) { if (faultcode) {
nsAutoString combined; nsAutoString combined;
nsSOAPUtils::GetElementTextContent(faultcode, combined); nsSOAPUtils::GetElementTextContent(faultcode, combined);
@ -142,9 +142,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultString(nsAString & aFaultString)
aFaultString.Truncate(); aFaultString.Truncate();
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultStringTagName, nsSOAPUtils::kFaultStringTagName,
getter_AddRefs(element)); getter_AddRefs(element));
if (element) { if (element) {
nsSOAPUtils::GetElementTextContent(element, aFaultString); nsSOAPUtils::GetElementTextContent(element, aFaultString);
} }
@ -161,9 +161,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultActor(nsAString & aFaultActor)
aFaultActor.Truncate(); aFaultActor.Truncate();
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultActorTagName, nsSOAPUtils::kFaultActorTagName,
getter_AddRefs(element)); getter_AddRefs(element));
if (element) { if (element) {
nsSOAPUtils::GetElementTextContent(element, aFaultActor); nsSOAPUtils::GetElementTextContent(element, aFaultActor);
} }
@ -179,8 +179,8 @@ NS_IMETHODIMP nsSOAPFault::GetDetail(nsIDOMElement * *aDetail)
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultDetailTagName, nsSOAPUtils::kFaultDetailTagName,
aDetail); aDetail);
return NS_OK; return NS_OK;
} }

20
extensions/webservices/soap/src/nsSOAPHeaderBlock.cpp
Просмотреть файл

@ -50,7 +50,7 @@ nsSOAPHeaderBlock::nsSOAPHeaderBlock()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPHeaderBlock, nsISOAPBlock, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPHeaderBlock, nsISOAPBlock,
nsISOAPHeaderBlock) nsISOAPHeaderBlock)
NS_IMPL_ADDREF_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock) NS_IMPL_ADDREF_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock)
NS_IMPL_RELEASE_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock) NS_IMPL_RELEASE_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock)
NS_INTERFACE_MAP_BEGIN(nsSOAPHeaderBlock) NS_INTERFACE_MAP_BEGIN(nsSOAPHeaderBlock)
@ -69,8 +69,8 @@ NS_IMETHODIMP nsSOAPHeaderBlock::GetActorURI(nsAString & aActorURI)
if (mVersion == nsISOAPMessage::VERSION_UNKNOWN) if (mVersion == nsISOAPMessage::VERSION_UNKNOWN)
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
return mElement->GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion], return mElement->GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion],
nsSOAPUtils::kActorAttribute, nsSOAPUtils::kActorAttribute,
aActorURI); aActorURI);
} else { } else {
aActorURI.Assign(mActorURI); aActorURI.Assign(mActorURI);
} }
@ -88,7 +88,7 @@ NS_IMETHODIMP nsSOAPHeaderBlock::SetActorURI(const nsAString & aActorURI)
/* attribute AString mustUnderstand; */ /* attribute AString mustUnderstand; */
NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool * NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool *
aMustUnderstand) aMustUnderstand)
{ {
NS_ENSURE_ARG_POINTER(&aMustUnderstand); NS_ENSURE_ARG_POINTER(&aMustUnderstand);
if (mElement) { if (mElement) {
@ -96,19 +96,19 @@ NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool *
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
nsAutoString m; nsAutoString m;
nsresult nsresult
rc = rc =
mElement-> mElement->
GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion], GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion],
nsSOAPUtils::kMustUnderstandAttribute, m); nsSOAPUtils::kMustUnderstandAttribute, m);
if (NS_FAILED(rc)) if (NS_FAILED(rc))
return rc; return rc;
if (m.Length() == 0) if (m.Length() == 0)
*aMustUnderstand = PR_FALSE; *aMustUnderstand = PR_FALSE;
else if (m.Equals(nsSOAPUtils::kTrue) else if (m.Equals(nsSOAPUtils::kTrue)
|| m.Equals(nsSOAPUtils::kTrueA)) || m.Equals(nsSOAPUtils::kTrueA))
*aMustUnderstand = PR_TRUE; *aMustUnderstand = PR_TRUE;
else if (m.Equals(nsSOAPUtils::kFalse) else if (m.Equals(nsSOAPUtils::kFalse)
|| m.Equals(nsSOAPUtils::kFalseA)) || m.Equals(nsSOAPUtils::kFalseA))
*aMustUnderstand = PR_FALSE; *aMustUnderstand = PR_FALSE;
else else
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;

2
extensions/webservices/soap/src/nsSOAPParameter.cpp
Просмотреть файл

@ -49,7 +49,7 @@ nsSOAPParameter::nsSOAPParameter()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPParameter, nsISOAPBlock, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPParameter, nsISOAPBlock,
nsISOAPParameter) nsISOAPParameter)
NS_IMPL_ADDREF_INHERITED(nsSOAPParameter, nsSOAPBlock) NS_IMPL_ADDREF_INHERITED(nsSOAPParameter, nsSOAPBlock)
NS_IMPL_RELEASE_INHERITED(nsSOAPParameter, nsSOAPBlock) NS_IMPL_RELEASE_INHERITED(nsSOAPParameter, nsSOAPBlock)
NS_INTERFACE_MAP_BEGIN(nsSOAPParameter) NS_INTERFACE_MAP_BEGIN(nsSOAPParameter)

24
extensions/webservices/soap/src/nsSOAPPropertyBag.cpp
Просмотреть файл

@ -106,7 +106,7 @@ nsSOAPPropertyBag::~nsSOAPPropertyBag()
/* nsIVariant getProperty (in AString name); */ /* nsIVariant getProperty (in AString name); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::GetProperty(const nsAString & aName, nsSOAPPropertyBag::GetProperty(const nsAString & aName,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
nsStringKey nameKey(aName); nsStringKey nameKey(aName);
@ -116,7 +116,7 @@ NS_IMETHODIMP
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::SetProperty(const nsAString & aName, nsSOAPPropertyBag::SetProperty(const nsAString & aName,
nsIVariant * aValue) nsIVariant * aValue)
{ {
NS_ENSURE_ARG_POINTER(&aName); NS_ENSURE_ARG_POINTER(&aName);
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);
@ -129,22 +129,22 @@ NS_IMETHODIMP
#define XPC_MAP_QUOTED_CLASSNAME "SOAPPropertyBag" #define XPC_MAP_QUOTED_CLASSNAME "SOAPPropertyBag"
#define XPC_MAP_WANT_GETPROPERTY #define XPC_MAP_WANT_GETPROPERTY
#define XPC_MAP_FLAGS 0 #define XPC_MAP_FLAGS 0
#include "xpc_map_end.h" /* This will #undef the above */ #include "xpc_map_end.h" /* This will #undef the above */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::GetProperty(nsIXPConnectWrappedNative * wrapper, nsSOAPPropertyBag::GetProperty(nsIXPConnectWrappedNative * wrapper,
JSContext * cx, JSObject * obj, JSContext * cx, JSObject * obj,
jsval id, jsval * vp, PRBool * _retval) jsval id, jsval * vp, PRBool * _retval)
{ {
if (JSVAL_IS_STRING(id)) { if (JSVAL_IS_STRING(id)) {
JSString *str = JSVAL_TO_STRING(id); JSString *str = JSVAL_TO_STRING(id);
const PRUnichar *name = NS_REINTERPRET_CAST(const PRUnichar *, const PRUnichar *name = NS_REINTERPRET_CAST(const PRUnichar *,
JS_GetStringChars(str)); JS_GetStringChars(str));
nsDependentString namestr(name); nsDependentString namestr(name);
nsStringKey nameKey(namestr); nsStringKey nameKey(namestr);
nsCOMPtr < nsIVariant > value = nsCOMPtr < nsIVariant > value =
dont_AddRef(NS_STATIC_CAST dont_AddRef(NS_STATIC_CAST
(nsIVariant *, mProperties->Get(&nameKey))); (nsIVariant *, mProperties->Get(&nameKey)));
if (value == nsnull) if (value == nsnull)
return NS_OK; return NS_OK;
void *mark; void *mark;
@ -161,8 +161,8 @@ PRBool PropertyBagEnumFunc(nsHashKey * aKey, void *aData, void *aClosure)
nsAutoString name(NS_STATIC_CAST(nsStringKey *, aKey)->GetString()); nsAutoString name(NS_STATIC_CAST(nsStringKey *, aKey)->GetString());
properties-> properties->
AppendElement(new AppendElement(new
nsSOAPProperty(name, nsSOAPProperty(name,
NS_STATIC_CAST(nsIVariant *, aData))); NS_STATIC_CAST(nsIVariant *, aData)));
return PR_TRUE; return PR_TRUE;
} }
@ -204,7 +204,7 @@ NS_IMETHODIMP
NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty) NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty)
nsSOAPProperty::nsSOAPProperty(const nsAString & aName, nsSOAPProperty::nsSOAPProperty(const nsAString & aName,
nsIVariant * aValue):mName(aName), mValue(aValue) { nsIVariant * aValue):mName(aName), mValue(aValue) {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
} }
nsSOAPProperty::~nsSOAPProperty() nsSOAPProperty::~nsSOAPProperty()
@ -257,7 +257,7 @@ NS_IMETHODIMP nsSOAPPropertyBagMutator::GetPropertyBag(nsIPropertyBag ** aProper
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBagMutator::AddProperty(const nsAString & aName, nsSOAPPropertyBagMutator::AddProperty(const nsAString & aName,
nsIVariant * aValue) nsIVariant * aValue)
{ {
NS_ENSURE_ARG_POINTER(&aName); NS_ENSURE_ARG_POINTER(&aName);
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);

28
extensions/webservices/soap/src/nsSOAPResponse.cpp
Просмотреть файл

@ -55,7 +55,7 @@ nsSOAPResponse::~nsSOAPResponse()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPResponse, nsISOAPMessage, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPResponse, nsISOAPMessage,
nsISOAPResponse) nsISOAPResponse)
NS_IMPL_ADDREF_INHERITED(nsSOAPResponse, nsSOAPMessage) NS_IMPL_ADDREF_INHERITED(nsSOAPResponse, nsSOAPMessage)
NS_IMPL_RELEASE_INHERITED(nsSOAPResponse, nsSOAPMessage) NS_IMPL_RELEASE_INHERITED(nsSOAPResponse, nsSOAPMessage)
NS_INTERFACE_MAP_BEGIN(nsSOAPResponse) NS_INTERFACE_MAP_BEGIN(nsSOAPResponse)
@ -80,20 +80,20 @@ NS_IMETHODIMP nsSOAPResponse::GetFault(nsISOAPFault * *aFault)
if (rc != nsSOAPMessage::VERSION_UNKNOWN) { if (rc != nsSOAPMessage::VERSION_UNKNOWN) {
nsCOMPtr < nsIDOMElement > fault; nsCOMPtr < nsIDOMElement > fault;
nsSOAPUtils::GetSpecificChildElement(nsnull, body, nsSOAPUtils::GetSpecificChildElement(nsnull, body,
*nsSOAPUtils:: *nsSOAPUtils::
kSOAPEnvURI[version], kSOAPEnvURI[version],
nsSOAPUtils::kFaultTagName, nsSOAPUtils::kFaultTagName,
getter_AddRefs(fault)); getter_AddRefs(fault));
if (fault) { if (fault) {
nsCOMPtr < nsISOAPFault > f = nsCOMPtr < nsISOAPFault > f =
do_CreateInstance(NS_SOAPFAULT_CONTRACTID); do_CreateInstance(NS_SOAPFAULT_CONTRACTID);
if (!f) if (!f)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
rc = f->SetElement(fault); rc = f->SetElement(fault);
if (NS_FAILED(rc)) if (NS_FAILED(rc))
return rc; return rc;
*aFault = f; *aFault = f;
NS_ADDREF(*aFault); NS_ADDREF(*aFault);
} }
} }
} else { } else {

52
extensions/xmlextras/soap/public/Makefile.in
Просмотреть файл

@ -35,35 +35,35 @@
# #
# ***** END LICENSE BLOCK ***** * # ***** END LICENSE BLOCK ***** *
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = xmlextras MODULE = xmlextras
XPIDL_MODULE = xmlsoap XPIDL_MODULE = xmlsoap
XPIDLSRCS = \ XPIDLSRCS = \
nsISOAPAttachments.idl \ nsISOAPAttachments.idl \
nsISOAPBlock.idl \ nsISOAPBlock.idl \
nsISOAPCall.idl \ nsISOAPCall.idl \
nsISOAPCallCompletion.idl \ nsISOAPCallCompletion.idl \
nsISOAPDecoder.idl \ nsISOAPDecoder.idl \
nsISOAPEncoder.idl \ nsISOAPEncoder.idl \
nsISOAPEncoding.idl \ nsISOAPEncoding.idl \
nsISOAPFault.idl \ nsISOAPFault.idl \
nsISOAPHeaderBlock.idl \ nsISOAPHeaderBlock.idl \
nsISOAPMessage.idl \ nsISOAPMessage.idl \
nsISOAPParameter.idl \ nsISOAPParameter.idl \
nsISOAPPropertyBagMutator.idl \ nsISOAPPropertyBagMutator.idl \
nsISOAPResponse.idl \ nsISOAPResponse.idl \
nsISOAPResponseListener.idl \ nsISOAPResponseListener.idl \
nsISOAPService.idl \ nsISOAPService.idl \
nsISOAPServiceRegistry.idl \ nsISOAPServiceRegistry.idl \
nsISOAPTransport.idl \ nsISOAPTransport.idl \
nsISOAPTransportListener.idl \ nsISOAPTransportListener.idl \
$(NULL) $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

42
extensions/xmlextras/soap/public/makefile.win
Просмотреть файл

@ -38,29 +38,29 @@
DEPTH=..\..\..\.. DEPTH=..\..\..\..
MODULE = xmlextras MODULE = xmlextras
XPIDL_MODULE = xmlsoap XPIDL_MODULE = xmlsoap
XPIDLSRCS = \ XPIDLSRCS = \
.\nsISOAPAttachments.idl \ .\nsISOAPAttachments.idl \
.\nsISOAPBlock.idl \ .\nsISOAPBlock.idl \
.\nsISOAPCall.idl \ .\nsISOAPCall.idl \
.\nsISOAPCallCompletion.idl \ .\nsISOAPCallCompletion.idl \
.\nsISOAPDecoder.idl \ .\nsISOAPDecoder.idl \
.\nsISOAPEncoder.idl \ .\nsISOAPEncoder.idl \
.\nsISOAPEncoding.idl \ .\nsISOAPEncoding.idl \
.\nsISOAPFault.idl \ .\nsISOAPFault.idl \
.\nsISOAPHeaderBlock.idl \ .\nsISOAPHeaderBlock.idl \
.\nsISOAPMessage.idl \ .\nsISOAPMessage.idl \
.\nsISOAPParameter.idl \ .\nsISOAPParameter.idl \
.\nsISOAPPropertyBagMutator.idl \ .\nsISOAPPropertyBagMutator.idl \
.\nsISOAPResponse.idl \ .\nsISOAPResponse.idl \
.\nsISOAPResponseListener.idl \ .\nsISOAPResponseListener.idl \
.\nsISOAPService.idl \ .\nsISOAPService.idl \
.\nsISOAPServiceRegistry.idl \ .\nsISOAPServiceRegistry.idl \
.\nsISOAPTransport.idl \ .\nsISOAPTransport.idl \
.\nsISOAPTransportListener.idl \ .\nsISOAPTransportListener.idl \
$(NULL) $(NULL)
include <$(DEPTH)\config\rules.mak> include <$(DEPTH)\config\rules.mak>

48
extensions/xmlextras/soap/src/Makefile.in
Просмотреть файл

@ -35,32 +35,32 @@
# #
# ***** END LICENSE BLOCK ***** * # ***** END LICENSE BLOCK ***** *
DEPTH = ../../../.. DEPTH = ../../../..
topsrcdir = @top_srcdir@ topsrcdir = @top_srcdir@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
MODULE = xmlextras MODULE = xmlextras
LIBRARY_NAME = xmlextrassoap_s LIBRARY_NAME = xmlextrassoap_s
REQUIRES = xpcom string caps dom js widget xpconnect necko schema REQUIRES = xpcom string caps dom js widget xpconnect necko schema
CPPSRCS = \ CPPSRCS = \
nsDefaultSOAPEncoder.cpp\ nsDefaultSOAPEncoder.cpp\
nsHTTPSOAPTransport.cpp \ nsHTTPSOAPTransport.cpp \
nsSOAPBlock.cpp \ nsSOAPBlock.cpp \
nsSOAPCall.cpp \ nsSOAPCall.cpp \
nsSOAPEncoding.cpp \ nsSOAPEncoding.cpp \
nsSOAPException.cpp \ nsSOAPException.cpp \
nsSOAPFault.cpp \ nsSOAPFault.cpp \
nsSOAPHeaderBlock.cpp \ nsSOAPHeaderBlock.cpp \
nsSOAPMessage.cpp \ nsSOAPMessage.cpp \
nsSOAPParameter.cpp \ nsSOAPParameter.cpp \
nsSOAPPropertyBag.cpp \ nsSOAPPropertyBag.cpp \
nsSOAPResponse.cpp \ nsSOAPResponse.cpp \
nsSOAPUtils.cpp \ nsSOAPUtils.cpp \
$(NULL) $(NULL)
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.
@ -68,8 +68,8 @@ FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_HTML DEFINES += -D_IMPL_NS_HTML
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
DEFINES += -DWIN32_LEAN_AND_MEAN DEFINES += -DWIN32_LEAN_AND_MEAN
endif endif

36
extensions/xmlextras/soap/src/makefile.win
Просмотреть файл

@ -41,7 +41,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=xmlextrassoap_s LIBRARY_NAME=xmlextrassoap_s
MODULE=xmlextras MODULE=xmlextras
REQUIRES = \ REQUIRES = \
xpcom \ xpcom \
string \ string \
caps \ caps \
@ -53,21 +53,21 @@ REQUIRES = \
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
OBJS= \ OBJS= \
.\$(OBJDIR)\nsDefaultSOAPEncoder.obj \ .\$(OBJDIR)\nsDefaultSOAPEncoder.obj \
.\$(OBJDIR)\nsHTTPSOAPTransport.obj \ .\$(OBJDIR)\nsHTTPSOAPTransport.obj \
.\$(OBJDIR)\nsSOAPBlock.obj \ .\$(OBJDIR)\nsSOAPBlock.obj \
.\$(OBJDIR)\nsSOAPCall.obj \ .\$(OBJDIR)\nsSOAPCall.obj \
.\$(OBJDIR)\nsSOAPEncoding.obj \ .\$(OBJDIR)\nsSOAPEncoding.obj \
.\$(OBJDIR)\nsSOAPException.obj \ .\$(OBJDIR)\nsSOAPException.obj \
.\$(OBJDIR)\nsSOAPFault.obj \ .\$(OBJDIR)\nsSOAPFault.obj \
.\$(OBJDIR)\nsSOAPHeaderBlock.obj \ .\$(OBJDIR)\nsSOAPHeaderBlock.obj \
.\$(OBJDIR)\nsSOAPMessage.obj \ .\$(OBJDIR)\nsSOAPMessage.obj \
.\$(OBJDIR)\nsSOAPParameter.obj \ .\$(OBJDIR)\nsSOAPParameter.obj \
.\$(OBJDIR)\nsSOAPPropertyBag.obj \ .\$(OBJDIR)\nsSOAPPropertyBag.obj \
.\$(OBJDIR)\nsSOAPResponse.obj \ .\$(OBJDIR)\nsSOAPResponse.obj \
.\$(OBJDIR)\nsSOAPUtils.obj \ .\$(OBJDIR)\nsSOAPUtils.obj \
$(NULL) $(NULL)
LCFLAGS = \ LCFLAGS = \
$(LCFLAGS) \ $(LCFLAGS) \
@ -77,7 +77,7 @@ LCFLAGS = \
include <$(DEPTH)\config\rules.mak> include <$(DEPTH)\config\rules.mak>
libs:: $(LIBRARY) libs:: $(LIBRARY)
$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
clobber:: clobber::
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

64
extensions/xmlextras/soap/src/nsHTTPSOAPTransport.cpp
Просмотреть файл

@ -69,14 +69,14 @@ NS_IMPL_ISUPPORTS1_CI(nsHTTPSOAPTransport, nsISOAPTransport)
#ifdef DEBUG #ifdef DEBUG
#define DEBUG_DUMP_DOCUMENT(message,doc) \ #define DEBUG_DUMP_DOCUMENT(message,doc) \
{ \ { \
nsresult rcc;\ nsresult rcc;\
nsXPIDLString serial;\ nsXPIDLString serial;\
nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rcc));\ nsCOMPtr<nsIDOMSerializer> serializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID, &rcc));\
if (NS_FAILED(rcc)) return rcc; \ if (NS_FAILED(rcc)) return rcc; \
rcc = serializer->SerializeToString(doc, getter_Copies(serial));\ rcc = serializer->SerializeToString(doc, getter_Copies(serial));\
if (NS_FAILED(rcc)) return rcc;\ if (NS_FAILED(rcc)) return rcc;\
nsAutoString result(serial);\ nsAutoString result(serial);\
printf(message ":\n%s\n", NS_ConvertUCS2toUTF8(result).get());\ printf(message ":\n%s\n", NS_ConvertUCS2toUTF8(result).get());\
} }
// Availble from the debugger... // Availble from the debugger...
nsresult DebugPrintDOM(nsIDOMNode * node) nsresult DebugPrintDOM(nsIDOMNode * node)
@ -281,7 +281,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(), rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(),
PR_FALSE, nsnull, nsnull); PR_FALSE, nsnull, nsnull);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -291,7 +291,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
if (!AStringIsNull(action)) { if (!AStringIsNull(action)) {
rv = request->SetRequestHeader("SOAPAction", rv = request->SetRequestHeader("SOAPAction",
NS_ConvertUCS2toUTF8(action).get()); NS_ConvertUCS2toUTF8(action).get());
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -302,7 +302,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
return rv; return rv;
rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument), rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument),
messageDocument); messageDocument);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -336,7 +336,7 @@ NS_IMETHODIMP nsHTTPSOAPTransport::SyncCall(nsISOAPCall * aCall, nsISOAPResponse
} }
NS_IMPL_ISUPPORTS2_CI(nsHTTPSOAPTransportCompletion, nsIDOMEventListener, NS_IMPL_ISUPPORTS2_CI(nsHTTPSOAPTransportCompletion, nsIDOMEventListener,
nsISOAPCallCompletion) nsISOAPCallCompletion)
nsHTTPSOAPTransportCompletion::nsHTTPSOAPTransportCompletion() nsHTTPSOAPTransportCompletion::nsHTTPSOAPTransportCompletion()
{ {
NS_INIT_ISUPPORTS(); NS_INIT_ISUPPORTS();
@ -363,7 +363,7 @@ NS_IMETHODIMP nsHTTPSOAPTransportCompletion::GetCall(nsISOAPCall * *aCall)
/* readonly attribute nsISOAPResponse response; */ /* readonly attribute nsISOAPResponse response; */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransportCompletion::GetResponse(nsISOAPResponse * nsHTTPSOAPTransportCompletion::GetResponse(nsISOAPResponse *
*aResponse) *aResponse)
{ {
*aResponse = *aResponse =
mRequest ? (nsCOMPtr < nsISOAPResponse >) nsnull : mResponse; mRequest ? (nsCOMPtr < nsISOAPResponse >) nsnull : mResponse;
@ -374,7 +374,7 @@ NS_IMETHODIMP
/* readonly attribute nsISOAPResponseListener listener; */ /* readonly attribute nsISOAPResponseListener listener; */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransportCompletion::GetListener(nsISOAPResponseListener * nsHTTPSOAPTransportCompletion::GetListener(nsISOAPResponseListener *
*aListener) *aListener)
{ {
*aListener = mListener; *aListener = mListener;
NS_IF_ADDREF(*aListener); NS_IF_ADDREF(*aListener);
@ -408,7 +408,7 @@ NS_IMETHODIMP
{ {
// PRUint32 status; // PRUint32 status;
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (mRequest) { // Avoid if it has been aborted. if (mRequest) { // Avoid if it has been aborted.
#if 0 #if 0
rv = mRequest->GetStatus(&status); rv = mRequest->GetStatus(&status);
if (NS_SUCCEEDED(rv) && (status < 200 || status >= 300)) if (NS_SUCCEEDED(rv) && (status < 200 || status >= 300))
@ -418,16 +418,16 @@ NS_IMETHODIMP
nsCOMPtr < nsIDOMDocument > document; nsCOMPtr < nsIDOMDocument > document;
rv = mRequest->GetResponseXML(getter_AddRefs(document)); rv = mRequest->GetResponseXML(getter_AddRefs(document));
if (NS_SUCCEEDED(rv) && document) { if (NS_SUCCEEDED(rv) && document) {
rv = mResponse->SetMessage(document); rv = mResponse->SetMessage(document);
DEBUG_DUMP_DOCUMENT("Asynchronous Response", document)} else { DEBUG_DUMP_DOCUMENT("Asynchronous Response", document)} else {
mResponse = nsnull; mResponse = nsnull;
} }
} else { } else {
mResponse = nsnull; mResponse = nsnull;
} }
nsCOMPtr < nsISOAPCallCompletion > kungFuDeathGrip = this; nsCOMPtr < nsISOAPCallCompletion > kungFuDeathGrip = this;
mRequest = nsnull; // Break cycle of references by releas. mRequest = nsnull; // Break cycle of references by releas.
PRBool c; // In other transports, this may signal to stop returning if multiple returns PRBool c; // In other transports, this may signal to stop returning if multiple returns
mListener->HandleResponse(mResponse, mCall, rv, PR_TRUE, &c); mListener->HandleResponse(mResponse, mCall, rv, PR_TRUE, &c);
} }
return NS_OK; return NS_OK;
@ -436,9 +436,9 @@ NS_IMETHODIMP
/* void asyncCall (in nsISOAPCall aCall, in nsISOAPResponseListener aListener, in nsISOAPResponse aResponse); */ /* void asyncCall (in nsISOAPCall aCall, in nsISOAPResponseListener aListener, in nsISOAPResponse aResponse); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::AsyncCall(nsISOAPCall * aCall, nsHTTPSOAPTransport::AsyncCall(nsISOAPCall * aCall,
nsISOAPResponseListener * aListener, nsISOAPResponseListener * aListener,
nsISOAPResponse * aResponse, nsISOAPResponse * aResponse,
nsISOAPCallCompletion ** aCompletion) nsISOAPCallCompletion ** aCompletion)
{ {
NS_ENSURE_ARG(aCall); NS_ENSURE_ARG(aCall);
@ -470,7 +470,7 @@ NS_IMETHODIMP
DEBUG_DUMP_DOCUMENT("Asynchronous Request", messageDocument) DEBUG_DUMP_DOCUMENT("Asynchronous Request", messageDocument)
rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(), rv = request->OpenRequest("POST", NS_ConvertUCS2toUTF8(uri).get(),
PR_TRUE, nsnull, nsnull); PR_TRUE, nsnull, nsnull);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -480,7 +480,7 @@ NS_IMETHODIMP
return rv; return rv;
if (!AStringIsNull(action)) { if (!AStringIsNull(action)) {
rv = request->SetRequestHeader("SOAPAction", rv = request->SetRequestHeader("SOAPAction",
NS_ConvertUCS2toUTF8(action).get()); NS_ConvertUCS2toUTF8(action).get());
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -491,7 +491,7 @@ NS_IMETHODIMP
return rv; return rv;
rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument), rv = variant->SetAsInterface(NS_GET_IID(nsIDOMDocument),
messageDocument); messageDocument);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -499,19 +499,19 @@ NS_IMETHODIMP
if (aListener) { if (aListener) {
completion = completion =
new nsHTTPSOAPTransportCompletion(aCall, aResponse, request, new nsHTTPSOAPTransportCompletion(aCall, aResponse, request,
aListener); aListener);
if (!completion) if (!completion)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr < nsIDOMEventListener > listener = nsCOMPtr < nsIDOMEventListener > listener =
do_QueryInterface(completion); do_QueryInterface(completion);
rv = eventTarget->AddEventListener(NS_LITERAL_STRING("load"), listener, rv = eventTarget->AddEventListener(NS_LITERAL_STRING("load"), listener,
PR_FALSE); PR_FALSE);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
rv = eventTarget->AddEventListener(NS_LITERAL_STRING("error"), rv = eventTarget->AddEventListener(NS_LITERAL_STRING("error"),
listener, PR_FALSE); listener, PR_FALSE);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
} }
@ -528,7 +528,7 @@ NS_IMETHODIMP
/* void addListener (in nsISOAPTransportListener aListener, in boolean aCapture); */ /* void addListener (in nsISOAPTransportListener aListener, in boolean aCapture); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::AddListener(nsISOAPTransportListener * aListener, nsHTTPSOAPTransport::AddListener(nsISOAPTransportListener * aListener,
PRBool aCapture) PRBool aCapture)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -536,7 +536,7 @@ NS_IMETHODIMP
/* void removeListener (in nsISOAPTransportListener aListener, in boolean aCapture); */ /* void removeListener (in nsISOAPTransportListener aListener, in boolean aCapture); */
NS_IMETHODIMP NS_IMETHODIMP
nsHTTPSOAPTransport::RemoveListener(nsISOAPTransportListener * nsHTTPSOAPTransport::RemoveListener(nsISOAPTransportListener *
aListener, PRBool aCapture) aListener, PRBool aCapture)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }

24
extensions/xmlextras/soap/src/nsSOAPBlock.cpp
Просмотреть файл

@ -55,7 +55,7 @@ nsSOAPBlock::~nsSOAPBlock()
NS_IMPL_ISUPPORTS2(nsSOAPBlock, nsISOAPBlock, nsIJSNativeInitializer) NS_IMPL_ISUPPORTS2(nsSOAPBlock, nsISOAPBlock, nsIJSNativeInitializer)
NS_IMETHODIMP nsSOAPBlock::Init(nsISOAPAttachments * aAttachments, NS_IMETHODIMP nsSOAPBlock::Init(nsISOAPAttachments * aAttachments,
PRUint16 aVersion) PRUint16 aVersion)
{ {
if (aVersion == nsISOAPMessage::VERSION_1_1 if (aVersion == nsISOAPMessage::VERSION_1_1
|| aVersion == nsISOAPMessage::VERSION_1_2) { || aVersion == nsISOAPMessage::VERSION_1_2) {
@ -167,15 +167,15 @@ NS_IMETHODIMP nsSOAPBlock::SetElement(nsIDOMElement * aElement)
NS_IMETHODIMP nsSOAPBlock::GetValue(nsIVariant * *aValue) NS_IMETHODIMP nsSOAPBlock::GetValue(nsIVariant * *aValue)
{ {
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);
if (mElement) { // Check for auto-computation if (mElement) { // Check for auto-computation
if (mComputeValue) { if (mComputeValue) {
mComputeValue = PR_FALSE; mComputeValue = PR_FALSE;
if (mEncoding) { if (mEncoding) {
mStatus = mStatus =
mEncoding->Decode(mElement, mSchemaType, mAttachments, mEncoding->Decode(mElement, mSchemaType, mAttachments,
getter_AddRefs(mValue)); getter_AddRefs(mValue));
} else { } else {
mStatus = NS_ERROR_NOT_INITIALIZED; mStatus = NS_ERROR_NOT_INITIALIZED;
} }
} }
} }
@ -195,7 +195,7 @@ NS_IMETHODIMP nsSOAPBlock::SetValue(nsIVariant * aValue)
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPBlock::Initialize(JSContext * cx, JSObject * obj, nsSOAPBlock::Initialize(JSContext * cx, JSObject * obj,
PRUint32 argc, jsval * argv) PRUint32 argc, jsval * argv)
{ {
// Get the arguments. // Get the arguments.
@ -207,11 +207,11 @@ NS_IMETHODIMP
nsCOMPtr < nsISupports > encoding; nsCOMPtr < nsISupports > encoding;
if (!JS_ConvertArguments(cx, argc, argv, "/%iv %is %is %ip %ip", if (!JS_ConvertArguments(cx, argc, argv, "/%iv %is %is %ip %ip",
getter_AddRefs(value), getter_AddRefs(value),
NS_STATIC_CAST(nsAString *, &name), NS_STATIC_CAST(nsAString *, &name),
NS_STATIC_CAST(nsAString *, &namespaceURI), NS_STATIC_CAST(nsAString *, &namespaceURI),
getter_AddRefs(schemaType), getter_AddRefs(schemaType),
getter_AddRefs(encoding))) getter_AddRefs(encoding)))
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
nsresult rc = SetValue(value); nsresult rc = SetValue(value);

6
extensions/xmlextras/soap/src/nsSOAPCall.cpp
Просмотреть файл

@ -150,7 +150,7 @@ NS_IMETHODIMP nsSOAPCall::Invoke(nsISOAPResponse ** _retval)
return rv; return rv;
nsCOMPtr < nsIDOMDocument > document; nsCOMPtr < nsIDOMDocument > document;
rv = response->GetMessage(getter_AddRefs(document)); // No XML response. rv = response->GetMessage(getter_AddRefs(document)); // No XML response.
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
if (!document) { if (!document) {
@ -159,13 +159,13 @@ NS_IMETHODIMP nsSOAPCall::Invoke(nsISOAPResponse ** _retval)
} }
return response->QueryInterface(NS_GET_IID(nsISOAPResponse), return response->QueryInterface(NS_GET_IID(nsISOAPResponse),
(void **) _retval); (void **) _retval);
} }
/* void asyncInvoke (in nsISOAPResponseListener listener); */ /* void asyncInvoke (in nsISOAPResponseListener listener); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPCall::AsyncInvoke(nsISOAPResponseListener * listener, nsSOAPCall::AsyncInvoke(nsISOAPResponseListener * listener,
nsISOAPCallCompletion ** aCompletion) nsISOAPCallCompletion ** aCompletion)
{ {
nsresult rv; nsresult rv;
nsCOMPtr < nsISOAPTransport > transport; nsCOMPtr < nsISOAPTransport > transport;

84
extensions/xmlextras/soap/src/nsSOAPEncoding.cpp
Просмотреть файл

@ -53,7 +53,7 @@
// First comes the registry which shares between associated encodings but is never seen by xpconnect. // First comes the registry which shares between associated encodings but is never seen by xpconnect.
NS_IMPL_ISUPPORTS1(nsSOAPEncodingRegistry, nsISOAPEncoding) nsSOAPEncodingRegistry::nsSOAPEncodingRegistry(nsISOAPEncoding * aEncoding):mEncodings(new NS_IMPL_ISUPPORTS1(nsSOAPEncodingRegistry, nsISOAPEncoding) nsSOAPEncodingRegistry::nsSOAPEncodingRegistry(nsISOAPEncoding * aEncoding):mEncodings(new
nsSupportsHashtable) nsSupportsHashtable)
{ {
NS_INIT_ISUPPORTS(); NS_INIT_ISUPPORTS();
@ -73,7 +73,7 @@ nsSOAPEncodingRegistry::~nsSOAPEncodingRegistry()
nsresult nsresult
nsSOAPEncodingRegistry:: nsSOAPEncodingRegistry::
GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf, GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf,
nsISOAPEncoding * *aEncoding) nsISOAPEncoding * *aEncoding)
{ {
NS_SOAP_ENSURE_ARG_STRING(aStyleURI); NS_SOAP_ENSURE_ARG_STRING(aStyleURI);
NS_ENSURE_ARG_POINTER(aEncoding); NS_ENSURE_ARG_POINTER(aEncoding);
@ -97,7 +97,7 @@ GetAssociatedEncoding(const nsAString & aStyleURI, PRBool aCreateIf,
nsresult nsresult
nsSOAPEncodingRegistry::SetSchemaCollection(nsISchemaCollection * nsSOAPEncodingRegistry::SetSchemaCollection(nsISchemaCollection *
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG(aSchemaCollection); NS_ENSURE_ARG(aSchemaCollection);
mSchemaCollection = aSchemaCollection; mSchemaCollection = aSchemaCollection;
@ -106,13 +106,13 @@ nsresult
nsresult nsresult
nsSOAPEncodingRegistry::GetSchemaCollection(nsISchemaCollection ** nsSOAPEncodingRegistry::GetSchemaCollection(nsISchemaCollection **
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG_POINTER(aSchemaCollection); NS_ENSURE_ARG_POINTER(aSchemaCollection);
if (!mSchemaCollection) { if (!mSchemaCollection) {
nsresult rv; nsresult rv;
nsCOMPtr < nsISchemaLoader > loader = nsCOMPtr < nsISchemaLoader > loader =
do_CreateInstance(NS_SCHEMALOADER_CONTRACTID, &rv); do_CreateInstance(NS_SCHEMALOADER_CONTRACTID, &rv);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
mSchemaCollection = do_QueryInterface(loader); mSchemaCollection = do_QueryInterface(loader);
@ -133,7 +133,7 @@ NS_IMETHODIMP nsSOAPEncodingRegistry::GetStyleURI(nsAString & aStyleURI)
/* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */ /* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetEncoder(const nsAString & aKey, nsSOAPEncodingRegistry::SetEncoder(const nsAString & aKey,
nsISOAPEncoder * aEncoder) nsISOAPEncoder * aEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -141,7 +141,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder getEncoder (in AString aKey); */ /* nsISOAPEncoder getEncoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetEncoder(const nsAString & aKey, nsSOAPEncodingRegistry::GetEncoder(const nsAString & aKey,
nsISOAPEncoder ** _retval) nsISOAPEncoder ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -149,7 +149,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */ /* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDecoder(const nsAString & aKey, nsSOAPEncodingRegistry::SetDecoder(const nsAString & aKey,
nsISOAPDecoder * aDecoder) nsISOAPDecoder * aDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -157,7 +157,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder getDecoder (in AString aKey); */ /* nsISOAPDecoder getDecoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDecoder(const nsAString & aKey, nsSOAPEncodingRegistry::GetDecoder(const nsAString & aKey,
nsISOAPDecoder ** _retval) nsISOAPDecoder ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -165,14 +165,14 @@ NS_IMETHODIMP
/* attribute nsISOAPEncoder defaultEncoder; */ /* attribute nsISOAPEncoder defaultEncoder; */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDefaultEncoder(nsISOAPEncoder * nsSOAPEncodingRegistry::GetDefaultEncoder(nsISOAPEncoder *
*aDefaultEncoder) *aDefaultEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDefaultEncoder(nsISOAPEncoder * nsSOAPEncodingRegistry::SetDefaultEncoder(nsISOAPEncoder *
aDefaultEncoder) aDefaultEncoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -180,14 +180,14 @@ NS_IMETHODIMP
/* attribute nsISOAPDecoder defaultDecoder; */ /* attribute nsISOAPDecoder defaultDecoder; */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::GetDefaultDecoder(nsISOAPDecoder * nsSOAPEncodingRegistry::GetDefaultDecoder(nsISOAPDecoder *
*aDefaultDecoder) *aDefaultDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::SetDefaultDecoder(nsISOAPDecoder * nsSOAPEncodingRegistry::SetDefaultDecoder(nsISOAPDecoder *
aDefaultDecoder) aDefaultDecoder)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -195,12 +195,12 @@ NS_IMETHODIMP
/* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */ /* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::Encode(nsIVariant * aSource, nsSOAPEncodingRegistry::Encode(nsIVariant * aSource,
const nsAString & aNamespaceURI, const nsAString & aNamespaceURI,
const nsAString & aName, const nsAString & aName,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIDOMElement * aDestination, nsIDOMElement * aDestination,
nsIDOMElement ** _retval) nsIDOMElement ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -208,9 +208,9 @@ NS_IMETHODIMP
/* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */ /* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncodingRegistry::Decode(nsIDOMElement * aSource, nsSOAPEncodingRegistry::Decode(nsIDOMElement * aSource,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
@ -277,7 +277,7 @@ nsSOAPEncoding::~nsSOAPEncoding()
nsresult nsresult
nsSOAPEncoding::SetSchemaCollection(nsISchemaCollection * nsSOAPEncoding::SetSchemaCollection(nsISchemaCollection *
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG(aSchemaCollection); NS_ENSURE_ARG(aSchemaCollection);
return mRegistry->SetSchemaCollection(aSchemaCollection); return mRegistry->SetSchemaCollection(aSchemaCollection);
@ -285,7 +285,7 @@ nsresult
nsresult nsresult
nsSOAPEncoding::GetSchemaCollection(nsISchemaCollection ** nsSOAPEncoding::GetSchemaCollection(nsISchemaCollection **
aSchemaCollection) aSchemaCollection)
{ {
NS_ENSURE_ARG_POINTER(aSchemaCollection); NS_ENSURE_ARG_POINTER(aSchemaCollection);
return mRegistry->GetSchemaCollection(aSchemaCollection); return mRegistry->GetSchemaCollection(aSchemaCollection);
@ -302,8 +302,8 @@ NS_IMETHODIMP nsSOAPEncoding::GetStyleURI(nsAString & aStyleURI)
/* nsISOAPEncoding getAssociatedEncoding (in AString aStyleURI, in boolean aCreateIf); */ /* nsISOAPEncoding getAssociatedEncoding (in AString aStyleURI, in boolean aCreateIf); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetAssociatedEncoding(const nsAString & aStyleURI, nsSOAPEncoding::GetAssociatedEncoding(const nsAString & aStyleURI,
PRBool aCreateIf, PRBool aCreateIf,
nsISOAPEncoding ** _retval) nsISOAPEncoding ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aStyleURI); NS_SOAP_ENSURE_ARG_STRING(aStyleURI);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -313,7 +313,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */ /* nsISOAPEncoder setEncoder (in AString aKey, in nsISOAPEncoder aEncoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::SetEncoder(const nsAString & aKey, nsSOAPEncoding::SetEncoder(const nsAString & aKey,
nsISOAPEncoder * aEncoder) nsISOAPEncoder * aEncoder)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG(aEncoder); NS_ENSURE_ARG(aEncoder);
@ -329,7 +329,7 @@ NS_IMETHODIMP
/* nsISOAPEncoder getEncoder (in AString aKey); */ /* nsISOAPEncoder getEncoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetEncoder(const nsAString & aKey, nsSOAPEncoding::GetEncoder(const nsAString & aKey,
nsISOAPEncoder ** _retval) nsISOAPEncoder ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -344,7 +344,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */ /* nsISOAPDecoder setDecoder (in AString aKey, in nsISOAPDecoder aDecoder); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::SetDecoder(const nsAString & aKey, nsSOAPEncoding::SetDecoder(const nsAString & aKey,
nsISOAPDecoder * aDecoder) nsISOAPDecoder * aDecoder)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG(aDecoder); NS_ENSURE_ARG(aDecoder);
@ -360,7 +360,7 @@ NS_IMETHODIMP
/* nsISOAPDecoder getDecoder (in AString aKey); */ /* nsISOAPDecoder getDecoder (in AString aKey); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::GetDecoder(const nsAString & aKey, nsSOAPEncoding::GetDecoder(const nsAString & aKey,
nsISOAPDecoder ** _retval) nsISOAPDecoder ** _retval)
{ {
NS_SOAP_ENSURE_ARG_STRING(aKey); NS_SOAP_ENSURE_ARG_STRING(aKey);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -375,12 +375,12 @@ NS_IMETHODIMP
/* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */ /* nsIDOMElement encode (in nsIVariant aSource, in AString aNamespaceURI, in AString aName, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments, in nsIDOMElement aDestination); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::Encode(nsIVariant * aSource, nsSOAPEncoding::Encode(nsIVariant * aSource,
const nsAString & aNamespaceURI, const nsAString & aNamespaceURI,
const nsAString & aName, const nsAString & aName,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIDOMElement * aDestination, nsIDOMElement * aDestination,
nsIDOMElement ** _retval) nsIDOMElement ** _retval)
{ {
NS_ENSURE_ARG(aSource); NS_ENSURE_ARG(aSource);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -391,8 +391,8 @@ NS_IMETHODIMP
return rv; return rv;
if (encoder) { if (encoder) {
return encoder->Encode(this, aSource, aNamespaceURI, aName, return encoder->Encode(this, aSource, aNamespaceURI, aName,
aSchemaType, aAttachments, aDestination, aSchemaType, aAttachments, aDestination,
_retval); _retval);
} }
*_retval = nsnull; *_retval = nsnull;
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
@ -401,9 +401,9 @@ NS_IMETHODIMP
/* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */ /* nsIVariant decode (in nsIDOMElement aSource, in nsISchemaType aSchemaType, in nsISOAPAttachments aAttachments); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPEncoding::Decode(nsIDOMElement * aSource, nsSOAPEncoding::Decode(nsIDOMElement * aSource,
nsISchemaType * aSchemaType, nsISchemaType * aSchemaType,
nsISOAPAttachments * aAttachments, nsISOAPAttachments * aAttachments,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
NS_ENSURE_ARG(aSource); NS_ENSURE_ARG(aSource);
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
@ -413,7 +413,7 @@ NS_IMETHODIMP
return rv; return rv;
if (decoder) { if (decoder) {
return decoder->Decode(this, aSource, aSchemaType, aAttachments, return decoder->Decode(this, aSource, aSchemaType, aAttachments,
_retval); _retval);
} }
*_retval = nsnull; *_retval = nsnull;
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;

2
extensions/xmlextras/soap/src/nsSOAPException.cpp
Просмотреть файл

@ -215,7 +215,7 @@ nsresult nsSOAPException::AddException(nsresult aStatus, const nsAString & aName
xs->GetCurrentException(getter_AddRefs(old)); xs->GetCurrentException(getter_AddRefs(old));
nsCOMPtr<nsIException> exception = new nsSOAPException(aStatus, nsCOMPtr<nsIException> exception = new nsSOAPException(aStatus,
aName.IsEmpty() ? NS_LITERAL_STRING("SOAP_FAILURE") : aName, aName.IsEmpty() ? NS_LITERAL_STRING("SOAP_FAILURE") : aName,
aMessage.IsEmpty() ? NS_LITERAL_STRING("No description") : aMessage, old); aMessage.IsEmpty() ? NS_LITERAL_STRING("No description") : aMessage, old);
if (exception) { if (exception) {
xm->SetCurrentException(exception); xm->SetCurrentException(exception);
} }

42
extensions/xmlextras/soap/src/nsSOAPFault.cpp
Просмотреть файл

@ -67,14 +67,14 @@ NS_IMETHODIMP nsSOAPFault::SetElement(nsIDOMElement * aElement)
return rc; return rc;
if (name.Equals(nsSOAPUtils::kFaultTagName)) { if (name.Equals(nsSOAPUtils::kFaultTagName)) {
if (namespaceURI. if (namespaceURI.
Equals(*nsSOAPUtils::kSOAPEnvURI[nsISOAPMessage::VERSION_1_2])) { Equals(*nsSOAPUtils::kSOAPEnvURI[nsISOAPMessage::VERSION_1_2])) {
mVersion = nsISOAPMessage::VERSION_1_2; mVersion = nsISOAPMessage::VERSION_1_2;
} else if (namespaceURI. } else if (namespaceURI.
Equals(*nsSOAPUtils:: Equals(*nsSOAPUtils::
kSOAPEnvURI[nsISOAPMessage::VERSION_1_1])) { kSOAPEnvURI[nsISOAPMessage::VERSION_1_1])) {
mVersion = nsISOAPMessage::VERSION_1_1; mVersion = nsISOAPMessage::VERSION_1_1;
} else { } else {
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
} }
} else { } else {
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;
@ -101,9 +101,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultCode(nsAString & aFaultCode)
aFaultCode.Truncate(); aFaultCode.Truncate();
nsCOMPtr < nsIDOMElement > faultcode; nsCOMPtr < nsIDOMElement > faultcode;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultCodeTagName, nsSOAPUtils::kFaultCodeTagName,
getter_AddRefs(faultcode)); getter_AddRefs(faultcode));
if (faultcode) { if (faultcode) {
nsAutoString combined; nsAutoString combined;
nsSOAPUtils::GetElementTextContent(faultcode, combined); nsSOAPUtils::GetElementTextContent(faultcode, combined);
@ -121,9 +121,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultNamespaceURI(nsAString & aNamespaceURI)
aNamespaceURI.Truncate(); aNamespaceURI.Truncate();
nsCOMPtr < nsIDOMElement > faultcode; nsCOMPtr < nsIDOMElement > faultcode;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultCodeTagName, nsSOAPUtils::kFaultCodeTagName,
getter_AddRefs(faultcode)); getter_AddRefs(faultcode));
if (faultcode) { if (faultcode) {
nsAutoString combined; nsAutoString combined;
nsSOAPUtils::GetElementTextContent(faultcode, combined); nsSOAPUtils::GetElementTextContent(faultcode, combined);
@ -142,9 +142,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultString(nsAString & aFaultString)
aFaultString.Truncate(); aFaultString.Truncate();
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultStringTagName, nsSOAPUtils::kFaultStringTagName,
getter_AddRefs(element)); getter_AddRefs(element));
if (element) { if (element) {
nsSOAPUtils::GetElementTextContent(element, aFaultString); nsSOAPUtils::GetElementTextContent(element, aFaultString);
} }
@ -161,9 +161,9 @@ NS_IMETHODIMP nsSOAPFault::GetFaultActor(nsAString & aFaultActor)
aFaultActor.Truncate(); aFaultActor.Truncate();
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultActorTagName, nsSOAPUtils::kFaultActorTagName,
getter_AddRefs(element)); getter_AddRefs(element));
if (element) { if (element) {
nsSOAPUtils::GetElementTextContent(element, aFaultActor); nsSOAPUtils::GetElementTextContent(element, aFaultActor);
} }
@ -179,8 +179,8 @@ NS_IMETHODIMP nsSOAPFault::GetDetail(nsIDOMElement * *aDetail)
nsCOMPtr < nsIDOMElement > element; nsCOMPtr < nsIDOMElement > element;
nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement, nsSOAPUtils::GetSpecificChildElement(nsnull, mFaultElement,
kEmpty, kEmpty,
nsSOAPUtils::kFaultDetailTagName, nsSOAPUtils::kFaultDetailTagName,
aDetail); aDetail);
return NS_OK; return NS_OK;
} }

20
extensions/xmlextras/soap/src/nsSOAPHeaderBlock.cpp
Просмотреть файл

@ -50,7 +50,7 @@ nsSOAPHeaderBlock::nsSOAPHeaderBlock()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPHeaderBlock, nsISOAPBlock, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPHeaderBlock, nsISOAPBlock,
nsISOAPHeaderBlock) nsISOAPHeaderBlock)
NS_IMPL_ADDREF_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock) NS_IMPL_ADDREF_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock)
NS_IMPL_RELEASE_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock) NS_IMPL_RELEASE_INHERITED(nsSOAPHeaderBlock, nsSOAPBlock)
NS_INTERFACE_MAP_BEGIN(nsSOAPHeaderBlock) NS_INTERFACE_MAP_BEGIN(nsSOAPHeaderBlock)
@ -69,8 +69,8 @@ NS_IMETHODIMP nsSOAPHeaderBlock::GetActorURI(nsAString & aActorURI)
if (mVersion == nsISOAPMessage::VERSION_UNKNOWN) if (mVersion == nsISOAPMessage::VERSION_UNKNOWN)
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
return mElement->GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion], return mElement->GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion],
nsSOAPUtils::kActorAttribute, nsSOAPUtils::kActorAttribute,
aActorURI); aActorURI);
} else { } else {
aActorURI.Assign(mActorURI); aActorURI.Assign(mActorURI);
} }
@ -88,7 +88,7 @@ NS_IMETHODIMP nsSOAPHeaderBlock::SetActorURI(const nsAString & aActorURI)
/* attribute AString mustUnderstand; */ /* attribute AString mustUnderstand; */
NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool * NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool *
aMustUnderstand) aMustUnderstand)
{ {
NS_ENSURE_ARG_POINTER(&aMustUnderstand); NS_ENSURE_ARG_POINTER(&aMustUnderstand);
if (mElement) { if (mElement) {
@ -96,19 +96,19 @@ NS_IMETHODIMP nsSOAPHeaderBlock::GetMustUnderstand(PRBool *
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
nsAutoString m; nsAutoString m;
nsresult nsresult
rc = rc =
mElement-> mElement->
GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion], GetAttributeNS(*nsSOAPUtils::kSOAPEnvURI[mVersion],
nsSOAPUtils::kMustUnderstandAttribute, m); nsSOAPUtils::kMustUnderstandAttribute, m);
if (NS_FAILED(rc)) if (NS_FAILED(rc))
return rc; return rc;
if (m.Length() == 0) if (m.Length() == 0)
*aMustUnderstand = PR_FALSE; *aMustUnderstand = PR_FALSE;
else if (m.Equals(nsSOAPUtils::kTrue) else if (m.Equals(nsSOAPUtils::kTrue)
|| m.Equals(nsSOAPUtils::kTrueA)) || m.Equals(nsSOAPUtils::kTrueA))
*aMustUnderstand = PR_TRUE; *aMustUnderstand = PR_TRUE;
else if (m.Equals(nsSOAPUtils::kFalse) else if (m.Equals(nsSOAPUtils::kFalse)
|| m.Equals(nsSOAPUtils::kFalseA)) || m.Equals(nsSOAPUtils::kFalseA))
*aMustUnderstand = PR_FALSE; *aMustUnderstand = PR_FALSE;
else else
return NS_ERROR_ILLEGAL_VALUE; return NS_ERROR_ILLEGAL_VALUE;

2
extensions/xmlextras/soap/src/nsSOAPParameter.cpp
Просмотреть файл

@ -49,7 +49,7 @@ nsSOAPParameter::nsSOAPParameter()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPParameter, nsISOAPBlock, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPParameter, nsISOAPBlock,
nsISOAPParameter) nsISOAPParameter)
NS_IMPL_ADDREF_INHERITED(nsSOAPParameter, nsSOAPBlock) NS_IMPL_ADDREF_INHERITED(nsSOAPParameter, nsSOAPBlock)
NS_IMPL_RELEASE_INHERITED(nsSOAPParameter, nsSOAPBlock) NS_IMPL_RELEASE_INHERITED(nsSOAPParameter, nsSOAPBlock)
NS_INTERFACE_MAP_BEGIN(nsSOAPParameter) NS_INTERFACE_MAP_BEGIN(nsSOAPParameter)

24
extensions/xmlextras/soap/src/nsSOAPPropertyBag.cpp
Просмотреть файл

@ -106,7 +106,7 @@ nsSOAPPropertyBag::~nsSOAPPropertyBag()
/* nsIVariant getProperty (in AString name); */ /* nsIVariant getProperty (in AString name); */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::GetProperty(const nsAString & aName, nsSOAPPropertyBag::GetProperty(const nsAString & aName,
nsIVariant ** _retval) nsIVariant ** _retval)
{ {
NS_ENSURE_ARG_POINTER(_retval); NS_ENSURE_ARG_POINTER(_retval);
nsStringKey nameKey(aName); nsStringKey nameKey(aName);
@ -116,7 +116,7 @@ NS_IMETHODIMP
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::SetProperty(const nsAString & aName, nsSOAPPropertyBag::SetProperty(const nsAString & aName,
nsIVariant * aValue) nsIVariant * aValue)
{ {
NS_ENSURE_ARG_POINTER(&aName); NS_ENSURE_ARG_POINTER(&aName);
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);
@ -129,22 +129,22 @@ NS_IMETHODIMP
#define XPC_MAP_QUOTED_CLASSNAME "SOAPPropertyBag" #define XPC_MAP_QUOTED_CLASSNAME "SOAPPropertyBag"
#define XPC_MAP_WANT_GETPROPERTY #define XPC_MAP_WANT_GETPROPERTY
#define XPC_MAP_FLAGS 0 #define XPC_MAP_FLAGS 0
#include "xpc_map_end.h" /* This will #undef the above */ #include "xpc_map_end.h" /* This will #undef the above */
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBag::GetProperty(nsIXPConnectWrappedNative * wrapper, nsSOAPPropertyBag::GetProperty(nsIXPConnectWrappedNative * wrapper,
JSContext * cx, JSObject * obj, JSContext * cx, JSObject * obj,
jsval id, jsval * vp, PRBool * _retval) jsval id, jsval * vp, PRBool * _retval)
{ {
if (JSVAL_IS_STRING(id)) { if (JSVAL_IS_STRING(id)) {
JSString *str = JSVAL_TO_STRING(id); JSString *str = JSVAL_TO_STRING(id);
const PRUnichar *name = NS_REINTERPRET_CAST(const PRUnichar *, const PRUnichar *name = NS_REINTERPRET_CAST(const PRUnichar *,
JS_GetStringChars(str)); JS_GetStringChars(str));
nsDependentString namestr(name); nsDependentString namestr(name);
nsStringKey nameKey(namestr); nsStringKey nameKey(namestr);
nsCOMPtr < nsIVariant > value = nsCOMPtr < nsIVariant > value =
dont_AddRef(NS_STATIC_CAST dont_AddRef(NS_STATIC_CAST
(nsIVariant *, mProperties->Get(&nameKey))); (nsIVariant *, mProperties->Get(&nameKey)));
if (value == nsnull) if (value == nsnull)
return NS_OK; return NS_OK;
void *mark; void *mark;
@ -161,8 +161,8 @@ PRBool PropertyBagEnumFunc(nsHashKey * aKey, void *aData, void *aClosure)
nsAutoString name(NS_STATIC_CAST(nsStringKey *, aKey)->GetString()); nsAutoString name(NS_STATIC_CAST(nsStringKey *, aKey)->GetString());
properties-> properties->
AppendElement(new AppendElement(new
nsSOAPProperty(name, nsSOAPProperty(name,
NS_STATIC_CAST(nsIVariant *, aData))); NS_STATIC_CAST(nsIVariant *, aData)));
return PR_TRUE; return PR_TRUE;
} }
@ -204,7 +204,7 @@ NS_IMETHODIMP
NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty) NS_IMPL_ISUPPORTS1_CI(nsSOAPProperty, nsIProperty)
nsSOAPProperty::nsSOAPProperty(const nsAString & aName, nsSOAPProperty::nsSOAPProperty(const nsAString & aName,
nsIVariant * aValue):mName(aName), mValue(aValue) { nsIVariant * aValue):mName(aName), mValue(aValue) {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
} }
nsSOAPProperty::~nsSOAPProperty() nsSOAPProperty::~nsSOAPProperty()
@ -257,7 +257,7 @@ NS_IMETHODIMP nsSOAPPropertyBagMutator::GetPropertyBag(nsIPropertyBag ** aProper
NS_IMETHODIMP NS_IMETHODIMP
nsSOAPPropertyBagMutator::AddProperty(const nsAString & aName, nsSOAPPropertyBagMutator::AddProperty(const nsAString & aName,
nsIVariant * aValue) nsIVariant * aValue)
{ {
NS_ENSURE_ARG_POINTER(&aName); NS_ENSURE_ARG_POINTER(&aName);
NS_ENSURE_ARG_POINTER(aValue); NS_ENSURE_ARG_POINTER(aValue);

28
extensions/xmlextras/soap/src/nsSOAPResponse.cpp
Просмотреть файл

@ -55,7 +55,7 @@ nsSOAPResponse::~nsSOAPResponse()
} }
NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPResponse, nsISOAPMessage, NS_IMPL_CI_INTERFACE_GETTER2(nsSOAPResponse, nsISOAPMessage,
nsISOAPResponse) nsISOAPResponse)
NS_IMPL_ADDREF_INHERITED(nsSOAPResponse, nsSOAPMessage) NS_IMPL_ADDREF_INHERITED(nsSOAPResponse, nsSOAPMessage)
NS_IMPL_RELEASE_INHERITED(nsSOAPResponse, nsSOAPMessage) NS_IMPL_RELEASE_INHERITED(nsSOAPResponse, nsSOAPMessage)
NS_INTERFACE_MAP_BEGIN(nsSOAPResponse) NS_INTERFACE_MAP_BEGIN(nsSOAPResponse)
@ -80,20 +80,20 @@ NS_IMETHODIMP nsSOAPResponse::GetFault(nsISOAPFault * *aFault)
if (rc != nsSOAPMessage::VERSION_UNKNOWN) { if (rc != nsSOAPMessage::VERSION_UNKNOWN) {
nsCOMPtr < nsIDOMElement > fault; nsCOMPtr < nsIDOMElement > fault;
nsSOAPUtils::GetSpecificChildElement(nsnull, body, nsSOAPUtils::GetSpecificChildElement(nsnull, body,
*nsSOAPUtils:: *nsSOAPUtils::
kSOAPEnvURI[version], kSOAPEnvURI[version],
nsSOAPUtils::kFaultTagName, nsSOAPUtils::kFaultTagName,
getter_AddRefs(fault)); getter_AddRefs(fault));
if (fault) { if (fault) {
nsCOMPtr < nsISOAPFault > f = nsCOMPtr < nsISOAPFault > f =
do_CreateInstance(NS_SOAPFAULT_CONTRACTID); do_CreateInstance(NS_SOAPFAULT_CONTRACTID);
if (!f) if (!f)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
rc = f->SetElement(fault); rc = f->SetElement(fault);
if (NS_FAILED(rc)) if (NS_FAILED(rc))
return rc; return rc;
*aFault = f; *aFault = f;
NS_ADDREF(*aFault); NS_ADDREF(*aFault);
} }
} }
} else { } else {