Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M Makefile.win

Browse Source 
M dom/jni/javaDOMEventsGlobals.cpp
M dom/jni/makefile.win
M dom/jni/nativeDOMProxyListener.cpp
M dom/jni/nativeDOMProxyListener.h
M dom/jni/org_mozilla_dom_events_EventImpl.cpp
M dom/src/makefile.win
M dom/src/nsJavaDOMImpl.cpp
M webclient/Makefile.win
M webclient/classes_spec/Makefile.win
M webclient/classes_spec/org/mozilla/webclient/wrapper_native/ProfileManagerImpl.java
M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CurrentPageActionEvents.cpp
M webclient/src_moz/HistoryActionEvents.cpp
M webclient/src_moz/HistoryImpl.cpp
M webclient/src_moz/InputStreamShim.cpp
M webclient/src_moz/Makefile.win
M webclient/src_moz/NativeEventThread.cpp
M webclient/src_moz/NativeEventThreadActionEvents.cpp
M webclient/src_moz/NavigationActionEvents.cpp
M webclient/src_moz/NavigationImpl.cpp
M webclient/src_moz/PreferencesActionEvents.cpp
M webclient/src_moz/PromptActionEvents.cpp
M webclient/src_moz/RDFActionEvents.cpp
M webclient/src_moz/win32/Makefile.win

Changes to make webclient compile and run with MOZILLA_0_9_9_BRANCH.


git-svn-id: svn://10.0.0.236/trunk@118989 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2002-04-15 17:38:52 +00:00
parent d1d308ecd3
commit 579dbe6ec7
25 changed files with 290 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/java/webclient/src_moz/InputStreamShim.cpp
View File

@@ -88,7 +88,7 @@ NS_IMETHODIMP_(nsrefcnt) InputStreamShim::Release(void)
return mRefCnt;
}
NS_IMPL_QUERY_INTERFACE(InputStreamShim, NS_GET_IID(nsIInputStream))
NS_IMPL_QUERY_INTERFACE1(InputStreamShim, nsIInputStream)
nsresult InputStreamShim::doReadFromJava()
{
@@ -223,7 +223,7 @@ InputStreamShim::doRead(void)
return NS_ERROR_FAILURE;
}
// copy the old buffer into the new buffer
nsCRT::memcpy(tBuffer, mBuffer, mBufferLength);
memcpy(tBuffer, mBuffer, mBufferLength);
// delete the old buffer
delete [] mBuffer;
// update mBuffer;
@@ -364,13 +364,13 @@ InputStreamShim::Read(char* aBuffer, PRUint32 aCount, PRUint32 *aNumRead)
if (mAvailableForMozilla) {
if (aCount <= (mCountFromJava - mCountFromMozilla)) {
// what she's asking for is less than or equal to what we have
nsCRT::memcpy(aBuffer, (mBuffer + mCountFromMozilla), aCount);
memcpy(aBuffer, (mBuffer + mCountFromMozilla), aCount);
mCountFromMozilla += aCount;
*aNumRead = aCount;
}
else {
// what she's asking for is more than what we have
nsCRT::memcpy(aBuffer, (mBuffer + mCountFromMozilla),
memcpy(aBuffer, (mBuffer + mCountFromMozilla),
(mCountFromJava - mCountFromMozilla));
*aNumRead = (mCountFromJava - mCountFromMozilla);