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

Added |nsresult nsCOMPtr::assignment_error() const;| which returns the error, if any, from the most recent operation (constructor or assignment operator) that implicitly calls |QueryInterface|. This did not increase the size of an |nsCOMPtr|.

This commit is contained in:
scc%netscape.com 1999-02-11 01:34:07 +00:00
Родитель 5fcfaafa90
Коммит 6a09eaa097
4 изменённых файлов: 160 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

65
xpcom/base/nsCOMPtr.h
Просмотреть файл

@ -33,6 +33,16 @@
#endif
/*
TO DO...
+ Factor out some base behavior to reduce possible bloating
+ Find an alternative to the current illegal and non-functioning comparison operators
+ Improve internal documentation
+ mention *&
*/
/* USER MANUAL
@ -436,31 +446,31 @@ class nsCOMPtr
explicit
nsCOMPtr( nsISupports* aRawPtr = 0 )
: mRawPtr(0),
mIsAwaitingAddRef(0)
/*
...it's unfortunate, but negligable, that this does a |QueryInterface| even
when constructed from a |T*| but we can't tell the difference between a |T*|
and a pointer to some object derived from |class T|.
*/
{
if ( aRawPtr )
if ( !NS_SUCCEEDED(aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr))) )
nsresult status = NS_OK;
if ( !aRawPtr || !NS_SUCCEEDED( status = aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr)) ) )
mRawPtr = 0; // ...in case they wrote |QueryInterface| wrong, and it returns an error _and_ a pointer
// ...and |QueryInterface| does the |AddRef| for us (if it returned a pointer)
mImplicitQueryInterfaceResult = status;
}
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -470,7 +480,7 @@ class nsCOMPtr
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -489,32 +499,30 @@ class nsCOMPtr
nsCOMPtr&
operator=( nsISupports* rhs )
{
T* rawPtr = 0;
if ( rhs )
if ( !NS_SUCCEEDED(rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr))) )
T* rawPtr;
nsresult status = NS_OK;
if ( !rhs || !NS_SUCCEEDED( status = rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr)) ) )
rawPtr = 0;
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = status;
return *this;
}
nsCOMPtr&
operator=( const nsDontAddRef<T>& rhs )
{
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -528,14 +536,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -549,14 +556,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -588,6 +594,12 @@ class nsCOMPtr
return NSCAP_REINTERPRET_CAST(nsDerivedSafe<T>*, mRawPtr);
}
nsresult
assignment_error() const
{
return mRawPtr ? NS_OK : mImplicitQueryInterfaceResult;
}
#if 0
private:
friend class nsGetterAddRefs<T>;
@ -620,16 +632,21 @@ class nsCOMPtr
void
FinishAssignment()
{
if ( mIsAwaitingAddRef )
if ( mRawPtr && mIsAwaitingAddRef )
{
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
mImplicitQueryInterfaceResult = NS_OK;
}
private:
T* mRawPtr;
union
{
NSCAP_BOOL mIsAwaitingAddRef;
nsresult mImplicitQueryInterfaceResult;
};
};

65
xpcom/glue/nsCOMPtr.h
Просмотреть файл

@ -33,6 +33,16 @@
#endif
/*
TO DO...
+ Factor out some base behavior to reduce possible bloating
+ Find an alternative to the current illegal and non-functioning comparison operators
+ Improve internal documentation
+ mention *&
*/
/* USER MANUAL
@ -436,31 +446,31 @@ class nsCOMPtr
explicit
nsCOMPtr( nsISupports* aRawPtr = 0 )
: mRawPtr(0),
mIsAwaitingAddRef(0)
/*
...it's unfortunate, but negligable, that this does a |QueryInterface| even
when constructed from a |T*| but we can't tell the difference between a |T*|
and a pointer to some object derived from |class T|.
*/
{
if ( aRawPtr )
if ( !NS_SUCCEEDED(aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr))) )
nsresult status = NS_OK;
if ( !aRawPtr || !NS_SUCCEEDED( status = aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr)) ) )
mRawPtr = 0; // ...in case they wrote |QueryInterface| wrong, and it returns an error _and_ a pointer
// ...and |QueryInterface| does the |AddRef| for us (if it returned a pointer)
mImplicitQueryInterfaceResult = status;
}
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -470,7 +480,7 @@ class nsCOMPtr
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -489,32 +499,30 @@ class nsCOMPtr
nsCOMPtr&
operator=( nsISupports* rhs )
{
T* rawPtr = 0;
if ( rhs )
if ( !NS_SUCCEEDED(rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr))) )
T* rawPtr;
nsresult status = NS_OK;
if ( !rhs || !NS_SUCCEEDED( status = rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr)) ) )
rawPtr = 0;
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = status;
return *this;
}
nsCOMPtr&
operator=( const nsDontAddRef<T>& rhs )
{
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -528,14 +536,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -549,14 +556,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -588,6 +594,12 @@ class nsCOMPtr
return NSCAP_REINTERPRET_CAST(nsDerivedSafe<T>*, mRawPtr);
}
nsresult
assignment_error() const
{
return mRawPtr ? NS_OK : mImplicitQueryInterfaceResult;
}
#if 0
private:
friend class nsGetterAddRefs<T>;
@ -620,16 +632,21 @@ class nsCOMPtr
void
FinishAssignment()
{
if ( mIsAwaitingAddRef )
if ( mRawPtr && mIsAwaitingAddRef )
{
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
mImplicitQueryInterfaceResult = NS_OK;
}
private:
T* mRawPtr;
union
{
NSCAP_BOOL mIsAwaitingAddRef;
nsresult mImplicitQueryInterfaceResult;
};
};

65
xpcom/public/nsCOMPtr.h
Просмотреть файл

@ -33,6 +33,16 @@
#endif
/*
TO DO...
+ Factor out some base behavior to reduce possible bloating
+ Find an alternative to the current illegal and non-functioning comparison operators
+ Improve internal documentation
+ mention *&
*/
/* USER MANUAL
@ -436,31 +446,31 @@ class nsCOMPtr
explicit
nsCOMPtr( nsISupports* aRawPtr = 0 )
: mRawPtr(0),
mIsAwaitingAddRef(0)
/*
...it's unfortunate, but negligable, that this does a |QueryInterface| even
when constructed from a |T*| but we can't tell the difference between a |T*|
and a pointer to some object derived from |class T|.
*/
{
if ( aRawPtr )
if ( !NS_SUCCEEDED(aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr))) )
nsresult status = NS_OK;
if ( !aRawPtr || !NS_SUCCEEDED( status = aRawPtr->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &mRawPtr)) ) )
mRawPtr = 0; // ...in case they wrote |QueryInterface| wrong, and it returns an error _and_ a pointer
// ...and |QueryInterface| does the |AddRef| for us (if it returned a pointer)
mImplicitQueryInterfaceResult = status;
}
nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
// nothing else to do here
}
nsCOMPtr( const nsDontQueryInterface<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -470,7 +480,7 @@ class nsCOMPtr
nsCOMPtr( const nsCOMPtr<T>& aSmartPtr )
: mRawPtr(aSmartPtr.mRawPtr),
mIsAwaitingAddRef(0)
mImplicitQueryInterfaceResult(NS_OK)
{
if ( mRawPtr )
{
@ -489,32 +499,30 @@ class nsCOMPtr
nsCOMPtr&
operator=( nsISupports* rhs )
{
T* rawPtr = 0;
if ( rhs )
if ( !NS_SUCCEEDED(rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr))) )
T* rawPtr;
nsresult status = NS_OK;
if ( !rhs || !NS_SUCCEEDED( status = rhs->QueryInterface(T::IID(), NSCAP_REINTERPRET_CAST(void**, &rawPtr)) ) )
rawPtr = 0;
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = status;
return *this;
}
nsCOMPtr&
operator=( const nsDontAddRef<T>& rhs )
{
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rhs.mRawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -528,14 +536,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -549,14 +556,13 @@ class nsCOMPtr
NSCAP_ADDREF(rawPtr);
}
if ( mIsAwaitingAddRef )
mIsAwaitingAddRef = 0;
else if ( mRawPtr )
if ( mRawPtr && !mIsAwaitingAddRef )
{
NSCAP_RELEASE(mRawPtr);
}
mRawPtr = rawPtr;
mImplicitQueryInterfaceResult = NS_OK;
return *this;
}
@ -588,6 +594,12 @@ class nsCOMPtr
return NSCAP_REINTERPRET_CAST(nsDerivedSafe<T>*, mRawPtr);
}
nsresult
assignment_error() const
{
return mRawPtr ? NS_OK : mImplicitQueryInterfaceResult;
}
#if 0
private:
friend class nsGetterAddRefs<T>;
@ -620,16 +632,21 @@ class nsCOMPtr
void
FinishAssignment()
{
if ( mIsAwaitingAddRef )
if ( mRawPtr && mIsAwaitingAddRef )
{
NSCAP_ADDREF(mRawPtr);
mIsAwaitingAddRef = 0;
}
mImplicitQueryInterfaceResult = NS_OK;
}
private:
T* mRawPtr;
union
{
NSCAP_BOOL mIsAwaitingAddRef;
nsresult mImplicitQueryInterfaceResult;
};
};

17
xpcom/tests/TestCOMPtr.cpp
Просмотреть файл

@ -297,6 +297,8 @@ main()
{
cout << ">>main()" << endl;
cout << "sizeof(nsCOMPtr<IFoo>) --> " << sizeof(nsCOMPtr<IFoo>) << endl;
{
cout << endl << "### Test 1: will a |nsCOMPtr| call |AddRef| on a pointer assigned into it?" << endl;
@ -480,8 +482,21 @@ main()
cout << "### End Test 24" << endl;
{
cout << endl << "### setup for Test 25" << endl;
nsCOMPtr<IFoo> fooP( new IFoo );
nsCOMPtr<IBar> barP;
cout << endl << "### Test 25: will a static |nsCOMPtr| |Release| before program termination?" << endl;
cout << "### Test 25: will an assignment fail when the interface is not supported, is the error available?" << endl;
barP = fooP;
cout << "barP.assignment_error() --> " << barP.assignment_error() << endl;
cout << "### cleanup for Test 25" << endl;
}
cout << "### End Test 25" << endl;
cout << endl << "### Test 26: will a static |nsCOMPtr| |Release| before program termination?" << endl;
gFoop = new IFoo;
cout << "<<main()" << endl;