From b9c2280a767decaf64a3f15634438e0b8ddeb100 Mon Sep 17 00:00:00 2001 From: "edburns%acm.org" Date: Tue, 16 Apr 2002 06:12:28 +0000 Subject: [PATCH] Webclient compiles and runs with MOZILLA_0_9_9_BRANCH. --- java/dom/src/nsJavaDOMImpl.cpp | 16 +++++++++++----- .../src_moz/CurrentPageActionEvents.cpp | 3 ++- java/webclient/src_moz/CurrentPageImpl.cpp | 2 +- java/webclient/src_moz/HistoryActionEvents.cpp | 5 +++-- java/webclient/src_moz/HistoryImpl.cpp | 5 +++-- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/java/dom/src/nsJavaDOMImpl.cpp b/java/dom/src/nsJavaDOMImpl.cpp index a29385965fd..7b64daf2acd 100644 --- a/java/dom/src/nsJavaDOMImpl.cpp +++ b/java/dom/src/nsJavaDOMImpl.cpp @@ -37,6 +37,7 @@ #include "nsIGenericFactory.h" #include "nsXPIDLString.h" +#include "nsReadableUtils.h" #include "nsCOMPtr.h" #if defined(DEBUG) @@ -306,10 +307,11 @@ NS_IMETHODIMP nsJavaDOMImpl::OnProgressChange(nsIWebProgress *aWebProgress, nsCOMPtr channel = do_QueryInterface(request); if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && NS_SUCCEEDED(url->GetSpec(urlSpecString))) { - urlSpec = (char *) urlSpecString.GetBufferHandle(); + urlSpec = ToNewCString(urlSpecString); } jstring jURL = env->NewStringUTF(urlSpec); + nsMemory::Free(urlSpec); if (!jURL) return NS_ERROR_FAILURE; // PENDING(edburns): this leaks. @@ -345,9 +347,10 @@ NS_IMETHODIMP nsJavaDOMImpl::OnStatusChange(nsIWebProgress *aWebProgress, nsCOMPtr channel = do_QueryInterface(request); if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && NS_SUCCEEDED(url->GetSpec(urlSpecString))) { - urlSpec = (char *) urlSpecString.GetBufferHandle(); + urlSpec = ToNewCString(urlSpecString); } jstring jURL = env->NewStringUTF(urlSpec); + nsMemory::Free(urlSpec); if (!jURL) return NS_ERROR_FAILURE; // PENDING(edburns): this leaks @@ -414,10 +417,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndDocumentLoad(nsIWebProgress *aWebProgress, nsCOMPtr channel = do_QueryInterface(request); if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && NS_SUCCEEDED(url->GetSpec(urlSpecString))) { - urlSpec = (char *) urlSpecString.GetBufferHandle(); + urlSpec = ToNewCString(urlSpecString); } jstring jURL = env->NewStringUTF(urlSpec); + nsMemory::Free(urlSpec); if (!jURL) return NS_ERROR_FAILURE; env->CallStaticVoidMethod(domAccessorClass, @@ -448,10 +452,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doStartURLLoad(nsIWebProgress *aWebProgress, nsCOMPtr channel = do_QueryInterface(request); if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && NS_SUCCEEDED(url->GetSpec(urlSpecString))) { - urlSpec = (char *) urlSpecString.GetBufferHandle(); + urlSpec = ToNewCString(urlSpecString); } jstring jURL = env->NewStringUTF(urlSpec); + nsMemory::Free(urlSpec); if (!jURL) return NS_ERROR_FAILURE; char* contentType = (char*) ""; @@ -491,10 +496,11 @@ NS_IMETHODIMP nsJavaDOMImpl::doEndURLLoad(nsIWebProgress *aWebProgress, nsCOMPtr channel = do_QueryInterface(request); if (channel && NS_SUCCEEDED(channel->GetURI(&url)) && NS_SUCCEEDED(url->GetSpec(urlSpecString))) { - urlSpec = (char *) urlSpecString.GetBufferHandle(); + urlSpec = ToNewCString(urlSpecString); } jstring jURL = env->NewStringUTF(urlSpec); + nsMemory::Free(urlSpec); if (!jURL) return NS_ERROR_FAILURE; #if defined(DEBUG) diff --git a/java/webclient/src_moz/CurrentPageActionEvents.cpp b/java/webclient/src_moz/CurrentPageActionEvents.cpp index 0d915878f79..7843188de49 100644 --- a/java/webclient/src_moz/CurrentPageActionEvents.cpp +++ b/java/webclient/src_moz/CurrentPageActionEvents.cpp @@ -45,6 +45,7 @@ #include "nsIURI.h" #include "nsIHistoryEntry.h" #include "nsString.h" +#include "nsReadableUtils.h" wsCopySelectionEvent::wsCopySelectionEvent(WebShellInitContext *yourInitContext) : nsActionEvent(), @@ -251,7 +252,7 @@ wsGetURLEvent::handleEvent () if (NS_FAILED(rv)) { return result; } - currentURL = (char *) urlSpecString.GetBufferHandle(); + currentURL = ToNewCString(urlSpecString); result = (void *) currentURL; } diff --git a/java/webclient/src_moz/CurrentPageImpl.cpp b/java/webclient/src_moz/CurrentPageImpl.cpp index d7cb660a9a8..d55cc2044f4 100644 --- a/java/webclient/src_moz/CurrentPageImpl.cpp +++ b/java/webclient/src_moz/CurrentPageImpl.cpp @@ -139,7 +139,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_CurrentPage return nsnull; } - nsCRT::free(charResult); + nsMemory::Free(charResult); } return urlString; diff --git a/java/webclient/src_moz/HistoryActionEvents.cpp b/java/webclient/src_moz/HistoryActionEvents.cpp index f2a784f19a1..54b053b2c3c 100644 --- a/java/webclient/src_moz/HistoryActionEvents.cpp +++ b/java/webclient/src_moz/HistoryActionEvents.cpp @@ -36,6 +36,7 @@ #include "nsIHistoryEntry.h" #include "nsIURI.h" #include "nsString.h" +#include "nsReadableUtils.h" /* * wsCanBackEvent @@ -257,7 +258,7 @@ wsGetURLForIndexEvent::handleEvent () nsresult rv; nsISHistory* sHistory; rv = mInitContext->webNavigation->GetSessionHistory(&sHistory); - const char *indexURL = nsnull; + char *indexURL = nsnull; nsIHistoryEntry * Entry; rv = sHistory->GetEntryAtIndex(mHistoryIndex, PR_FALSE, &Entry); @@ -279,7 +280,7 @@ wsGetURLForIndexEvent::handleEvent () return result; } - indexURL = urlSpecString.get(); + indexURL = ToNewCString(urlSpecString); result = (void *) indexURL; } return result; diff --git a/java/webclient/src_moz/HistoryImpl.cpp b/java/webclient/src_moz/HistoryImpl.cpp index f9dc15d97b9..1006333af4f 100644 --- a/java/webclient/src_moz/HistoryImpl.cpp +++ b/java/webclient/src_moz/HistoryImpl.cpp @@ -269,7 +269,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl { JNIEnv * pEnv = env; jobject jobj = obj; - const char * charResult = nsnull; + char * charResult = nsnull; jstring urlString = nsnull; WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr; @@ -284,7 +284,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl new wsGetURLForIndexEvent(initContext, historyIndex); PLEvent * event = (PLEvent*) *actionEvent; - charResult = (const char *) ::util_PostSynchronousEvent(initContext, + charResult = (char *) ::util_PostSynchronousEvent(initContext, event); if (charResult != nsnull) { @@ -294,6 +294,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl ::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull"); return nsnull; } + nsMemory::Free((void *) charResult); } return urlString;