mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
e4e2da55c9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
135 lines
3.0 KiB
C++
135 lines
3.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsScriptableInputStream.h"
|
|
#include "nsMemory.h"
|
|
#include "nsString.h"
|
|
|
|
NS_IMPL_ISUPPORTS(nsScriptableInputStream, nsIScriptableInputStream)
|
|
|
|
// nsIScriptableInputStream methods
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Close()
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
return mInputStream->Close();
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Init(nsIInputStream* aInputStream)
|
|
{
|
|
if (!aInputStream) {
|
|
return NS_ERROR_NULL_POINTER;
|
|
}
|
|
mInputStream = aInputStream;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Available(uint64_t* aResult)
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
return mInputStream->Available(aResult);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::Read(uint32_t aCount, char** aResult)
|
|
{
|
|
nsresult rv = NS_OK;
|
|
uint64_t count64 = 0;
|
|
char* buffer = nullptr;
|
|
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
rv = mInputStream->Available(&count64);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
// bug716556 - Ensure count+1 doesn't overflow
|
|
uint32_t count =
|
|
XPCOM_MIN((uint32_t)XPCOM_MIN<uint64_t>(count64, aCount), UINT32_MAX - 1);
|
|
buffer = (char*)malloc(count + 1); // make room for '\0'
|
|
if (!buffer) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
rv = ReadHelper(buffer, count);
|
|
if (NS_FAILED(rv)) {
|
|
free(buffer);
|
|
return rv;
|
|
}
|
|
|
|
buffer[count] = '\0';
|
|
*aResult = buffer;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsScriptableInputStream::ReadBytes(uint32_t aCount, nsACString& aResult)
|
|
{
|
|
if (!mInputStream) {
|
|
return NS_ERROR_NOT_INITIALIZED;
|
|
}
|
|
|
|
aResult.SetLength(aCount);
|
|
if (aResult.Length() != aCount) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
char* ptr = aResult.BeginWriting();
|
|
nsresult rv = ReadHelper(ptr, aCount);
|
|
if (NS_FAILED(rv)) {
|
|
aResult.Truncate();
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsScriptableInputStream::ReadHelper(char* aBuffer, uint32_t aCount)
|
|
{
|
|
uint32_t totalBytesRead = 0;
|
|
while (1) {
|
|
uint32_t bytesRead;
|
|
nsresult rv = mInputStream->Read(aBuffer + totalBytesRead,
|
|
aCount - totalBytesRead,
|
|
&bytesRead);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
totalBytesRead += bytesRead;
|
|
if (totalBytesRead == aCount) {
|
|
break;
|
|
}
|
|
|
|
// If we have read zero bytes, we have hit EOF.
|
|
if (bytesRead == 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsScriptableInputStream::Create(nsISupports* aOuter, REFNSIID aIID,
|
|
void** aResult)
|
|
{
|
|
if (aOuter) {
|
|
return NS_ERROR_NO_AGGREGATION;
|
|
}
|
|
|
|
RefPtr<nsScriptableInputStream> sis = new nsScriptableInputStream();
|
|
return sis->QueryInterface(aIID, aResult);
|
|
}
|